wardite 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d2b7f37620b7290c9a4c1fc558024d87cb7ad73bf217c7f7abbda3e6dfda266
-  data.tar.gz: c239d24ee56a9dd80084abc11dcffad7a40edbc2c4644146c3cf91fa5b393ddd
+  metadata.gz: a6335000832a623233f1a9719fe271fa4a000270bc55312fc996fe3f4e72bad9
+  data.tar.gz: d72874301c47400a24fa9992de296d5d490c04d2c6f1dad2b76493f7eed3b464
 SHA512:
-  metadata.gz: 8a9369b5cb946190e8dd0f0fc5c17d383e9f5f168098332b78a4ed821398f0a6d7b631558ba6a8a32a14d9ebcce88dd23e8f05d32b73eb7d9e7aafa14a46b0f4
-  data.tar.gz: 62f7f961e035a39203616793aa257d238a62760c70f6c9184070d3b79cc0615b829fbe5c4b89608838efe3db6b1a9e26332a125530992fcb41dcd64df8df3304
+  metadata.gz: 3d3a12027244cac1cc6efeb382a6a164c070946a85886eae1915c90360a6c139766ae2780103511bf1e332418576a6dbdc1fd7ca7266a2974dd228d24155bedb
+  data.tar.gz: 282d5051760ca800a876daaa1962bea603961ce3fc4551560255030c433e445ba0efc945b75b5829112a6742b6492142ad3c2a1d577f30816bcf76f39bd58f2e

data/README.md

@@ -7,6 +7,21 @@ A pure-ruby webassembly runtime.
 - [x] Fully typed by RBS (with the aid of [rbs-inline](https://github.com/soutaro/rbs-inline))
 - [ ] WASI (p1) support
 
+## Supported Instructions
+
+ref: https://webassembly.github.io/spec/core/binary/instructions.html
+
+- [x] Control Instructions
+- [x] Parametric Instructions
+- [x] Variable Instructions
+- [ ] Table Instructions
+- [x] Memory Instructions (except `data.drop`)
+- [x] Numeric Instructions (`0x41 ... 0xC4`)
+- [x] Numeric Instructions (`0xFC` Operations)
+- [ ] Reference Instructions
+- [ ] Vector Instructions
+- [x] end `0x0B`
+
 ## Installation
 
 Install the gem and add to the application's Gemfile by executing:

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/leb128.rb

@@ -2,8 +2,9 @@
 module Wardite
   module Leb128Helper
     # @rbs buf: File|StringIO
+    # @rbs max_level: Integer
     # @rbs return: Integer
-    def fetch_uleb128(buf)
+    def fetch_uleb128(buf, max_level: 8)
       dest = 0
       level = 0
       while b = buf.read(1)
@@ -18,7 +19,7 @@ module Wardite
           return dest
         end
 
-        if level > 6
+        if level > max_level
           break
         end
         level += 1
@@ -29,7 +30,7 @@ module Wardite
 
     # @rbs buf: File|StringIO
     # @rbs return: Integer
-    def fetch_sleb128(buf)
+    def fetch_sleb128(buf, max_level: 8)
       dest = 0
       level = 0
       while b = buf.read(1)
@@ -44,7 +45,7 @@ module Wardite
           break
         end
 
-        if level > 6
+        if level > max_level
           raise "unreachable! debug: dest = #{dest} level = #{level}"
         end
         level += 1

data/lib/wardite/load.rb

@@ -630,7 +630,7 @@ module Wardite
           when :i32
             operand << fetch_sleb128(buf)
           when :i64
-            operand << fetch_sleb128(buf)
+            operand << fetch_sleb128(buf, max_level: 16)
           when :f32
             data = buf.read 4
             if !data || data.size != 4
@@ -667,6 +667,12 @@ module Wardite
       end
 
       dest
+    rescue => e
+      require "pp"
+      $stderr.puts "parsed:::"
+      $stderr.puts "#{dest.pretty_inspect}"
+      $stderr.puts "code = #{code}"
+      raise e
     end
 
     # @rbs c: String
@@ -845,7 +851,7 @@ module Wardite
     # @rbs return: nil
     def self.unimplemented_skip_section(code)
       $stderr.puts "warning: unimplemented section: 0x0#{code}"
-      size = @buf.read(1)&.ord
+      size = fetch_uleb128(@buf)
       @buf.read(size)
       nil
     end

data/lib/wardite/version.rb

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

data/lib/wardite.rb

@@ -310,20 +310,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 +601,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)
 
@@ -884,6 +893,8 @@ module Wardite
 
     attr_accessor :locals #: Array[wasmValue]
 
+    attr_accessor :findex #: Integer
+
     # @rbs pc: Integer
     # @rbs sp: Integer
     # @rbs body: Array[Op]
@@ -897,6 +908,8 @@ module Wardite
       @arity = arity
       @locals = locals
       @labels = []
+
+      @findex = 0
     end
   end
 
@@ -970,6 +983,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
@@ -1233,6 +1248,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 +1259,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/leb128.rbs

@@ -4,11 +4,12 @@
 module Wardite
   module Leb128Helper
     # @rbs buf: File|StringIO
+    # @rbs max_level: Integer
     # @rbs return: Integer
-    def fetch_uleb128: (File | StringIO buf) -> Integer
+    def fetch_uleb128: (File | StringIO buf, ?max_level: Integer) -> Integer
 
     # @rbs buf: File|StringIO
     # @rbs return: Integer
-    def fetch_sleb128: (File | StringIO buf) -> Integer
+    def fetch_sleb128: (File | StringIO buf, ?max_level: untyped) -> Integer
   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]
@@ -334,6 +336,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.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Uchio Kondo
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-10 00:00:00.000000000 Z
+date: 2024-11-11 00:00:00.000000000 Z
 dependencies: []
 description: A pure-ruby webassembly runtime
 email: