wardite 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '02079b17ada50d21f00ea34c1830452eea21ff12a2fb6e9c5903d07cdca53d3a'
-  data.tar.gz: 9ab24caf2cc630593ce32ab652c8044a621f67ddce1cb70f75a1cd9e767b13e2
+  metadata.gz: a6335000832a623233f1a9719fe271fa4a000270bc55312fc996fe3f4e72bad9
+  data.tar.gz: d72874301c47400a24fa9992de296d5d490c04d2c6f1dad2b76493f7eed3b464
 SHA512:
-  metadata.gz: 88054ffba3884002ea3ff7c63b21a38ff41a93f2e641ec7b82cf39f47e7df7672c5c6412f4efd1ca9feb6e222aaaadf98e67a40810c8ed213046df348aac8f79
-  data.tar.gz: 1c5b8765bff6ae42eb00c696efd8af2c6b892911d52fc68a1124fb3804419f121f886ba416b6b39b3183afa22e1f6aadf730681c004f254796c5e6934ab39da1
+  metadata.gz: 3d3a12027244cac1cc6efeb382a6a164c070946a85886eae1915c90360a6c139766ae2780103511bf1e332418576a6dbdc1fd7ca7266a2974dd228d24155bedb
+  data.tar.gz: 282d5051760ca800a876daaa1962bea603961ce3fc4551560255030c433e445ba0efc945b75b5829112a6742b6492142ad3c2a1d577f30816bcf76f39bd58f2e

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

@@ -2,5 +2,5 @@
 # rbs_inline: enabled
 
 module Wardite
-  VERSION = "0.4.1" #: 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.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.1
+  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: