wardite 0.2.2 → 0.4.0

data/scripts/gen_conv.rb

@@ -39,11 +39,18 @@ module GenConv
     code = DEF.dup
     method = op.to_s
     symbol = "#{to.to_s}_#{method}_#{from.to_sym}"
+    extra_kargs = ""
     
     if method == "extend"
       method = "extend_"
+    elsif method =~ /^extendN_(u|s)$/
+      suffix = $1
+      from_size = from.to_s.scan(/\d+/).join
+      symbol = "#{to.to_s}_extend_#{from_size}_#{suffix}"
+      extra_kargs = ", from: :#{from.to_s}"
     elsif method.end_with?("_s") or method.end_with?("_u")
-      core, suffix = *(method.split("_")[0..1])
+      core = method.sub(/_(s|u)$/, "")
+      suffix = method.scan(/_(s|u)$/).join
       symbol = "#{to.to_s}_#{core}_#{from.to_sym}_#{suffix}"
     end
     # NOTE to is as namespace
@@ -52,11 +59,14 @@ module GenConv
     code.gsub!(/\$\{TO\}/, to.to_s)
     code.gsub!(/\$\{TO_CLASS\}/, to_class(to.to_sym))
     code.gsub!(/\$\{FROM_CLASS\}/, to_class(from.to_sym))
+    code.gsub!(/\$\{EXTRA_KARGS\}/, extra_kargs)
     return code
   end
 
   def self.to_class(typ)
     {
+      i8: "I32",
+      i16: "I32",
       i32: "I32",
       i64: "I64",
       f32: "F32",
@@ -69,7 +79,7 @@ module GenConv
     when :${SYMBOL}
       from = runtime.stack.pop
       raise EvalError, "maybe empty or invalid stack" if !from.is_a?(${FROM_CLASS})
-      to = from.${METHOD}(to: :${TO})
+      to = from.${METHOD}(to: :${TO}${EXTRA_KARGS})
       raise EvalError, "failed to convert type" if !to.is_a?(${TO_CLASS})
       runtime.stack.push(to)
   RUBY

data/sig/generated/wardite/const.rbs

@@ -28,6 +28,8 @@ module Wardite
     SectionCode: Integer
 
     SectionData: Integer
+
+    SectionDataCount: Integer
   end
 
   include Const

data/sig/generated/wardite/instruction.rbs

@@ -1,34 +1,46 @@
 # Generated from lib/wardite/instruction.rb with RBS::Inline
 
 module Wardite
+  type operandItem = Integer | Array[Integer] | Float | Block
+
   class Op
     # @see https://pengowray.github.io/wasm-ops/
     SYMS: Array[Symbol]
 
+    FC_SYMS: Array[Symbol]
+
     # @rbs return: Hash[Integer, Symbol]
     def self.table: () -> Hash[Integer, Symbol]
 
+    # @rbs return: Hash[Integer, Symbol]
+    def self.fc_table: () -> Hash[Integer, Symbol]
+
     attr_accessor namespace: Symbol
 
     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]
-    def initialize: (Symbol namespace, Symbol code, Array[Integer | Float | Block] operand) -> untyped
+    # @rbs operand: Array[operandItem]
+    def initialize: (Symbol namespace, Symbol code, Array[operandItem] operand) -> untyped
 
     # @rbs chr: String
     # @rbs return: [Symbol, Symbol]
     def self.to_sym: (String chr) -> [ Symbol, Symbol ]
 
+    # @rbs lower: Integer
+    # @rbs return: [Symbol, Symbol]
+    def self.resolve_fc_sym: (Integer lower) -> [ Symbol, Symbol ]
+
     # @rbs code: Symbol
     # @rbs return: Array[Symbol]
     def self.operand_of: (Symbol code) -> Array[Symbol]
 
     # @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: (Integer code) -> Symbol

data/sig/generated/wardite/load.rbs

@@ -26,8 +26,17 @@ module Wardite
     def initialize: () -> void
   end
 
+  class TableSection < Section
+    attr_accessor table_types: Array[Symbol]
+
+    attr_accessor table_limits: Array[[ Integer, Integer? ]]
+
+    # @rbs return: void
+    def initialize: () -> void
+  end
+
   class MemorySection < Section
-    attr_accessor limits: Array[[ Integer, Integer | nil ]]
+    attr_accessor limits: Array[[ Integer, Integer? ]]
 
     # @rbs return: void
     def initialize: () -> void
@@ -42,7 +51,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
@@ -55,6 +64,24 @@ module Wardite
     def initialize: () -> void
   end
 
+  class StartSection < Section
+    attr_accessor func_index: Integer
+
+    # @rbs return: void
+    def initialize: () -> void
+  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: () -> void
+  end
+
   class CodeSection < Section
     class CodeBody
       attr_accessor locals_count: Array[Integer]
@@ -76,7 +103,9 @@ module Wardite
 
   class DataSection < Section
     class Segment
-      attr_accessor flags: Integer
+      attr_accessor mode: :active | :passive
+
+      attr_accessor mem_index: Integer
 
       attr_accessor offset: Integer
 
@@ -93,6 +122,14 @@ module Wardite
     def initialize: () -> void
   end
 
+  class DataCountSection < Section
+    attr_accessor count: Integer
+
+    # @rbs count: Integer
+    # @rbs return: void
+    def initialize: (Integer count) -> void
+  end
+
   class ExportSection < Section
     class ExportDesc
       attr_accessor name: String
@@ -134,11 +171,13 @@ module Wardite
 
     extend Wardite::ValueHelper
 
+    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: (File | StringIO buf, ?import_object: Hash[Symbol, Hash[Symbol, Proc]], ?enable_wasi: boolish) -> Instance
+    def self.load_from_buffer: (File | StringIO buf, ?import_object: Hash[Symbol, Hash[Symbol, wasmCallable]], ?enable_wasi: boolish) -> Instance
 
     # @rbs return: Integer
     def self.preamble: () -> Integer
@@ -155,12 +194,21 @@ module Wardite
     # @rbs return: MemorySection
     def self.memory_section: () -> MemorySection
 
+    # @rbs return: StartSection
+    def self.start_section: () -> StartSection
+
+    # @rbs return: ElemSection
+    def self.elem_section: () -> ElemSection
+
     # @rbs return: GlobalSection
     def self.global_section: () -> GlobalSection
 
     # @rbs return: FunctionSection
     def self.function_section: () -> FunctionSection
 
+    # @rbs return: TableSection
+    def self.table_section: () -> TableSection
+
     # @rbs return: CodeSection
     def self.code_section: () -> CodeSection
 
@@ -168,9 +216,17 @@ module Wardite
     # @rbs return: Array[::Wardite::Op]
     def self.code_body: (StringIO buf) -> Array[::Wardite::Op]
 
+    # @rbs c: String
+    # @rbs buf: StringIO
+    # @rbs return: [Symbol, Symbol]
+    def self.resolve_code: (String c, StringIO buf) -> [ Symbol, Symbol ]
+
     # @rbs return: DataSection
     def self.data_section: () -> DataSection
 
+    # @rbs return: DataCountSection
+    def self.data_count_section: () -> DataCountSection
+
     # @rbs sbuf: StringIO
     # @rbs return: String
     def self.fetch_insn_while_end: (StringIO sbuf) -> String
@@ -180,8 +236,8 @@ module Wardite
     def self.decode_expr: (Array[Op] ops) -> Integer
 
     # @rbs ops: Array[Op]
-    # @rbs return: I32|I64|F32|F64
-    def self.decode_global_expr: (Array[Op] ops) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def self.decode_global_expr: (Array[Op] ops) -> wasmValue
 
     # @rbs return: ExportSection
     def self.export_section: () -> ExportSection

data/sig/generated/wardite/value.rbs

@@ -1,6 +1,8 @@
 # Generated from lib/wardite/value.rb with RBS::Inline
 
 module Wardite
+  type wasmValue = I32 | I64 | F32 | F64
+
   module ValueHelper
     # @rbs value: Integer
     # @rbs return: I32
@@ -34,7 +36,7 @@ module Wardite
   class I32
     include ValueHelper
 
-    I32_MAX: untyped
+    I32_MAX: 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
@@ -59,44 +61,57 @@ module Wardite
     def packed: (?size: Integer | nil) -> String
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def wrap: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def wrap: (to: Symbol) -> wasmValue
+
+    # @rbs to: Symbol
+    # @rbs return: wasmValue
+    def extend_s: (to: Symbol) -> wasmValue
+
+    # @rbs to: Symbol
+    # @rbs return: wasmValue
+    def extend_u: (to: Symbol) -> wasmValue
+
+    # @rbs to: Symbol
+    # @rbs return: wasmValue
+    def trunc_s: (to: Symbol) -> wasmValue
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def extend_s: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def trunc_u: (to: Symbol) -> wasmValue
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def extend_u: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def convert_s: (to: Symbol) -> wasmValue
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def trunc_s: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def convert_u: (to: Symbol) -> wasmValue
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def trunc_u: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def demote: (to: Symbol) -> wasmValue
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def convert_s: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def promote: (to: Symbol) -> wasmValue
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def convert_u: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def reinterpret: (to: Symbol) -> wasmValue
 
+    # @rbs from: Symbol
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def demote: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def extendN_s: (from: Symbol, to: Symbol) -> wasmValue
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def promote: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def trunc_sat_u: (to: Symbol) -> wasmValue
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def reinterpret: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def trunc_sat_s: (to: Symbol) -> wasmValue
 
     # I32#inspect shows signed value for convinience
     def inspect: () -> untyped
@@ -105,7 +120,7 @@ module Wardite
   class I64
     include ValueHelper
 
-    I64_MAX: untyped
+    I64_MAX: Integer
 
     attr_accessor value: Integer
 
@@ -127,44 +142,57 @@ module Wardite
     def packed: (?size: Integer | nil) -> String
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def wrap: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def wrap: (to: Symbol) -> wasmValue
+
+    # @rbs to: Symbol
+    # @rbs return: wasmValue
+    def extend_s: (to: Symbol) -> wasmValue
+
+    # @rbs to: Symbol
+    # @rbs return: wasmValue
+    def extend_u: (to: Symbol) -> wasmValue
+
+    # @rbs to: Symbol
+    # @rbs return: wasmValue
+    def trunc_s: (to: Symbol) -> wasmValue
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def extend_s: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def trunc_u: (to: Symbol) -> wasmValue
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def extend_u: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def convert_s: (to: Symbol) -> wasmValue
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def trunc_s: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def convert_u: (to: Symbol) -> wasmValue
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def trunc_u: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def demote: (to: Symbol) -> wasmValue
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def convert_s: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def promote: (to: Symbol) -> wasmValue
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def convert_u: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def reinterpret: (to: Symbol) -> wasmValue
 
+    # @rbs from: Symbol
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def demote: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def extendN_s: (from: Symbol, to: Symbol) -> wasmValue
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def promote: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def trunc_sat_u: (to: Symbol) -> wasmValue
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def reinterpret: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def trunc_sat_s: (to: Symbol) -> wasmValue
 
     # I64#inspect shows signed value
     def inspect: () -> untyped
@@ -190,47 +218,64 @@ module Wardite
     def packed: (?size: Integer | nil) -> String
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def wrap: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def wrap: (to: Symbol) -> wasmValue
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def extend_s: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def extend_s: (to: Symbol) -> wasmValue
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def extend_u: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def extend_u: (to: Symbol) -> wasmValue
 
     # @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: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs saturating: bool
+    # @rbs return: wasmValue
+    def trunc_s: (to: Symbol, ?saturating: bool) -> wasmValue
 
     # @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: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs sturating: bool
+    # @rbs return: wasmValue
+    def trunc_u: (to: Symbol, ?saturating: untyped) -> wasmValue
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def convert_s: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def convert_s: (to: Symbol) -> wasmValue
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def convert_u: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def convert_u: (to: Symbol) -> wasmValue
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def demote: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def demote: (to: Symbol) -> wasmValue
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def promote: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def promote: (to: Symbol) -> wasmValue
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def reinterpret: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def reinterpret: (to: Symbol) -> wasmValue
+
+    # @rbs from: Symbol
+    # @rbs to: Symbol
+    # @rbs return: wasmValue
+    def extendN_s: (from: Symbol, to: Symbol) -> wasmValue
+
+    # @rbs to: Symbol
+    # @rbs return: wasmValue
+    def trunc_sat_u: (to: Symbol) -> wasmValue
+
+    # @rbs to: Symbol
+    # @rbs return: wasmValue
+    def trunc_sat_s: (to: Symbol) -> wasmValue
 
     def inspect: () -> untyped
   end
@@ -255,47 +300,62 @@ module Wardite
     def packed: (?size: Integer | nil) -> String
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def wrap: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def wrap: (to: Symbol) -> wasmValue
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def extend_s: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def extend_s: (to: Symbol) -> wasmValue
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def extend_u: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def extend_u: (to: Symbol) -> wasmValue
 
     # @see the same as F32
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def trunc_s: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs saturating: bool
+    # @rbs return: wasmValue
+    def trunc_s: (to: Symbol, ?saturating: bool) -> wasmValue
 
     # @see the same as F32
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def trunc_u: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs saturating: bool
+    # @rbs return: wasmValue
+    def trunc_u: (to: Symbol, ?saturating: bool) -> wasmValue
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def convert_s: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def convert_s: (to: Symbol) -> wasmValue
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def convert_u: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def convert_u: (to: Symbol) -> wasmValue
 
     # @todo no loss of digits...
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def demote: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def demote: (to: Symbol) -> wasmValue
+
+    # @rbs to: Symbol
+    # @rbs return: wasmValue
+    def promote: (to: Symbol) -> wasmValue
+
+    # @rbs to: Symbol
+    # @rbs return: wasmValue
+    def reinterpret: (to: Symbol) -> wasmValue
+
+    # @rbs from: Symbol
+    # @rbs to: Symbol
+    # @rbs return: wasmValue
+    def extendN_s: (from: Symbol, to: Symbol) -> wasmValue
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def promote: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def trunc_sat_u: (to: Symbol) -> wasmValue
 
     # @rbs to: Symbol
-    # @rbs return: I32|I64|F32|F64
-    def reinterpret: (to: Symbol) -> (I32 | I64 | F32 | F64)
+    # @rbs return: wasmValue
+    def trunc_sat_s: (to: Symbol) -> wasmValue
 
     def inspect: () -> untyped
   end

data/sig/generated/wardite/wasi.rbs

@@ -10,12 +10,12 @@ module Wardite
     def initialize: () -> untyped
 
     # @rbs store: Store
-    # @rbs args: Array[I32|I64|F32|F64]
+    # @rbs args: Array[wasmValue]
     # @rbs return: Object
-    def fd_write: (Store store, Array[I32 | I64 | F32 | F64] args) -> Object
+    def fd_write: (Store store, Array[wasmValue] args) -> Object
 
-    # @rbs return: Hash[Symbol, Proc]
-    def to_module: () -> Hash[Symbol, Proc]
+    # @rbs return: Hash[Symbol, wasmCallable]
+    def to_module: () -> Hash[Symbol, wasmCallable]
 
     private