wardite 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 932c8c0c36490c2b84b652ee4b43682ee0218c3d6ed4164685e5066b45e79e60
-  data.tar.gz: d185d75762ac744752fede64fe6fd766a4639105697af520eb01b802ae7bd4a2
+  metadata.gz: f92001daa1c57ae535fd1556fabee90a61dbe741e4e5b9f313c26e5d75d68b3e
+  data.tar.gz: 237df98e70875e1b6e69fbf0019cc298c3df26fa69cd4e62df8a04eaeff37522
 SHA512:
-  metadata.gz: 5251ca5fe770cfce8ad98f35ab31017b95d70d91e0088d640612c51f1506bb31e5484c26571cfc84503c686ab18f82a14b604698be5a0577072ef5dff6880cc7
-  data.tar.gz: f2c8f3e17ae79c3f79b9f736d3f31e317178cecacbc562900a592572596b283fdee1594267ccc3afb156426b7f7265a0d9ad9902bfc1a6a86e5f2db5622a9aa8
+  metadata.gz: 94b5d318cebff3c8d87ea03fa0c5489ece3ef26ca7fcd6e6324febaf55a63f0a9ecb0a76d01b5adf5712737d8daf79ac55f5e2149ff8f85612acbaee1a2ace8c
+  data.tar.gz: c5991f43b9a62a7df87f23ec71350a77bf9493ccd083c6d0dba596c55976460e0c89625294048389a5fec1e35826bfbddd205718b45e04353b8e1627ccc4bb57

data/examples/break.wat

@@ -0,0 +1,13 @@
+;; https://developer.mozilla.org/en-US/docs/WebAssembly/Reference/Control_flow/block
+(module
+  (func (export "ret_if_100") (param $num i32) (result i32)
+    (block $my_block
+      local.get $num
+      i32.const 100
+      i32.eq
+      (if
+        (then
+          br $my_block))
+      i32.const -1
+      local.set $num)
+    local.get $num))

data/examples/call_indirect.wat

@@ -0,0 +1,15 @@
+(module
+  ;; ref https://ukyo.github.io/wasm-usui-book/webroot/get-started-webassembly.html
+  ;; and https://developer.mozilla.org/ja/docs/WebAssembly/Understanding_the_text_format
+  (type $return_i32 (func (result i32)))
+  (table 3 funcref)
+  (elem (i32.const 0) $f1 $f2 $f3)
+
+  (func $f1 (result i32) i32.const 111)
+  (func $f2 (result i32) i32.const 222)
+  (func $f3 (result i32) i32.const 333)
+
+  (func (export "call_indirect") (param $i i32) (result i32)
+    local.get $i
+    call_indirect (type $return_i32))
+)

data/examples/loop.wat

@@ -0,0 +1,20 @@
+(module ;; https://developer.mozilla.org/en-US/docs/WebAssembly/Reference/Control_flow/br
+  (global $i (mut i32) (i32.const 0))
+
+  (func $count (result i32)
+    (loop $my_loop (result i32)
+      global.get $i
+      i32.const 1
+      i32.add
+      global.set $i
+
+      global.get $i
+      global.get $i
+      i32.const 10
+      i32.lt_s
+      br_if $my_loop
+    )
+  )
+
+  (export "count" (func $count))
+)

data/examples/start.wat

@@ -0,0 +1,12 @@
+(module
+  (global $var (mut i32) (i32.const 0))
+  (func $init
+    i32.const 100
+    global.set $var
+  )
+  (func $main (result i32)
+    global.get $var ;; load $var onto the stack
+  )
+  (start $init)
+  (export "test" (func $main))
+)

data/lib/wardite/instruction.rb

@@ -1,6 +1,9 @@
 # rbs_inline: enabled
 
 module Wardite
+  # @rbs!
+  #   type operandItem = Integer | Array[Integer] | Float | Block
+
   class Op
     # @see https://pengowray.github.io/wasm-ops/
     SYMS = %i[
@@ -50,11 +53,11 @@ module Wardite
     attr_accessor :code #: Symbol
 
     # TODO: add types of potential operands
-    attr_accessor :operand #: Array[Integer|Float|Block]
+    attr_accessor :operand #: Array[operandItem]
 
     # @rbs namespace: Symbol
     # @rbs code: Symbol
-    # @rbs operand: Array[Integer|Float|Block]
+    # @rbs operand: Array[operandItem]
     def initialize(namespace, code, operand)
       @namespace = namespace      
       @code = code
@@ -102,9 +105,7 @@ module Wardite
         [:f32]
       when :f64_const
         [:f64]
-      when :if
-        [:u8_if_block]
-      when :block, :loop
+      when :if, :block, :loop
         [:u8_block]
       else
         []
@@ -112,10 +113,15 @@ module Wardite
     end
 
     # @see https://www.w3.org/TR/wasm-core-1/#value-types%E2%91%A2
+    # We use this for reftype conversion. https://webassembly.github.io/spec/core/binary/types.html#binary-reftype
     # @rbs code: Integer
     # @rbs return: Symbol
     def self.i2type(code)
       case code
+      when 0x6f
+        :externref
+      when 0x70
+        :funcref
       when 0x7f
         :i32
       when 0x7e

data/lib/wardite/load.rb

@@ -35,8 +35,23 @@ module Wardite
     end
   end
 
+  class TableSection < Section
+    attr_accessor :table_types #: Array[Symbol]
+
+    attr_accessor :table_limits #: Array[[Integer, Integer?]]
+
+    # @rbs return: void
+    def initialize
+      self.name = "Table"
+      self.code = 0x4
+
+      @table_types = []
+      @table_limits = []
+    end
+  end
+
   class MemorySection < Section
-    attr_accessor :limits #: Array[[Integer, Integer|nil]]
+    attr_accessor :limits #: Array[[Integer, Integer?]]
 
     # @rbs return: void
     def initialize
@@ -56,7 +71,7 @@ module Wardite
       # TODO: unused in wasm 1.0 spec?
       attr_accessor :shared #: bool
 
-      attr_accessor :value #: I32|I64|F32|F64
+      attr_accessor :value #: wasmValue
 
       # @rbs &blk: (Global) -> void
       # @rbs return: void
@@ -76,6 +91,35 @@ module Wardite
     end
   end
 
+  class StartSection < Section
+    attr_accessor :func_index #: Integer
+
+    # @rbs return: void
+    def initialize
+      self.name = "Start"
+      self.code = 0x8
+      self.func_index = -1
+    end
+  end
+
+  class ElemSection < Section
+    attr_accessor :table_indices #: Array[Integer]
+
+    attr_accessor :table_offsets #: Array[Integer]
+
+    attr_accessor :element_indices #: Array[Array[Integer]]
+
+    # @rbs return: void
+    def initialize
+      self.name = "Elem"
+      self.code = 0x9
+
+      @table_indices = []
+      @table_offsets = []
+      @element_indices = []
+    end
+  end
+
   class CodeSection < Section
     class CodeBody
       attr_accessor :locals_count #: Array[Integer]
@@ -186,8 +230,10 @@ module Wardite
     extend Wardite::Leb128Helper
     extend Wardite::ValueHelper
 
+    # @rbs self.@buf: File|StringIO
+
     # @rbs buf: File|StringIO
-    # @rbs import_object: Hash[Symbol, Hash[Symbol, Proc]]
+    # @rbs import_object: Hash[Symbol, Hash[Symbol, wasmCallable]]
     # @rbs enable_wasi: boolish
     # @rbs return: Instance
     def self.load_from_buffer(buf, import_object: {}, enable_wasi: true)
@@ -249,7 +295,7 @@ module Wardite
           when Wardite::SectionFunction
             function_section
           when Wardite::SectionTable
-            unimplemented_skip_section(code)
+            table_section
           when Wardite::SectionMemory
             memory_section
           when Wardite::SectionGlobal
@@ -257,9 +303,9 @@ module Wardite
           when Wardite::SectionExport
             export_section
           when Wardite::SectionStart
-            unimplemented_skip_section(code)
+            start_section
           when Wardite::SectionElement
-            unimplemented_skip_section(code)
+            elem_section
           when Wardite::SectionCode
             code_section
           when Wardite::SectionData
@@ -387,6 +433,50 @@ module Wardite
       dest
     end
 
+    # @rbs return: StartSection
+    def self.start_section
+      dest = StartSection.new
+      size = fetch_uleb128(@buf)
+      dest.size = size
+      # StartSection won't use size
+      func_index = fetch_uleb128(@buf)
+      dest.func_index = func_index
+      dest
+    end
+
+    # @rbs return: ElemSection
+    def self.elem_section
+      dest = ElemSection.new
+      size = fetch_uleb128(@buf)
+      dest.size = size
+      sbuf = StringIO.new(@buf.read(size) || raise("buffer too short"))
+
+      len = fetch_uleb128(sbuf)
+      len.times do |i|
+        etype = fetch_uleb128(sbuf)
+        case etype
+        when 0x0 # expr, vec(funcidx)
+          dest.table_indices << 0 # default and fixed to table[0]
+
+          code = fetch_insn_while_end(sbuf)
+          ops = code_body(StringIO.new(code))
+          offset = decode_expr(ops)
+          dest.table_offsets << offset
+
+          elms = []
+          elen = fetch_uleb128(sbuf)
+          elen.times do |i|
+            index = fetch_uleb128(sbuf)
+            elms << index
+          end
+          dest.element_indices << elms
+        else
+          raise NotImplementedError, "element section type #{etype} is a TODO!"
+        end
+      end
+      dest
+    end
+
     # @rbs return: GlobalSection
     def self.global_section
       dest = GlobalSection.new
@@ -433,6 +523,30 @@ module Wardite
       dest
     end
 
+    # @rbs return: TableSection
+    def self.table_section
+      dest = TableSection.new
+      size = fetch_uleb128(@buf)
+      dest.size = size
+      sbuf = StringIO.new(@buf.read(size) || raise("buffer too short"))
+
+      len = fetch_uleb128(sbuf)
+      len.times do |i|
+        code = fetch_uleb128(sbuf)
+        type = Op.i2type(code)
+        dest.table_types << type
+
+        flags = fetch_uleb128(sbuf)
+        min = fetch_uleb128(sbuf)
+        max = nil
+        if flags != 0
+          max = fetch_uleb128(sbuf)
+        end
+        dest.table_limits << [min, max]
+      end
+      dest
+    end
+
     # @rbs return: CodeSection
     def self.code_section
       dest = CodeSection.new
@@ -478,7 +592,7 @@ module Wardite
       while c = buf.read(1)
         namespace, code = Op.to_sym(c)
         operand_types = Op.operand_of(code)
-        operand = [] #: Array[Integer|Float|Block]
+        operand = [] #: Array[operandItem]
         operand_types.each do |typ|
           case typ
           when :u8
@@ -489,6 +603,13 @@ module Wardite
             operand << ope.ord
           when :u32
             operand << fetch_uleb128(buf)
+          when :u32_vec
+            len = fetch_uleb128(buf)
+            vec = [] #: Array[Integer]
+            len.times do
+              vec << fetch_uleb128(buf)
+            end
+            operand << vec
           when :i32
             operand << fetch_sleb128(buf)
           when :i64
@@ -509,7 +630,7 @@ module Wardite
             v = data.unpack("E")[0]
             raise "String#unpack is broken" if !v.is_a?(Float)
             operand << v
-          when :u8_if_block # :if specific
+          when :u8_block
             block_ope = buf.read 1
             if ! block_ope
               raise LoadError, "buffer too short for if"
@@ -599,7 +720,7 @@ module Wardite
     end
 
     # @rbs ops: Array[Op]
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def self.decode_global_expr(ops)
       # sees first opcode
       op = ops.first

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 }
@@ -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]
@@ -252,7 +255,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 +264,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 +301,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 +314,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]
@@ -373,19 +376,19 @@ 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
@@ -393,7 +396,7 @@ module Wardite
     # @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
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def trunc_s(to:)
       v = value.to_i
       case to
@@ -424,7 +427,7 @@ module Wardite
 
     # @see https://webassembly.github.io/spec/core/exec/numerics.html#xref-exec-numerics-op-trunc-u-mathrm-trunc-mathsf-u-m-n-z
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def trunc_u(to:)
       v = value.to_i
       if v < 0
@@ -443,32 +446,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]
@@ -517,26 +520,26 @@ 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
+    # @rbs return: wasmValue
     def trunc_s(to:)
       v = value.to_i
       case to
@@ -567,7 +570,7 @@ module Wardite
 
     # @see the same as F32
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
+    # @rbs return: wasmValue
     def trunc_u(to:)
       v = value.to_i
       if v < 0
@@ -586,33 +589,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]

data/lib/wardite/version.rb

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