wardite 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1960efc493205587db2fbb0e21504247d120831417b081dc169c0b7c10fccaf
-  data.tar.gz: cbdbf5e122fe118ccee7a615b184be2032b6000a043b3642a9b5336f6b0fbe19
+  metadata.gz: e3ca81e45a3da7f90566d465d5248bcac03981953e97c81681de900851348407
+  data.tar.gz: 2b0952f92a92bce4d54283868fd2565b9dbaa178cc1187b2a7f6feca6225fe57
 SHA512:
-  metadata.gz: 207a1cd23ab5f25fdf9dd421ab42c70528be1987e57f41d656f47e205ee78ba321b9553364f988f6f039f87a77878e040075e690b00b97ace0bf91e35c07431f
-  data.tar.gz: 944b8112be80c9c3b78dd7cdec01ac3c72f7e4e077196a315bfaa14ffeb4dfa6cdb868570ae0bc55fb4f07da858f968807fee8bb50d5846fa763dd7b82359f98
+  metadata.gz: 8a4db779ed117465fb2c981c0b9da39dcdd001e60abf00262d04353449b5b72ad433949d6c640458fe2b61b503e84180dbf3c7709d791b48f7ed2a5ad9dbe372
+  data.tar.gz: 7d00f04205f6ef10b21dee7067adf1f480a529cea4bf0caa404fd888547f101f3908f54863262333e2b363d2d17b28b4899ff12ddc5e226958eda975354fd954

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

@@ -2,5 +2,5 @@
 # rbs_inline: enabled
 
 module Wardite
-  VERSION = "0.4.3" #: 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
@@ -1119,6 +1120,7 @@ module Wardite
       end
       
       @data += String.new("\0" * (delta * 64 * 1024))
+      self.current = newsize
       prev
     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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wardite
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Uchio Kondo
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-17 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