wardite 0.2.0 → 0.2.1

data/scripts/gen_conv.rb

@@ -0,0 +1,76 @@
+require "stringio"
+
+module GenConv
+  def self.execute(path, defined_ops: {})
+    parent_dir = File.dirname(path)
+    system "mkdir -p #{parent_dir}"
+
+    basic_module = File.read(
+      File.expand_path("../templates/conv_module.rb.tmpl", __FILE__)
+    )
+
+    ope_defs = generate_ops(defined_ops: defined_ops)
+    basic_module.gsub!(/\$\{DEFS\}/, ope_defs)
+
+    dest = File.open(path, "w")
+    dest.puts basic_module
+
+    $stderr.puts "generated: #{path}"
+  end
+
+  def self.generate_ops(defined_ops:)
+    result = StringIO.new("")
+    defined_ops.each_pair do |to, ops|
+      ops.each_pair do |op, argtypes|
+        argtypes.each do |from|
+          code = generate_one_branch(op: op, to: to, from: from)
+          result << "\n"
+          code.each_line do |ln|
+            result << " " * 6 << ln
+          end
+          result << "\n"
+        end
+      end      
+    end
+    result.string
+  end
+
+  def self.generate_one_branch(op:, to:, from:)
+    code = DEF.dup
+    method = op.to_s
+    symbol = "#{to.to_s}_#{method}_#{from.to_sym}"
+    
+    if method == "extend"
+      method = "extend_"
+    elsif method.end_with?("_s") or method.end_with?("_u")
+      core, suffix = *(method.split("_")[0..1])
+      symbol = "#{to.to_s}_#{core}_#{from.to_sym}_#{suffix}"
+    end
+    # NOTE to is as namespace
+    code.gsub!(/\$\{SYMBOL\}/, symbol)
+    code.gsub!(/\$\{METHOD\}/, method)
+    code.gsub!(/\$\{TO\}/, to.to_s)
+    code.gsub!(/\$\{TO_CLASS\}/, to_class(to.to_sym))
+    code.gsub!(/\$\{FROM_CLASS\}/, to_class(from.to_sym))
+    return code
+  end
+
+  def self.to_class(typ)
+    {
+      i32: "I32",
+      i64: "I64",
+      f32: "F32",
+      f64: "F64",
+    }[typ]
+  end
+
+  # ope_templates
+  DEF = <<~RUBY
+    when :${SYMBOL}
+      from = runtime.stack.pop
+      raise EvalError, "maybe empty or invalid stack" if !from.is_a?(${FROM_CLASS})
+      to = from.${METHOD}(to: :${TO})
+      raise EvalError, "failed to convert type" if !to.is_a?(${TO_CLASS})
+      runtime.stack.push(to)
+  RUBY
+end

data/scripts/templates/conv_module.rb.tmpl

@@ -0,0 +1,18 @@
+# rbs_inline: enabled
+require_relative "value"
+
+module Wardite
+  module Evaluator
+    # @rbs runtime: Runtime
+    # @rbs frame: Frame
+    # @rbs insn: Op
+    # @rbs return: void 
+    def self.convert_eval_insn(runtime, frame, insn)
+      case insn.code
+${DEFS}
+      else
+        raise "Unknown opcode for namespace #{insn.namespace}: #{insn.code}"
+      end
+    end
+  end
+end

data/sig/generated/wardite/alu_f32.generated.rbs

@@ -0,0 +1,11 @@
+# Generated from lib/wardite/alu_f32.generated.rb with RBS::Inline
+
+module Wardite
+  module Evaluator
+    # @rbs runtime: Runtime
+    # @rbs frame: Frame
+    # @rbs insn: Op
+    # @rbs return: void 
+    def self.f32_eval_insn: (Runtime runtime, Frame frame, Op insn) -> void
+  end
+end

data/sig/generated/wardite/alu_f64.generated.rbs

@@ -0,0 +1,11 @@
+# Generated from lib/wardite/alu_f64.generated.rb with RBS::Inline
+
+module Wardite
+  module Evaluator
+    # @rbs runtime: Runtime
+    # @rbs frame: Frame
+    # @rbs insn: Op
+    # @rbs return: void 
+    def self.f64_eval_insn: (Runtime runtime, Frame frame, Op insn) -> void
+  end
+end

data/sig/generated/wardite/alu_i64.generated.rbs

@@ -0,0 +1,11 @@
+# Generated from lib/wardite/alu_i64.generated.rb with RBS::Inline
+
+module Wardite
+  module Evaluator
+    # @rbs runtime: Runtime
+    # @rbs frame: Frame
+    # @rbs insn: Op
+    # @rbs return: void 
+    def self.i64_eval_insn: (Runtime runtime, Frame frame, Op insn) -> void
+  end
+end

data/sig/generated/wardite/convert.generated.rbs

@@ -0,0 +1,11 @@
+# Generated from lib/wardite/convert.generated.rb with RBS::Inline
+
+module Wardite
+  module Evaluator
+    # @rbs runtime: Runtime
+    # @rbs frame: Frame
+    # @rbs insn: Op
+    # @rbs return: void 
+    def self.convert_eval_insn: (Runtime runtime, Frame frame, Op insn) -> void
+  end
+end

data/sig/generated/wardite/instruction.rbs

@@ -2,6 +2,12 @@
 
 module Wardite
   class Op
+    # @see https://pengowray.github.io/wasm-ops/
+    SYMS: Array[Symbol]
+
+    # @rbs return: Hash[Integer, Symbol]
+    def self.table: () -> Hash[Integer, Symbol]
+
     attr_accessor namespace: Symbol
 
     attr_accessor code: Symbol

data/sig/generated/wardite/value.rbs

@@ -1,58 +1,302 @@
 # Generated from lib/wardite/value.rb with RBS::Inline
 
 module Wardite
+  module ValueHelper
+    # @rbs value: Integer
+    # @rbs return: I32
+    def I32: (Integer value) -> I32
+
+    # @rbs value: Integer
+    # @rbs return: I64
+    def I64: (Integer value) -> I64
+
+    # @rbs value: Float
+    # @rbs return: F32
+    def F32: (Float value) -> F32
+
+    # @rbs value: Float
+    # @rbs return: F64
+    def F64: (Float value) -> F64
+
+    private
+
+    # @rbs value: Integer
+    # @rbs return: Integer
+    def as_u32: (Integer value) -> Integer
+
+    # @rbs value: Integer
+    # @rbs return: Integer
+    def as_u64: (Integer value) -> Integer
+  end
+
+  extend ValueHelper
+
   class I32
+    include ValueHelper
+
+    I32_MAX: untyped
+
+    # 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
 
+    # @rbs str: String
+    # @rbs size: Integer|nil
+    # @rbs signed: bool
+    # @rbs return: I32
+    def self.from_bytes: (String str, ?size: Integer | nil, ?signed: bool) -> I32
+
+    # @rbs return: Integer
+    def memsize: () -> Integer
+
+    # returns a value interpreted as signed integer
+    # @rbs return: Integer
+    def value_s: () -> Integer
+
     # TODO: eliminate use of pack, to support mruby - in this file!
+    # @rbs size: Integer|nil
     # @rbs return: String
-    def packed: () -> String
+    def packed: (?size: Integer | nil) -> String
+
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def wrap: (to: Symbol) -> (I32 | I64 | F32 | F64)
+
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def extend_s: (to: Symbol) -> (I32 | I64 | F32 | F64)
+
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def extend_u: (to: Symbol) -> (I32 | I64 | F32 | F64)
+
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def trunc_s: (to: Symbol) -> (I32 | I64 | F32 | F64)
+
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def trunc_u: (to: Symbol) -> (I32 | I64 | F32 | F64)
+
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def convert_s: (to: Symbol) -> (I32 | I64 | F32 | F64)
+
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def convert_u: (to: Symbol) -> (I32 | I64 | F32 | F64)
 
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def demote: (to: Symbol) -> (I32 | I64 | F32 | F64)
+
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def promote: (to: Symbol) -> (I32 | I64 | F32 | F64)
+
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def reinterpret: (to: Symbol) -> (I32 | I64 | F32 | F64)
+
+    # I32#inspect shows signed value for convinience
     def inspect: () -> untyped
   end
 
   class I64
+    include ValueHelper
+
+    I64_MAX: untyped
+
     attr_accessor value: Integer
 
+    # @rbs str: String
+    # @rbs size: Integer|nil
+    # @rbs signed: bool
+    # @rbs return: I64
+    def self.from_bytes: (String str, ?size: Integer | nil, ?signed: bool) -> I64
+
+    # @rbs return: Integer
+    def memsize: () -> Integer
+
+    # returns a value interpreted as signed integer
+    # @rbs return: Integer
+    def value_s: () -> Integer
+
+    # @rbs size: Integer|nil
     # @rbs return: String
-    def packed: () -> String
+    def packed: (?size: Integer | nil) -> String
+
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def wrap: (to: Symbol) -> (I32 | I64 | F32 | F64)
+
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def extend_s: (to: Symbol) -> (I32 | I64 | F32 | F64)
+
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def extend_u: (to: Symbol) -> (I32 | I64 | F32 | F64)
 
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def trunc_s: (to: Symbol) -> (I32 | I64 | F32 | F64)
+
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def trunc_u: (to: Symbol) -> (I32 | I64 | F32 | F64)
+
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def convert_s: (to: Symbol) -> (I32 | I64 | F32 | F64)
+
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def convert_u: (to: Symbol) -> (I32 | I64 | F32 | F64)
+
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def demote: (to: Symbol) -> (I32 | I64 | F32 | F64)
+
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def promote: (to: Symbol) -> (I32 | I64 | F32 | F64)
+
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def reinterpret: (to: Symbol) -> (I32 | I64 | F32 | F64)
+
+    # I64#inspect shows signed value
     def inspect: () -> untyped
   end
 
   class F32
+    include ValueHelper
+
     attr_accessor value: Float
 
+    # @rbs str: String
+    # @rbs return: F32
+    def self.from_bytes: (String str) -> F32
+
+    # @rbs return: Integer
+    def memsize: () -> Integer
+
+    # @rbs return: :positive|:negative
+    def sign: () -> (:positive | :negative)
+
+    # @rbs size: Integer|nil
     # @rbs return: String
-    def packed: () -> String
+    def packed: (?size: Integer | nil) -> String
+
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def wrap: (to: Symbol) -> (I32 | I64 | F32 | F64)
+
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def extend_s: (to: Symbol) -> (I32 | I64 | F32 | F64)
+
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def extend_u: (to: Symbol) -> (I32 | I64 | F32 | F64)
+
+    # @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
+    def trunc_s: (to: Symbol) -> (I32 | I64 | F32 | F64)
+
+    # @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
+    def trunc_u: (to: Symbol) -> (I32 | I64 | F32 | F64)
+
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def convert_s: (to: Symbol) -> (I32 | I64 | F32 | F64)
+
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def convert_u: (to: Symbol) -> (I32 | I64 | F32 | F64)
+
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def demote: (to: Symbol) -> (I32 | I64 | F32 | F64)
+
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def promote: (to: Symbol) -> (I32 | I64 | F32 | F64)
+
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def reinterpret: (to: Symbol) -> (I32 | I64 | F32 | F64)
 
     def inspect: () -> untyped
   end
 
   class F64
+    include ValueHelper
+
     attr_accessor value: Float
 
+    # @rbs str: String
+    # @rbs return: F64
+    def self.from_bytes: (String str) -> F64
+
+    # @rbs return: Integer
+    def memsize: () -> Integer
+
+    # @rbs return: :positive|:negative
+    def sign: () -> (:positive | :negative)
+
+    # @rbs size: Integer|nil
     # @rbs return: String
-    def packed: () -> String
+    def packed: (?size: Integer | nil) -> String
 
-    def inspect: () -> untyped
-  end
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def wrap: (to: Symbol) -> (I32 | I64 | F32 | F64)
 
-  module ValueHelper
-    # @rbs value: Integer
-    # @rbs return: I32
-    def I32: (Integer value) -> I32
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def extend_s: (to: Symbol) -> (I32 | I64 | F32 | F64)
 
-    # @rbs value: Integer
-    # @rbs return: I64
-    def I64: (Integer value) -> I64
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def extend_u: (to: Symbol) -> (I32 | I64 | F32 | F64)
 
-    # @rbs value: Float
-    # @rbs return: F32
-    def F32: (Float value) -> F32
+    # @see the same as F32
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def trunc_s: (to: Symbol) -> (I32 | I64 | F32 | F64)
 
-    # @rbs value: Float
-    # @rbs return: F64
-    def F64: (Float value) -> F64
+    # @see the same as F32
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def trunc_u: (to: Symbol) -> (I32 | I64 | F32 | F64)
+
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def convert_s: (to: Symbol) -> (I32 | I64 | F32 | F64)
+
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def convert_u: (to: Symbol) -> (I32 | I64 | F32 | F64)
+
+    # @todo no loss of digits...
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def demote: (to: Symbol) -> (I32 | I64 | F32 | F64)
+
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def promote: (to: Symbol) -> (I32 | I64 | F32 | F64)
+
+    # @rbs to: Symbol
+    # @rbs return: I32|I64|F32|F64
+    def reinterpret: (to: Symbol) -> (I32 | I64 | F32 | F64)
+
+    def inspect: () -> untyped
   end
 end

data/sig/generated/wardite.rbs

@@ -215,7 +215,7 @@ module Wardite
     include ValueHelper
 
     # TODO: add types of class that the stack accomodates
-    attr_accessor stack: Array[I32 | I64 | F32 | F64 | Block]
+    attr_accessor stack: Array[I32 | I64 | F32 | F64]
 
     attr_accessor call_stack: Array[Frame]
 
@@ -265,8 +265,8 @@ module Wardite
     def stack_unwind: (Integer sp, Integer arity) -> void
 
     # @rbs finish: Integer
-    # @rbs return: Array[I32|I64|F32|F64|Block]
-    def drained_stack: (Integer finish) -> Array[I32 | I64 | F32 | F64 | Block]
+    # @rbs return: Array[I32|I64|F32|F64]
+    def drained_stack: (Integer finish) -> Array[I32 | I64 | F32 | F64]
 
     # @rbs name: Symbol
     # @rbs args: Array[Object]
@@ -333,6 +333,8 @@ module Wardite
   class Memory
     attr_accessor data: String
 
+    attr_accessor current: Integer
+
     attr_accessor max: Integer | nil
 
     # @rbs min: Integer
@@ -340,6 +342,10 @@ module Wardite
     # @rbs return: void
     def initialize: (Integer min, Integer | nil max) -> void
 
+    # @rbs delta: Integer
+    # @rbs return: Integer
+    def grow: (Integer delta) -> Integer
+
     def inspect: () -> untyped
   end
 
@@ -437,6 +443,9 @@ module Wardite
   class EvalError < StandardError
   end
 
+  class Unreachable < StandardError
+  end
+
   # @rbs path: String|nil
   # @rbs buffer: File|StringIO|nil
   # @rbs **options: Hash[Symbol, Object]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wardite
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Uchio Kondo
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-02 00:00:00.000000000 Z
+date: 2024-11-04 00:00:00.000000000 Z
 dependencies: []
 description: A pure-ruby webassembly runtime
 email:
@@ -25,6 +25,7 @@ files:
 - examples/add.wasm
 - examples/add.wat
 - examples/call.wat
+- examples/consts.wat
 - examples/fib.wat
 - examples/fib2.wat
 - examples/helloworld.wat
@@ -34,18 +35,28 @@ files:
 - examples/memory.wat
 - exe/wardite
 - lib/wardite.rb
+- lib/wardite/alu_f32.generated.rb
+- lib/wardite/alu_f64.generated.rb
 - lib/wardite/alu_i32.generated.rb
+- lib/wardite/alu_i64.generated.rb
 - lib/wardite/const.rb
+- lib/wardite/convert.generated.rb
 - lib/wardite/instruction.rb
 - lib/wardite/leb128.rb
 - lib/wardite/value.rb
 - lib/wardite/version.rb
 - lib/wardite/wasi.rb
 - scripts/gen_alu.rb
+- scripts/gen_conv.rb
 - scripts/templates/alu_module.rb.tmpl
+- scripts/templates/conv_module.rb.tmpl
 - sig/generated/wardite.rbs
+- sig/generated/wardite/alu_f32.generated.rbs
+- sig/generated/wardite/alu_f64.generated.rbs
 - sig/generated/wardite/alu_i32.generated.rbs
+- sig/generated/wardite/alu_i64.generated.rbs
 - sig/generated/wardite/const.rbs
+- sig/generated/wardite/convert.generated.rbs
 - sig/generated/wardite/instruction.rbs
 - sig/generated/wardite/leb128.rbs
 - sig/generated/wardite/value.rbs