azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Wasm] Migrate usages of @JsFun to js("code")

Browse Source
This commit is contained in:
Svyatoslav Kuzmich
2023-01-14 15:19:25 +01:00
committed by Space Team
parent 7a04999e4a
commit 7175b9f31c
18 changed files with 303 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/wasm/internal/kotlin/wasm/internal/ExceptionHelpers.kt
+10 -10
View File
@@ -5,16 +5,16 @@
package kotlin.wasm.internal
@JsFun(
"""(message, wasmTypeName, stack) => {
const error = new Error();
error.message = message;
error.name = wasmTypeName;
error.stack = stack;
throw error;
}"""
)
private external fun throwJsError(message: String?, wasmTypeName: String?, stack: String): Nothing
@Suppress("UNUSED_PARAMETER") // TODO: Remove after bootstrap update
private fun throwJsError(message: String?, wasmTypeName: String?, stack: String): Nothing {
js("""
const error = new Error();
error.message = message;
error.name = wasmTypeName;
error.stack = stack;
throw error;
""")
}
internal fun throwAsJsException(t: Throwable): Nothing {
throwJsError(t.message, t::class.simpleName, t.stackTraceToString())
libraries/stdlib/wasm/internal/kotlin/wasm/internal/ExternalWrapper.kt
+57 -56
View File
@@ -3,6 +3,8 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
@file:Suppress("UNUSED_PARAMETER") // TODO: Remove after bootstrap update
package kotlin.wasm.internal
import kotlin.wasm.internal.reftypes.anyref
@@ -31,6 +33,7 @@ internal class JsExternalBox @WasmPrimitiveConstructor constructor(val ref: Exte
}
}
@Suppress("DEPRECATION")
//language=js
@JsFun("""
(() => {
@@ -85,41 +88,41 @@ return (obj) => {
)
private external fun externrefHashCode(ref: ExternalInterfaceType): Int
@JsFun("ref => String(ref)")
private external fun externrefToString(ref: ExternalInterfaceType): String
private fun externrefToString(ref: ExternalInterfaceType): String =
js("String(ref)")
@JsFun("ref => Number(ref)")
private external fun externrefToInt(ref: ExternalInterfaceType): Int
private fun externrefToInt(ref: ExternalInterfaceType): Int =
js("Number(ref)")
@JsFun("ref => Number(ref)")
private external fun externrefToLong(ref: ExternalInterfaceType): Long
private fun externrefToLong(ref: ExternalInterfaceType): Long =
js("Number(ref)")
@JsFun("ref => Boolean(ref)")
private external fun externrefToBoolean(ref: ExternalInterfaceType): Boolean
private fun externrefToBoolean(ref: ExternalInterfaceType): Boolean =
js("Boolean(ref)")
@JsFun("ref => Number(ref)")
private external fun externrefToFloat(ref: ExternalInterfaceType): Float
private fun externrefToFloat(ref: ExternalInterfaceType): Float =
js("Number(ref)")
@JsFun("ref => Number(ref)")
private external fun externrefToDouble(ref: ExternalInterfaceType): Double
private fun externrefToDouble(ref: ExternalInterfaceType): Double =
js("Number(ref)")
@JsFun("x => x")
private external fun intToExternref(x: Int): ExternalInterfaceType
private fun intToExternref(x: Int): ExternalInterfaceType =
js("x")
@JsFun("x => x")
private external fun longToExternref(x: Long): ExternalInterfaceType
private fun longToExternref(x: Long): ExternalInterfaceType =
js("x")
@JsFun("x => x")
private external fun booleanToExternref(x: Boolean): ExternalInterfaceType
private fun booleanToExternref(x: Boolean): ExternalInterfaceType =
js("x")
@JsFun("x => x")
private external fun floatToExternref(x: Float): ExternalInterfaceType
private fun floatToExternref(x: Float): ExternalInterfaceType =
js("x")
@JsFun("x => x")
private external fun doubleToExternref(x: Double): ExternalInterfaceType
private fun doubleToExternref(x: Double): ExternalInterfaceType =
js("x")
@JsFun("(lhs, rhs) => lhs === rhs")
private external fun externrefEquals(lhs: ExternalInterfaceType, rhs: ExternalInterfaceType): Boolean
private fun externrefEquals(lhs: ExternalInterfaceType, rhs: ExternalInterfaceType): Boolean =
js("lhs === rhs")
private external fun tryGetOrSetExternrefBox(ref: ExternalInterfaceType, ifNotCached: JsExternalBox): JsExternalBox?
@@ -136,8 +139,8 @@ private fun ExternalInterfaceType.externAsWasmAnyref(): anyref =
private fun Any.asWasmExternRef(): ExternalInterfaceType =
implementedAsIntrinsic
@JsFun("(ref) => ref == null")
internal external fun isNullish(ref: ExternalInterfaceType?): Boolean
internal fun isNullish(ref: ExternalInterfaceType?): Boolean =
js("ref == null")
@Suppress("UNUSED_PARAMETER")
@ExcludedFromCodegen
@@ -179,18 +182,18 @@ internal fun anyToExternRef(x: Any): ExternalInterfaceType {
x.asWasmExternRef()
}
@JsFun("x => x.length")
internal external fun stringLength(x: ExternalInterfaceType): Int
internal fun stringLength(x: ExternalInterfaceType): Int =
js("x.length")
// kotlin string to js string export
// TODO Uint16Array may work with byte endian different with Wasm (i.e. little endian)
@JsFun("""(address, length, prefix) => {
internal fun importStringFromWasm(address: Int, length: Int, prefix: ExternalInterfaceType?): ExternalInterfaceType {
js("""
const mem16 = new Uint16Array(wasmExports.memory.buffer, address, length);
const str = String.fromCharCode.apply(null, mem16);
return (prefix == null) ? str : prefix + str;
""")
}
""")
internal external fun importStringFromWasm(address: Int, length: Int, prefix: ExternalInterfaceType?): ExternalInterfaceType
internal fun kotlinToJsStringAdapter(x: String?): ExternalInterfaceType? {
// Using nullable String to represent default value
@@ -224,21 +227,18 @@ internal fun jsCheckIsNullOrUndefinedAdapter(x: ExternalInterfaceType?): Externa
// js string to kotlin string import
// TODO Uint16Array may work with byte endian different with Wasm (i.e. little endian)
//language=js
@JsFun(
""" (src, srcOffset, srcLength, dstAddr) => {
const mem16 = new Uint16Array(wasmExports.memory.buffer, dstAddr, srcLength);
let arrayIndex = 0;
let srcIndex = srcOffset;
while (arrayIndex < srcLength) {
mem16.set([src.charCodeAt(srcIndex)], arrayIndex);
srcIndex++;
arrayIndex++;
}
}
"""
)
internal external fun jsExportStringToWasm(src: ExternalInterfaceType, srcOffset: Int, srcLength: Int, dstAddr: Int)
internal fun jsExportStringToWasm(src: ExternalInterfaceType, srcOffset: Int, srcLength: Int, dstAddr: Int) {
js("""
const mem16 = new Uint16Array(wasmExports.memory.buffer, dstAddr, srcLength);
let arrayIndex = 0;
let srcIndex = srcOffset;
while (arrayIndex < srcLength) {
mem16.set([src.charCodeAt(srcIndex)], arrayIndex);
srcIndex++;
arrayIndex++;
}
""")
}
private const val STRING_INTEROP_MEM_BUFFER_SIZE = 65_536 // 1 page 4KiB
@@ -269,14 +269,14 @@ internal fun jsToKotlinStringAdapter(x: ExternalInterfaceType): String {
}
@JsFun("() => ''")
private external fun getJsEmptyString(): ExternalInterfaceType
private fun getJsEmptyString(): ExternalInterfaceType =
js("''")
@JsFun("() => true")
private external fun getJsTrue(): ExternalInterfaceType
private fun getJsTrue(): ExternalInterfaceType =
js("true")
@JsFun("() => false")
private external fun getJsFalse(): ExternalInterfaceType
private fun getJsFalse(): ExternalInterfaceType =
js("false")
private val jsEmptyString by lazy(::getJsEmptyString)
private val jsTrue by lazy(::getJsTrue)
@@ -335,8 +335,9 @@ internal fun kotlinShortToExternRefAdapter(x: Short): ExternalInterfaceType =
internal fun kotlinCharToExternRefAdapter(x: Char): ExternalInterfaceType =
intToExternref(x.toInt())
@JsFun("() => []")
internal external fun newJsArray(): ExternalInterfaceType
internal fun newJsArray(): ExternalInterfaceType =
js("[]")
@JsFun("(array, element) => { array.push(element); }")
internal external fun jsArrayPush(array: ExternalInterfaceType, element: ExternalInterfaceType)
internal fun jsArrayPush(array: ExternalInterfaceType, element: ExternalInterfaceType) {
js("array.push(element);")
}