refactor control execution instructions

CharlieTap · CharlieTap · commit 13ee326167fd · 2024-12-09T21:12:10.000Z
diff --git a/executor/invoker/src/commonMain/kotlin/io/github/charlietap/chasm/executor/invoker/instruction/control/BlockExecutor.kt b/executor/invoker/src/commonMain/kotlin/io/github/charlietap/chasm/executor/invoker/instruction/control/BlockExecutor.kt
@@ -6,6 +6,7 @@ import com.github.michaelbull.result.Result
 import com.github.michaelbull.result.binding
 import io.github.charlietap.chasm.ast.instruction.ControlInstruction
 import io.github.charlietap.chasm.ast.instruction.Instruction
+import io.github.charlietap.chasm.executor.invoker.context.ExecutionContext
 import io.github.charlietap.chasm.executor.invoker.instruction.InstructionBlockExecutor
 import io.github.charlietap.chasm.executor.runtime.Arity
 import io.github.charlietap.chasm.executor.runtime.Stack
@@ -17,6 +18,17 @@ import io.github.charlietap.chasm.executor.runtime.store.Store
 
 internal typealias BlockExecutor = (Store, Stack, ControlInstruction.BlockType, List<Instruction>) -> Result<Unit, InvocationError>
 
+internal inline fun BlockExecutor(
+    context: ExecutionContext,
+    instruction: ControlInstruction.Block,
+): Result<Unit, InvocationError> =
+    BlockExecutor(
+        store = context.store,
+        stack = context.stack,
+        blockType = instruction.blockType,
+        instructions = instruction.instructions,
+    )
+
 internal inline fun BlockExecutor(
     store: Store,
     stack: Stack,
diff --git a/executor/invoker/src/commonMain/kotlin/io/github/charlietap/chasm/executor/invoker/instruction/control/BrOnCastExecutor.kt b/executor/invoker/src/commonMain/kotlin/io/github/charlietap/chasm/executor/invoker/instruction/control/BrOnCastExecutor.kt
@@ -3,6 +3,7 @@ package io.github.charlietap.chasm.executor.invoker.instruction.control
 import com.github.michaelbull.result.Result
 import com.github.michaelbull.result.binding
 import com.github.michaelbull.result.toResultOr
+import io.github.charlietap.chasm.ast.instruction.ControlInstruction
 import io.github.charlietap.chasm.ast.module.Index
 import io.github.charlietap.chasm.ast.type.ReferenceType
 import io.github.charlietap.chasm.executor.invoker.context.ExecutionContext
@@ -21,17 +22,30 @@ internal typealias BrOnCastExecutor = (ExecutionContext, Index.LabelIndex, Refer
 
 internal fun BrOnCastExecutor(
     context: ExecutionContext,
-    labelIndex: Index.LabelIndex,
-    referenceType1: ReferenceType,
-    referenceType2: ReferenceType,
-    breakIfMatches: Boolean,
+    instruction: ControlInstruction.BrOnCast,
+): Result<Unit, InvocationError> =
+    BrOnCastExecutor(
+        context = context,
+        labelIndex = instruction.labelIndex,
+        referenceType1 = instruction.srcReferenceType,
+        referenceType2 = instruction.dstReferenceType,
+        breakIfMatches = true,
+        referenceTypeSubstitutor = ::ReferenceTypeSubstitutor,
+        referenceTypeMatcher = ::ReferenceTypeMatcher,
+        typeOfReferenceValue = ::TypeOfReferenceValue,
+        breakExecutor = ::BreakExecutor,
+    )
+
+internal fun BrOnCastFailExecutor(
+    context: ExecutionContext,
+    instruction: ControlInstruction.BrOnCastFail,
 ): Result<Unit, InvocationError> =
     BrOnCastExecutor(
         context = context,
-        labelIndex = labelIndex,
-        referenceType1 = referenceType1,
-        referenceType2 = referenceType2,
-        breakIfMatches = breakIfMatches,
+        labelIndex = instruction.labelIndex,
+        referenceType1 = instruction.srcReferenceType,
+        referenceType2 = instruction.dstReferenceType,
+        breakIfMatches = false,
         referenceTypeSubstitutor = ::ReferenceTypeSubstitutor,
         referenceTypeMatcher = ::ReferenceTypeMatcher,
         typeOfReferenceValue = ::TypeOfReferenceValue,
diff --git a/executor/invoker/src/commonMain/kotlin/io/github/charlietap/chasm/executor/invoker/instruction/control/BreakExecutor.kt b/executor/invoker/src/commonMain/kotlin/io/github/charlietap/chasm/executor/invoker/instruction/control/BreakExecutor.kt
@@ -4,7 +4,9 @@ package io.github.charlietap.chasm.executor.invoker.instruction.control
 
 import com.github.michaelbull.result.Result
 import com.github.michaelbull.result.binding
+import io.github.charlietap.chasm.ast.instruction.ControlInstruction
 import io.github.charlietap.chasm.ast.module.Index
+import io.github.charlietap.chasm.executor.invoker.context.ExecutionContext
 import io.github.charlietap.chasm.executor.invoker.ext.index
 import io.github.charlietap.chasm.executor.runtime.Stack
 import io.github.charlietap.chasm.executor.runtime.error.InvocationError
@@ -16,6 +18,15 @@ import io.github.charlietap.chasm.executor.runtime.instruction.AdminInstruction
 
 internal typealias BreakExecutor = (Stack, Index.LabelIndex) -> Result<Unit, InvocationError>
 
+internal inline fun BreakExecutor(
+    context: ExecutionContext,
+    instruction: ControlInstruction.Br,
+): Result<Unit, InvocationError> =
+    BreakExecutor(
+        stack = context.stack,
+        labelIndex = instruction.labelIndex,
+    )
+
 internal inline fun BreakExecutor(
     stack: Stack,
     labelIndex: Index.LabelIndex,
diff --git a/executor/invoker/src/commonMain/kotlin/io/github/charlietap/chasm/executor/invoker/instruction/control/ControlInstructionExecutor.kt b/executor/invoker/src/commonMain/kotlin/io/github/charlietap/chasm/executor/invoker/instruction/control/ControlInstructionExecutor.kt
@@ -1,6 +1,5 @@
 package io.github.charlietap.chasm.executor.invoker.instruction.control
 
-import com.github.michaelbull.result.Err
 import com.github.michaelbull.result.Result
 import com.github.michaelbull.result.binding
 import io.github.charlietap.chasm.ast.instruction.ControlInstruction
@@ -30,10 +29,13 @@ internal fun ControlInstructionExecutor(
         brOnNullExecutor = ::BrOnNullExecutor,
         brOnNonNullExecutor = ::BrOnNonNullExecutor,
         brOnCastExecutor = ::BrOnCastExecutor,
+        brOnCastFailExecutor = ::BrOnCastFailExecutor,
+        nopExecutor = ::NopExecutor,
         returnExecutor = ::ReturnExecutor,
         throwExecutor = ::ThrowExecutor,
         throwRefExecutor = ::ThrowRefExecutor,
         tryTableExecutor = ::TryTableExecutor,
+        unreachableExecutor = ::UnreachableExecutor,
     )
 
 internal inline fun ControlInstructionExecutor(
@@ -45,28 +47,30 @@ internal inline fun ControlInstructionExecutor(
     crossinline returnCallIndirectExecutor: Executor<ControlInstruction.ReturnCallIndirect>,
     crossinline callRefExecutor: Executor<ControlInstruction.CallRef>,
     crossinline returnCallRefExecutor: Executor<ControlInstruction.ReturnCallRef>,
-    crossinline blockExecutor: BlockExecutor,
+    crossinline blockExecutor: Executor<ControlInstruction.Block>,
     crossinline loopExecutor: Executor<ControlInstruction.Loop>,
     crossinline ifExecutor: Executor<ControlInstruction.If>,
-    crossinline breakExecutor: BreakExecutor,
+    crossinline breakExecutor: Executor<ControlInstruction.Br>,
     crossinline brIfExecutor: Executor<ControlInstruction.BrIf>,
     crossinline brTableExecutor: Executor<ControlInstruction.BrTable>,
     crossinline brOnNullExecutor: Executor<ControlInstruction.BrOnNull>,
     crossinline brOnNonNullExecutor: Executor<ControlInstruction.BrOnNonNull>,
-    crossinline brOnCastExecutor: BrOnCastExecutor,
+    crossinline brOnCastExecutor: Executor<ControlInstruction.BrOnCast>,
+    crossinline brOnCastFailExecutor: Executor<ControlInstruction.BrOnCastFail>,
+    crossinline nopExecutor: Executor<ControlInstruction.Nop>,
     crossinline returnExecutor: Executor<ControlInstruction.Return>,
     crossinline throwExecutor: Executor<ControlInstruction.Throw>,
     crossinline throwRefExecutor: Executor<ControlInstruction.ThrowRef>,
     crossinline tryTableExecutor: Executor<ControlInstruction.TryTable>,
+    crossinline unreachableExecutor: Executor<ControlInstruction.Unreachable>,
 ): Result<Unit, InvocationError> = binding {
-    val (stack, store) = context
     when (instruction) {
-        is ControlInstruction.Nop -> Unit
-        is ControlInstruction.Unreachable -> Err(InvocationError.Trap.TrapEncountered).bind<Unit>()
-        is ControlInstruction.Block -> blockExecutor(store, stack, instruction.blockType, instruction.instructions).bind()
+        is ControlInstruction.Nop -> nopExecutor(context, instruction).bind()
+        is ControlInstruction.Unreachable -> unreachableExecutor(context, instruction).bind()
+        is ControlInstruction.Block -> blockExecutor(context, instruction).bind()
         is ControlInstruction.Loop -> loopExecutor(context, instruction).bind()
         is ControlInstruction.If -> ifExecutor(context, instruction).bind()
-        is ControlInstruction.Br -> breakExecutor(stack, instruction.labelIndex).bind()
+        is ControlInstruction.Br -> breakExecutor(context, instruction).bind()
         is ControlInstruction.BrIf -> brIfExecutor(context, instruction).bind()
         is ControlInstruction.BrTable -> brTableExecutor(context, instruction).bind()
         is ControlInstruction.BrOnNull -> brOnNullExecutor(context, instruction).bind()
@@ -78,10 +82,8 @@ internal inline fun ControlInstructionExecutor(
         is ControlInstruction.ReturnCallIndirect -> returnCallIndirectExecutor(context, instruction).bind()
         is ControlInstruction.CallRef -> callRefExecutor(context, instruction).bind()
         is ControlInstruction.ReturnCallRef -> returnCallRefExecutor(context, instruction).bind()
-        is ControlInstruction.BrOnCast ->
-            brOnCastExecutor(context, instruction.labelIndex, instruction.srcReferenceType, instruction.dstReferenceType, true).bind()
-        is ControlInstruction.BrOnCastFail ->
-            brOnCastExecutor(context, instruction.labelIndex, instruction.srcReferenceType, instruction.dstReferenceType, false).bind()
+        is ControlInstruction.BrOnCast -> brOnCastExecutor(context, instruction).bind()
+        is ControlInstruction.BrOnCastFail -> brOnCastFailExecutor(context, instruction).bind()
         is ControlInstruction.Throw -> throwExecutor(context, instruction).bind()
         is ControlInstruction.ThrowRef -> throwRefExecutor(context, instruction).bind()
         is ControlInstruction.TryTable -> tryTableExecutor(context, instruction).bind()
diff --git a/executor/invoker/src/commonMain/kotlin/io/github/charlietap/chasm/executor/invoker/instruction/control/NopExecutor.kt b/executor/invoker/src/commonMain/kotlin/io/github/charlietap/chasm/executor/invoker/instruction/control/NopExecutor.kt
@@ -0,0 +1,12 @@
+package io.github.charlietap.chasm.executor.invoker.instruction.control
+
+import com.github.michaelbull.result.Ok
+import com.github.michaelbull.result.Result
+import io.github.charlietap.chasm.ast.instruction.ControlInstruction
+import io.github.charlietap.chasm.executor.invoker.context.ExecutionContext
+import io.github.charlietap.chasm.executor.runtime.error.InvocationError
+
+internal inline fun NopExecutor(
+    context: ExecutionContext,
+    instruction: ControlInstruction.Nop,
+): Result<Unit, InvocationError> = Ok(Unit)
diff --git a/executor/invoker/src/commonMain/kotlin/io/github/charlietap/chasm/executor/invoker/instruction/control/UnreachableExecutor.kt b/executor/invoker/src/commonMain/kotlin/io/github/charlietap/chasm/executor/invoker/instruction/control/UnreachableExecutor.kt
@@ -0,0 +1,12 @@
+package io.github.charlietap.chasm.executor.invoker.instruction.control
+
+import com.github.michaelbull.result.Err
+import com.github.michaelbull.result.Result
+import io.github.charlietap.chasm.ast.instruction.ControlInstruction
+import io.github.charlietap.chasm.executor.invoker.context.ExecutionContext
+import io.github.charlietap.chasm.executor.runtime.error.InvocationError
+
+internal inline fun UnreachableExecutor(
+    context: ExecutionContext,
+    instruction: ControlInstruction.Unreachable,
+): Result<Unit, InvocationError> = Err(InvocationError.Trap.TrapEncountered)
diff --git a/executor/invoker/src/commonTest/kotlin/io/github/charlietap/chasm/executor/invoker/instruction/control/ControlInstructionExecutorTest.kt b/executor/invoker/src/commonTest/kotlin/io/github/charlietap/chasm/executor/invoker/instruction/control/ControlInstructionExecutorTest.kt
