wardite 0.6.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0d5832e8cec120cdc72a68daf9acafb4d571fa2be166a6b912536774278c634
-  data.tar.gz: 6527a2be1289f3d3e9223cd93497b95c1956593fea6b3430f8cd8293e4ab8e5f
+  metadata.gz: 20aa59cedbb81d21c2681737929bb7f29fcf70cd189ca5d0de1ff538fca57782
+  data.tar.gz: fed9168236c3d23e377d38e2a6bf175336def008268aa5910215667ff3fac750
 SHA512:
-  metadata.gz: 95c24b6c6461b449270eb9a343e613095b2ee7ee587c1ebb88933c6c3c6e65bcba044b48ab51928ff2398b9b11a1d84a4830b78aeb1e67c37448900c2ffa2ddb
-  data.tar.gz: 4ff3a32bd496162b06df804717a3017e2bcfbdccf25a2727c2c0096cbd6aa12abd119e05b2fdea4db29aaff0f668f42ef856e8b120a685abb0b7c4765c1eb18b
+  metadata.gz: '098a4d2d2c25221667307bdf49fa207f682dd0f53e9ee33700cf18790961ce0ea627ed3f8ff7292a4cf55d70bf0c6068ed0b4b03502ec95aedd511c547dac7a0'
+  data.tar.gz: 9e1b69ba3cea02e033892ad4bf3fafc456d96d0f4741e8b0a9b6c55d2285cbb7d29fc0f0b2e71b1b35812c905b6281d1c4713c7b9215c5f99b42d94c88a6295b

data/Steepfile

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

data/exe/wardite

@@ -1,29 +1,7 @@
 #!/usr/bin/env ruby
 
 require "wardite"
-path = ARGV[0]
+require "wardite/cli/cli"
 
-f = File.open(path)
-instance = Wardite::BinaryLoader::load_from_buffer(f);
-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
-    else
-      a.to_i
-    end
-  end
-  ret = instance.runtime.call(method, args)
-  $stderr.puts "return value: #{ret.inspect}"
-end
+cli = Wardite::Cli::Cli.new(ARGV)
+cli.run

data/lib/wardite/cli/cli.rb

@@ -0,0 +1,135 @@
+# rbs_inline: enabled
+require "optparse"
+
+module Wardite
+  module Cli
+    class Cli
+      # @rbs @args: Array[String]
+
+      attr_reader :invoke  #: String?
+      attr_reader :mapdir  #: String?
+      attr_reader :file    #: String
+      attr_reader :memsize #: Integer
+      attr_reader :wasi    #: bool
+      attr_reader :yjit    #: bool
+
+      # @rbs args: Array[String]
+      # @rbs return: void
+      def initialize(args)
+        @invoke = @mapdir = nil
+        @wasi = true # default to true
+        @yjit = false
+        @memsize = 1
+        options = OptionParser.new do |opts|
+          opts.version = Wardite::VERSION
+          opts.on("--invoke [fnname]", "Invoke the function") { |v|
+            @invoke = v
+          }
+          opts.on("--mapdir [dirs]", "Map the directory") { |v|
+            @mapdir = v
+          }
+          opts.on("--memsize [size_in_bytes]", "Initial memory size") { |v|
+            @memsize = (v.to_i / (64 * 1024).to_f).ceil.to_i
+          }
+          opts.on("--no-wasi", "Disable WASI feature") {|_v|
+            @wasi = false
+          }
+          opts.on("--yjit", "Enable yjit if available; setting WARDITE_YJIT_ON=1 has the same effect") {|_v|
+            @yjit = true
+          }
+          opts.on("FILE.wasm") { }
+        end
+        options.parse!(args)
+        @file = args[0] || raise("require file argument")
+        @args = (args[1..-1] || [])
+        @args.unshift if @args[0] == '--'
+
+        if (yjit || ENV["WARDITE_YJIT_ON"] == "1") && (defined? RubyVM::YJIT)
+          RubyVM::YJIT.enable
+        end
+      end
+
+      # @rbs return: Array[Integer | Float]
+      # @rbs %a{pure}
+      def args
+        @args.map do |a|
+          if a.include? "."
+            a.to_f
+          else
+            a.to_i
+          end
+        end
+      end
+
+      # @rbs return: ::Wardite::Instance
+      def new_instance
+        f = File.open(file)
+        ins = Wardite::BinaryLoader::load_from_buffer(f, enable_wasi: wasi);
+        if memsize > 1
+          ins.store.memories[0].grow(memsize)
+        end
+        ins
+      end
+
+      # @rbs return: void
+      def run
+        if invoke
+          invoke_function
+        else
+          if wasi
+            invoke_wasi
+            return
+          end
+          raise("requires function name to invoke")
+        end
+      end
+
+      # @rbs return: void
+      def invoke_function
+        unless invoke
+          raise "--invoke not set"
+        end
+        instance = new_instance
+        ret = instance.runtime.call(invoke, args)
+        $stderr.puts "return value: #{ret.inspect}"
+      end
+
+      # @rbs return: void
+      def invoke_wasi
+        instance = new_instance #: ::Wardite::Instance
+        unless instance.wasi
+          raise "WASI not activated"
+        end
+        instance.wasi.argv = ["wardite"] + @args
+        if mapdir && mount_dst && mount_src
+          # TODO: support multiple mapdir
+          instance.wasi.mapdir[mount_dst] = mount_src
+          instance.wasi.set_preopened_dir(mount_dst, mount_src)
+        end
+
+        if defined? Bundler
+          Bundler.with_original_env do
+            instance.runtime._start
+          end
+        else
+          instance.runtime._start
+        end
+      end
+
+      # @rbs return: String?
+      # @rbs %a{pure}
+      def mount_src
+        mapdir&.split(":")&.first
+      end
+
+      # @rbs return: String?
+      # @rbs %a{pure}
+      def mount_dst
+        m = mapdir&.split(":")
+        if m
+          m.size == 2 ? m[1] : m[0]
+        end
+      end
+    end
+  end
+end

data/lib/wardite/value.rb

@@ -383,7 +383,7 @@ module Wardite
       raise EvalError, "unsupported operation" if to != :f64
       v = [value].pack("L!").unpack("d")[0]
       raise EvalError, "[BUG] String#unpack is broke, really?" if !v.is_a?(Float)
-      F32(v)
+      F64(v)
     end
 
     # @rbs from: Symbol

data/lib/wardite/version.rb

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

data/lib/wardite/wasi/consts.rb

@@ -103,6 +103,13 @@ module Wardite
       RIGHT_PATH_REMOVE_DIRECTORY |
       RIGHT_PATH_UNLINK_FILE
 
+    LOOKUP_SYMLINK_FOLLOW = 1 << 0
+
+    O_CREAT = 1 << 0
+    O_DIRECTORY = 1 << 1
+    O_EXCL = 1 << 2
+    O_TRUNC = 1 << 3
+
     # @rbs mode_str: String
     # @rbs return: Integer
     def self.to_ftype(mode_str)

data/lib/wardite/wasi/dirent_cache.rb

@@ -0,0 +1,87 @@
+# rbs_inline: enabled
+
+module Wardite
+  module Wasi
+    class Dirent
+      attr_reader :path #: String
+      attr_reader :ino #: Integer
+      attr_reader :type #: Integer
+      
+      # @rbs path: String
+      # @rbs ino: Integer
+      # @rbs type: Integer
+      # @rbs return: void
+      def initialize(path, ino, type)
+        @path = path
+        @ino = ino
+        @type = type
+      end
+    end
+
+    class DirentCache
+      attr_reader :entries #: Array[Dirent]
+      attr_accessor :eof #: bool
+      
+      # @rbs path: String
+      # @rbs return: void
+      def initialize(path)
+        @entries = []
+        Dir.entries(path).sort.each do |entry|
+          case entry
+          when "."
+            @entries << Dirent.new(entry, File.stat(path).ino, FILETYPE_DIRECTORY)
+          when ".."
+            @entries << Dirent.new(entry, 0, FILETYPE_DIRECTORY)
+          else
+            full_path = File.join(path, entry)
+            type = case File.ftype(full_path)
+                   when "directory" then FILETYPE_DIRECTORY
+                   when "file"      then FILETYPE_REGULAR_FILE
+                   when "link"      then FILETYPE_SYMBOLIC_LINK
+                   else FILETYPE_UNKNOWN
+                   end
+            @entries << Dirent.new(entry, File.stat(full_path).ino, type)
+          end
+        end
+
+        @eof = false
+      end
+
+      # @rbs buf_len: Integer
+      # @rbs cookie: Integer
+      # @rbs return: [String, bool]
+      def fetch_entries_binary(buf_len, cookie)
+        # d_next is the index of the next file in the list, so it should
+        # always be one higher than the requested cookie.
+        d_next = cookie + 1
+        buf = ""
+        entries_slice = entries[cookie..-1]
+        return "", false if entries_slice.nil? || entries_slice.empty?
+
+        entries_slice.each do |entry|
+          data = make_dirent_pack1(d_next, entry.ino, entry.path.size, entry.type, entry.path)
+          if buf.size + data.size > buf_len
+            # truncated
+            return buf, true
+          end
+          buf += data
+          d_next += 1
+        end
+        
+        return buf, false
+      end
+
+      # @rbs d_next: Integer
+      # @rbs ino: Integer
+      # @rbs name_len: Integer
+      # @rbs type: Integer
+      # @rbs name: String
+      # @rbs return: String
+      def make_dirent_pack1(d_next, ino, name_len, type, name)
+        data = [d_next, ino, name_len, type].pack("Q! Q! I! I!")
+        data += name
+        data
+      end
+    end
+  end
+end

data/lib/wardite/wasi/preopens.rb

@@ -0,0 +1,17 @@
+# rbs_inline: enabled
+
+module Wardite
+  module Wasi
+    class PreopenedDir
+      attr_reader :path #: String
+      attr_reader :guest_path #: String
+      attr_reader :fd #: Integer
+      
+      def initialize(path, guest_path, fd)
+        @path = path
+        @guest_path = guest_path
+        @fd = fd
+      end
+    end
+  end
+end