wardite 0.2.1 → 0.3.0

data/sig/generated/wardite.rbs

@@ -7,171 +7,6 @@ module Wardite
 end
 
 module Wardite
-  class Section
-    attr_accessor name: String
-
-    attr_accessor code: Integer
-
-    attr_accessor size: Integer
-  end
-
-  class TypeSection < Section
-    attr_accessor defined_types: Array[Array[Symbol]]
-
-    attr_accessor defined_results: Array[Array[Symbol]]
-
-    # @rbs return: void
-    def initialize: () -> void
-  end
-
-  class FunctionSection < Section
-    attr_accessor func_indices: Array[Integer]
-
-    # @rbs return: void
-    def initialize: () -> void
-  end
-
-  class MemorySection < Section
-    attr_accessor limits: Array[[ Integer, Integer | nil ]]
-
-    # @rbs return: void
-    def initialize: () -> void
-  end
-
-  class CodeSection < Section
-    class CodeBody
-      attr_accessor locals_count: Array[Integer]
-
-      attr_accessor locals_type: Array[Symbol]
-
-      attr_accessor body: Array[Op]
-
-      # @rbs &blk: (CodeBody) -> void
-      # @rbs return: void
-      def initialize: () { (CodeBody) -> void } -> void
-    end
-
-    attr_accessor func_codes: Array[CodeBody]
-
-    # @rbs return: void
-    def initialize: () -> void
-  end
-
-  class DataSection < Section
-    class Segment
-      attr_accessor flags: Integer
-
-      attr_accessor offset: Integer
-
-      attr_accessor data: String
-
-      # @rbs &blk: (Segment) -> void
-      # @rbs return: void
-      def initialize: () { (Segment) -> void } -> void
-    end
-
-    attr_accessor segments: Array[Segment]
-
-    # @rbs return: void
-    def initialize: () -> void
-  end
-
-  class ExportSection < Section
-    class ExportDesc
-      attr_accessor name: String
-
-      attr_accessor kind: Integer
-
-      attr_accessor func_index: Integer
-    end
-
-    attr_accessor exports: Hash[String, ExportDesc]
-
-    def initialize: () -> void
-
-    # @rbs &blk: (ExportDesc) -> void
-    def add_desc: () { (ExportDesc) -> void } -> untyped
-  end
-
-  class ImportSection < Section
-    class ImportDesc
-      attr_accessor module_name: String
-
-      attr_accessor name: String
-
-      attr_accessor kind: Integer
-
-      attr_accessor sig_index: Integer
-    end
-
-    attr_accessor imports: Array[ImportDesc]
-
-    def initialize: () -> void
-
-    # @rbs &blk: (ImportDesc) -> void
-    def add_desc: () { (ImportDesc) -> void } -> untyped
-  end
-
-  module BinaryLoader
-    extend Wardite::Leb128Helper
-
-    extend Wardite::ValueHelper
-
-    # @rbs buf: File|StringIO
-    # @rbs import_object: Hash[Symbol, Hash[Symbol, Proc]]
-    # @rbs enable_wasi: boolish
-    # @rbs return: Instance
-    def self.load_from_buffer: (File | StringIO buf, ?import_object: Hash[Symbol, Hash[Symbol, Proc]], ?enable_wasi: boolish) -> Instance
-
-    # @rbs return: Integer
-    def self.preamble: () -> Integer
-
-    # @rbs return: Array[Section]
-    def self.sections: () -> Array[Section]
-
-    # @rbs return: TypeSection
-    def self.type_section: () -> TypeSection
-
-    # @rbs return: ImportSection
-    def self.import_section: () -> ImportSection
-
-    # @rbs return: MemorySection
-    def self.memory_section: () -> MemorySection
-
-    # @rbs return: FunctionSection
-    def self.function_section: () -> FunctionSection
-
-    # @rbs return: CodeSection
-    def self.code_section: () -> CodeSection
-
-    # @rbs buf: StringIO
-    # @rbs return: Array[::Wardite::Op]
-    def self.code_body: (StringIO buf) -> Array[::Wardite::Op]
-
-    # @rbs return: DataSection
-    def self.data_section: () -> DataSection
-
-    # @rbs sbuf: StringIO
-    # @rbs return: String
-    def self.fetch_insn_while_end: (StringIO sbuf) -> String
-
-    # @rbs ops: Array[Op]
-    # @rbs return: Integer
-    def self.decode_expr: (Array[Op] ops) -> Integer
-
-    # @rbs return: ExportSection
-    def self.export_section: () -> ExportSection
-
-    # @rbs code: Integer
-    # @rbs return: nil
-    def self.unimplemented_skip_section: (Integer code) -> nil
-
-    # @rbs sbuf: StringIO
-    # @rbs n: Integer
-    # @rbs return: String
-    def self.assert_read: (StringIO sbuf, Integer n) -> String
-  end
-
   class Instance
     attr_accessor version: Integer
 
@@ -179,15 +14,17 @@ 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: ImportSection
     def import_section: () -> ImportSection
@@ -198,12 +35,24 @@ 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: 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)
 
@@ -215,7 +64,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]
 
@@ -224,6 +73,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
@@ -233,6 +85,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
@@ -242,8 +98,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
@@ -253,6 +109,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
@@ -265,8 +132,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]
@@ -278,6 +145,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
 
@@ -289,15 +167,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
@@ -309,12 +187,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
@@ -322,6 +203,12 @@ module Wardite
 
     attr_accessor memories: Array[Memory]
 
+    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
@@ -349,6 +236,46 @@ 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
+
+    attr_accessor mutable: bool
+
+    # TODO: unused in wasm 1.0 spec?
+    attr_accessor shared: bool
+
+    attr_accessor value: wasmValue
+
+    # @rbs &blk: (Global) -> void
+    # @rbs return: void
+    def initialize: () { (Global) -> void } -> void
+
+    alias mutable? mutable
+
+    alias shared? shared
+  end
+
   class WasmData
     attr_accessor memory_index: Integer
 
@@ -415,20 +342,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.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Uchio Kondo
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-04 00:00:00.000000000 Z
+date: 2024-11-10 00:00:00.000000000 Z
 dependencies: []
 description: A pure-ruby webassembly runtime
 email:
@@ -24,15 +24,20 @@ 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
+- examples/global.wat
 - examples/helloworld.wat
 - examples/i32_const.wat
 - examples/i32_store.wat
 - examples/local_set.wat
+- examples/loop.wat
 - examples/memory.wat
+- examples/start.wat
 - exe/wardite
 - lib/wardite.rb
 - lib/wardite/alu_f32.generated.rb
@@ -43,6 +48,7 @@ files:
 - lib/wardite/convert.generated.rb
 - lib/wardite/instruction.rb
 - lib/wardite/leb128.rb
+- lib/wardite/load.rb
 - lib/wardite/value.rb
 - lib/wardite/version.rb
 - lib/wardite/wasi.rb
@@ -59,6 +65,7 @@ files:
 - sig/generated/wardite/convert.generated.rbs
 - sig/generated/wardite/instruction.rbs
 - sig/generated/wardite/leb128.rbs
+- sig/generated/wardite/load.rbs
 - sig/generated/wardite/value.rbs
 - sig/generated/wardite/version.rbs
 - sig/generated/wardite/wasi.rbs