wardite 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b2773f96babcc390d09312304046e661a1226b14413c307a3f9c082655cedb9
-  data.tar.gz: 011022bf110c979bb68bf18bb513588e6fe152177d92d8b3e3d69a296a7d73f2
+  metadata.gz: 20aa59cedbb81d21c2681737929bb7f29fcf70cd189ca5d0de1ff538fca57782
+  data.tar.gz: fed9168236c3d23e377d38e2a6bf175336def008268aa5910215667ff3fac750
 SHA512:
-  metadata.gz: d10a3156096c3610a2ac49d6b20d5814e81c106f01c01194b9ca1eda6ad746b9ee74d7755b141b617926e32142a0a62b3c959275ae4d53abc68bf4f527c9fada
-  data.tar.gz: d5a1cad2ea0b9270e4b8adb0070495cefe2d8347bcaa1e85def5b4befe60a82800a73d9c02f8cfcb73f1546888a2a96c9caa853d5e3b0bd9fa608de770211bbd
+  metadata.gz: '098a4d2d2c25221667307bdf49fa207f682dd0f53e9ee33700cf18790961ce0ea627ed3f8ff7292a4cf55d70bf0c6068ed0b4b03502ec95aedd511c547dac7a0'
+  data.tar.gz: 9e1b69ba3cea02e033892ad4bf3fafc456d96d0f4741e8b0a9b6c55d2285cbb7d29fc0f0b2e71b1b35812c905b6281d1c4713c7b9215c5f99b42d94c88a6295b

data/lib/wardite/cli/cli.rb

@@ -11,18 +11,21 @@ module Wardite
       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 [dest[:src]]", "Map the directory") { |v|
+          opts.on("--mapdir [dirs]", "Map the directory") { |v|
             @mapdir = v
           }
           opts.on("--memsize [size_in_bytes]", "Initial memory size") { |v|
@@ -31,12 +34,19 @@ module Wardite
           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]
@@ -66,7 +76,10 @@ module Wardite
         if invoke
           invoke_function
         else
-          invoke_wasi if wasi
+          if wasi
+            invoke_wasi
+            return
+          end
           raise("requires function name to invoke")
         end
       end
@@ -91,6 +104,7 @@ module Wardite
         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
@@ -99,7 +113,7 @@ module Wardite
           end
         else
           instance.runtime._start
-        end              
+        end
       end
 
       # @rbs return: String?

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.7.0" #: 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

data/lib/wardite/wasi.rb

@@ -2,6 +2,8 @@
 
 require "wardite/wasm_module"
 require "wardite/wasi/consts"
+require "wardite/wasi/preopens"
+require "wardite/wasi/dirent_cache"
 require "securerandom"
 require "fcntl"
 
@@ -10,21 +12,136 @@ module Wardite
     include ValueHelper
     include WasmModule
 
-    attr_accessor :fd_table #: Array[(IO|File)]
+    attr_accessor :fd_table #: Hash[Integer, (IO|File|::Wardite::Wasi::PreopenedDir)]
+    attr_accessor :fd_count #: Integer
     attr_accessor :argv #: Array[String]
     attr_accessor :mapdir #: Hash[String, String]
+    attr_accessor :dirent_cache #: Hash[Integer, ::Wardite::Wasi::DirentCache]
 
     # @rbs argv: Array[String]
     # @rbs mapdir: Hash[String, String]
     # @rbs return: void
     def initialize(argv: [], mapdir: {})
-      @fd_table = [
-        STDIN,
-        STDOUT,
-        STDERR,
-      ]
+      @fd_table = {
+        0 => STDIN,
+        1 => STDOUT,
+        2 => STDERR,
+      }
+      @fd_count = 3
       @argv = argv
       @mapdir = mapdir
+
+      @dirent_cache = {}
+    end
+
+    # @rbs file: IO|File|::Wardite::Wasi::PreopenedDir
+    # @rbs return: Integer
+    def set_fd(file)
+      fd = @fd_count
+      @fd_table[fd] = file
+      @fd_count += 1
+      fd
+    end
+
+    # @rbs path: String
+    # @rbs guest_path: String
+    # @rbs return: void
+    def set_preopened_dir(path, guest_path)
+      fd = @fd_count
+      set_fd(::Wardite::Wasi::PreopenedDir.new(path, guest_path, fd))
+    end
+
+    # @rbs orig_path: String
+    # @rbs return: String
+    def resolv_path(orig_path)
+      @mapdir.each do |k, v|
+        if orig_path.start_with?(k)
+          return v + orig_path[k.size..-1].to_s
+        end
+      end
+
+      return orig_path
+    end
+
+    # @rbs atfd: Integer
+    # @rbs target: String
+    # @rbs return: String
+    def get_path_at(atfd, target)
+      target = resolv_path(target)
+
+      at = @fd_table[atfd]
+      pwd = case at
+            when Wasi::PreopenedDir
+              at.guest_path
+            when File
+              Dir.fchdir(at.fileno) do
+                Dir.pwd
+              end
+            else
+              raise ArgumentError, "invalid fd: #{atfd}"
+            end
+
+      ret = File.expand_path(target, pwd)
+      ret
+    end
+
+    # @rbs dirflags: Integer
+    # @rbs oflags: Integer
+    # @rbs fdflags: Integer
+    # @rbs rights: Integer
+    def interpret_open_flags(dirflags, oflags, fdflags, rights)
+      open_flags = 0
+      if dirflags & Wasi::LOOKUP_SYMLINK_FOLLOW == 0
+        open_flags |= File::Constants::NOFOLLOW
+      end
+      if oflags & Wasi::O_DIRECTORY != 0
+        # open_flags |= File::Constants::DIRECTORY
+        $stderr.puts "O_DIRECTORY is not supported, ignore" if ENV["WARDITE_TRACE"]
+      elsif oflags & Wasi::O_EXCL != 0
+        open_flags |= File::Constants::EXCL
+      end
+
+      default_mode = File::Constants::RDONLY
+      if oflags & Wasi::O_TRUNC != 0
+        open_flags |= File::Constants::TRUNC
+        default_mode = File::Constants::RDWR
+      end
+      if oflags & Wasi::O_CREAT != 0
+        open_flags |= File::Constants::CREAT
+        default_mode = File::Constants::RDWR
+      end
+      if fdflags & Wasi::FD_NONBLOCK != 0
+        open_flags |= File::Constants::NONBLOCK
+      end
+      if fdflags & Wasi::FD_APPEND != 0
+        open_flags |= File::Constants::APPEND
+        default_mode = File::Constants::RDWR
+      end
+      if fdflags & Wasi::FD_DSYNC != 0
+        open_flags |= File::Constants::DSYNC
+      end
+      if fdflags & Wasi::FD_RSYNC != 0
+        open_flags |= File::Constants::RSYNC
+      end
+      if fdflags & Wasi::FD_SYNC != 0
+        open_flags |= File::Constants::SYNC
+      end
+
+      r = Wasi::RIGHT_FD_READ
+      w = Wasi::RIGHT_FD_WRITE
+      rw = r | w
+      case
+      when (rights & rw) == rw
+        open_flags |= File::Constants::RDWR
+      when (rights & w) == w
+        open_flags |= File::Constants::WRONLY
+      when (rights & r) == r
+        open_flags |= File::Constants::RDONLY
+      else
+        open_flags |= default_mode
+      end
+
+      open_flags
     end
 
     # @rbs store: Store
@@ -140,17 +257,216 @@ module Wardite
       0
     end
 
+    # @rbs store: Store
+    # @rbs args: Array[wasmValue]
+    # @rbs return: Object
+    def path_create_directory(store, args)
+      fd = args[0].value.to_i
+      path = args[1].value.to_i
+      path_len = args[2].value.to_i
+      path_str = store.memories[0].data[path...(path+path_len)]
+      if !path_str
+        return Wasi::ENOENT
+      end
+
+      target = get_path_at(fd, path_str)
+      Dir.mkdir(target, 0700)
+      0
+      # TODO; rescue EBADF, ENOTDIR
+    end
+
+    # @rbs store: Store
+    # @rbs args: Array[wasmValue]
+    # @rbs return: Object
+    def path_filestat_get(store, args)
+      fd = args[0].value.to_i
+      flags = args[1].value.to_i
+      path = args[2].value.to_i
+      path_len = args[3].value.to_i
+      target = get_path_at(fd, store.memories[0].data[path...(path+path_len)].to_s)
+
+      stat = File.stat(target)
+      memory = store.memories[0]
+      binformat = [
+        stat.dev, stat.ino, Wasi.to_ftype(stat.ftype), stat.nlink,
+        stat.size, stat.atime.to_i, stat.mtime.to_i, stat.ctime.to_i
+      ].pack("Q8")
+      memory.data[flags...(flags+binformat.size)] = binformat
+      0
+    rescue Errno::ENOENT
+      return Wasi::ENOENT
+    end
+
+    # @rbs store: Store
+    # @rbs args: Array[wasmValue]
+    # @rbs return: Object
+    def path_filestat_set_times(store, args)
+      fd = args[0].value.to_i
+      # TODO: flags support
+      _flags = args[1].value.to_i
+      path = args[2].value.to_i
+      path_len = args[3].value.to_i
+      atim = args[4].value.to_i # nanoseconds
+      mtim = args[5].value.to_i # nanoseconds
+      target = get_path_at(fd, store.memories[0].data[path...(path+path_len)].to_s)
+
+      atime = Time.at(atim.to_f / 1_000_000_000)
+      mtime = Time.at(mtim.to_f / 1_000_000_000)
+      File.utime(atime, mtime, target)
+      0
+    end
+
+    # @rbs store: Store
+    # @rbs args: Array[wasmValue]
+    # @rbs return: Object
+    def path_link(store, args)
+      old_fd = args[0].value.to_i
+      old_path = args[1].value.to_i
+      old_path_len = args[2].value.to_i
+      old_name = get_path_at(old_fd, store.memories[0].data[old_path...(old_path+old_path_len)].to_s)
+
+      new_fd = args[3].value.to_i
+      new_path = args[4].value.to_i
+      new_path_len = args[5].value.to_i
+      new_name = get_path_at(new_fd, store.memories[0].data[new_path...(new_path+new_path_len)].to_s)
+
+      File.link(old_name, new_name)
+      0
+    end
+
+    # @rbs store: Store
+    # @rbs args: Array[wasmValue]
+    # @rbs return: Object
+    def path_open(store, args)
+      dirfd = args[0].value.to_i
+      dirflags = args[1].value.to_i
+      path = args[2].value.to_i
+      path_len = args[3].value.to_i
+      oflags = args[4].value.to_i
+      fs_rights_base = args[5].value.to_i
+      _fs_rights_inheriting = args[6].value.to_i
+      fs_flags = args[7].value.to_i
+      fd_off = args[8].value.to_i
+
+      path_name = get_path_at(dirfd, store.memories[0].data[path...(path+path_len)].to_s)
+      open_flags = interpret_open_flags(dirflags, oflags, fs_flags, fs_rights_base)
+      is_dir = (oflags & Wasi::O_DIRECTORY) != 0
+      if is_dir && (oflags & Wasi::O_CREAT) != 0
+        return Wasi::EINVAL
+      end
+
+      file = File.open(path_name, open_flags, 0600)
+      fd = set_fd file
+
+      memory = store.memories[0]
+      memory.data[fd_off...(fd_off+4)] = [fd].pack("I!")
+      0
+    rescue Errno::ENOENT
+      return Wasi::ENOENT
+    end
+
+    # @rbs store: Store
+    # @rbs args: Array[wasmValue]
+    # @rbs return: Object
+    def path_readlink(store, args)
+      fd = args[0].value.to_i
+      path = args[1].value.to_i
+      path_len = args[2].value.to_i
+      buf = args[3].value.to_i
+      buf_len = args[4].value.to_i
+      result_buf = args[5].value.to_i
+
+      if buf_len <= 0 || path_len <= 0
+        return Wasi::EINVAL
+      end
+      target = get_path_at(fd, store.memories[0].data[path...(path+path_len)].to_s)
+
+      link_target = File.readlink(target)
+      if link_target.size > buf_len
+        return Wasi::ENAMETOOLONG
+      end
+
+      memory = store.memories[0]
+      memory.data[buf...(buf+link_target.size)] = link_target
+      memory.data[result_buf...(result_buf+4)] = [link_target.size].pack("I!")
+      0
+    end
+
+    # @rbs store: Store
+    # @rbs args: Array[wasmValue]
+    # @rbs return: Object
+    def path_remove_directory(store, args)
+      fd = args[0].value.to_i
+      path = args[1].value.to_i
+      path_len = args[2].value.to_i
+      path_str = store.memories[0].data[path...(path+path_len)].to_s
+      target = get_path_at(fd, path_str)
+
+      Dir.rmdir(target)
+      0
+    end
+
+    # @rbs store: Store
+    # @rbs args: Array[wasmValue]
+    # @rbs return: Object
+    def path_rename(store, args)
+      fd = args[0].value.to_i
+      old_path = args[1].value.to_i
+      old_path_len = args[2].value.to_i
+
+      new_fd = args[3].value.to_i
+      new_path = args[4].value.to_i
+      new_path_len = args[5].value.to_i
+
+      old_target = get_path_at(fd, store.memories[0].data[old_path...(old_path+old_path_len)].to_s)
+      new_target = get_path_at(new_fd, store.memories[0].data[new_path...(new_path+new_path_len)].to_s)
+
+      File.rename(old_target, new_target)
+      0
+    end
+
+    # @rbs store: Store
+    # @rbs args: Array[wasmValue]
+    # @rbs return: Object
+    def path_symlink(store, args)
+      old_path = args[0].value.to_i
+      old_path_len = args[1].value.to_i
+      old_name = store.memories[0].data[old_path...(old_path+old_path_len)].to_s
+
+      fd = args[2].value.to_i
+      new_path = args[3].value.to_i
+      new_path_len = args[4].value.to_i
+      new_name = get_path_at(fd, store.memories[0].data[new_path...(new_path+new_path_len)].to_s)
+
+      File.symlink(old_name, new_name)
+      0
+    end
+
+    # @rbs store: Store
+    # @rbs args: Array[wasmValue]
+    # @rbs return: Object
+    def path_unlink_file(store, args)
+      fd = args[0].value.to_i
+      path = args[1].value.to_i
+      path_len = args[2].value.to_i
+      path_str = store.memories[0].data[path...(path+path_len)].to_s
+      target = get_path_at(fd, path_str)
+
+      File.unlink(target)
+      0
+    end
+
     # @rbs store: Store
     # @rbs args: Array[wasmValue]
     # @rbs return: Object
     def fd_prestat_get(store, args)
       fd = args[0].value.to_i
       prestat_offset = args[1].value.to_i
-      if fd >= @fd_table.size
+      if fd >= fd_count
         return Wasi::EBADF
       end
       file = @fd_table[fd]
-      if !file.is_a?(File)
+      if !file.is_a?(Wasi::PreopenedDir)
         return Wasi::EBADF
       end
       name = file.path
@@ -161,6 +477,31 @@ module Wardite
       0
     end
 
+    # @rbs store: Store
+    # @rbs args: Array[wasmValue]
+    # @rbs return: Object
+    def fd_prestat_dir_name(store, args)
+      fd = args[0].value.to_i
+      path = args[1].value.to_i
+      path_len = args[2].value.to_i
+      if fd >= fd_count
+        return Wasi::EBADF
+      end
+      file = @fd_table[fd]
+      if !file.is_a?(Wasi::PreopenedDir)
+        return Wasi::EBADF
+      end
+      name = file.path
+      if name.size > path_len
+        return Wasi::ENAMETOOLONG
+      end
+      name += ("\0" * (path_len - name.size))
+
+      memory = store.memories[0]
+      memory.data[path...(path+name.size)] = name
+      0
+    end
+
     # @rbs store: Store
     # @rbs args: Array[wasmValue]
     # @rbs return: Object
@@ -177,7 +518,7 @@ module Wardite
         raise Wardite::ArgumentError, "args too short"
       end
       file = self.fd_table[fd]
-      return Wasi::EBADF if !file
+      return Wasi::EBADF if !file || file.is_a?(Wasi::PreopenedDir)
       memory = store.memories[0]
       nwritten = 0
       iovs_len.times do
@@ -210,7 +551,7 @@ module Wardite
         raise Wardite::ArgumentError, "args too short"
       end
       file = self.fd_table[fd]
-      return Wasi::EBADF if !file
+      return Wasi::EBADF if !file || file.is_a?(Wasi::PreopenedDir)
       memory = store.memories[0]
       nread = 0
       
@@ -221,10 +562,10 @@ module Wardite
         iovs += 4
         buf = file.read(slen)
         if !buf
-          return Wasi::EFAULT
+          break 0
         end
-        memory.data[start...(start+slen)] = buf
-        nread += slen
+        memory.data[start...(start+buf.size)] = buf
+        nread += buf.size
       end
 
       memory.data[rp...(rp+4)] = [nread].pack("I!")
@@ -237,12 +578,16 @@ module Wardite
     def fd_fdstat_get(store, args)
       fd = args[0].value.to_i
       fdstat_offset = args[1].value.to_i
-      if fd >= @fd_table.size
+      if fd >= fd_count
         return Wasi::EBADF
       end
       file = @fd_table[fd]
       fdflags = 0
-      if file.is_a?(IO)
+      if !file
+        return Wasi::EBADF
+      elsif file.is_a?(Wasi::PreopenedDir)
+        file = File.open(file.guest_path) # reopen directory
+      elsif file.is_a?(IO) && !file.is_a?(File)
         fdflags |= Wasi::FD_APPEND
       else
         if (Fcntl::O_APPEND & file.fcntl(Fcntl::F_GETFL, 0)) != 0
@@ -285,10 +630,14 @@ module Wardite
     def fd_filestat_get(store, args)
       fd = args[0].value.to_i
       filestat_offset = args[1].value.to_i
-      if fd >= @fd_table.size
+      if fd >= fd_count
         return Wasi::EBADF
       end
       file = @fd_table[fd]
+      if !file || file.is_a?(Wasi::PreopenedDir)
+        return Wasi::EBADF
+      end
+
       stat = file.stat #: File::Stat
       memory = store.memories[0]
       binformat = [stat.dev, stat.ino, Wasi.to_ftype(stat.ftype), stat.nlink, stat.size, stat.atime.to_i, stat.mtime.to_i, stat.ctime.to_i].pack("Q8")
@@ -296,6 +645,94 @@ module Wardite
       0
     end
 
+    # @rbs store: Store
+    # @rbs args: Array[wasmValue]
+    # @rbs return: Object
+    def fd_readdir(store, args)
+      fd = args[0].value.to_i
+      buf = args[1].value.to_i
+      buf_len = args[2].value.to_i
+      cookie = args[3].value.to_i
+      result_buf_used = args[4].value.to_i
+
+      if buf_len < 24 # when smaller than Dirent header size: Q! Q! I! I!
+        return Wasi::EINVAL
+      end
+
+      memory = store.memories[0]
+      
+      if dirent_cache[fd]&.eof
+        dirent_cache.delete(fd)
+      end
+      dir = @fd_table[fd]
+      if dir.is_a?(Wasi::PreopenedDir) || (dir.is_a?(File) && dir.stat.ftype == "directory")
+        dirent_cache[fd] ||= Wasi::DirentCache.new(dir.path)
+      else
+        return Wasi::EBADF
+      end
+
+      dirent = dirent_cache[fd]
+      bindata, is_truncated = dirent.fetch_entries_binary(buf_len, cookie)
+
+      bufused = bindata.size
+      # bufused == buf_len means more dirents exist
+      if is_truncated
+        bufused = buf_len
+        memory.data[buf...(buf+buf_len)] = bindata + "\0" * (buf_len - bindata.size)
+      else
+        dirent.eof = true
+        memory.data[buf...(buf+bindata.size)] = bindata
+      end
+
+      memory.data[result_buf_used...(result_buf_used+4)] = [bufused].pack("I!")
+      0
+    end
+
+    # @rbs store: Store
+    # @rbs args: Array[wasmValue]
+    def fd_tell(store, args)
+      fd = args[0].value.to_i
+      result_buf = args[1].value.to_i
+      if fd >= fd_count
+        return Wasi::EBADF
+      end
+      file = @fd_table[fd]
+      if !file || file.is_a?(Wasi::PreopenedDir)
+        return Wasi::EBADF
+      end
+
+      memory = store.memories[0]
+      memory.data[result_buf...(result_buf+4)] = [file.tell].pack("I!")
+      0
+    rescue Errno::EBADF
+      return Wasi::EBADF
+    end
+
+    # @rbs store: Store
+    # @rbs args: Array[wasmValue]
+    # @rbs return: Object
+    def fd_close(store, args)
+      fd = args[0].value.to_i
+      if fd >= fd_count
+        return Wasi::EBADF
+      end
+      file = @fd_table[fd]
+      if !file
+        return Wasi::EBADF
+      end
+      if file.is_a?(Wasi::PreopenedDir)
+        # do nothing for preopened dir...?
+        $stderr.puts "close preopened dir?: #{file.guest_path}"
+        @fd_table.delete(fd)
+        return 0
+      end
+      file.close
+      @fd_table.delete(fd)
+      0
+    rescue Errno::EBADF
+      return Wasi::EBADF      
+    end
+
     # @rbs store: Store
     # @rbs args: Array[wasmValue]
     # @rbs return: Object

data/lib/wardite.rb

@@ -354,6 +354,7 @@ module Wardite
     # @rbs external_function: ExternalFunction
     # @rbs return: wasmValue|nil
     def invoke_external(external_function)
+      $stderr.puts "[trace] call external function: #{external_function.name}" if ENV["WARDITE_TRACE"]
       local_start = stack.size - external_function.callsig.size
       args = stack[local_start..]
       if !args

data/sig/generated/wardite/cli/cli.rbs

@@ -15,6 +15,8 @@ module Wardite
 
       attr_reader wasi: bool
 
+      attr_reader yjit: bool
+
       # @rbs args: Array[String]
       # @rbs return: void
       def initialize: (Array[String] args) -> void

data/sig/generated/wardite/wasi/consts.rbs

@@ -130,6 +130,16 @@ module Wardite
 
     RIGHT_DIR_RIGHT_BASE: untyped
 
+    LOOKUP_SYMLINK_FOLLOW: untyped
+
+    O_CREAT: untyped
+
+    O_DIRECTORY: untyped
+
+    O_EXCL: untyped
+
+    O_TRUNC: untyped
+
     # @rbs mode_str: String
     # @rbs return: Integer
     def self.to_ftype: (String mode_str) -> Integer

data/sig/generated/wardite/wasi/dirent_cache.rbs

@@ -0,0 +1,42 @@
+# Generated from lib/wardite/wasi/dirent_cache.rb with RBS::Inline
+
+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: (String path, Integer ino, Integer type) -> void
+    end
+
+    class DirentCache
+      attr_reader entries: Array[Dirent]
+
+      attr_accessor eof: bool
+
+      # @rbs path: String
+      # @rbs return: void
+      def initialize: (String path) -> void
+
+      # @rbs buf_len: Integer
+      # @rbs cookie: Integer
+      # @rbs return: [String, bool]
+      def fetch_entries_binary: (Integer buf_len, Integer cookie) -> [ String, bool ]
+
+      # @rbs d_next: Integer
+      # @rbs ino: Integer
+      # @rbs name_len: Integer
+      # @rbs type: Integer
+      # @rbs name: String
+      # @rbs return: String
+      def make_dirent_pack1: (Integer d_next, Integer ino, Integer name_len, Integer type, String name) -> String
+    end
+  end
+end

data/sig/generated/wardite/wasi/preopens.rbs

@@ -0,0 +1,15 @@
+# Generated from lib/wardite/wasi/preopens.rb with RBS::Inline
+
+module Wardite
+  module Wasi
+    class PreopenedDir
+      attr_reader path: String
+
+      attr_reader guest_path: String
+
+      attr_reader fd: Integer
+
+      def initialize: (untyped path, untyped guest_path, untyped fd) -> untyped
+    end
+  end
+end

data/sig/generated/wardite/wasi.rbs

@@ -6,17 +6,45 @@ module Wardite
 
     include WasmModule
 
-    attr_accessor fd_table: Array[IO | File]
+    attr_accessor fd_table: Hash[Integer, IO | File | ::Wardite::Wasi::PreopenedDir]
+
+    attr_accessor fd_count: Integer
 
     attr_accessor argv: Array[String]
 
     attr_accessor mapdir: Hash[String, String]
 
+    attr_accessor dirent_cache: Hash[Integer, ::Wardite::Wasi::DirentCache]
+
     # @rbs argv: Array[String]
     # @rbs mapdir: Hash[String, String]
     # @rbs return: void
     def initialize: (?argv: Array[String], ?mapdir: Hash[String, String]) -> void
 
+    # @rbs file: IO|File|::Wardite::Wasi::PreopenedDir
+    # @rbs return: Integer
+    def set_fd: (IO | File | ::Wardite::Wasi::PreopenedDir file) -> Integer
+
+    # @rbs path: String
+    # @rbs guest_path: String
+    # @rbs return: void
+    def set_preopened_dir: (String path, String guest_path) -> void
+
+    # @rbs orig_path: String
+    # @rbs return: String
+    def resolv_path: (String orig_path) -> String
+
+    # @rbs atfd: Integer
+    # @rbs target: String
+    # @rbs return: String
+    def get_path_at: (Integer atfd, String target) -> String
+
+    # @rbs dirflags: Integer
+    # @rbs oflags: Integer
+    # @rbs fdflags: Integer
+    # @rbs rights: Integer
+    def interpret_open_flags: (Integer dirflags, Integer oflags, Integer fdflags, Integer rights) -> untyped
+
     # @rbs store: Store
     # @rbs args: Array[wasmValue]
     # @rbs return: Object
@@ -42,11 +70,66 @@ module Wardite
     # @rbs return: Object
     def clock_time_get: (Store store, Array[wasmValue] args) -> Object
 
+    # @rbs store: Store
+    # @rbs args: Array[wasmValue]
+    # @rbs return: Object
+    def path_create_directory: (Store store, Array[wasmValue] args) -> Object
+
+    # @rbs store: Store
+    # @rbs args: Array[wasmValue]
+    # @rbs return: Object
+    def path_filestat_get: (Store store, Array[wasmValue] args) -> Object
+
+    # @rbs store: Store
+    # @rbs args: Array[wasmValue]
+    # @rbs return: Object
+    def path_filestat_set_times: (Store store, Array[wasmValue] args) -> Object
+
+    # @rbs store: Store
+    # @rbs args: Array[wasmValue]
+    # @rbs return: Object
+    def path_link: (Store store, Array[wasmValue] args) -> Object
+
+    # @rbs store: Store
+    # @rbs args: Array[wasmValue]
+    # @rbs return: Object
+    def path_open: (Store store, Array[wasmValue] args) -> Object
+
+    # @rbs store: Store
+    # @rbs args: Array[wasmValue]
+    # @rbs return: Object
+    def path_readlink: (Store store, Array[wasmValue] args) -> Object
+
+    # @rbs store: Store
+    # @rbs args: Array[wasmValue]
+    # @rbs return: Object
+    def path_remove_directory: (Store store, Array[wasmValue] args) -> Object
+
+    # @rbs store: Store
+    # @rbs args: Array[wasmValue]
+    # @rbs return: Object
+    def path_rename: (Store store, Array[wasmValue] args) -> Object
+
+    # @rbs store: Store
+    # @rbs args: Array[wasmValue]
+    # @rbs return: Object
+    def path_symlink: (Store store, Array[wasmValue] args) -> Object
+
+    # @rbs store: Store
+    # @rbs args: Array[wasmValue]
+    # @rbs return: Object
+    def path_unlink_file: (Store store, Array[wasmValue] args) -> Object
+
     # @rbs store: Store
     # @rbs args: Array[wasmValue]
     # @rbs return: Object
     def fd_prestat_get: (Store store, Array[wasmValue] args) -> Object
 
+    # @rbs store: Store
+    # @rbs args: Array[wasmValue]
+    # @rbs return: Object
+    def fd_prestat_dir_name: (Store store, Array[wasmValue] args) -> Object
+
     # @rbs store: Store
     # @rbs args: Array[wasmValue]
     # @rbs return: Object
@@ -67,6 +150,20 @@ module Wardite
     # @rbs return: Object
     def fd_filestat_get: (Store store, Array[wasmValue] args) -> Object
 
+    # @rbs store: Store
+    # @rbs args: Array[wasmValue]
+    # @rbs return: Object
+    def fd_readdir: (Store store, Array[wasmValue] args) -> Object
+
+    # @rbs store: Store
+    # @rbs args: Array[wasmValue]
+    def fd_tell: (Store store, Array[wasmValue] args) -> untyped
+
+    # @rbs store: Store
+    # @rbs args: Array[wasmValue]
+    # @rbs return: Object
+    def fd_close: (Store store, Array[wasmValue] args) -> Object
+
     # @rbs store: Store
     # @rbs args: Array[wasmValue]
     # @rbs return: Object

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: wardite
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Uchio Kondo
 bindir: exe
 cert_chain: []
-date: 2025-03-10 00:00:00.000000000 Z
+date: 2025-04-04 00:00:00.000000000 Z
 dependencies: []
 description: A pure-ruby webassembly runtime
 email:
@@ -58,6 +58,8 @@ files:
 - lib/wardite/version.rb
 - lib/wardite/wasi.rb
 - lib/wardite/wasi/consts.rb
+- lib/wardite/wasi/dirent_cache.rb
+- lib/wardite/wasi/preopens.rb
 - lib/wardite/wasm_module.rb
 - misc/bench-value.rb
 - misc/slides/fib.c
@@ -92,6 +94,8 @@ files:
 - sig/generated/wardite/version.rbs
 - sig/generated/wardite/wasi.rbs
 - sig/generated/wardite/wasi/consts.rbs
+- sig/generated/wardite/wasi/dirent_cache.rbs
+- sig/generated/wardite/wasi/preopens.rbs
 - sig/generated/wardite/wasm_module.rbs
 - sig/wardite.rbs
 homepage: https://github.com/udzura/wardite