wardite 0.2.2 → 0.4.0

data/lib/wardite/value.rb

@@ -1,12 +1,15 @@
 # rbs_inline: enabled
 
 module Wardite
+  # @rbs!
+  #   type wasmValue = I32 | I64 | F32 | F64
+
   module ValueHelper
     # @rbs value: Integer
     # @rbs return: I32
     def I32(value)
       if value < 0
-        $stderr.puts "debug: negative i32 value #{value} is passed, convert to unsigned"
+        # $stderr.puts "trace: negative i32 value #{value} is passed, convert to unsigned"
         value = as_u32(value)
       end
       I32.new.tap{|i| i.value = value & I32::I32_MAX }
@@ -16,7 +19,7 @@ module Wardite
     # @rbs return: I64
     def I64(value)
       if value < 0
-        $stderr.puts "debug: negative i64 value #{value} is passed, convert to unsigned"
+        # $stderr.puts "trace: negative i64 value #{value} is passed, convert to unsigned"
         value = as_u64(value)
       end
       I64.new.tap{|i| i.value = value & I64::I64_MAX }
@@ -53,7 +56,7 @@ module Wardite
   class I32
     include ValueHelper
 
-    I32_MAX = (1<<32) - 1
+    I32_MAX = (1<<32) - 1 #: Integer
     # value should be stored as unsigned Integer, even in I32/I64
     # when we want to access signed value, it'd be done via #value_s
     attr_accessor :value #: Integer
@@ -107,39 +110,39 @@ module Wardite
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def wrap(to:)
       raise EvalError, "unsupported operation"
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def extend_s(to:)
       raise EvalError, "unsupported operation" if to != :i64
       I64(value_s)
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def extend_u(to:)
       raise EvalError, "unsupported operation" if to != :i64
       I64(value)
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def trunc_s(to:)
       raise EvalError, "unsupported operation"
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def trunc_u(to:)
       raise EvalError, "unsupported operation"
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def convert_s(to:)
       case to
       when :f32
@@ -152,7 +155,7 @@ module Wardite
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def convert_u(to:)
       case to
       when :f32
@@ -165,21 +168,21 @@ module Wardite
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def demote(to:)
       raise EvalError, "unsupported operation"
 
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def promote(to:)
       raise EvalError, "unsupported operation"
 
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def reinterpret(to:)
       raise EvalError, "unsupported operation" if to != :f32
       v = [value].pack("I!").unpack("f")[0]
@@ -187,6 +190,49 @@ module Wardite
       F32(v)
     end
 
+    # @rbs from: Symbol
+    # @rbs to: Symbol
+    # @rbs return: wasmValue
+    def extendN_s(from:, to:)
+      src_value = case from
+      when :i8
+        base = value & 0xff
+        (base >> 8).zero? ?
+          base :
+          ((-base) ^ 0xff) + 1
+      when :i16
+        base = value & 0xffff
+        (base >> 15).zero? ?
+          base :
+          ((-base) ^ 0xffff) + 1
+      when :i32
+        value_s
+      else
+        raise EvalError, "unsupported value size"
+      end
+
+      case to
+      when :i32
+        I32(src_value)
+      when :i64
+        I64(src_value)
+      else
+        raise EvalError, "unsupported value size"
+      end
+    end
+
+    # @rbs to: Symbol
+    # @rbs return: wasmValue
+    def trunc_sat_u(to:)
+      raise EvalError, "unsupported operation"
+    end
+
+    # @rbs to: Symbol
+    # @rbs return: wasmValue
+    def trunc_sat_s(to:)
+      raise EvalError, "unsupported operation"
+    end
+
     # I32#inspect shows signed value for convinience
     def inspect
       "I32(#{value_s})"
@@ -196,7 +242,7 @@ module Wardite
   class I64
     include ValueHelper
 
-    I64_MAX = (1<<64) - 1
+    I64_MAX = (1<<64) - 1 #: Integer
 
     attr_accessor :value #: Integer
 
@@ -252,7 +298,7 @@ module Wardite
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def wrap(to:)
       if to != :i32
         raise EvalError, "unsupported operation #{to}"
@@ -261,31 +307,31 @@ module Wardite
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def extend_s(to:)
       raise EvalError, "unsupported operation"
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def extend_u(to:)
       raise EvalError, "unsupported operation"
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def trunc_s(to:)
       raise EvalError, "unsupported operation"
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def trunc_u(to:)
       raise EvalError, "unsupported operation"
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def convert_s(to:)
       case to
       when :f32
@@ -298,7 +344,7 @@ module Wardite
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def convert_u(to:)
       case to
       when :f32
@@ -311,19 +357,19 @@ module Wardite
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def demote(to:)
       raise EvalError, "unsupported operation"
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def promote(to:)
       raise EvalError, "unsupported operation"
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def reinterpret(to:)
       raise EvalError, "unsupported operation" if to != :f64
       v = [value].pack("L!").unpack("d")[0]
@@ -331,6 +377,25 @@ module Wardite
       F32(v)
     end
 
+    # @rbs from: Symbol
+    # @rbs to: Symbol
+    # @rbs return: wasmValue
+    def extendN_s(from:, to:)
+      raise EvalError, "unsupported operation"
+    end
+
+    # @rbs to: Symbol
+    # @rbs return: wasmValue
+    def trunc_sat_u(to:)
+      raise EvalError, "unsupported operation"
+    end
+
+    # @rbs to: Symbol
+    # @rbs return: wasmValue
+    def trunc_sat_s(to:)
+      raise EvalError, "unsupported operation"
+    end
+
     # I64#inspect shows signed value
     def inspect
       "I64(#{@value})"
@@ -373,47 +438,71 @@ module Wardite
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def wrap(to:)
       raise EvalError, "unsupported operation"
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def extend_s(to:)
       raise EvalError, "unsupported operation"
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def extend_u(to:)
       raise EvalError, "unsupported operation"
     end
 
     # @todo need more testcase...
     # @see https://webassembly.github.io/spec/core/exec/numerics.html#xref-exec-numerics-op-trunc-s-mathrm-trunc-mathsf-s-m-n-z
+    # @see copy this impl to F64 when changed
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def trunc_s(to:)
+    # @rbs saturating: bool
+    # @rbs return: wasmValue
+    def trunc_s(to:, saturating: false)
       v = value.to_i
       case to
       when :i32
         if v >= 0
-          I32(v & (I32::I32_MAX >> 1))
+          i32_signed_max = I32::I32_MAX >> 1
+          if saturating
+            v = i32_signed_max if v > i32_signed_max
+          else
+            v = v & i32_signed_max
+          end
+          I32(v & i32_signed_max)
         else
-          v = v & I32::I32_MAX
-          if (v >> 31).zero?
-            raise EvalError, "[undefined behavior] detected overflow: #{value}"
+          i32_signed_min = -(I32::I32_MAX >> 1) - 1
+          if saturating
+            v = i32_signed_min if v < i32_signed_min
+          else
+            v = v & I32::I32_MAX
+            if (v >> 31).zero?
+              raise EvalError, "[undefined behavior] detected overflow: #{value}"
+            end
           end
           I32(v)
         end
       when :i64
         if v >= 0
-          I64(v & (I64::I64_MAX >> 1))
+          i64_signed_max = I64::I64_MAX >> 1
+          if saturating
+            v = i64_signed_max if v > i64_signed_max
+          else
+            v = v & i64_signed_max
+          end
+          I64(v & i64_signed_max)
         else
-          v = v & I64::I64_MAX
-          if (v >> 31).zero?
-            raise EvalError, "[undefined behavior] detected overflow: #{value}"
+          i64_signed_min = -(I64::I64_MAX >> 1) - 1
+          if saturating
+            v = i64_signed_min if v < i64_signed_min
+          else
+            v = v & I64::I64_MAX
+            if (v >> 63).zero?
+              raise EvalError, "[undefined behavior] detected overflow: #{value}"
+            end
           end
           I64(v)
         end
@@ -423,19 +512,33 @@ module Wardite
     end
 
     # @see https://webassembly.github.io/spec/core/exec/numerics.html#xref-exec-numerics-op-trunc-u-mathrm-trunc-mathsf-u-m-n-z
+    # @see copy this impl to F64 when changed
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def trunc_u(to:)
+    # @rbs sturating: bool
+    # @rbs return: wasmValue
+    def trunc_u(to:, saturating: false)
       v = value.to_i
       if v < 0
-        raise EvalError, "[undefined behavior] unexpected negative value"
+        if saturating
+          v = 0
+        else
+          raise EvalError, "[undefined behavior] unexpected negative value"
+        end
       end
       case to
       when :i32
-        v = v & I32::I32_MAX
+        if saturating
+          v = I32::I32_MAX if v > I32::I32_MAX
+        else
+          v = v & I32::I32_MAX
+        end
         I32(v)
       when :i64
-        v = v & I64::I64_MAX
+        if saturating
+          v = I64::I64_MAX if v > I64::I64_MAX
+        else
+          v = v & I64::I64_MAX
+        end
         I64(v)
       else
         raise EvalError, "unsupported operation to: #{to}"
@@ -443,32 +546,32 @@ module Wardite
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def convert_s(to:)
       raise EvalError, "unsupported operation"
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def convert_u(to:)
       raise EvalError, "unsupported operation"
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def demote(to:)
       raise EvalError, "unsupported operation"
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def promote(to:)
       raise EvalError, "unsupported operation" if to != :f64
       F64(value)
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def reinterpret(to:)
       raise EvalError, "unsupported operation" if to != :i32
       v = [value].pack("f").unpack("I!")[0]
@@ -476,6 +579,25 @@ module Wardite
       I32(v)
     end
 
+    # @rbs from: Symbol
+    # @rbs to: Symbol
+    # @rbs return: wasmValue
+    def extendN_s(from:, to:)
+      raise EvalError, "unsupported operation"
+    end
+
+    # @rbs to: Symbol
+    # @rbs return: wasmValue
+    def trunc_sat_u(to:)
+      trunc_u(to: to, saturating: true)
+    end
+
+    # @rbs to: Symbol
+    # @rbs return: wasmValue
+    def trunc_sat_s(to:)
+      trunc_s(to: to, saturating: true)
+    end
+
     def inspect
       "F32(#{@value})"
     end
@@ -517,46 +639,69 @@ module Wardite
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def wrap(to:)
       raise EvalError, "unsupported operation"
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def extend_s(to:)
       raise EvalError, "unsupported operation"
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def extend_u(to:)
       raise EvalError, "unsupported operation"
     end
 
     # @see the same as F32
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def trunc_s(to:)
+    # @rbs saturating: bool
+    # @rbs return: wasmValue
+    def trunc_s(to:, saturating: false)
       v = value.to_i
       case to
       when :i32
         if v >= 0
-          I32(v & (I32::I32_MAX >> 1))
+          i32_signed_max = I32::I32_MAX >> 1
+          if saturating
+            v = i32_signed_max if v > i32_signed_max
+          else
+            v = v & i32_signed_max
+          end
+          I32(v & i32_signed_max)
         else
-          v = v & I32::I32_MAX
-          if (v >> 31).zero?
-            raise EvalError, "[undefined behavior] detected overflow: #{value}"
+          i32_signed_min = -(I32::I32_MAX >> 1) - 1
+          if saturating
+            v = i32_signed_min if v < i32_signed_min
+          else
+            v = v & I32::I32_MAX
+            if (v >> 31).zero?
+              raise EvalError, "[undefined behavior] detected overflow: #{value}"
+            end
           end
           I32(v)
         end
       when :i64
         if v >= 0
-          I64(v & (I64::I64_MAX >> 1))
+          i64_signed_max = I64::I64_MAX >> 1
+          if saturating
+            v = i64_signed_max if v > i64_signed_max
+          else
+            v = v & i64_signed_max
+          end
+          I64(v & i64_signed_max)
         else
-          v = v & I64::I64_MAX
-          if (v >> 31).zero?
-            raise EvalError, "[undefined behavior] detected overflow: #{value}"
+          i64_signed_min = -(I64::I64_MAX >> 1) - 1
+          if saturating
+            v = i64_signed_min if v < i64_signed_min
+          else
+            v = v & I64::I64_MAX
+            if (v >> 63).zero?
+              raise EvalError, "[undefined behavior] detected overflow: #{value}"
+            end
           end
           I64(v)
         end
@@ -567,18 +712,31 @@ module Wardite
 
     # @see the same as F32
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def trunc_u(to:)
+    # @rbs saturating: bool
+    # @rbs return: wasmValue
+    def trunc_u(to:, saturating: false)
       v = value.to_i
       if v < 0
-        raise EvalError, "[undefined behavior] unexpected negative value"
+        if saturating
+          v = 0
+        else
+          raise EvalError, "[undefined behavior] unexpected negative value"
+        end
       end
       case to
       when :i32
-        v = v & I32::I32_MAX
+        if saturating
+          v = I32::I32_MAX if v > I32::I32_MAX
+        else
+          v = v & I32::I32_MAX
+        end
         I32(v)
       when :i64
-        v = v & I64::I64_MAX
+        if saturating
+          v = I64::I64_MAX if v > I64::I64_MAX
+        else
+          v = v & I64::I64_MAX
+        end
         I64(v)
       else
         raise EvalError, "unsupported operation to: #{to}"
@@ -586,33 +744,33 @@ module Wardite
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def convert_s(to:)
       raise EvalError, "unsupported operation"
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def convert_u(to:)
       raise EvalError, "unsupported operation"
     end
 
     # @todo no loss of digits...
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def demote(to:)
       raise EvalError, "unsupported operation" if to != :f32
       F32(value)
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def promote(to:)
       raise EvalError, "unsupported operation"
     end
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def reinterpret(to:)
       raise EvalError, "unsupported operation" if to != :i64
       v = [value].pack("d").unpack("L!")[0]
@@ -620,6 +778,25 @@ module Wardite
       I64(v)
     end
 
+    # @rbs from: Symbol
+    # @rbs to: Symbol
+    # @rbs return: wasmValue
+    def extendN_s(from:, to:)
+      raise EvalError, "unsupported operation"
+    end
+
+    # @rbs to: Symbol
+    # @rbs return: wasmValue
+    def trunc_sat_u(to:)
+      trunc_u(to: to, saturating: true)
+    end
+
+    # @rbs to: Symbol
+    # @rbs return: wasmValue
+    def trunc_sat_s(to:)
+      trunc_s(to: to, saturating: true)
+    end
+
     def inspect
       "F64(#{@value})"
     end

data/lib/wardite/version.rb

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

data/lib/wardite/wasi.rb

@@ -14,7 +14,7 @@ module Wardite
     end
 
     # @rbs store: Store
-    # @rbs args: Array[I32|I64|F32|F64]
+    # @rbs args: Array[wasmValue]
     # @rbs return: Object
     def fd_write(store, args)
       iargs = args.map do |elm|
@@ -45,7 +45,7 @@ module Wardite
       0
     end
 
-    # @rbs return: Hash[Symbol, Proc]
+    # @rbs return: Hash[Symbol, wasmCallable]
     def to_module
       {
         fd_write: lambda{|store, args| self.fd_write(store, args) },