wardite 0.2.2 → 0.4.0

data/sig/generated/wardite.rbs

@@ -14,15 +14,20 @@ module Wardite
 
     attr_accessor runtime: Runtime
 
+    attr_accessor types: Array[Type]
+
     attr_accessor store: Store
 
     attr_accessor exports: Exports
 
-    attr_reader import_object: Hash[Symbol, Hash[Symbol, Proc]]
+    attr_reader import_object: Hash[Symbol, Hash[Symbol, wasmCallable]]
 
-    # @rbs import_object: Hash[Symbol, Hash[Symbol, Proc]]
+    # @rbs import_object: Hash[Symbol, Hash[Symbol, wasmCallable]]
     # @rbs &blk: (Instance) -> void
-    def initialize: (Hash[Symbol, Hash[Symbol, Proc]] import_object) { (Instance) -> void } -> untyped
+    def initialize: (Hash[Symbol, Hash[Symbol, wasmCallable]] import_object) { (Instance) -> void } -> untyped
+
+    # @rbs return: void
+    def check_data_count: () -> void
 
     # @rbs return: ImportSection
     def import_section: () -> ImportSection
@@ -33,15 +38,27 @@ module Wardite
     # @rbs return: MemorySection|nil
     def memory_section: () -> (MemorySection | nil)
 
+    # @rbs return: StartSection|nil
+    def start_section: () -> (StartSection | nil)
+
     # @rbs return: GlobalSection|nil
     def global_section: () -> (GlobalSection | nil)
 
     # @rbs return: DataSection|nil
     def data_section: () -> (DataSection | nil)
 
+    # @rbs return: DataCountSection|nil
+    def data_count_section: () -> (DataCountSection | nil)
+
     # @rbs return: FunctionSection|nil
     def function_section: () -> (FunctionSection | nil)
 
+    # @rbs return: TableSection?
+    def table_section: () -> TableSection?
+
+    # @rbs return: ElemSection?
+    def elem_section: () -> ElemSection?
+
     # @rbs return: CodeSection|nil
     def code_section: () -> (CodeSection | nil)
 
@@ -53,7 +70,7 @@ module Wardite
     include ValueHelper
 
     # TODO: add types of class that the stack accomodates
-    attr_accessor stack: Array[I32 | I64 | F32 | F64]
+    attr_accessor stack: Array[wasmValue]
 
     attr_accessor call_stack: Array[Frame]
 
@@ -62,6 +79,9 @@ module Wardite
     # @rbs inst: Instance
     def initialize: (Instance inst) -> untyped
 
+    # @rbs return: void
+    def invoke_start_section: () -> void
+
     # @rbs name: String|Symbol
     # @rbs return: bool
     def callable?: (String | Symbol name) -> bool
@@ -71,6 +91,10 @@ module Wardite
     # @rbs return: Object|nil
     def call: (String | Symbol name, Array[Object] args) -> (Object | nil)
 
+    # @rbs idx: Integer
+    # @rbs return: void
+    def call_by_index: (Integer idx) -> void
+
     # @rbs wasm_function: WasmFunction
     # @rbs return: void
     def push_frame: (WasmFunction wasm_function) -> void
@@ -80,8 +104,8 @@ module Wardite
     def invoke_internal: (WasmFunction wasm_function) -> (Object | nil)
 
     # @rbs external_function: ExternalFunction
-    # @rbs return: I32|I64|F32|F64|nil
-    def invoke_external: (ExternalFunction external_function) -> (I32 | I64 | F32 | F64 | nil)
+    # @rbs return: wasmValue|nil
+    def invoke_external: (ExternalFunction external_function) -> (wasmValue | nil)
 
     # @rbs return: void
     def execute!: () -> void
@@ -91,6 +115,17 @@ module Wardite
     # @rbs return: void
     def eval_insn: (Frame frame, Op insn) -> void
 
+    # @rbs ops: Array[Op]
+    # @rbs pc_start: Integer
+    # @rbs return: Integer
+    def fetch_ops_while_else_or_end: (Array[Op] ops, Integer pc_start) -> Integer
+
+    # @rbs labels: Array[Label]
+    # @rbs stack: Array[wasmValue]
+    # @rbs level: Integer
+    # @rbs return: Integer
+    def do_branch: (Array[Label] labels, Array[wasmValue] stack, Integer level) -> Integer
+
     # @rbs ops: Array[Op]
     # @rbs pc_start: Integer
     # @rbs return: Integer
@@ -103,8 +138,8 @@ module Wardite
     def stack_unwind: (Integer sp, Integer arity) -> void
 
     # @rbs finish: Integer
-    # @rbs return: Array[I32|I64|F32|F64]
-    def drained_stack: (Integer finish) -> Array[I32 | I64 | F32 | F64]
+    # @rbs return: Array[wasmValue]
+    def drained_stack: (Integer finish) -> Array[wasmValue]
 
     # @rbs name: Symbol
     # @rbs args: Array[Object]
@@ -116,6 +151,17 @@ module Wardite
     def respond_to?: (String | Symbol name) -> bool
   end
 
+  class Type
+    attr_accessor callsig: Array[Symbol]
+
+    attr_accessor retsig: Array[Symbol]
+
+    # @rbs callsig: Array[Symbol]
+    # @rbs retsig: Array[Symbol]
+    # @rbs returb: void
+    def initialize: (Array[Symbol] callsig, Array[Symbol] retsig) -> untyped
+  end
+
   class Frame
     attr_accessor pc: Integer
 
@@ -127,15 +173,15 @@ module Wardite
 
     attr_accessor labels: Array[Label]
 
-    attr_accessor locals: Array[I32 | I64 | F32 | F64]
+    attr_accessor locals: Array[wasmValue]
 
     # @rbs pc: Integer
     # @rbs sp: Integer
     # @rbs body: Array[Op]
     # @rbs arity: Integer
-    # @rbs locals: Array[Object]
+    # @rbs locals: Array[wasmValue]
     # @rbs returb: void
-    def initialize: (Integer pc, Integer sp, Array[Op] body, Integer arity, Array[Object] locals) -> untyped
+    def initialize: (Integer pc, Integer sp, Array[Op] body, Integer arity, Array[wasmValue] locals) -> untyped
   end
 
   class Label
@@ -147,12 +193,15 @@ module Wardite
 
     attr_accessor arity: Integer
 
+    attr_accessor start: Integer | nil
+
     # @rbs kind: (:if|:loop|:block)
     # @rbs pc: Integer
     # @rbs sp: Integer
     # @rbs arity: Integer
-    # @rbs returb: void
-    def initialize: (:if | :loop | :block kind, Integer pc, Integer sp, Integer arity) -> untyped
+    # @rbs start: Integer|nil
+    # @rbs return: void
+    def initialize: (:if | :loop | :block kind, Integer pc, Integer sp, Integer arity, ?Integer | nil start) -> void
   end
 
   class Store
@@ -162,6 +211,10 @@ module Wardite
 
     attr_accessor globals: Array[Global]
 
+    attr_accessor tables: Array[Table]
+
+    attr_accessor elements: Array[[ Symbol, Integer, Array[Integer] ]]
+
     # @rbs inst: Instance
     # @rbs return: void
     def initialize: (Instance inst) -> void
@@ -189,6 +242,27 @@ module Wardite
     def inspect: () -> untyped
   end
 
+  class Table
+    attr_accessor type: Symbol
+
+    attr_accessor current: Integer
+
+    attr_accessor max: Integer | nil
+
+    attr_accessor refs: Array[WasmFunction | ExternalFunction | nil]
+
+    # @rbs type: Symbol
+    # @rbs init: Integer
+    # @rbs max: Integer|nil
+    # @rbs return: void
+    def initialize: (Symbol type, Integer init, Integer | nil max) -> void
+
+    # @rbs idx: Integer
+    # @rbs elem: WasmFunction|ExternalFunction|nil
+    # @rbs return: void
+    def set: (Integer idx, WasmFunction | ExternalFunction | nil elem) -> void
+  end
+
   class Global
     attr_accessor type: Symbol
 
@@ -197,7 +271,7 @@ module Wardite
     # TODO: unused in wasm 1.0 spec?
     attr_accessor shared: bool
 
-    attr_accessor value: I32 | I64 | F32 | F64
+    attr_accessor value: wasmValue
 
     # @rbs &blk: (Global) -> void
     # @rbs return: void
@@ -274,20 +348,32 @@ module Wardite
 
     # @rbs return: Array[Integer]
     def locals_count: () -> Array[Integer]
+
+    # @rbs override_type: Type?
+    # @rbs return: WasmFunction
+    def clone: (?override_type: Type?) -> WasmFunction
   end
 
+  type wasmFuncReturn = Object | nil
+
+  type wasmCallable = ^(Store, Array[wasmValue]) -> wasmFuncReturn
+
   class ExternalFunction
     attr_accessor callsig: Array[Symbol]
 
     attr_accessor retsig: Array[Symbol]
 
-    attr_accessor callable: Proc
+    attr_accessor callable: wasmCallable
 
     # @rbs callsig: Array[Symbol]
     # @rbs retsig: Array[Symbol]
-    # @rbs callable: Proc
+    # @rbs callable: wasmCallable
     # @rbs return: void
-    def initialize: (Array[Symbol] callsig, Array[Symbol] retsig, Proc callable) -> void
+    def initialize: (Array[Symbol] callsig, Array[Symbol] retsig, wasmCallable callable) -> void
+
+    # @rbs override_type: Type?
+    # @rbs return: ExternalFunction
+    def clone: (?override_type: Type?) -> ExternalFunction
   end
 
   class GenericError < StandardError

data/sig/wardite.rbs

@@ -1,6 +1,4 @@
 module Wardite
   # definitions that cannot cover by rbs-inline
-  module BinaryLoader
-    self.@buf: File|StringIO
-  end
+  # but nothing for now
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wardite
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Uchio Kondo
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-08 00:00:00.000000000 Z
+date: 2024-11-10 00:00:00.000000000 Z
 dependencies: []
 description: A pure-ruby webassembly runtime
 email:
@@ -24,7 +24,9 @@ files:
 - examples/.gitignore
 - examples/add.wasm
 - examples/add.wat
+- examples/break.wat
 - examples/call.wat
+- examples/call_indirect.wat
 - examples/consts.wat
 - examples/fib.wat
 - examples/fib2.wat
@@ -33,7 +35,12 @@ files:
 - examples/i32_const.wat
 - examples/i32_store.wat
 - examples/local_set.wat
+- examples/loop.wat
 - examples/memory.wat
+- examples/memory_init.wat
+- examples/saturate.wat
+- examples/saturate_u.wat
+- examples/start.wat
 - exe/wardite
 - lib/wardite.rb
 - lib/wardite/alu_f32.generated.rb