VMGen: Overhaul the instruction generation system

Sources/WasmKit/CMakeLists.txt

@@ -18,20 +18,20 @@ add_wasmkit_library(WasmKit
   Execution/Instructions/InstructionSupport.swift
   Execution/Instructions/Numeric.swift
   Execution/Instructions/Variable.swift
-  Execution/Types/Instances.swift
-  Execution/Types/Errors.swift
-  Execution/Types/Value.swift
-  Execution/Types/UntypedValue.swift
-  Execution/Runtime/InstDispatch.swift
-  Execution/Runtime/Runtime.swift
-  Execution/Runtime/RuntimeInterceptor.swift
-  Execution/Runtime/ExecutionState.swift
-  Execution/Runtime/Profiler.swift
-  Execution/Runtime/NameRegistry.swift
-  Execution/Runtime/Store.swift
-  Execution/Runtime/StoreAllocator.swift
-  Execution/Runtime/SignpostTracer.swift
-  Execution/Runtime/Function.swift
+  Execution/DispatchInstruction.swift
+  Execution/Errors.swift
+  Execution/Execution.swift
+  Execution/Function.swift
+  Execution/Instances.swift
+  Execution/NameRegistry.swift
+  Execution/Profiler.swift
+  Execution/Runtime.swift
+  Execution/RuntimeInterceptor.swift
+  Execution/SignpostTracer.swift
+  Execution/Store.swift
+  Execution/StoreAllocator.swift
+  Execution/UntypedValue.swift
+  Execution/Value.swift
 )
 
 target_link_wasmkit_libraries(WasmKit PUBLIC

Sources/WasmKit/Execution/Runtime/InstDispatch.swift → Sources/WasmKit/Execution/DispatchInstruction.swift

@@ -1,5 +1,6 @@
-// This file is generated by Utilities/generate_inst_dispatch.swift
-extension ExecutionState {
+//// Automatically generated by Utilities/Sources/VMGen.swift
+//// DO NOT EDIT DIRECTLY
+extension Execution {
     @inline(__always)
     mutating func doExecute(_ instruction: UInt64, sp: inout Sp, pc: inout Pc, md: inout Md, ms: inout Ms) throws {
         switch instruction {
@@ -409,7 +410,7 @@ extension Instruction {
 }
 
 
-extension ExecutionState {
+extension Execution {
     @inline(__always) mutating func i32Add(sp: Sp, binaryOperand: Instruction.BinaryOperand) {
         sp[i32: binaryOperand.result] = sp[i32: binaryOperand.lhs].add(sp[i32: binaryOperand.rhs])
     }
@@ -890,7 +891,7 @@ extension ExecutionState {
 }
 
 
-extension ExecutionState {
+extension Execution {
     @_silgen_name("wasmkit_execute_copyStack") @inline(__always)
     mutating func execute_copyStack(sp: UnsafeMutablePointer<Sp>, pc: UnsafeMutablePointer<Pc>, md: UnsafeMutablePointer<Md>, ms: UnsafeMutablePointer<Ms>) {
         let copyStackOperand = Instruction.CopyStackOperand.load(from: &pc.pointee)

Sources/WasmKit/Execution/Runtime/ExecutionState.swift → Sources/WasmKit/Execution/Execution.swift

@@ -2,9 +2,9 @@ import _CWasmKit
 
 /// An execution state of an invocation of exported function.
 ///
-/// Each new invocation through exported function has a separate ``ExecutionState``
+/// Each new invocation through exported function has a separate ``Execution``
 /// even though the invocation happens during another invocation.
-struct ExecutionState {
+struct Execution {
     /// The reference to the ``Runtime`` associated with the execution.
     let runtime: RuntimeRef
     /// The end of the VM stack space.
@@ -17,14 +17,14 @@ struct ExecutionState {
     /// the given ``Runtime`` instance.
     static func with<T>(
         runtime: RuntimeRef,
-        body: (inout ExecutionState, Sp) throws -> T
+        body: (inout Execution, Sp) throws -> T
     ) rethrows -> T {
         let limit = Int(UInt16.max)
         let valueStack = UnsafeMutablePointer<StackSlot>.allocate(capacity: limit)
         defer {
             valueStack.deallocate()
         }
-        var context = ExecutionState(runtime: runtime, stackEnd: valueStack.advanced(by: limit))
+        var context = Execution(runtime: runtime, stackEnd: valueStack.advanced(by: limit))
         return try body(&context, valueStack)
     }
 
@@ -136,7 +136,7 @@ func executeWasm(
 ) throws -> [Value] {
     // NOTE: `runtime` variable must not outlive this function
     let runtime = RuntimeRef(runtime)
-    return try ExecutionState.with(runtime: runtime) { (stack, sp) in
+    return try Execution.with(runtime: runtime) { (stack, sp) in
         // Advance the stack pointer to be able to reference negative indices
         // for saving slots.
         let sp = sp.advanced(by: FrameHeaderLayout.numberOfSavingSlots)
@@ -164,7 +164,7 @@ func executeWasm(
     }
 }
 
-extension ExecutionState {
+extension Execution {
     /// A namespace for the "current memory" (Md and Ms) management.
     enum CurrentMemory {
         /// Assigns the current memory to the given internal memory.
@@ -309,7 +309,7 @@ extension ExecutionState {
                 returnPC: pc,
                 spAddend: callLike.spAddend
             )
-            ExecutionState.CurrentMemory.mayUpdateCurrentInstance(
+            Execution.CurrentMemory.mayUpdateCurrentInstance(
                 instance: function.instance,
                 from: callerInstance, md: &md, ms: &ms
             )

Sources/WasmKit/Execution/Runtime/Function.swift → Sources/WasmKit/Execution/Function.swift

@@ -165,7 +165,7 @@ struct WasmFunctionEntity {
         self.index = index
     }
 
-    mutating func ensureCompiled(context: inout ExecutionState) throws -> InstructionSequence {
+    mutating func ensureCompiled(context: inout Execution) throws -> InstructionSequence {
         try ensureCompiled(runtime: context.runtime)
     }
 

Sources/WasmKit/Execution/Instructions/Control.swift

@@ -1,6 +1,6 @@
 /// > Note:
 /// <https://webassembly.github.io/spec/core/exec/instructions.html#control-instructions>
-extension ExecutionState {
+extension Execution {
     func unreachable(sp: Sp, pc: Pc) throws -> Pc {
         throw Trap.unreachable
     }

Sources/WasmKit/Execution/Instructions/Instruction.swift

@@ -1,3 +1,5 @@
+//// Automatically generated by Utilities/Sources/VMGen.swift
+//// DO NOT EDIT DIRECTLY
 enum Instruction: Equatable {
     case copyStack(Instruction.CopyStackOperand)
     case globalGet(Instruction.GlobalGetOperand)

Sources/WasmKit/Execution/Instructions/InstructionSupport.swift

@@ -81,7 +81,6 @@ extension Int32: InstructionImmediate {
 }
 
 extension Instruction {
-    /// size = 6, alignment = 2
     struct BinaryOperand: Equatable, InstructionImmediate {
         let result: LVReg
         let lhs: VReg
@@ -94,7 +93,6 @@ extension Instruction {
         }
     }
 
-    /// size = 4, alignment = 2
     struct UnaryOperand: Equatable, InstructionImmediate {
         let result: LVReg
         let input: LVReg
@@ -125,7 +123,6 @@ extension Instruction {
         }
     }
 
-    /// size = 4, alignment = 8
     struct LoadOperand: Equatable, InstructionImmediate {
         let offset: UInt64
         let pointer: VReg

Sources/WasmKit/Execution/Instructions/Memory.swift

@@ -1,6 +1,6 @@
 /// > Note:
 /// <https://webassembly.github.io/spec/core/exec/instructions.html#memory-instructions>
-extension ExecutionState {
+extension Execution {
     @inline(never) func throwOutOfBoundsMemoryAccess() throws -> Never {
         throw Trap.outOfBoundsMemoryAccess
     }

Sources/WasmKit/Execution/Instructions/Numeric.swift

@@ -1,6 +1,6 @@
 /// > Note:
 /// <https://webassembly.github.io/spec/core/exec/instructions.html#numeric-instructions>
-extension ExecutionState {
+extension Execution {
     @inline(__always)
     mutating func const32(sp: Sp, const32Operand: Instruction.Const32Operand) {
         sp[const32Operand.result] = UntypedValue(storage32: const32Operand.value)

Sources/WasmKit/Execution/Instructions/Parametric.swift

@@ -1,6 +1,6 @@
 /// > Note:
 /// <https://webassembly.github.io/spec/core/exec/instructions.html#parametric-instructions>
-extension ExecutionState {
+extension Execution {
     mutating func select(sp: Sp, selectOperand: Instruction.SelectOperand) {
         let flag = sp[i32: selectOperand.condition]
         let selected = flag != 0 ? selectOperand.onTrue : selectOperand.onFalse

Sources/WasmKit/Execution/Instructions/Reference.swift

@@ -1,6 +1,6 @@
 /// > Note:
 /// <https://webassembly.github.io/spec/core/exec/instructions.html#reference-instructions>
-extension ExecutionState {
+extension Execution {
     mutating func refNull(sp: Sp, refNullOperand: Instruction.RefNullOperand) {
         let value: Value
         switch refNullOperand.type {

Sources/WasmKit/Execution/Instructions/Table.swift

@@ -2,7 +2,7 @@
 /// <https://webassembly.github.io/spec/core/exec/instructions.html#table-instructions>
 
 import WasmParser
-extension ExecutionState {
+extension Execution {
     mutating func tableGet(sp: Sp, tableGetOperand: Instruction.TableGetOperand) throws {
         let runtime = runtime.value
         let table = getTable(tableGetOperand.tableIndex, sp: sp, store: runtime.store)
@@ -131,7 +131,7 @@ extension ExecutionState {
     }
 }
 
-extension ExecutionState {
+extension Execution {
     fileprivate func getTable(_ tableIndex: UInt32, sp: Sp, store: Store) -> InternalTable {
         return currentInstance(sp: sp).tables[Int(tableIndex)]
     }

Sources/WasmKit/Execution/Instructions/Variable.swift

@@ -1,6 +1,6 @@
 /// > Note:
 /// <https://webassembly.github.io/spec/core/syntax/instructions.html#variable-instructions>
-extension ExecutionState {
+extension Execution {
     mutating func globalGet(sp: Sp, globalGetOperand: Instruction.GlobalGetOperand) {
         globalGetOperand.global.withValue{
             sp[globalGetOperand.reg] = $0.rawValue

Sources/WasmKit/Execution/Runtime/Runtime.swift → Sources/WasmKit/Execution/Runtime.swift

@@ -174,12 +174,12 @@ extension Runtime {
 }
 
 extension Runtime {
-    @available(*, unavailable, message: "Runtime doesn't manage execution state anymore. Use ExecutionState.step instead")
+    @available(*, unavailable, message: "Runtime doesn't manage execution state anymore. Use Execution.step instead")
     public func step() throws {
         fatalError()
     }
 
-    @available(*, unavailable, message: "Runtime doesn't manage execution state anymore. Use ExecutionState.step instead")
+    @available(*, unavailable, message: "Runtime doesn't manage execution state anymore. Use Execution.step instead")
     public func run() throws {
         fatalError()
     }

Sources/_CWasmKit/include/DirectThreadedCode.inc

@@ -1,3 +1,5 @@
+//// Automatically generated by Utilities/Sources/VMGen.swift
+//// DO NOT EDIT DIRECTLY
 SWIFT_CC(swiftasync) static inline void wasmkit_tc_copyStack(Sp sp, Pc pc, Md md, Ms ms, SWIFT_CONTEXT void *state) {
     SWIFT_CC(swift) void wasmkit_execute_copyStack(Sp *sp, Pc *pc, Md *md, Ms *ms, SWIFT_CONTEXT void *state, SWIFT_ERROR_RESULT void **error);
     void * _Nullable error = NULL;