wardite 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cefed459056cdf59c5c8823b1b4ef8ff53c84fd09a9f73883aaa291561ba4e00
-  data.tar.gz: b4ac97c31de3cc655aaf68d9c2097d1cb73ff67a184fd0c365d99b36371f1f93
+  metadata.gz: f92001daa1c57ae535fd1556fabee90a61dbe741e4e5b9f313c26e5d75d68b3e
+  data.tar.gz: 237df98e70875e1b6e69fbf0019cc298c3df26fa69cd4e62df8a04eaeff37522
 SHA512:
-  metadata.gz: b3987aab13095263b109e7c907bee2640c3b9d2a5777b1b81812f692508de160d7fdd9f28e8c19c25d53445905e3b7b65379e0443f36dd56232e5c61b7d054bc
-  data.tar.gz: ca3e1e1b0390869ce69ddc880e574ff3fb6c75c7def7538ad628c121ea5c12e1c860dbadc960cbaba48841f6ab5be3f1eeb117e0822dd9488271eab0eb1745d9
+  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/global.wat

@@ -0,0 +1,13 @@
+(module ;; from https://developer.mozilla.org/en-US/docs/WebAssembly/Reference/Variables/Global_set
+  (global $var (mut i32) (i32.const 0))
+  (global $var2 (mut i32) (i32.const 40))
+  (func $main (result i32)
+    i32.const 10 ;; load a number onto the stack
+    global.set $var ;; set the $var
+
+    global.get $var ;; load $var onto the stack
+    global.get $var2
+    i32.add ;; 10 + 40
+  )
+  (export "test" (func $main))
+)

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
@@ -82,7 +85,7 @@ module Wardite
       end
     end
 
-    # @rbs chr: Symbol
+    # @rbs code: Symbol
     # @rbs return: Array[Symbol]
     def self.operand_of(code)
       case 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