wardite 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6335000832a623233f1a9719fe271fa4a000270bc55312fc996fe3f4e72bad9
-  data.tar.gz: d72874301c47400a24fa9992de296d5d490c04d2c6f1dad2b76493f7eed3b464
+  metadata.gz: e3ca81e45a3da7f90566d465d5248bcac03981953e97c81681de900851348407
+  data.tar.gz: 2b0952f92a92bce4d54283868fd2565b9dbaa178cc1187b2a7f6feca6225fe57
 SHA512:
-  metadata.gz: 3d3a12027244cac1cc6efeb382a6a164c070946a85886eae1915c90360a6c139766ae2780103511bf1e332418576a6dbdc1fd7ca7266a2974dd228d24155bedb
-  data.tar.gz: 282d5051760ca800a876daaa1962bea603961ce3fc4551560255030c433e445ba0efc945b75b5829112a6742b6492142ad3c2a1d577f30816bcf76f39bd58f2e
+  metadata.gz: 8a4db779ed117465fb2c981c0b9da39dcdd001e60abf00262d04353449b5b72ad433949d6c640458fe2b61b503e84180dbf3c7709d791b48f7ed2a5ad9dbe372
+  data.tar.gz: 7d00f04205f6ef10b21dee7067adf1f480a529cea4bf0caa404fd888547f101f3908f54863262333e2b363d2d17b28b4899ff12ddc5e226958eda975354fd954

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/alu_i32.generated.rb

@@ -311,7 +311,7 @@ module Wardite
         digits = target.memsize
         count = 0
         digits.times do |i|
-          if (target.value & (1 << i)).zero?
+          if (target.value & (1 << i)).nonzero?
             count += 1
           end
         end
@@ -347,7 +347,13 @@ module Wardite
         if !right.is_a?(I32) || !left.is_a?(I32)
           raise EvalError, "maybe empty or invalid stack"
         end
-        runtime.stack.push(I32(left.value_s / right.value_s))
+        result = left.value_s / right.value_s.to_f
+        iresult = (result >= 0 ? result.floor : result.ceil).to_i
+        if iresult >= (1 << (left.memsize - 1))
+          raise IntegerOverflow, "integer overflow"
+        end
+      
+        runtime.stack.push(I32(iresult))
 
 
       when :i32_div_u
@@ -363,7 +369,13 @@ module Wardite
         if !right.is_a?(I32) || !left.is_a?(I32)
           raise EvalError, "maybe empty or invalid stack"
         end
-        runtime.stack.push(I32(left.value_s % right.value_s))
+        result = left.value_s % right.value_s
+        if result > 0 && left.value_s < 0
+          result = result - right.value_s
+        elsif result < 0 && left.value_s > 0
+          result = result - right.value_s
+        end
+        runtime.stack.push(I32(result))
 
 
       when :i32_rem_u
@@ -403,8 +415,8 @@ module Wardite
         if !right.is_a?(I32) || !left.is_a?(I32)
           raise EvalError, "maybe empty or invalid stack"
         end
-        value = left.value << right.value
-        value %= (1 << right.memsize) 
+        value = left.value << (right.value % right.memsize)
+        value %= 1 << right.memsize
       
         runtime.stack.push(I32(value))
 
@@ -414,7 +426,7 @@ module Wardite
         if !right.is_a?(I32) || !left.is_a?(I32)
           raise EvalError, "maybe empty or invalid stack"
         end
-        value = left.value_s >> right.value
+        value = left.value_s >> (right.value % right.memsize)
         runtime.stack.push(I32(value))
 
 
@@ -423,7 +435,7 @@ module Wardite
         if !right.is_a?(I32) || !left.is_a?(I32)
           raise EvalError, "maybe empty or invalid stack"
         end
-        value = left.value >> right.value
+        value = left.value >> (right.value % right.memsize)
         runtime.stack.push(I32(value))
 
 
@@ -432,9 +444,10 @@ module Wardite
         if !right.is_a?(I32) || !left.is_a?(I32)
           raise EvalError, "maybe empty or invalid stack"
         end
-        rotated = left.value << right.value
-        rest = left.value & (I32::I32_MAX << (right.memsize - right.value))
-        value = rotated | (rest >> (right.memsize - right.value))
+        k = (right.value % right.memsize)
+        rotated = left.value << k
+        rest = left.value & (I32::I32_MAX << (right.memsize - k))
+        value = rotated | (rest >> (right.memsize - k))
         runtime.stack.push(I32(value))
 
 
@@ -443,9 +456,10 @@ module Wardite
         if !right.is_a?(I32) || !left.is_a?(I32)
           raise EvalError, "maybe empty or invalid stack"
         end
-        rotated = left.value >> right.value
-        rest = left.value & (I32::I32_MAX >> (right.memsize - right.value))
-        value = rotated | (rest << (right.memsize - right.value))
+        k = (right.value % right.memsize)
+        rotated = left.value >> k
+        rest = left.value & (I32::I32_MAX >> (right.memsize - k))
+        value = rotated | (rest << (right.memsize - k))
         runtime.stack.push(I32(value))
 
 

data/lib/wardite/alu_i64.generated.rb

@@ -368,7 +368,7 @@ module Wardite
         digits = target.memsize
         count = 0
         digits.times do |i|
-          if (target.value & (1 << i)).zero?
+          if (target.value & (1 << i)).nonzero?
             count += 1
           end
         end
@@ -404,7 +404,13 @@ module Wardite
         if !right.is_a?(I64) || !left.is_a?(I64)
           raise EvalError, "maybe empty or invalid stack"
         end
-        runtime.stack.push(I64(left.value_s / right.value_s))
+        result = left.value_s / right.value_s.to_f
+        iresult = (result >= 0 ? result.floor : result.ceil).to_i
+        if iresult >= (1 << (left.memsize - 1))
+          raise IntegerOverflow, "integer overflow"
+        end
+      
+        runtime.stack.push(I64(iresult))
 
 
       when :i64_div_u
@@ -420,7 +426,13 @@ module Wardite
         if !right.is_a?(I64) || !left.is_a?(I64)
           raise EvalError, "maybe empty or invalid stack"
         end
-        runtime.stack.push(I64(left.value_s % right.value_s))
+        result = left.value_s % right.value_s
+        if result > 0 && left.value_s < 0
+          result = result - right.value_s
+        elsif result < 0 && left.value_s > 0
+          result = result - right.value_s
+        end
+        runtime.stack.push(I64(result))
 
 
       when :i64_rem_u
@@ -460,8 +472,8 @@ module Wardite
         if !right.is_a?(I64) || !left.is_a?(I64)
           raise EvalError, "maybe empty or invalid stack"
         end
-        value = left.value << right.value
-        value %= (1 << right.memsize) 
+        value = left.value << (right.value % right.memsize)
+        value %= 1 << right.memsize
       
         runtime.stack.push(I64(value))
 
@@ -471,7 +483,7 @@ module Wardite
         if !right.is_a?(I64) || !left.is_a?(I64)
           raise EvalError, "maybe empty or invalid stack"
         end
-        value = left.value_s >> right.value
+        value = left.value_s >> (right.value % right.memsize)
         runtime.stack.push(I64(value))
 
 
@@ -480,7 +492,7 @@ module Wardite
         if !right.is_a?(I64) || !left.is_a?(I64)
           raise EvalError, "maybe empty or invalid stack"
         end
-        value = left.value >> right.value
+        value = left.value >> (right.value % right.memsize)
         runtime.stack.push(I64(value))
 
 
@@ -489,9 +501,10 @@ module Wardite
         if !right.is_a?(I64) || !left.is_a?(I64)
           raise EvalError, "maybe empty or invalid stack"
         end
-        rotated = left.value << right.value
-        rest = left.value & (I64::I64_MAX << (right.memsize - right.value))
-        value = rotated | (rest >> (right.memsize - right.value))
+        k = (right.value % right.memsize)
+        rotated = left.value << k
+        rest = left.value & (I64::I64_MAX << (right.memsize - k))
+        value = rotated | (rest >> (right.memsize - k))
         runtime.stack.push(I64(value))
 
 
@@ -500,9 +513,10 @@ module Wardite
         if !right.is_a?(I64) || !left.is_a?(I64)
           raise EvalError, "maybe empty or invalid stack"
         end
-        rotated = left.value >> right.value
-        rest = left.value & (I64::I64_MAX >> (right.memsize - right.value))
-        value = rotated | (rest << (right.memsize - right.value))
+        k = (right.value % right.memsize)
+        rotated = left.value >> k
+        rest = left.value & (I64::I64_MAX >> (right.memsize - k))
+        value = rotated | (rest << (right.memsize - k))
         runtime.stack.push(I64(value))
 
 

data/lib/wardite/errors.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+# rbs_inline: enabled
+module Wardite
+  # basic error class.
+  class WebAssemblyError < StandardError    
+  end
+
+  class IntegerOverflow < WebAssemblyError; end
+end

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.2" #: String
+  VERSION = "0.5.0" #: String
 end

data/lib/wardite.rb

@@ -7,6 +7,7 @@ require_relative "wardite/const"
 require_relative "wardite/instruction"
 require_relative "wardite/value"
 require_relative "wardite/load"
+require_relative "wardite/errors"
 
 module Wardite
   module Evaluator
@@ -258,10 +259,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
@@ -727,10 +731,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
 
@@ -1114,6 +1120,7 @@ module Wardite
       end
       
       @data += String.new("\0" * (delta * 64 * 1024))
+      self.current = newsize
       prev
     end
 
@@ -1219,8 +1226,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
@@ -1228,15 +1238,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
 

data/scripts/gen_alu.rb

@@ -480,7 +480,7 @@ module GenAlu
         digits = target.memsize
         count = 0
         digits.times do |i|
-          if (target.value & (1 << i)).zero?
+          if (target.value & (1 << i)).nonzero?
             count += 1
           end
         end
@@ -520,7 +520,13 @@ module GenAlu
         if !right.is_a?(${CLASS}) || !left.is_a?(${CLASS})
           raise EvalError, "maybe empty or invalid stack"
         end
-        runtime.stack.push(${CLASS}(left.value_s / right.value_s))
+        result = left.value_s / right.value_s.to_f
+        iresult = (result >= 0 ? result.floor : result.ceil).to_i
+        if iresult >= (1 << (left.memsize - 1))
+          raise IntegerOverflow, "integer overflow"
+        end
+
+        runtime.stack.push(${CLASS}(iresult))
     RUBY
 
     div_u: <<~RUBY,
@@ -547,7 +553,13 @@ module GenAlu
         if !right.is_a?(${CLASS}) || !left.is_a?(${CLASS})
           raise EvalError, "maybe empty or invalid stack"
         end
-        runtime.stack.push(${CLASS}(left.value_s % right.value_s))
+        result = left.value_s % right.value_s
+        if result > 0 && left.value_s < 0
+          result = result - right.value_s
+        elsif result < 0 && left.value_s > 0
+          result = result - right.value_s
+        end
+        runtime.stack.push(${CLASS}(result))
     RUBY
 
     rem_u: <<~RUBY,
@@ -592,8 +604,8 @@ module GenAlu
         if !right.is_a?(${CLASS}) || !left.is_a?(${CLASS})
           raise EvalError, "maybe empty or invalid stack"
         end
-        value = left.value << right.value
-        value %= (1 << right.memsize) 
+        value = left.value << (right.value % right.memsize)
+        value %= 1 << right.memsize
 
         runtime.stack.push(${CLASS}(value))
     RUBY
@@ -604,7 +616,7 @@ module GenAlu
         if !right.is_a?(${CLASS}) || !left.is_a?(${CLASS})
           raise EvalError, "maybe empty or invalid stack"
         end
-        value = left.value_s >> right.value
+        value = left.value_s >> (right.value % right.memsize)
         runtime.stack.push(${CLASS}(value))
     RUBY
 
@@ -614,7 +626,7 @@ module GenAlu
         if !right.is_a?(${CLASS}) || !left.is_a?(${CLASS})
           raise EvalError, "maybe empty or invalid stack"
         end
-        value = left.value >> right.value
+        value = left.value >> (right.value % right.memsize)
         runtime.stack.push(${CLASS}(value))
     RUBY
 
@@ -624,9 +636,10 @@ module GenAlu
         if !right.is_a?(${CLASS}) || !left.is_a?(${CLASS})
           raise EvalError, "maybe empty or invalid stack"
         end
-        rotated = left.value << right.value
-        rest = left.value & (${CLASS}::${CLASS}_MAX << (right.memsize - right.value))
-        value = rotated | (rest >> (right.memsize - right.value))
+        k = (right.value % right.memsize)
+        rotated = left.value << k
+        rest = left.value & (${CLASS}::${CLASS}_MAX << (right.memsize - k))
+        value = rotated | (rest >> (right.memsize - k))
         runtime.stack.push(${CLASS}(value))
     RUBY
 
@@ -636,9 +649,10 @@ module GenAlu
         if !right.is_a?(${CLASS}) || !left.is_a?(${CLASS})
           raise EvalError, "maybe empty or invalid stack"
         end
-        rotated = left.value >> right.value
-        rest = left.value & (${CLASS}::${CLASS}_MAX >> (right.memsize - right.value))
-        value = rotated | (rest << (right.memsize - right.value))
+        k = (right.value % right.memsize)
+        rotated = left.value >> k
+        rest = left.value & (${CLASS}::${CLASS}_MAX >> (right.memsize - k))
+        value = rotated | (rest << (right.memsize - k))
         runtime.stack.push(${CLASS}(value))
     RUBY
 

data/sig/generated/wardite/errors.rbs

@@ -0,0 +1,12 @@
+# Generated from lib/wardite/errors.rb with RBS::Inline
+
+# frozen_string_literal: true
+# rbs_inline: enabled
+module Wardite
+  # basic error class.
+  class WebAssemblyError < StandardError
+  end
+
+  class IntegerOverflow < WebAssemblyError
+  end
+end

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

@@ -315,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
@@ -324,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?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wardite
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Uchio Kondo
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-11 00:00:00.000000000 Z
+date: 2024-11-24 00:00:00.000000000 Z
 dependencies: []
 description: A pure-ruby webassembly runtime
 email:
@@ -49,6 +49,7 @@ files:
 - lib/wardite/alu_i64.generated.rb
 - lib/wardite/const.rb
 - lib/wardite/convert.generated.rb
+- lib/wardite/errors.rb
 - lib/wardite/instruction.rb
 - lib/wardite/leb128.rb
 - lib/wardite/load.rb
@@ -66,6 +67,7 @@ files:
 - sig/generated/wardite/alu_i64.generated.rbs
 - sig/generated/wardite/const.rbs
 - sig/generated/wardite/convert.generated.rbs
+- sig/generated/wardite/errors.rbs
 - sig/generated/wardite/instruction.rbs
 - sig/generated/wardite/leb128.rbs
 - sig/generated/wardite/load.rbs