wardite 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '02079b17ada50d21f00ea34c1830452eea21ff12a2fb6e9c5903d07cdca53d3a'
-  data.tar.gz: 9ab24caf2cc630593ce32ab652c8044a621f67ddce1cb70f75a1cd9e767b13e2
+  metadata.gz: f1960efc493205587db2fbb0e21504247d120831417b081dc169c0b7c10fccaf
+  data.tar.gz: cbdbf5e122fe118ccee7a615b184be2032b6000a043b3642a9b5336f6b0fbe19
 SHA512:
-  metadata.gz: 88054ffba3884002ea3ff7c63b21a38ff41a93f2e641ec7b82cf39f47e7df7672c5c6412f4efd1ca9feb6e222aaaadf98e67a40810c8ed213046df348aac8f79
-  data.tar.gz: 1c5b8765bff6ae42eb00c696efd8af2c6b892911d52fc68a1124fb3804419f121f886ba416b6b39b3183afa22e1f6aadf730681c004f254796c5e6934ab39da1
+  metadata.gz: 207a1cd23ab5f25fdf9dd421ab42c70528be1987e57f41d656f47e205ee78ba321b9553364f988f6f039f87a77878e040075e690b00b97ace0bf91e35c07431f
+  data.tar.gz: 944b8112be80c9c3b78dd7cdec01ac3c72f7e4e077196a315bfaa14ffeb4dfa6cdb868570ae0bc55fb4f07da858f968807fee8bb50d5846fa763dd7b82359f98

data/README.md

@@ -43,7 +43,7 @@ path = ARGV[0]
 method = ARGV[1]
 args = ARGV[2..-1] || []
 
-instance = Wardite::new(path: path);
+instance = Wardite::new(path: path)
 if !method && instance.runtime.respond_to?(:_start)
   instance.runtime._start
 else

data/lib/wardite/convert.generated.rb

@@ -58,7 +58,7 @@ module Wardite
         runtime.stack.push(to)
 
 
-      when :i32_extend_8_s
+      when :i32_extend8_s
         from = runtime.stack.pop
         raise EvalError, "maybe empty or invalid stack" if !from.is_a?(I32)
         to = from.extendN_s(to: :i32, from: :i8)
@@ -66,7 +66,7 @@ module Wardite
         runtime.stack.push(to)
 
 
-      when :i32_extend_16_s
+      when :i32_extend16_s
         from = runtime.stack.pop
         raise EvalError, "maybe empty or invalid stack" if !from.is_a?(I32)
         to = from.extendN_s(to: :i32, from: :i16)
@@ -178,7 +178,7 @@ module Wardite
         runtime.stack.push(to)
 
 
-      when :i64_extend_8_s
+      when :i64_extend8_s
         from = runtime.stack.pop
         raise EvalError, "maybe empty or invalid stack" if !from.is_a?(I32)
         to = from.extendN_s(to: :i64, from: :i8)
@@ -186,7 +186,7 @@ module Wardite
         runtime.stack.push(to)
 
 
-      when :i64_extend_16_s
+      when :i64_extend16_s
         from = runtime.stack.pop
         raise EvalError, "maybe empty or invalid stack" if !from.is_a?(I32)
         to = from.extendN_s(to: :i64, from: :i16)
@@ -194,7 +194,7 @@ module Wardite
         runtime.stack.push(to)
 
 
-      when :i64_extend_32_s
+      when :i64_extend32_s
         from = runtime.stack.pop
         raise EvalError, "maybe empty or invalid stack" if !from.is_a?(I32)
         to = from.extendN_s(to: :i64, from: :i32)

data/lib/wardite/load.rb

@@ -193,7 +193,7 @@ module Wardite
       
       attr_accessor :kind #: Integer
 
-      attr_accessor :func_index #: Integer
+      attr_accessor :index #: Integer
     end
 
     attr_accessor :exports #: Hash[String, ExportDesc]
@@ -840,7 +840,7 @@ module Wardite
         dest.add_desc do |desc|
           desc.name = name
           desc.kind = kind
-          desc.func_index = index
+          desc.index = index
         end
       end
 

data/lib/wardite/value.rb

@@ -237,6 +237,10 @@ module Wardite
     def inspect
       "I32(#{value_s})"
     end
+
+    def ==(other)
+      return self.class == other.class && self.value == other.value
+    end
   end
 
   class I64
@@ -400,6 +404,10 @@ module Wardite
     def inspect
       "I64(#{@value})"
     end
+ 
+    def ==(other)
+      return self.class == other.class && self.value == other.value
+    end
   end
 
   class F32
@@ -601,6 +609,10 @@ module Wardite
     def inspect
       "F32(#{@value})"
     end
+
+    def ==(other)
+      return self.class == other.class && self.value == other.value
+    end
   end
 
   class F64
@@ -800,5 +812,9 @@ module Wardite
     def inspect
       "F64(#{@value})"
     end
+
+    def ==(other)
+      return self.class == other.class && self.value == other.value
+    end
   end
 end

data/lib/wardite/version.rb

@@ -2,5 +2,5 @@
 # rbs_inline: enabled
 
 module Wardite
-  VERSION = "0.4.1" #: String
+  VERSION = "0.4.3" #: String
 end

data/lib/wardite.rb

@@ -258,10 +258,13 @@ module Wardite
       if !callable?(name)
         raise ::NoMethodError, "function #{name} not found"
       end
-      kind, fn = @instance.exports[name.to_s]
+      kind, fn = @instance.exports.mappings[name.to_s]
       if kind != 0
         raise ::NoMethodError, "#{name} is not a function"
       end
+      if !fn.is_a?(WasmFunction) && !fn.is_a?(ExternalFunction)
+        raise ::NoMethodError, "#{name} is not a function"
+      end
       if fn.callsig.size != args.size
         raise ArgumentError, "unmatch arg size"
       end
@@ -310,20 +313,28 @@ module Wardite
       end
       self.stack = drained_stack(local_start)
 
-      wasm_function.locals_type.each_with_index do |typ, i|
-        case typ
-        when :i32, :u32
-          locals.push I32(0)
-        when :i64, :u64
-          locals.push I64(0)
-        else
-          $stderr.puts "warning: unknown type #{typ.inspect}. default to I32"
-          locals.push I32(0)
+      wasm_function.locals_count.each_with_index do |count, i|
+        typ = wasm_function.locals_type[i]
+        count.times do
+          case typ
+          when :i32, :u32
+            locals.push I32(0)
+          when :i64, :u64
+            locals.push I64(0)
+          when :f32
+            locals.push F32(0.0)
+          when :f64
+            locals.push F64(0.0)
+          else
+            $stderr.puts "warning: unknown type #{typ.inspect}. default to I32"
+            locals.push I32(0)
+          end
         end
       end
 
       arity = wasm_function.retsig.size
       frame = Frame.new(-1, stack.size, wasm_function.body, arity, locals)
+      frame.findex = wasm_function.findex
       self.call_stack.push(frame)
     end
 
@@ -593,7 +604,8 @@ module Wardite
         end
         local = frame.locals[idx]
         if !local
-          raise EvalError, "local not found"
+          # require "irb"; binding.irb
+          raise EvalError, "local not found, idx = #{idx}"
         end
         stack.push(local)
 
@@ -718,10 +730,12 @@ module Wardite
       end
 
     rescue => e
-      require "pp"
-      $stderr.puts "instance:::\n#{self.instance.pretty_inspect}"
-      $stderr.puts "frame:::\n#{frame.pretty_inspect}"
-      $stderr.puts "stack:::\n#{stack.pretty_inspect}"
+      if ENV["DEBUG"]
+        require "pp"
+        $stderr.puts "instance:::\n#{self.instance.pretty_inspect}"
+        $stderr.puts "frame:::\n#{frame.pretty_inspect}"
+        $stderr.puts "stack:::\n#{stack.pretty_inspect}"
+      end
       raise e
     end
 
@@ -884,6 +898,8 @@ module Wardite
 
     attr_accessor :locals #: Array[wasmValue]
 
+    attr_accessor :findex #: Integer
+
     # @rbs pc: Integer
     # @rbs sp: Integer
     # @rbs body: Array[Op]
@@ -897,6 +913,8 @@ module Wardite
       @arity = arity
       @locals = locals
       @labels = []
+
+      @findex = 0
     end
   end
 
@@ -970,6 +988,8 @@ module Wardite
           retsig = type_section.defined_results[sigindex]
           codes = code_section.func_codes[findex]
           wasm_function = WasmFunction.new(callsig, retsig, codes)
+          idx = self.funcs.size
+          wasm_function.findex = idx
           self.funcs << wasm_function
         end
       end
@@ -1204,8 +1224,11 @@ module Wardite
     end
   end
 
+  # @rbs!
+  #   type exportHandle = WasmFunction | ExternalFunction | Table | Global | Memory
+
   class Exports
-    attr_accessor :mappings #: Hash[String, [Integer, WasmFunction|ExternalFunction]]
+    attr_accessor :mappings #: Hash[String, [Integer, exportHandle]]
 
     # @rbs export_section: ExportSection
     # @rbs store: Store
@@ -1213,15 +1236,36 @@ module Wardite
     def initialize(export_section, store)
       @mappings = {}
       export_section.exports.each_pair do |name, desc|
-        # TODO: introduce map by kind
-        @mappings[name] = [desc.kind, store.funcs[desc.func_index]]
+        case desc.kind
+        when 0x0
+          @mappings[name] = [desc.kind, store.funcs[desc.index]]
+        when 0x1
+          @mappings[name] = [desc.kind, store.tables[desc.index]]
+        when 0x2
+          @mappings[name] = [desc.kind, store.memories[desc.index]]
+        when 0x3
+          @mappings[name] = [desc.kind, store.globals[desc.index]]
+        else
+        end
       end
     end
 
     # @rbs name: String
-    # @rbs return: [Integer, WasmFunction|ExternalFunction]
+    # @rbs return: exportHandle|nil
     def [](name)
-      @mappings[name]
+      @mappings[name]&.[](1)
+    end
+
+    def respond_to?(name) 
+      !!self[name.to_s] || super
+    end
+
+    def method_missing(name, *_args)
+      if self[name.to_s]
+        self[name.to_s]
+      else
+        super
+      end
     end
   end
 
@@ -1233,6 +1277,8 @@ module Wardite
 
     attr_accessor :code_body #: CodeSection::CodeBody
 
+    attr_accessor :findex #: Integer
+
     # @rbs callsig: Array[Symbol]
     # @rbs retsig: Array[Symbol]
     # @rbs code_body: CodeSection::CodeBody
@@ -1242,6 +1288,7 @@ module Wardite
       @retsig = retsig
 
       @code_body = code_body
+      @findex = 0 # for debug
     end
 
     # @rbs return: Array[Op]

data/scripts/gen_conv.rb

@@ -46,7 +46,7 @@ module GenConv
     elsif method =~ /^extendN_(u|s)$/
       suffix = $1
       from_size = from.to_s.scan(/\d+/).join
-      symbol = "#{to.to_s}_extend_#{from_size}_#{suffix}"
+      symbol = "#{to.to_s}_extend#{from_size}_#{suffix}"
       extra_kargs = ", from: :#{from.to_s}"
     elsif method.end_with?("_s") or method.end_with?("_u")
       core = method.sub(/_(s|u)$/, "")

data/sig/generated/wardite/load.rbs

@@ -136,7 +136,7 @@ module Wardite
 
       attr_accessor kind: Integer
 
-      attr_accessor func_index: Integer
+      attr_accessor index: Integer
     end
 
     attr_accessor exports: Hash[String, ExportDesc]

data/sig/generated/wardite/value.rbs

@@ -115,6 +115,8 @@ module Wardite
 
     # I32#inspect shows signed value for convinience
     def inspect: () -> untyped
+
+    def ==: (untyped other) -> untyped
   end
 
   class I64
@@ -196,6 +198,8 @@ module Wardite
 
     # I64#inspect shows signed value
     def inspect: () -> untyped
+
+    def ==: (untyped other) -> untyped
   end
 
   class F32
@@ -278,6 +282,8 @@ module Wardite
     def trunc_sat_s: (to: Symbol) -> wasmValue
 
     def inspect: () -> untyped
+
+    def ==: (untyped other) -> untyped
   end
 
   class F64
@@ -358,5 +364,7 @@ module Wardite
     def trunc_sat_s: (to: Symbol) -> wasmValue
 
     def inspect: () -> untyped
+
+    def ==: (untyped other) -> untyped
   end
 end

data/sig/generated/wardite.rbs

@@ -175,6 +175,8 @@ module Wardite
 
     attr_accessor locals: Array[wasmValue]
 
+    attr_accessor findex: Integer
+
     # @rbs pc: Integer
     # @rbs sp: Integer
     # @rbs body: Array[Op]
@@ -313,8 +315,10 @@ module Wardite
     def result_size: () -> Integer
   end
 
+  type exportHandle = WasmFunction | ExternalFunction | Table | Global | Memory
+
   class Exports
-    attr_accessor mappings: Hash[String, [ Integer, WasmFunction | ExternalFunction ]]
+    attr_accessor mappings: Hash[String, [ Integer, exportHandle ]]
 
     # @rbs export_section: ExportSection
     # @rbs store: Store
@@ -322,8 +326,12 @@ module Wardite
     def initialize: (ExportSection export_section, Store store) -> void
 
     # @rbs name: String
-    # @rbs return: [Integer, WasmFunction|ExternalFunction]
-    def []: (String name) -> [ Integer, WasmFunction | ExternalFunction ]
+    # @rbs return: exportHandle|nil
+    def []: (String name) -> (exportHandle | nil)
+
+    def respond_to?: (untyped name) -> untyped
+
+    def method_missing: (untyped name, *untyped _args) -> untyped
   end
 
   # TODO: common interface btw. WasmFunction and ExternalFunction?
@@ -334,6 +342,8 @@ module Wardite
 
     attr_accessor code_body: CodeSection::CodeBody
 
+    attr_accessor findex: Integer
+
     # @rbs callsig: Array[Symbol]
     # @rbs retsig: Array[Symbol]
     # @rbs code_body: CodeSection::CodeBody

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wardite
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Uchio Kondo
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-10 00:00:00.000000000 Z
+date: 2024-11-17 00:00:00.000000000 Z
 dependencies: []
 description: A pure-ruby webassembly runtime
 email: