wardite 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3ca81e45a3da7f90566d465d5248bcac03981953e97c81681de900851348407
-  data.tar.gz: 2b0952f92a92bce4d54283868fd2565b9dbaa178cc1187b2a7f6feca6225fe57
+  metadata.gz: bbf27d475ac9dac6a9c0f6284bf379858dfef4ee52f3a2d609f41e0a87110b46
+  data.tar.gz: 69d508dc6674117a0c94e8308b357e49a05952f17ac949470c53e8a3267442c2
 SHA512:
-  metadata.gz: 8a4db779ed117465fb2c981c0b9da39dcdd001e60abf00262d04353449b5b72ad433949d6c640458fe2b61b503e84180dbf3c7709d791b48f7ed2a5ad9dbe372
-  data.tar.gz: 7d00f04205f6ef10b21dee7067adf1f480a529cea4bf0caa404fd888547f101f3908f54863262333e2b363d2d17b28b4899ff12ddc5e226958eda975354fd954
+  metadata.gz: 9d1b5d0ed4b626ab9c34fd0aabedca56b48afa4e9629557e0fcc8d0c7a2e05ad57d674d630c4f4b1599ec1babf70082d2a21041890f6081d4fbe18b8e57c0789
+  data.tar.gz: ae55bd53d03c27a6626e320223389655adcfb67033d99bf9715171eb9bb90c718fab3eacefb2e8d9dd367f7c6d5c986f2bc956741da261d821ce102362b0898e

data/Steepfile

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

data/examples/grayscale.rb

@@ -0,0 +1,64 @@
+#
+# Usage:
+#     $ bundle exec ruby --yjit examples/grayscale.rb \
+#         --wasm-file path/to/grayscale.wasm \
+#         --source tmp/source.png \
+#         --dest tmp/result.png \
+#         --width 660 --height 495
+#
+require "wardite"
+require "base64"
+require "optparse"
+require "ostruct"
+
+$options = OpenStruct.new
+
+opt = OptionParser.new
+opt.on('--wasm-file [FILE]') {|v| $options.wasm_file = v }
+opt.on('--source [IMAGE]') {|v| $options.source = v }
+opt.on('--dest [IMAGE]') {|v| $options.dest = v }
+opt.on('--width [W]') {|v| $options.width = v.to_i }
+opt.on('--height [H]') {|v| $options.height = v.to_i }
+opt.parse!
+
+#require 'ruby-prof'
+#profile = RubyProf::Profile.new
+
+f = File.open($options.wasm_file)
+data = IO.read($options.source)
+orig = Base64.encode64(data).gsub(/(\r|\n)/, "")
+data_url = "data:image/png;base64," + orig
+instance = Wardite::BinaryLoader::load_from_buffer(f);
+instance.store.memories[0].grow(data_url.size / (64*1024) + 1)
+
+start = instance.exports.__heap_base.value.value
+instance.store.memories[0].data[start...(start+data_url.size)] = data_url
+
+offset = 0
+result = nil
+begin
+  # pub fn grayscale(width: i32, height: i32, memory_offset: i32, length: i32) -> *const u8
+  #profile.start
+  offset = instance.runtime.grayscale_blob($options.width, $options.height, start, data_url.size)
+  #result = profile.stop
+rescue => e
+  raise "failed to execute grayscale() " + e.message
+end
+
+#printer = RubyProf::GraphPrinter.new(result)
+#printer.print(STDOUT, {})
+
+len = 0
+until instance.store.memories[0].data[offset.value+len] == "\0"
+  len += 1
+end
+
+result_b64 = instance.store.memories[0].data[offset.value...(offset.value+len)]
+result = Base64.decode64(result_b64)
+
+dest = File.open($options.dest, "w")
+dest.write result
+dest.close
+
+puts "created: #{$options.dest}"
+

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
@@ -78,6 +76,8 @@ module Wardite
     # TODO: add types of potential operands
     attr_accessor :operand #: Array[operandItem]
 
+    attr_accessor :meta #: Hash[Symbol, Integer]
+
     # @rbs namespace: Symbol
     # @rbs code: Symbol
     # @rbs operand: Array[operandItem]
@@ -85,6 +85,7 @@ module Wardite
       @namespace = namespace      
       @code = code
       @operand = operand
+      @meta = {}
     end
 
     # @rbs chr: String

data/lib/wardite/load.rb

@@ -1,4 +1,6 @@
 # rbs_inline: enabled
+require "wardite/revisitor"
+
 module Wardite
   class Section
     attr_accessor :name #: String
@@ -248,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)
@@ -257,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
 
@@ -356,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
@@ -374,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
@@ -480,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)
@@ -583,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)
@@ -593,10 +600,13 @@ module Wardite
           locals_type << Op.i2type(value_type || -1)
         end
         body = code_body(cbuf)
+        revisitor = Revisitor.new(body)
+        revisitor.revisit!
+        
         dest.func_codes << CodeSection::CodeBody.new do |b|
           b.locals_count = locals_count
           b.locals_type = locals_type
-          b.body = body
+          b.body = revisitor.ops
         end
       end
       dest
@@ -605,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)
@@ -850,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

@@ -0,0 +1,92 @@
+# rbs_inline: enabled
+module Wardite
+  class Revisitor
+    attr_accessor :ops #: Array[Op]
+    
+    # @rbs ops: Array[Op]
+    # @rbs return: void
+    def initialize(ops)
+      @ops = ops
+    end
+
+    # @rbs return: void
+    def revisit!
+      @ops.each_with_index do |op, idx|
+        case op.code
+        when :block
+          next_pc = fetch_ops_while_end(idx)
+          op.meta[:end_pos] = next_pc
+  
+        when :loop
+          next_pc = fetch_ops_while_end(idx)
+          op.meta[:end_pos] = next_pc
+  
+        when :if
+          next_pc = fetch_ops_while_end(idx)
+          else_pc = fetch_ops_while_else_or_end(idx)
+          op.meta[:end_pos] = next_pc
+          op.meta[:else_pos] = else_pc
+        end
+      end
+    end
+
+    # @rbs pc_start: Integer
+    # @rbs return: Integer
+    # @rbs return: void
+    def fetch_ops_while_else_or_end(pc_start)
+      cursor = pc_start
+      depth = 0
+      loop {
+        cursor += 1
+        inst = @ops[cursor]
+        case inst&.code
+        when nil
+          raise EvalError, "end op not found"
+        when :if, :block, :loop
+          depth += 1
+        when :else
+          if depth == 0
+            return cursor
+          end
+          # do not touch depth
+        when :end
+          if depth == 0
+            return cursor
+          else
+            depth -= 1
+          end
+        else
+          # nop
+        end
+      }
+      raise "not found corresponding end"
+    end
+
+    # @rbs pc_start: Integer
+    # @rbs return: Integer
+    # @rbs return: void
+    def fetch_ops_while_end(pc_start)
+      cursor = pc_start
+      depth = 0
+      loop {
+        cursor += 1
+        inst = @ops[cursor]
+        case inst&.code
+        when nil
+          raise EvalError, "end op not found"
+        when :if, :block, :loop
+          depth += 1
+        when :end
+          if depth == 0
+            return cursor
+          else
+            depth -= 1
+          end
+        else
+          # nop
+        end
+      }
+      raise "not found corresponding end"
+    end
+  end
+end

data/lib/wardite/value.rb

@@ -8,20 +8,12 @@ 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.new(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 }
     end
 
@@ -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,11 @@ module Wardite
     # when we want to access signed value, it'd be done via #value_s
     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.0" #: String
+  VERSION = "0.6.0" #: 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