From 955d7dad298898612b74d5d4499e2e0848a4e9f3 Mon Sep 17 00:00:00 2001 From: Daan Vanden Bosch Date: Mon, 19 Apr 2021 21:53:15 +0200 Subject: [PATCH] Greatly improved script assembly performance. --- .../core/{ => unsafe}/UnsafeCast.kt | 2 +- .../world/phantasmal/core/unsafe/UnsafeMap.kt | 14 ++ .../jsMain/kotlin/world/phantasmal/core/Js.kt | 22 --- .../core/{ => unsafe}/UnsafeCast.kt | 2 +- .../world/phantasmal/core/unsafe/UnsafeMap.kt | 10 ++ .../core/{ => unsafe}/UnsafeCast.kt | 2 +- .../world/phantasmal/core/unsafe/UnsafeMap.kt | 19 ++ lib/build.gradle.kts | 2 + .../phantasmal/lib/asm/AsmTokenization.kt | 112 ++++++++++-- .../world/phantasmal/lib/asm/Assembly.kt | 164 ++++++++++-------- .../world/phantasmal/lib/asm/BytecodeIr.kt | 94 +++++----- .../kotlin/world/phantasmal/lib/asm/Opcode.kt | 16 +- .../lib/fileFormats/quest/Bytecode.kt | 36 ++-- .../phantasmal/lib/asm/DisassemblyTests.kt | 92 +++++----- .../observable/value/AbstractDependentVal.kt | 2 +- .../value/FlatteningDependentVal.kt | 2 +- .../observable/value/list/AbstractListVal.kt | 2 +- .../observable/value/list/DependentListVal.kt | 2 +- .../value/list/FlatteningDependentListVal.kt | 2 +- .../observable/value/list/FoldedVal.kt | 2 +- .../core/rendering/conversion/MeshBuilder.kt | 5 +- .../conversion/NinjaGeometryConversion.kt | 49 +++--- .../web/core/stores/ItemDropStore.kt | 15 +- .../stores/HuntOptimizerStore.kt | 17 +- .../web/questEditor/stores/AsmStore.kt | 2 +- .../webui/dom/HTMLElementSizeVal.kt | 2 +- 26 files changed, 418 insertions(+), 271 deletions(-) rename core/src/commonMain/kotlin/world/phantasmal/core/{ => unsafe}/UnsafeCast.kt (84%) create mode 100644 core/src/commonMain/kotlin/world/phantasmal/core/unsafe/UnsafeMap.kt rename core/src/jsMain/kotlin/world/phantasmal/core/{ => unsafe}/UnsafeCast.kt (72%) create mode 100644 core/src/jsMain/kotlin/world/phantasmal/core/unsafe/UnsafeMap.kt rename core/src/jvmMain/kotlin/world/phantasmal/core/{ => unsafe}/UnsafeCast.kt (75%) create mode 100644 core/src/jvmMain/kotlin/world/phantasmal/core/unsafe/UnsafeMap.kt diff --git a/core/src/commonMain/kotlin/world/phantasmal/core/UnsafeCast.kt b/core/src/commonMain/kotlin/world/phantasmal/core/unsafe/UnsafeCast.kt similarity index 84% rename from core/src/commonMain/kotlin/world/phantasmal/core/UnsafeCast.kt rename to core/src/commonMain/kotlin/world/phantasmal/core/unsafe/UnsafeCast.kt index 8fc6885b..b7876734 100644 --- a/core/src/commonMain/kotlin/world/phantasmal/core/UnsafeCast.kt +++ b/core/src/commonMain/kotlin/world/phantasmal/core/unsafe/UnsafeCast.kt @@ -1,4 +1,4 @@ -package world.phantasmal.core +package world.phantasmal.core.unsafe /** * Asserts that T is not null. No runtime check happens in KJS. Should only be used when absolutely diff --git a/core/src/commonMain/kotlin/world/phantasmal/core/unsafe/UnsafeMap.kt b/core/src/commonMain/kotlin/world/phantasmal/core/unsafe/UnsafeMap.kt new file mode 100644 index 00000000..ae5c169b --- /dev/null +++ b/core/src/commonMain/kotlin/world/phantasmal/core/unsafe/UnsafeMap.kt @@ -0,0 +1,14 @@ +package world.phantasmal.core.unsafe + +/** + * Map optimized for JS (it compiles to the built-in Map). + * In JS, keys are compared by reference, equals and hashCode are NOT invoked. On JVM, equals and + * hashCode ARE used. + */ +expect class UnsafeMap() { + fun get(key: K): V? + fun has(key: K): Boolean + fun forEach(callback: (value: V, key: K) -> Unit) + fun set(key: K, value: V) + fun delete(key: K): Boolean +} diff --git a/core/src/jsMain/kotlin/world/phantasmal/core/Js.kt b/core/src/jsMain/kotlin/world/phantasmal/core/Js.kt index 425bdfff..0caaa586 100644 --- a/core/src/jsMain/kotlin/world/phantasmal/core/Js.kt +++ b/core/src/jsMain/kotlin/world/phantasmal/core/Js.kt @@ -43,10 +43,6 @@ inline val JsPair<*, T>.second: T get() = asDynamic()[1].unsafeCast() inline operator fun JsPair.component1(): T = first inline operator fun JsPair<*, T>.component2(): T = second -@Suppress("FunctionName", "UNUSED_PARAMETER") -inline fun JsPair(first: A, second: B): JsPair = - js("[first, second]").unsafeCast>() - @Suppress("UNUSED_PARAMETER") inline fun objectEntries(jsObject: dynamic): Array> = js("Object.entries(jsObject)").unsafeCast>>() @@ -67,21 +63,3 @@ inline fun emptyJsSet(): JsSet = @Suppress("UNUSED_PARAMETER") inline fun jsSetOf(vararg values: T): JsSet = js("new Set(values)").unsafeCast>() - -external interface JsMap { - val size: Int - - fun clear() - fun delete(key: K): Boolean - fun forEach(callback: (value: V, key: K) -> Unit) - fun get(key: K): V? - fun has(key: K): Boolean - fun set(key: K, value: V): JsMap -} - -@Suppress("UNUSED_PARAMETER") -inline fun jsMapOf(vararg pairs: JsPair): JsMap = - js("new Map(pairs)").unsafeCast>() - -inline fun emptyJsMap(): JsMap = - js("new Map()").unsafeCast>() diff --git a/core/src/jsMain/kotlin/world/phantasmal/core/UnsafeCast.kt b/core/src/jsMain/kotlin/world/phantasmal/core/unsafe/UnsafeCast.kt similarity index 72% rename from core/src/jsMain/kotlin/world/phantasmal/core/UnsafeCast.kt rename to core/src/jsMain/kotlin/world/phantasmal/core/unsafe/UnsafeCast.kt index a3517a04..8c32b3cf 100644 --- a/core/src/jsMain/kotlin/world/phantasmal/core/UnsafeCast.kt +++ b/core/src/jsMain/kotlin/world/phantasmal/core/unsafe/UnsafeCast.kt @@ -1,4 +1,4 @@ -package world.phantasmal.core +package world.phantasmal.core.unsafe @Suppress("NOTHING_TO_INLINE") actual inline fun T?.unsafeAssertNotNull(): T = unsafeCast() diff --git a/core/src/jsMain/kotlin/world/phantasmal/core/unsafe/UnsafeMap.kt b/core/src/jsMain/kotlin/world/phantasmal/core/unsafe/UnsafeMap.kt new file mode 100644 index 00000000..04e26439 --- /dev/null +++ b/core/src/jsMain/kotlin/world/phantasmal/core/unsafe/UnsafeMap.kt @@ -0,0 +1,10 @@ +package world.phantasmal.core.unsafe + +@JsName("Map") +actual external class UnsafeMap { + actual fun get(key: K): V? + actual fun has(key: K): Boolean + actual fun forEach(callback: (value: V, key: K) -> Unit) + actual fun set(key: K, value: V) + actual fun delete(key: K): Boolean +} diff --git a/core/src/jvmMain/kotlin/world/phantasmal/core/UnsafeCast.kt b/core/src/jvmMain/kotlin/world/phantasmal/core/unsafe/UnsafeCast.kt similarity index 75% rename from core/src/jvmMain/kotlin/world/phantasmal/core/UnsafeCast.kt rename to core/src/jvmMain/kotlin/world/phantasmal/core/unsafe/UnsafeCast.kt index 967f2318..cadf5ef1 100644 --- a/core/src/jvmMain/kotlin/world/phantasmal/core/UnsafeCast.kt +++ b/core/src/jvmMain/kotlin/world/phantasmal/core/unsafe/UnsafeCast.kt @@ -1,4 +1,4 @@ -package world.phantasmal.core +package world.phantasmal.core.unsafe @Suppress("UNCHECKED_CAST", "NOTHING_TO_INLINE") actual inline fun T?.unsafeAssertNotNull(): T = this as T diff --git a/core/src/jvmMain/kotlin/world/phantasmal/core/unsafe/UnsafeMap.kt b/core/src/jvmMain/kotlin/world/phantasmal/core/unsafe/UnsafeMap.kt new file mode 100644 index 00000000..5335b0ae --- /dev/null +++ b/core/src/jvmMain/kotlin/world/phantasmal/core/unsafe/UnsafeMap.kt @@ -0,0 +1,19 @@ +package world.phantasmal.core.unsafe + +actual class UnsafeMap { + private val map = HashMap() + + actual fun get(key: K): V? = map[key] + + actual fun has(key: K): Boolean = key in map + + actual fun forEach(callback: (value: V, key: K) -> Unit) { + map.forEach { (k, v) -> callback(v, k) } + } + + actual fun set(key: K, value: V) { + map[key] = value + } + + actual fun delete(key: K): Boolean = map.remove(key) != null +} diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts index 11f1abc5..65ddbb52 100644 --- a/lib/build.gradle.kts +++ b/lib/build.gradle.kts @@ -40,7 +40,9 @@ kotlin { sourceSets { all { + languageSettings.useExperimentalAnnotation("kotlin.RequiresOptIn") languageSettings.useExperimentalAnnotation("kotlin.ExperimentalUnsignedTypes") + languageSettings.useExperimentalAnnotation("kotlin.time.ExperimentalTime") } commonMain { diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/AsmTokenization.kt b/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/AsmTokenization.kt index a4e750ba..fc7f91f3 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/AsmTokenization.kt +++ b/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/AsmTokenization.kt @@ -2,12 +2,33 @@ package world.phantasmal.lib.asm import world.phantasmal.core.fastIsWhitespace import world.phantasmal.core.isDigit +import kotlin.contracts.ExperimentalContracts +import kotlin.contracts.contract private val HEX_INT_REGEX = Regex("""^0[xX][0-9a-fA-F]+$""") private val FLOAT_REGEX = Regex("""^-?\d+(\.\d+)?(e-?\d+)?$""") private val IDENT_REGEX = Regex("""^[a-z][a-z0-9_=<>!]*$""") +const val TOKEN_INT32 = 1 +const val TOKEN_FLOAT32 = 2 +const val TOKEN_INVALID_NUMBER = 3 +const val TOKEN_REGISTER = 4 +const val TOKEN_LABEL = 5 +const val TOKEN_SECTION_CODE = 6 +const val TOKEN_SECTION_DATA = 7 +const val TOKEN_SECTION_STR = 8 +const val TOKEN_INVALID_SECTION = 9 +const val TOKEN_STR = 10 +const val TOKEN_UNTERMINATED_STR = 11 +const val TOKEN_IDENT = 12 +const val TOKEN_INVALID_IDENT = 13 +const val TOKEN_ARG_SEP = 14 + sealed class Token { + /** + * This property is used for increased perf type checks in JS. + */ + abstract val type: Int abstract val col: Int abstract val len: Int @@ -15,80 +36,143 @@ sealed class Token { override val col: Int, override val len: Int, val value: Int, - ) : Token() + ) : Token() { + override val type = TOKEN_INT32 + } class Float32( override val col: Int, override val len: Int, val value: Float, - ) : Token() + ) : Token() { + override val type = TOKEN_FLOAT32 + } class InvalidNumber( override val col: Int, override val len: Int, - ) : Token() + ) : Token() { + override val type = TOKEN_INVALID_NUMBER + } class Register( override val col: Int, override val len: Int, val value: Int, - ) : Token() + ) : Token() { + override val type = TOKEN_REGISTER + } class Label( override val col: Int, override val len: Int, val value: Int, - ) : Token() + ) : Token() { + override val type = TOKEN_LABEL + } sealed class Section : Token() { class Code( override val col: Int, override val len: Int, - ) : Section() + ) : Section() { + override val type = TOKEN_SECTION_CODE + } class Data( override val col: Int, override val len: Int, - ) : Section() + ) : Section() { + override val type = TOKEN_SECTION_DATA + } class Str( override val col: Int, override val len: Int, - ) : Section() + ) : Section() { + override val type = TOKEN_SECTION_STR + } } class InvalidSection( override val col: Int, override val len: Int, - ) : Token() + ) : Token() { + override val type = TOKEN_INVALID_SECTION + } class Str( override val col: Int, override val len: Int, val value: String, - ) : Token() + ) : Token() { + override val type = TOKEN_STR + } class UnterminatedString( override val col: Int, override val len: Int, val value: String, - ) : Token() + ) : Token() { + override val type = TOKEN_UNTERMINATED_STR + } class Ident( override val col: Int, override val len: Int, val value: String, - ) : Token() + ) : Token() { + override val type = TOKEN_IDENT + } class InvalidIdent( override val col: Int, override val len: Int, - ) : Token() + ) : Token() { + override val type = TOKEN_INVALID_IDENT + } class ArgSeparator( override val col: Int, override val len: Int, - ) : Token() + ) : Token() { + override val type = TOKEN_ARG_SEP + } + + @OptIn(ExperimentalContracts::class) + @Suppress("NOTHING_TO_INLINE") + inline fun isInt32(): Boolean { + contract { returns(true) implies (this@Token is Int32) } + return type == TOKEN_INT32 + } + + @OptIn(ExperimentalContracts::class) + @Suppress("NOTHING_TO_INLINE") + inline fun isFloat32(): Boolean { + contract { returns(true) implies (this@Token is Float32) } + return type == TOKEN_FLOAT32 + } + + @OptIn(ExperimentalContracts::class) + @Suppress("NOTHING_TO_INLINE") + inline fun isRegister(): Boolean { + contract { returns(true) implies (this@Token is Register) } + return type == TOKEN_REGISTER + } + + @OptIn(ExperimentalContracts::class) + @Suppress("NOTHING_TO_INLINE") + inline fun isStr(): Boolean { + contract { returns(true) implies (this@Token is Str) } + return type == TOKEN_STR + } + + @OptIn(ExperimentalContracts::class) + @Suppress("NOTHING_TO_INLINE") + inline fun isArgSeparator(): Boolean { + contract { returns(true) implies (this@Token is ArgSeparator) } + return type == TOKEN_ARG_SEP + } } fun tokenizeLine(line: String): MutableList = diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/Assembly.kt b/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/Assembly.kt index d38014e7..6de69074 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/Assembly.kt +++ b/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/Assembly.kt @@ -5,6 +5,7 @@ import world.phantasmal.core.Problem import world.phantasmal.core.PwResult import world.phantasmal.core.Severity import world.phantasmal.lib.buffer.Buffer +import kotlin.time.measureTimedValue private val logger = KotlinLogging.logger {} @@ -28,13 +29,13 @@ fun assemble( }." } - val result = Assembler(asm, inlineStackArgs).assemble() + val (result, time) = measureTimedValue { Assembler(asm, inlineStackArgs).assemble() } logger.trace { val warnings = result.problems.count { it.severity == Severity.Warning } val errors = result.problems.count { it.severity == Severity.Error } - "Assembly finished with $warnings warnings and $errors errors." + "Assembly finished in ${time.inMilliseconds}ms with $warnings warnings and $errors errors." } return result @@ -69,7 +70,16 @@ private class Assembler(private val asm: List, private val inlineStackAr val token = tokens.removeFirst() var hasLabel = false + // Token type checks are ordered from most frequent to least frequent for increased + // perf. when (token) { + is Token.Ident -> { + if (section === SegmentType.Instructions) { + parseInstruction(token) + } else { + addUnexpectedTokenError(token) + } + } is Token.Label -> { parseLabel(token) hasLabel = true @@ -78,26 +88,19 @@ private class Assembler(private val asm: List, private val inlineStackAr parseSection(token) } is Token.Int32 -> { - if (section == SegmentType.Data) { + if (section === SegmentType.Data) { parseBytes(token) } else { addUnexpectedTokenError(token) } } is Token.Str -> { - if (section == SegmentType.String) { + if (section === SegmentType.String) { parseString(token) } else { addUnexpectedTokenError(token) } } - is Token.Ident -> { - if (section === SegmentType.Instructions) { - parseInstruction(token) - } else { - addUnexpectedTokenError(token) - } - } is Token.InvalidSection -> { addError(token, "Invalid section type.") } @@ -146,11 +149,13 @@ private class Assembler(private val asm: List, private val inlineStackAr mnemonic = token?.let { SrcLoc(lineNo, token.col, token.len) }, - args = argTokens.map { + // Use mapTo with ArrayList for better perf in JS. + args = argTokens.mapTo(ArrayList(argTokens.size)) { SrcLoc(lineNo, it.col, it.len) }, - stackArgs = stackArgTokens.map { sat -> - SrcLoc(lineNo, sat.col, sat.len) + // Use mapTo with ArrayList for better perf in JS. + stackArgs = stackArgTokens.mapTo(ArrayList(argTokens.size)) { + SrcLoc(lineNo, it.col, it.len) }, ) ) @@ -356,15 +361,19 @@ private class Assembler(private val asm: List, private val inlineStackAr if (opcode == null) { addError(identToken, "Unknown opcode.") } else { - val varargs = opcode.params.any { - it.type is ILabelVarType || it.type is RegRefVarType - } + // Use find instead of any for better JS perf. + val varargs = opcode.params.find { + it.type === ILabelVarType || it.type === RegRefVarType + } != null val paramCount = - if (!inlineStackArgs && opcode.stack == StackInteraction.Pop) 0 + if (!inlineStackArgs && opcode.stack === StackInteraction.Pop) 0 else opcode.params.size - val argCount = tokens.count { it !is Token.ArgSeparator } + // Use fold instead of count for better JS perf. + val argCount = tokens.fold(0) { sum, token -> + if (token.isArgSeparator()) sum else sum + 1 + } val lastToken = tokens.lastOrNull() val errorLength = lastToken?.let { it.col + it.len - identToken.col } ?: 0 @@ -413,7 +422,7 @@ private class Assembler(private val asm: List, private val inlineStackAr val arg = stackArgs.getOrNull(i) ?: continue val argToken = stackTokens.getOrNull(i) ?: continue - if (argToken is Token.Register) { + if (argToken.isRegister()) { if (param.type is RegTupRefType) { addInstruction( OP_ARG_PUSHB, @@ -433,8 +442,8 @@ private class Assembler(private val asm: List, private val inlineStackAr } } else { when (param.type) { - is ByteType, - is RegRefType, + ByteType, + RegRefType, is RegTupRefType, -> { addInstruction( @@ -446,11 +455,8 @@ private class Assembler(private val asm: List, private val inlineStackAr ) } - is ShortType, + ShortType, is LabelType, - is ILabelType, - is DLabelType, - is SLabelType, -> { addInstruction( OP_ARG_PUSHW, @@ -461,7 +467,7 @@ private class Assembler(private val asm: List, private val inlineStackAr ) } - is IntType -> { + IntType -> { addInstruction( OP_ARG_PUSHL, listOf(arg), @@ -471,7 +477,7 @@ private class Assembler(private val asm: List, private val inlineStackAr ) } - is FloatType -> { + FloatType -> { addInstruction( OP_ARG_PUSHL, listOf(Arg((arg.value as Float).toRawBits())), @@ -481,7 +487,7 @@ private class Assembler(private val asm: List, private val inlineStackAr ) } - is StringType -> { + StringType -> { addInstruction( OP_ARG_PUSHS, listOf(arg), @@ -528,12 +534,12 @@ private class Assembler(private val asm: List, private val inlineStackAr val token = tokens[i] val param = params[paramI] - if (token is Token.ArgSeparator) { + if (token.isArgSeparator()) { if (shouldBeArg) { addError(token, "Expected an argument.") } else if ( - param.type !is ILabelVarType && - param.type !is RegRefVarType + param.type !== ILabelVarType && + param.type !== RegRefVarType ) { paramI++ } @@ -551,28 +557,24 @@ private class Assembler(private val asm: List, private val inlineStackAr var match: Boolean - when (token) { - is Token.Int32 -> { + when { + token.isInt32() -> { when (param.type) { - is ByteType -> { + ByteType -> { match = true parseInt(1, token, args, argTokens) } - is ShortType, + ShortType, is LabelType, - is ILabelType, - is DLabelType, - is SLabelType, - is ILabelVarType, -> { match = true parseInt(2, token, args, argTokens) } - is IntType -> { + IntType -> { match = true parseInt(4, token, args, argTokens) } - is FloatType -> { + FloatType -> { match = true args.add(Arg(token.value)) argTokens.add(token) @@ -583,8 +585,8 @@ private class Assembler(private val asm: List, private val inlineStackAr } } - is Token.Float32 -> { - match = param.type == FloatType + token.isFloat32() -> { + match = param.type === FloatType if (match) { args.add(Arg(token.value)) @@ -592,17 +594,17 @@ private class Assembler(private val asm: List, private val inlineStackAr } } - is Token.Register -> { + token.isRegister() -> { match = stack || - param.type is RegRefType || - param.type is RegRefVarType || + param.type === RegRefType || + param.type === RegRefVarType || param.type is RegTupRefType parseRegister(token, args, argTokens) } - is Token.Str -> { - match = param.type is StringType + token.isStr() -> { + match = param.type === StringType if (match) { args.add(Arg(token.value)) @@ -619,22 +621,24 @@ private class Assembler(private val asm: List, private val inlineStackAr semiValid = false val typeStr: String? = when (param.type) { - is ByteType -> "an 8-bit integer" - is ShortType -> "a 16-bit integer" - is IntType -> "a 32-bit integer" - is FloatType -> "a float" - is LabelType -> "a label" + ByteType -> "an 8-bit integer" + ShortType -> "a 16-bit integer" + IntType -> "a 32-bit integer" + FloatType -> "a float" - is ILabelType, - is ILabelVarType, + ILabelType, + ILabelVarType, -> "an instruction label" - is DLabelType -> "a data label" - is SLabelType -> "a string label" - is StringType -> "a string" + DLabelType -> "a data label" + SLabelType -> "a string label" - is RegRefType, - is RegRefVarType, + is LabelType -> "a label" + + StringType -> "a string" + + RegRefType, + RegRefVarType, is RegTupRefType, -> "a register reference" @@ -660,22 +664,30 @@ private class Assembler(private val asm: List, private val inlineStackAr argTokens: MutableList, ) { val value = token.value - val bitSize = 8 * size - // Minimum of the signed version of this integer type. - val minValue = -(1 shl (bitSize - 1)) - // Maximum of the unsigned version of this integer type. - val maxValue = (1L shl (bitSize)) - 1L - when { - value < minValue -> { - addError(token, "${bitSize}-Bit integer can't be less than ${minValue}.") - } - value > maxValue -> { - addError(token, "${bitSize}-Bit integer can't be greater than ${maxValue}.") - } - else -> { - args.add(Arg(value)) - argTokens.add(token) + // Fast-path 32-bit ints for improved JS perf. Otherwise maxValue would have to be a Long + // or UInt, which incurs a perf hit in JS. + if (size == 4) { + args.add(Arg(value)) + argTokens.add(token) + } else { + val bitSize = 8 * size + // Minimum of the signed version of this integer type. + val minValue = -(1 shl (bitSize - 1)) + // Maximum of the unsigned version of this integer type. + val maxValue = (1 shl (bitSize)) - 1 + + when { + value < minValue -> { + addError(token, "${bitSize}-Bit integer can't be less than ${minValue}.") + } + value > maxValue -> { + addError(token, "${bitSize}-Bit integer can't be greater than ${maxValue}.") + } + else -> { + args.add(Arg(value)) + argTokens.add(token) + } } } } diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/BytecodeIr.kt b/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/BytecodeIr.kt index 39c486dd..f79212e1 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/BytecodeIr.kt +++ b/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/BytecodeIr.kt @@ -1,5 +1,6 @@ package world.phantasmal.lib.asm +import world.phantasmal.core.unsafe.unsafeAssertNotNull import world.phantasmal.lib.buffer.Buffer import kotlin.math.ceil @@ -47,7 +48,7 @@ class InstructionSegment( override fun copy(): InstructionSegment = InstructionSegment( ArrayList(labels), - instructions.mapTo(mutableListOf()) { it.copy() }, + instructions.mapTo(ArrayList(instructions.size)) { it.copy() }, srcLoc.copy(), ) } @@ -101,43 +102,46 @@ class Instruction( /** * Immediate arguments for the opcode. */ - val args: List = emptyList(), - val srcLoc: InstructionSrcLoc? = null, + val args: List, + val srcLoc: InstructionSrcLoc?, ) { /** * Maps each parameter by index to its immediate arguments. */ - private val paramToArgs: List> - - init { - val paramToArgs: MutableList> = mutableListOf() - this.paramToArgs = paramToArgs - - if (opcode.stack != StackInteraction.Pop) { - for (i in opcode.params.indices) { - val type = opcode.params[i].type - val pArgs = mutableListOf() - paramToArgs.add(pArgs) - - // Variable length arguments are always last, so we can just gobble up all arguments - // from this point. - if (type is ILabelVarType || type is RegRefVarType) { - check(i == opcode.params.lastIndex) - - for (j in i until args.size) { - pArgs.add(args[j]) - } - } else { - pArgs.add(args[i]) - } - } - } - } + // Avoid using lazy to keep GC pressure low. + private var paramToArgs: List>? = null /** * Returns the immediate arguments for the parameter at the given index. */ - fun getArgs(paramIndex: Int): List = paramToArgs[paramIndex] + fun getArgs(paramIndex: Int): List { + if (paramToArgs == null) { + val paramToArgs: MutableList> = mutableListOf() + this.paramToArgs = paramToArgs + + if (opcode.stack !== StackInteraction.Pop) { + for (i in opcode.params.indices) { + val type = opcode.params[i].type + val pArgs = mutableListOf() + paramToArgs.add(pArgs) + + // Variable length arguments are always last, so we can just gobble up all arguments + // from this point. + if (type === ILabelVarType || type === RegRefVarType) { + check(i == opcode.params.lastIndex) + + for (j in i until args.size) { + pArgs.add(args[j]) + } + } else { + pArgs.add(args[i]) + } + } + } + } + + return paramToArgs.unsafeAssertNotNull()[paramIndex] + } /** * Returns the source locations of the immediate arguments for the parameter at the given index. @@ -150,7 +154,7 @@ class Instruction( // Variable length arguments are always last, so we can just gobble up all SrcLocs from // paramIndex onward. - return if (type is ILabelVarType || type is RegRefVarType) { + return if (type === ILabelVarType || type === RegRefVarType) { argSrcLocs.drop(paramIndex) } else { listOf(argSrcLocs[paramIndex]) @@ -171,7 +175,7 @@ class Instruction( // Variable length arguments are always last, so we can just gobble up all SrcLocs from // paramIndex onward. - return if (type is ILabelVarType || type is RegRefVarType) { + return if (type === ILabelVarType || type === RegRefVarType) { argSrcLocs.drop(paramIndex) } else { listOf(argSrcLocs[paramIndex]) @@ -185,31 +189,28 @@ class Instruction( fun getSize(dcGcFormat: Boolean): Int { var size = opcode.size - if (opcode.stack == StackInteraction.Pop) return size + if (opcode.stack === StackInteraction.Pop) return size for (i in opcode.params.indices) { val type = opcode.params[i].type val args = getArgs(i) size += when (type) { - is ByteType, - is RegRefType, - is RegTupRefType, + ByteType, + RegRefType, -> 1 // Ensure this case is before the LabelType case because ILabelVarType extends // LabelType. - is ILabelVarType -> 1 + 2 * args.size + ILabelVarType -> 1 + 2 * args.size - is ShortType, - is LabelType, - -> 2 + ShortType -> 2 - is IntType, - is FloatType, + IntType, + FloatType, -> 4 - is StringType -> { + StringType -> { if (dcGcFormat) { (args[0].value as String).length + 1 } else { @@ -217,7 +218,12 @@ class Instruction( } } - is RegRefVarType -> 1 + args.size + RegRefVarType -> 1 + args.size + + // Check RegTupRefType and LabelType last, because "is" checks are very slow in JS. + is RegTupRefType -> 1 + + is LabelType -> 2 else -> error("Parameter type ${type::class} not implemented.") } diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/Opcode.kt b/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/Opcode.kt index 2ed60a45..c33c7eb6 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/Opcode.kt +++ b/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/Opcode.kt @@ -1,11 +1,13 @@ package world.phantasmal.lib.asm -private val MNEMONIC_TO_OPCODES: MutableMap by lazy { - val map = mutableMapOf() +import world.phantasmal.core.unsafe.UnsafeMap - OPCODES.forEach { if (it != null) map[it.mnemonic] = it } - OPCODES_F8.forEach { if (it != null) map[it.mnemonic] = it } - OPCODES_F9.forEach { if (it != null) map[it.mnemonic] = it } +private val MNEMONIC_TO_OPCODES: UnsafeMap by lazy { + val map = UnsafeMap() + + OPCODES.forEach { if (it != null) map.set(it.mnemonic, it) } + OPCODES_F8.forEach { if (it != null) map.set(it.mnemonic, it) } + OPCODES_F9.forEach { if (it != null) map.set(it.mnemonic, it) } map } @@ -170,13 +172,13 @@ fun codeToOpcode(code: Int): Opcode = } fun mnemonicToOpcode(mnemonic: String): Opcode? { - var opcode = MNEMONIC_TO_OPCODES[mnemonic] + var opcode = MNEMONIC_TO_OPCODES.get(mnemonic) if (opcode == null) { UNKNOWN_OPCODE_MNEMONIC_REGEX.matchEntire(mnemonic)?.destructured?.let { (codeStr) -> val code = codeStr.toInt(16) opcode = codeToOpcode(code) - MNEMONIC_TO_OPCODES[mnemonic] = opcode!! + MNEMONIC_TO_OPCODES.set(mnemonic, opcode!!) } } diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/Bytecode.kt b/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/Bytecode.kt index aa8e07da..38dfc5af 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/Bytecode.kt +++ b/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/Bytecode.kt @@ -466,13 +466,13 @@ private fun parseInstructionsSegment( // Parse the arguments. try { val args = parseInstructionArguments(cursor, opcode, dcGcFormat) - instructions.add(Instruction(opcode, args)) + instructions.add(Instruction(opcode, args, srcLoc = null)) } catch (e: Exception) { if (lenient) { logger.error(e) { "Exception occurred while parsing arguments for instruction ${opcode.mnemonic}." } - instructions.add(Instruction(opcode, emptyList())) + instructions.add(Instruction(opcode, emptyList(), srcLoc = null)) } else { throw e } @@ -590,21 +590,23 @@ private fun parseInstructionArguments( is StringType -> { val maxBytes = min(4096, cursor.bytesLeft) - args.add(Arg( - if (dcGcFormat) { - cursor.stringAscii( - maxBytes, - nullTerminated = true, - dropRemaining = false - ) - } else { - cursor.stringUtf16( - maxBytes, - nullTerminated = true, - dropRemaining = false - ) - }, - )) + args.add( + Arg( + if (dcGcFormat) { + cursor.stringAscii( + maxBytes, + nullTerminated = true, + dropRemaining = false + ) + } else { + cursor.stringUtf16( + maxBytes, + nullTerminated = true, + dropRemaining = false + ) + }, + ) + ) } is RegRefType, diff --git a/lib/src/commonTest/kotlin/world/phantasmal/lib/asm/DisassemblyTests.kt b/lib/src/commonTest/kotlin/world/phantasmal/lib/asm/DisassemblyTests.kt index d231e828..1c9bc49e 100644 --- a/lib/src/commonTest/kotlin/world/phantasmal/lib/asm/DisassemblyTests.kt +++ b/lib/src/commonTest/kotlin/world/phantasmal/lib/asm/DisassemblyTests.kt @@ -7,26 +7,30 @@ import kotlin.test.assertEquals class DisassemblyTests : LibTestSuite { @Test fun vararg_instructions() { - val ir = BytecodeIr(listOf( - InstructionSegment( - labels = mutableListOf(0), - instructions = mutableListOf( - Instruction( - opcode = OP_SWITCH_JMP, - args = listOf( - Arg(90), - Arg(100), - Arg(101), - Arg(102), + val ir = BytecodeIr( + listOf( + InstructionSegment( + labels = mutableListOf(0), + instructions = mutableListOf( + Instruction( + opcode = OP_SWITCH_JMP, + args = listOf( + Arg(90), + Arg(100), + Arg(101), + Arg(102), + ), + srcLoc = null, + ), + Instruction( + opcode = OP_RET, + args = emptyList(), + srcLoc = null, ), ), - Instruction( - opcode = OP_RET, - args = emptyList() - ), - ), + ) ) - )) + ) val asm = """ |.code @@ -44,30 +48,40 @@ class DisassemblyTests : LibTestSuite { // arguments is on or off. @Test fun va_list_instructions() { - val ir = BytecodeIr(listOf( - InstructionSegment( - labels = mutableListOf(0), - instructions = mutableListOf( - Instruction( - opcode = OP_VA_START, + val ir = BytecodeIr( + listOf( + InstructionSegment( + labels = mutableListOf(0), + instructions = mutableListOf( + Instruction( + opcode = OP_VA_START, + args = emptyList(), + srcLoc = null, + ), + Instruction( + opcode = OP_ARG_PUSHW, + args = listOf(Arg(1337)), + srcLoc = null, + ), + Instruction( + opcode = OP_VA_CALL, + args = listOf(Arg(100)), + srcLoc = null, + ), + Instruction( + opcode = OP_VA_END, + args = emptyList(), + srcLoc = null, + ), + Instruction( + opcode = OP_RET, + args = emptyList(), + srcLoc = null, + ), ), - Instruction( - opcode = OP_ARG_PUSHW, - args = listOf(Arg(1337)), - ), - Instruction( - opcode = OP_VA_CALL, - args = listOf(Arg(100)), - ), - Instruction( - opcode = OP_VA_END, - ), - Instruction( - opcode = OP_RET, - ), - ), + ) ) - )) + ) val asm = """ |.code diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/value/AbstractDependentVal.kt b/observable/src/commonMain/kotlin/world/phantasmal/observable/value/AbstractDependentVal.kt index 5123c6c8..5f010506 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/value/AbstractDependentVal.kt +++ b/observable/src/commonMain/kotlin/world/phantasmal/observable/value/AbstractDependentVal.kt @@ -2,7 +2,7 @@ package world.phantasmal.observable.value import world.phantasmal.core.disposable.Disposable import world.phantasmal.core.disposable.disposable -import world.phantasmal.core.unsafeAssertNotNull +import world.phantasmal.core.unsafe.unsafeAssertNotNull import world.phantasmal.observable.Observer /** diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/value/FlatteningDependentVal.kt b/observable/src/commonMain/kotlin/world/phantasmal/observable/value/FlatteningDependentVal.kt index 5c87bd65..be461920 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/value/FlatteningDependentVal.kt +++ b/observable/src/commonMain/kotlin/world/phantasmal/observable/value/FlatteningDependentVal.kt @@ -2,7 +2,7 @@ package world.phantasmal.observable.value import world.phantasmal.core.disposable.Disposable import world.phantasmal.core.disposable.disposable -import world.phantasmal.core.unsafeAssertNotNull +import world.phantasmal.core.unsafe.unsafeAssertNotNull import world.phantasmal.observable.Observer /** diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/value/list/AbstractListVal.kt b/observable/src/commonMain/kotlin/world/phantasmal/observable/value/list/AbstractListVal.kt index 38d97493..9b2d83f9 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/value/list/AbstractListVal.kt +++ b/observable/src/commonMain/kotlin/world/phantasmal/observable/value/list/AbstractListVal.kt @@ -2,7 +2,7 @@ package world.phantasmal.observable.value.list import world.phantasmal.core.disposable.Disposable import world.phantasmal.core.disposable.disposable -import world.phantasmal.core.unsafeAssertNotNull +import world.phantasmal.core.unsafe.unsafeAssertNotNull import world.phantasmal.observable.ChangeEvent import world.phantasmal.observable.Observable import world.phantasmal.observable.Observer diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/value/list/DependentListVal.kt b/observable/src/commonMain/kotlin/world/phantasmal/observable/value/list/DependentListVal.kt index 8189aff7..04c3637e 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/value/list/DependentListVal.kt +++ b/observable/src/commonMain/kotlin/world/phantasmal/observable/value/list/DependentListVal.kt @@ -1,6 +1,6 @@ package world.phantasmal.observable.value.list -import world.phantasmal.core.unsafeAssertNotNull +import world.phantasmal.core.unsafe.unsafeAssertNotNull import world.phantasmal.observable.value.Val /** diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/value/list/FlatteningDependentListVal.kt b/observable/src/commonMain/kotlin/world/phantasmal/observable/value/list/FlatteningDependentListVal.kt index de808b13..6a698d21 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/value/list/FlatteningDependentListVal.kt +++ b/observable/src/commonMain/kotlin/world/phantasmal/observable/value/list/FlatteningDependentListVal.kt @@ -1,7 +1,7 @@ package world.phantasmal.observable.value.list import world.phantasmal.core.disposable.Disposable -import world.phantasmal.core.unsafeAssertNotNull +import world.phantasmal.core.unsafe.unsafeAssertNotNull import world.phantasmal.observable.value.Val /** diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/value/list/FoldedVal.kt b/observable/src/commonMain/kotlin/world/phantasmal/observable/value/list/FoldedVal.kt index 95086249..fd9b2bb1 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/value/list/FoldedVal.kt +++ b/observable/src/commonMain/kotlin/world/phantasmal/observable/value/list/FoldedVal.kt @@ -2,7 +2,7 @@ package world.phantasmal.observable.value.list import world.phantasmal.core.disposable.Disposable import world.phantasmal.core.disposable.disposable -import world.phantasmal.core.unsafeAssertNotNull +import world.phantasmal.core.unsafe.unsafeAssertNotNull import world.phantasmal.observable.Observer import world.phantasmal.observable.value.AbstractVal diff --git a/web/src/main/kotlin/world/phantasmal/web/core/rendering/conversion/MeshBuilder.kt b/web/src/main/kotlin/world/phantasmal/web/core/rendering/conversion/MeshBuilder.kt index 5153c527..61de9337 100644 --- a/web/src/main/kotlin/world/phantasmal/web/core/rendering/conversion/MeshBuilder.kt +++ b/web/src/main/kotlin/world/phantasmal/web/core/rendering/conversion/MeshBuilder.kt @@ -3,17 +3,16 @@ package world.phantasmal.web.core.rendering.conversion import org.khronos.webgl.Float32Array import org.khronos.webgl.Uint16Array import org.khronos.webgl.set -import world.phantasmal.core.JsMap import world.phantasmal.core.asArray -import world.phantasmal.core.emptyJsMap import world.phantasmal.core.jsArrayOf +import world.phantasmal.core.unsafe.UnsafeMap import world.phantasmal.lib.fileFormats.ninja.XvrTexture import world.phantasmal.web.externals.three.* import world.phantasmal.webui.obj class MeshBuilder( private val textures: List = emptyList(), - private val textureCache: JsMap = emptyJsMap(), + private val textureCache: UnsafeMap = UnsafeMap(), ) { private val positions = mutableListOf() private val normals = mutableListOf() diff --git a/web/src/main/kotlin/world/phantasmal/web/core/rendering/conversion/NinjaGeometryConversion.kt b/web/src/main/kotlin/world/phantasmal/web/core/rendering/conversion/NinjaGeometryConversion.kt index 04f76c30..5055c9af 100644 --- a/web/src/main/kotlin/world/phantasmal/web/core/rendering/conversion/NinjaGeometryConversion.kt +++ b/web/src/main/kotlin/world/phantasmal/web/core/rendering/conversion/NinjaGeometryConversion.kt @@ -4,6 +4,7 @@ import mu.KotlinLogging import org.khronos.webgl.Float32Array import org.khronos.webgl.Uint16Array import world.phantasmal.core.* +import world.phantasmal.core.unsafe.UnsafeMap import world.phantasmal.lib.fileFormats.* import world.phantasmal.lib.fileFormats.ninja.* import world.phantasmal.web.core.dot @@ -128,32 +129,36 @@ fun renderGeometryToGroup( processMesh: (AreaSection, AreaObject, Mesh) -> Unit = { _, _, _ -> }, ): Group { val group = Group() - val textureCache = emptyJsMap() - val meshCache = emptyJsMap() + val textureCache = UnsafeMap() + val meshCache = UnsafeMap() for ((sectionIndex, section) in renderGeometry.sections.withIndex()) { for (areaObj in section.objects) { - group.add(areaObjectToMesh( - textures, - textureCache, - meshCache, - section, - sectionIndex, - areaObj, - processMesh, - )) + group.add( + areaObjectToMesh( + textures, + textureCache, + meshCache, + section, + sectionIndex, + areaObj, + processMesh, + ) + ) } for (areaObj in section.animatedObjects) { - group.add(areaObjectToMesh( - textures, - textureCache, - meshCache, - section, - sectionIndex, - areaObj, - processMesh, - )) + group.add( + areaObjectToMesh( + textures, + textureCache, + meshCache, + section, + sectionIndex, + areaObj, + processMesh, + ) + ) } } @@ -200,8 +205,8 @@ fun AreaObject.fingerPrint(): String = private fun areaObjectToMesh( textures: List, - textureCache: JsMap, - meshCache: JsMap, + textureCache: UnsafeMap, + meshCache: UnsafeMap, section: AreaSection, sectionIndex: Int, areaObj: AreaObject, diff --git a/web/src/main/kotlin/world/phantasmal/web/core/stores/ItemDropStore.kt b/web/src/main/kotlin/world/phantasmal/web/core/stores/ItemDropStore.kt index b0259ee2..331c1f89 100644 --- a/web/src/main/kotlin/world/phantasmal/web/core/stores/ItemDropStore.kt +++ b/web/src/main/kotlin/world/phantasmal/web/core/stores/ItemDropStore.kt @@ -1,7 +1,6 @@ package world.phantasmal.web.core.stores -import world.phantasmal.core.JsMap -import world.phantasmal.core.emptyJsMap +import world.phantasmal.core.unsafe.UnsafeMap import world.phantasmal.lib.fileFormats.quest.NpcType import world.phantasmal.web.core.loading.AssetLoader import world.phantasmal.web.core.models.Server @@ -25,21 +24,21 @@ class ItemDropStore( private suspend fun loadEnemyDropTable(server: Server): EnemyDropTable { val drops = assetLoader.load>("/enemy_drops.${server.slug}.json") - val table = emptyJsMap>>() - val itemTypeToDrops = emptyJsMap>() + val table = UnsafeMap>>() + val itemTypeToDrops = UnsafeMap>() for (drop in drops) { var diffTable = table.get(drop.difficulty) if (diffTable == null) { - diffTable = emptyJsMap() + diffTable = UnsafeMap() table.set(drop.difficulty, diffTable) } var sectionIdTable = diffTable.get(drop.sectionId) if (sectionIdTable == null) { - sectionIdTable = emptyJsMap() + sectionIdTable = UnsafeMap() diffTable.set(drop.sectionId, sectionIdTable) } @@ -60,11 +59,11 @@ class ItemDropStore( } class EnemyDropTable( - private val table: JsMap>>, + private val table: UnsafeMap>>, /** * Mapping of [ItemType] ids to [EnemyDrop]s. */ - private val itemTypeToDrops: JsMap>, + private val itemTypeToDrops: UnsafeMap>, ) { fun getDrop(difficulty: Difficulty, sectionId: SectionId, npcType: NpcType): EnemyDrop? = table.get(difficulty)?.get(sectionId)?.get(npcType) diff --git a/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/stores/HuntOptimizerStore.kt b/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/stores/HuntOptimizerStore.kt index 1b378455..e0d94f3a 100644 --- a/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/stores/HuntOptimizerStore.kt +++ b/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/stores/HuntOptimizerStore.kt @@ -5,6 +5,7 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import mu.KotlinLogging import world.phantasmal.core.* +import world.phantasmal.core.unsafe.UnsafeMap import world.phantasmal.lib.fileFormats.quest.NpcType import world.phantasmal.observable.value.Val import world.phantasmal.observable.value.list.ListVal @@ -134,7 +135,7 @@ class HuntOptimizerStore( // enemies that drop the item multiplied by the corresponding drop rate as its value. val variables: dynamic = obj {} // Each variable has a matching FullMethod. - val fullMethods = emptyJsMap() + val fullMethods = UnsafeMap() val wantedItemTypeIds = emptyJsSet() @@ -148,7 +149,7 @@ class HuntOptimizerStore( for (method in methods) { // Calculate enemy counts including rare enemies // Counts include rare enemies, so they are fractional. - val counts = emptyJsMap() + val counts = UnsafeMap() for ((enemyType, count) in method.enemyCounts) { val rareEnemyType = enemyType.rareType @@ -191,15 +192,15 @@ class HuntOptimizerStore( dropTable: EnemyDropTable, wantedItemTypeIds: JsSet, method: HuntMethodModel, - defaultCounts: JsMap, + defaultCounts: UnsafeMap, splitPanArms: Boolean, variables: dynamic, - fullMethods: JsMap, + fullMethods: UnsafeMap, ) { - val counts: JsMap? + val counts: UnsafeMap? if (splitPanArms) { - var splitPanArmsCounts: JsMap? = null + var splitPanArmsCounts: UnsafeMap? = null // Create a secondary counts map if there are any pan arms that can be split // into migiums and hidooms. @@ -207,7 +208,7 @@ class HuntOptimizerStore( val panArms2Count = defaultCounts.get(NpcType.PanArms2) if (panArmsCount != null || panArms2Count != null) { - splitPanArmsCounts = emptyJsMap() + splitPanArmsCounts = UnsafeMap() if (panArmsCount != null) { splitPanArmsCounts.delete(NpcType.PanArms) @@ -262,7 +263,7 @@ class HuntOptimizerStore( wantedItemTypeIds: JsSet, constraints: dynamic, variables: dynamic, - fullMethods: JsMap, + fullMethods: UnsafeMap, ): List { val result = Solver.Solve(obj { optimize = "time" diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/stores/AsmStore.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/stores/AsmStore.kt index a0e53ebe..30e3c169 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/stores/AsmStore.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/stores/AsmStore.kt @@ -140,7 +140,7 @@ class AsmStore( }) setBytecodeIrTimeout?.let(window::clearTimeout) - setBytecodeIrTimeout = window.setTimeout(::setBytecodeIr, 300) + setBytecodeIrTimeout = window.setTimeout(::setBytecodeIr, 1000) // TODO: Update breakpoints. } diff --git a/webui/src/main/kotlin/world/phantasmal/webui/dom/HTMLElementSizeVal.kt b/webui/src/main/kotlin/world/phantasmal/webui/dom/HTMLElementSizeVal.kt index 919d41fa..008e4741 100644 --- a/webui/src/main/kotlin/world/phantasmal/webui/dom/HTMLElementSizeVal.kt +++ b/webui/src/main/kotlin/world/phantasmal/webui/dom/HTMLElementSizeVal.kt @@ -3,7 +3,7 @@ package world.phantasmal.webui.dom import org.w3c.dom.HTMLElement import world.phantasmal.core.disposable.Disposable import world.phantasmal.core.disposable.disposable -import world.phantasmal.core.unsafeAssertNotNull +import world.phantasmal.core.unsafe.unsafeAssertNotNull import world.phantasmal.observable.Observer import world.phantasmal.observable.value.AbstractVal