wardite 0.5.1 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89b6c42e1a3f16c39c214eb127c5b87966c0d2933257a1da7fdc96236c6a0f9b
-  data.tar.gz: 321d62cdddc61c8a342b966b3e4d7b6c01ffbbcb5788a6787fd3490ba96b1430
+  metadata.gz: f0d5832e8cec120cdc72a68daf9acafb4d571fa2be166a6b912536774278c634
+  data.tar.gz: 6527a2be1289f3d3e9223cd93497b95c1956593fea6b3430f8cd8293e4ab8e5f
 SHA512:
-  metadata.gz: 4b8b67989d47775828aca0908794f6b02abdea5ed653d794fa308d437f2d1735997a91dee341cdfa51aa5829aa097ca61dd262dba8479e805d1bbfd540f90ff5
-  data.tar.gz: 26face977ed4d76232bdee62f64208a22ec824314cb3d479979705fee327a1c9ce72ee960055a0c26db591f932c598b591651170fedf31b36533c52774f05fbe
+  metadata.gz: 95c24b6c6461b449270eb9a343e613095b2ee7ee587c1ebb88933c6c3c6e65bcba044b48ab51928ff2398b9b11a1d84a4830b78aeb1e67c37448900c2ffa2ddb
+  data.tar.gz: 4ff3a32bd496162b06df804717a3017e2bcfbdccf25a2727c2c0096cbd6aa12abd119e05b2fdea4db29aaff0f668f42ef856e8b120a685abb0b7c4765c1eb18b

data/README.md

@@ -70,9 +70,9 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/udzura
 
 ## See also
 
-- https://github.com/technohippy/wasmrb?tab=readme-ov-file
+- https://github.com/technohippy/wasmrb
   - Referencial implementation but no support with WASI
-  - Wardite aims to support full WASI (previwe 1)
+  - Wardite aims to support full WASI (preview 1)
 - https://github.com/skanehira/chibiwasm
   - Small and consise implementation in Rust
   - Wardite was first built upon [its development tutorial](https://skanehira.github.io/writing-a-wasm-runtime-in-rust/). Thanks!

data/Steepfile

@@ -4,6 +4,7 @@ target :lib do
   check "lib"
 
   library "pp"
+  library "securerandom"
   # configure_code_diagnostics(Steep::Diagnostic::Ruby.strict)
 end
 

data/exe/wardite

@@ -1,16 +1,22 @@
 #!/usr/bin/env ruby
 
 require "wardite"
-
 path = ARGV[0]
-method = ARGV[1]
-args = ARGV[2..-1] || []
 
 f = File.open(path)
 instance = Wardite::BinaryLoader::load_from_buffer(f);
-if !method && instance.runtime.respond_to?(:_start)
-  instance.runtime._start
+if instance.runtime.respond_to?(:_start) # assumed WASI
+  argv = ARGV[1..-1] || []
+  instance.wasi.argv = ["wardite"] + argv
+  Bundler.with_original_env do
+    # instance.store.memories[0].grow(128)
+    instance.runtime._start
+  end
 else
+  path = ARGV[0]
+  method = ARGV[1]
+  args = ARGV[2..-1] || []
+  
   args = args.map do|a|
     if a.include? "."
       a.to_f

data/lib/wardite/instruction.rb

@@ -46,16 +46,15 @@ module Wardite
 
     # @rbs @@table: Hash[Integer, Symbol] | nil
     @@table = nil
-    # @rbs @@table: Hash[Integer, Symbol] | nil
+    # @rbs @@fc_table: Hash[Integer, Symbol] | nil
     @@fc_table = nil
 
     # @rbs return: Hash[Integer, Symbol]
     def self.table
       return @@table if @@table != nil
-      @@table = {}.tap do |ha|
-        SYMS.each_with_index do |sym, i|
-          ha[i] = sym
-        end
+      @@table = {} #: Hash[Integer, Symbol] | nil
+      SYMS.each_with_index do |sym, i|
+        @@table[i] = sym
       end
       @@table
     end
@@ -63,10 +62,9 @@ module Wardite
     # @rbs return: Hash[Integer, Symbol]
     def self.fc_table
       return @@fc_table if @@fc_table != nil
-      @@fc_table = {}.tap do |ha|
-        FC_SYMS.each_with_index do |sym, i|
-          ha[i] = sym
-        end
+      @@fc_table = {} #: Hash[Integer, Symbol] | nil
+      FC_SYMS.each_with_index do |sym, i|
+        @@fc_table[i] = sym
       end
       @@fc_table
     end

data/lib/wardite/load.rb

@@ -250,7 +250,7 @@ module Wardite
     # @rbs self.@buf: File|StringIO
 
     # @rbs buf: File|StringIO
-    # @rbs import_object: Hash[Symbol, Hash[Symbol, wasmCallable]]
+    # @rbs import_object: Hash[Symbol, wasmModuleSrc]
     # @rbs enable_wasi: boolish
     # @rbs return: Instance
     def self.load_from_buffer(buf, import_object: {}, enable_wasi: true)
@@ -259,14 +259,19 @@ module Wardite
       version = preamble
       sections_ = sections
 
+      wasi_env = nil
       if enable_wasi
+        require "wardite/wasi"
         wasi_env = Wardite::WasiSnapshotPreview1.new       
-        import_object[:wasi_snapshot_preview1] = wasi_env.to_module
+        import_object[:wasi_snapshot_preview1] = wasi_env
       end
 
       return Instance.new(import_object) do |i|
         i.version = version
         i.sections = sections_
+        if enable_wasi
+          i.wasi = wasi_env
+        end
       end
     end
 
@@ -358,7 +363,7 @@ module Wardite
         end
 
         arglen = fetch_uleb128(sbuf)
-        arg = []
+        arg = [] #: Array[Symbol]
         arglen.times do
           case ty = assert_read(sbuf, 1)&.ord
           when 0x7f
@@ -376,7 +381,7 @@ module Wardite
         dest.defined_types << arg
 
         retlen = fetch_uleb128(sbuf)
-        ret = []
+        ret = [] #: Array[Symbol]
         retlen.times do
           case ty = assert_read(sbuf, 1)&.ord
           when 0x7f
@@ -482,7 +487,7 @@ module Wardite
           offset = decode_expr(ops)
           dest.table_offsets << offset
 
-          elms = []
+          elms = [] #: Array[Integer]
           elen = fetch_uleb128(sbuf)
           elen.times do |i|
             index = fetch_uleb128(sbuf)
@@ -585,8 +590,8 @@ module Wardite
           $stderr.puts "warning: instruction not ended with inst end(0x0b): 0x0#{last_code.ord}" 
         end
         cbuf = StringIO.new(code)
-        locals_count = []
-        locals_type = []
+        locals_count = [] #: Array[Integer]
+        locals_type = [] #: Array[Symbol]
         locals_len = fetch_uleb128(cbuf)
         locals_len.times do
           type_count = fetch_uleb128(cbuf)
@@ -610,7 +615,7 @@ module Wardite
     # @rbs buf: StringIO
     # @rbs return: Array[::Wardite::Op]
     def self.code_body(buf)
-      dest = []
+      dest = [] #: Array[Op]
       while c = buf.read(1)
         namespace, code = resolve_code(c, buf)
         operand_types = Op.operand_of(code)
@@ -855,7 +860,7 @@ module Wardite
     # @rbs code: Integer
     # @rbs return: nil
     def self.unimplemented_skip_section(code)
-      $stderr.puts "warning: unimplemented section: 0x0#{code}"
+      $stderr.puts "warning: unimplemented section: 0x0#{code}" if ENV['WARN_UNIMPLEMENTED_SECTION']
       size = fetch_uleb128(@buf)
       @buf.read(size)
       nil

data/lib/wardite/revisitor.rb

@@ -42,7 +42,7 @@ module Wardite
         case inst&.code
         when nil
           raise EvalError, "end op not found"
-        when :if
+        when :if, :block, :loop
           depth += 1
         when :else
           if depth == 0

data/lib/wardite/value.rb

@@ -8,21 +8,13 @@ module Wardite
     # @rbs value: Integer
     # @rbs return: I32
     def I32(value)
-      if value < 0
-        # $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 }
+      I32.cached_or_initialize(value & I32::I32_MAX)
     end
 
     # @rbs value: Integer
     # @rbs return: I64
     def I64(value)
-      if value < 0
-        # $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 }
+      I64.new(value & I64::I64_MAX)
     end
 
     # @rbs value: Float
@@ -36,19 +28,6 @@ module Wardite
     def F64(value)
       F64.new.tap{|i| i.value = value }
     end
-
-    private
-    # @rbs value: Integer
-    # @rbs return: Integer
-    def as_u32(value)
-      ((-value) ^ I32::I32_MAX) + 1
-    end
-
-    # @rbs value: Integer
-    # @rbs return: Integer
-    def as_u64(value)
-      ((-value) ^ I64::I64_MAX) + 1
-    end
   end
 
   extend ValueHelper
@@ -61,6 +40,21 @@ module Wardite
     # when we want to access signed value, it'd be done via #value_s
     attr_accessor :value #: Integer
 
+    # @rbs!
+    #   @@i32_object_pool: Hash[Integer, I32]
+    @@i32_object_pool = {} #: Hash[Integer, I32]
+
+    # @rbs value: Integer
+    # @rbs return: I32
+    def self.cached_or_initialize(value)
+      @@i32_object_pool[value] || I32.new(value)
+    end
+
+    # @rbs value: Integer
+    def initialize(value=0)
+      @value = value
+    end
+
     # @rbs str: String
     # @rbs size: Integer|nil
     # @rbs signed: bool
@@ -241,6 +235,12 @@ module Wardite
     def ==(other)
       return self.class == other.class && self.value == other.value
     end
+
+    (0..64).each do |value|
+      @@i32_object_pool[value] = I32.new(value)
+    end
+    value = -1 & I32::I32_MAX
+    @@i32_object_pool[value] = I32.new(value)
   end
 
   class I64
@@ -250,6 +250,11 @@ module Wardite
 
     attr_accessor :value #: Integer
 
+    # @rbs value: Integer
+    def initialize(value=0)
+      @value = value
+    end
+
     # @rbs str: String
     # @rbs size: Integer|nil
     # @rbs signed: bool

data/lib/wardite/version.rb

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

data/lib/wardite/wasi/consts.rb

@@ -0,0 +1,129 @@
+# rbs_inline: enabled
+
+module Wardite
+  module Wasi
+    EACCES = 2
+    EAGAIN = 6
+    EBADF  = 8
+    EEXIST = 20
+    EFAULT = 21
+    EINTR  = 27
+    EINVAL = 28
+    EIO    = 29
+    EISDIR = 31
+    ELOOP  = 32
+    ENAMETOOLONG = 37
+    ENOENT = 44
+    ENOSYS = 52
+    ENOTDIR = 54
+    ERANGE  = 68
+    ENOTEMPTY = 55
+    ENOTSOCK = 57
+    ENOTSUP = 58
+    EPERM  = 63
+    EROFS  = 69
+
+    FILETYPE_UNKNOWN = 0
+    FILETYPE_BLOCK_DEVICE = 1 #: Integer
+    FILETYPE_CHARACTER_DEVICE = 2 #: Integer
+    FILETYPE_DIRECTORY = 3 #: Integer
+    FILETYPE_REGULAR_FILE = 4 #: Integer
+    FILETYPE_SOCKET_DGRAM = 5 #: Integer
+    FILETYPE_SOCKET_STREAM = 6 #: Integer
+    FILETYPE_SYMBOLIC_LINK = 7 #: Integer
+
+    FD_APPEND  = 1 << 0 #: Integer
+    FD_DSYNC   = 1 << 1 #: Integer
+    FD_NONBLOCK = 1 << 2 #: Integer
+    FD_RSYNC    = 1 << 3 #: Integer
+    FD_SYNC     = 1 << 4 #: Integer
+  
+    RIGHT_FD_DATASYNC = 1 << 0
+    RIGHT_FD_READ = 1 << 1
+    RIGHT_FD_SEEK = 1 << 2
+    RIGHT_FDSTAT_SET_FLAGS = 1 << 3
+    RIGHT_FD_SYNC = 1 << 4
+    RIGHT_FD_TELL = 1 << 5
+    RIGHT_FD_WRITE = 1 << 6
+    RIGHT_FD_ADVISE = 1 << 7
+    RIGHT_FD_ALLOCATE = 1 << 8
+    RIGHT_PATH_CREATE_DIRECTORY = 1 << 9
+    RIGHT_PATH_CREATE_FILE = 1 << 10
+    RIGHT_PATH_LINK_SOURCE = 1 << 11
+    RIGHT_PATH_LINK_TARGET = 1 << 12
+    RIGHT_PATH_OPEN = 1 << 13
+    RIGHT_FD_READDIR = 1 << 14
+    RIGHT_PATH_READLINK = 1 << 15
+    RIGHT_PATH_RENAME_SOURCE = 1 << 16
+    RIGHT_PATH_RENAME_TARGET = 1 << 17
+    RIGHT_PATH_FILESTAT_GET = 1 << 18
+    RIGHT_PATH_FILESTAT_SET_SIZE = 1 << 19
+    RIGHT_PATH_FILESTAT_SET_TIMES = 1 << 20
+    RIGHT_FD_FILESTAT_GET = 1 << 21
+    RIGHT_FD_FILESTAT_SET_SIZE = 1 << 22
+    RIGHT_FD_FILESTAT_SET_TIMES = 1 << 23
+    RIGHT_PATH_SYMLINK = 1 << 24
+    RIGHT_PATH_REMOVE_DIRECTORY = 1 << 25
+    RIGHT_PATH_UNLINK_FILE = 1 << 26
+    RIGHT_POLL_FD_READWRITE = 1 << 27
+    RIGHT_SOCK_SHUTDOWN = 1 << 28
+
+    RIGHT_FILE_RIGHT_BASE = RIGHT_FD_DATASYNC |
+      RIGHT_FD_READ |
+      RIGHT_FD_SEEK |
+      RIGHT_FDSTAT_SET_FLAGS |
+      RIGHT_FD_SYNC |
+      RIGHT_FD_TELL |
+      RIGHT_FD_WRITE |
+      RIGHT_FD_ADVISE |
+      RIGHT_FD_ALLOCATE |
+      RIGHT_FD_FILESTAT_GET |
+      RIGHT_FD_FILESTAT_SET_SIZE |
+      RIGHT_FD_FILESTAT_SET_TIMES |
+      RIGHT_POLL_FD_READWRITE
+  
+    RIGHT_DIR_RIGHT_BASE = RIGHT_FD_DATASYNC |
+      RIGHT_FDSTAT_SET_FLAGS |
+      RIGHT_FD_SYNC |
+      RIGHT_PATH_CREATE_DIRECTORY |
+      RIGHT_PATH_CREATE_FILE |
+      RIGHT_PATH_LINK_SOURCE |
+      RIGHT_PATH_LINK_TARGET |
+      RIGHT_PATH_OPEN |
+      RIGHT_FD_READDIR |
+      RIGHT_PATH_READLINK |
+      RIGHT_PATH_RENAME_SOURCE |
+      RIGHT_PATH_RENAME_TARGET |
+      RIGHT_PATH_FILESTAT_GET |
+      RIGHT_PATH_FILESTAT_SET_SIZE |
+      RIGHT_PATH_FILESTAT_SET_TIMES |
+      RIGHT_FD_FILESTAT_GET |
+      RIGHT_FD_FILESTAT_SET_TIMES |
+      RIGHT_PATH_SYMLINK |
+      RIGHT_PATH_REMOVE_DIRECTORY |
+      RIGHT_PATH_UNLINK_FILE
+
+    # @rbs mode_str: String
+    # @rbs return: Integer
+    def self.to_ftype(mode_str)
+      case mode_str
+      when "file"
+        FILETYPE_REGULAR_FILE
+      when "directory"
+        FILETYPE_DIRECTORY
+      when "characterSpecial"
+        FILETYPE_CHARACTER_DEVICE
+      when "blockSpecial"
+        FILETYPE_BLOCK_DEVICE
+      when "fifo"
+        FILETYPE_UNKNOWN
+      when "link"
+        FILETYPE_SYMBOLIC_LINK
+      when "socket"
+        FILETYPE_SOCKET_STREAM # TODO: check UDP
+      else
+        FILETYPE_UNKNOWN
+      end
+    end
+  end
+end