Hello WebAssembly! (MVP implementation)

spec/compiler/ffi/ffi_spec.cr

@@ -1,4 +1,4 @@
-{% skip_file if !flag?(:unix) || flag?(:without_ffi) %}
+{% skip_file if !flag?(:unix) || flag?(:without_ffi) || flag?(:wasm32) %}
 
 require "../spec_helper"
 require "compiler/crystal/ffi"

spec/compiler/loader/unix_spec.cr

@@ -1,4 +1,4 @@
-{% skip_file unless flag?(:unix) %}
+{% skip_file if !flag?(:unix) || flag?(:wasm32) %}
 
 require "./spec_helper"
 require "../spec_helper"

src/compiler/crystal/codegen/target.cr

@@ -96,12 +96,16 @@ class Crystal::Codegen::Target
     @environment.starts_with?("linux")
   end
 
+  def wasi?
+    @environment.starts_with?("wasi")
+  end
+
   def bsd?
     freebsd? || netbsd? || openbsd? || dragonfly?
   end
 
   def unix?
-    macos? || bsd? || linux?
+    macos? || bsd? || linux? || wasi?
   end
 
   def gnu?

src/crystal/system.cr

@@ -8,7 +8,10 @@ module Crystal::System
   # def self.cpu_count
 end
 
-{% if flag?(:unix) %}
+{% if flag?(:wasi) %}
+  require "./system/wasi/hostname"
+  require "./system/wasi/cpucount"
+{% elsif flag?(:unix) %}
   require "./system/unix/hostname"
 
   {% if flag?(:bsd) %}
@@ -19,9 +22,6 @@ end
 {% elsif flag?(:win32) %}
   require "./system/win32/hostname"
   require "./system/win32/cpucount"
-{% elsif flag?(:wasm32) %}
-  require "./system/wasm/hostname"
-  require "./system/wasm/cpucount"
 {% else %}
   {% raise "No Crystal::System implementation available" %}
 {% end %}

src/crystal/system/dir.cr

@@ -51,10 +51,10 @@ module Crystal::System::Dir
   # def self.delete(path : String) : Nil
 end
 
-{% if flag?(:unix) %}
+{% if flag?(:wasi) %}
+  require "./wasi/dir"
+{% elsif flag?(:unix) %}
   require "./unix/dir"
-{% elsif flag?(:wasm32) %}
-  require "./wasm/dir"
 {% elsif flag?(:win32) %}
   require "./win32/dir"
 {% else %}

src/crystal/system/env.cr

@@ -12,7 +12,7 @@ module Crystal::System::Env
   # def self.each(&block : String, String ->)
 end
 
-{% if flag?(:unix) || flag?(:wasm32) %}
+{% if flag?(:unix) %}
   require "./unix/env"
 {% elsif flag?(:win32) %}
   require "./win32/env"

src/crystal/system/event_loop.cr

@@ -28,8 +28,8 @@ struct Crystal::Event
   # def add(time_span : Time::Span?) : Nil
 end
 
-{% if flag?(:wasm32) %}
-  require "./wasm/event_loop"
+{% if flag?(:wasi) %}
+  require "./wasi/event_loop"
 {% elsif flag?(:unix) %}
   require "./unix/event_loop_libevent"
 {% elsif flag?(:win32) %}

src/crystal/system/fiber.cr

@@ -9,12 +9,12 @@ module Crystal::System::Fiber
   # def self.main_fiber_stack(stack_bottom : Void*) : Void*
 end
 
-{% if flag?(:unix) %}
+{% if flag?(:wasi) %}
+  require "./wasi/fiber"
+{% elsif flag?(:unix) %}
   require "./unix/fiber"
 {% elsif flag?(:win32) %}
   require "./win32/fiber"
-{% elsif flag?(:wasm32) %}
-  require "./wasm/fiber"
 {% else %}
   {% raise "fiber not supported" %}
 {% end %}

src/crystal/system/file.cr

@@ -49,12 +49,12 @@ module Crystal::System::File
   # def file_descriptor_close
 end
 
-{% if flag?(:unix) %}
+{% if flag?(:wasi) %}
+  require "./wasi/file"
+{% elsif flag?(:unix) %}
   require "./unix/file"
 {% elsif flag?(:win32) %}
   require "./win32/file"
-{% elsif flag?(:wasm32) %}
-  require "./wasm/file"
 {% else %}
   {% raise "No Crystal::System::File implementation available" %}
 {% end %}

src/crystal/system/file_descriptor.cr

@@ -1,9 +1,9 @@
-{% if flag?(:unix) %}
+{% if flag?(:wasi) %}
+  require "./wasi/file_descriptor"
+{% elsif flag?(:unix) %}
   require "./unix/file_descriptor"
 {% elsif flag?(:win32) %}
   require "./win32/file_descriptor"
-{% elsif flag?(:wasm32) %}
-  require "./wasm/file_descriptor"
 {% else %}
   {% raise "No Crystal::System::FileDescriptor implementation available" %}
 {% end %}

src/crystal/system/file_info.cr

@@ -1,4 +1,4 @@
-{% if flag?(:unix) || flag?(:wasm32) %}
+{% if flag?(:unix) %}
   require "./unix/file_info"
 {% elsif flag?(:win32) %}
   require "./win32/file_info"

src/crystal/system/group.cr

@@ -1,7 +1,7 @@
-{% if flag?(:unix) %}
+{% if flag?(:wasi) %}
+  require "./wasi/group"
+{% elsif flag?(:unix) %}
   require "./unix/group"
-{% elsif flag?(:wasm32) %}
-  require "./wasm/group"
 {% else %}
   {% raise "No Crystal::System::Group implementation available" %}
 {% end %}

src/crystal/system/mime.cr

@@ -3,7 +3,7 @@ module Crystal::System::MIME
   # def self.load
 end
 
-{% if flag?(:unix) || flag?(:wasm32) %}
+{% if flag?(:unix) %}
   require "./unix/mime"
 {% elsif flag?(:win32) %}
   require "./win32/mime"

src/crystal/system/path.cr

@@ -3,7 +3,7 @@ module Crystal::System::Path
   # def self.home : String
 end
 
-{% if flag?(:unix) || flag?(:wasm32) %}
+{% if flag?(:unix) %}
   require "./unix/path"
 {% elsif flag?(:win32) %}
   require "./win32/path"

src/crystal/system/print_error.cr

@@ -3,7 +3,7 @@ module Crystal::System
   # This is useful for error messages from components that are required for
   # IO to work (fibers, scheduler, event_loop).
   def self.print_error(message, *args)
-    {% if flag?(:unix) || flag?(:wasm32) %}
+    {% if flag?(:unix) %}
       LibC.dprintf 2, message, *args
     {% elsif flag?(:win32) %}
       buffer = StaticArray(UInt8, 512).new(0_u8)

src/crystal/system/process.cr

@@ -70,12 +70,12 @@ module Crystal::System
   ORIGINAL_STDERR = IO::FileDescriptor.new(2, blocking: true)
 end
 
-{% if flag?(:unix) %}
+{% if flag?(:wasi) %}
+  require "./wasi/process"
+{% elsif flag?(:unix) %}
   require "./unix/process"
 {% elsif flag?(:win32) %}
   require "./win32/process"
-{% elsif flag?(:wasm32) %}
-  require "./wasm/process"
 {% else %}
   {% raise "No Crystal::System::Process implementation available" %}
 {% end %}

src/crystal/system/random.cr

@@ -10,9 +10,11 @@ module Crystal::System::Random
   # def self.next_u
 end
 
-{% if flag?(:linux) %}
+{% if flag?(:wasi) %}
+  require "./wasi/random"
+{% elsif flag?(:linux) %}
   require "./unix/getrandom"
-{% elsif flag?(:openbsd) || flag?(:netbsd) || flag?(:wasm32) %}
+{% elsif flag?(:openbsd) || flag?(:netbsd) %}
   require "./unix/arc4random"
 {% elsif flag?(:unix) %}
   require "./unix/urandom"

src/crystal/system/socket.cr

@@ -76,10 +76,10 @@ module Crystal::System::Socket
   # private def system_tcp_keepalive_count=(val : Int)
 end
 
-{% if flag?(:unix) %}
+{% if flag?(:wasi) %}
+  require "./wasi/socket"
+{% elsif flag?(:unix) %}
   require "./unix/socket"
-{% elsif flag?(:wasm32) %}
-  require "./wasm/socket"
 {% elsif flag?(:win32) %}
   require "./win32/socket"
 {% else %}

src/crystal/system/thread.cr

@@ -28,13 +28,13 @@ end
 
 require "./thread_linked_list"
 
-{% if flag?(:unix) %}
+{% if flag?(:wasi) %}
+  require "./wasi/thread"
+{% elsif flag?(:unix) %}
   require "./unix/pthread"
   require "./unix/pthread_condition_variable"
 {% elsif flag?(:win32) %}
   require "./win32/thread"
-{% elsif flag?(:wasm32) %}
-  require "./wasm/thread"
 {% else %}
   {% raise "thread not supported" %}
 {% end %}

src/crystal/system/thread_mutex.cr

@@ -17,12 +17,12 @@ class Thread
   end
 end
 
-{% if flag?(:unix) %}
+{% if flag?(:wasi) %}
+  require "./wasi/thread_mutex"
+{% elsif flag?(:unix) %}
   require "./unix/pthread_mutex"
 {% elsif flag?(:win32) %}
   require "./win32/thread_mutex"
-{% elsif flag?(:wasm32) %}
-  require "./wasm/thread_mutex"
 {% else %}
   {% raise "thread not supported" %}
 {% end %}

src/crystal/system/time.cr

@@ -12,7 +12,7 @@ module Crystal::System::Time
   # def self.load_localtime : ::Time::Location?
 end
 
-{% if flag?(:unix) || flag?(:wasm32) %}
+{% if flag?(:unix) %}
   require "./unix/time"
 {% elsif flag?(:win32) %}
   require "./win32/time"

src/crystal/system/user.cr

@@ -1,7 +1,7 @@
-{% if flag?(:unix) %}
+{% if flag?(:wasi) %}
+  require "./wasi/user"
+{% elsif flag?(:unix) %}
   require "./unix/user"
-{% elsif flag?(:wasm32) %}
-  require "./wasm/user"
 {% else %}
   {% raise "No Crystal::System::User implementation available" %}
 {% end %}

src/crystal/system/wasm/lib_wasi.cr → src/crystal/system/wasi/lib_wasi.cr

@@ -98,4 +98,5 @@ lib LibWasi
   fun path_open = __wasi_path_open(fd : Fd, dirflags : LookupFlags, path : UInt8*, oflags : OpenFlags, fs_rights_base : Rights, fs_rights_inheriting : Rights, fdflags : FdFlags, ret : Fd*) : WasiError
   fun fd_readdir = __wasi_fd_readdir(fd : Fd, buf : UInt8*, len : Size, cookie : UInt64, ret : Size*) : WasiError
   fun fd_close = __wasi_fd_close(fd : Fd) : WasiError
+  fun random_get = __wasi_random_get(buf : UInt8*, len : Size) : WasiError
 end

src/crystal/system/wasi/random.cr

@@ -0,0 +1,14 @@
+require "./lib_wasi"
+
+module Crystal::System::Random
+  def self.random_bytes(buf : Bytes) : Nil
+    err = LibWasi.random_get(buf, buf.size)
+    raise RuntimeError.from_os_error("random_get", err) unless err.success?
+  end
+
+  def self.next_u : UInt8
+    buf = uninitialized UInt8[1]
+    random_bytes(buf.to_slice)
+    buf.unsafe_as(UInt8)
+  end
+end

src/crystal/system/wasm/thread.cr → src/crystal/system/wasi/thread.cr

@@ -1,30 +1,13 @@
 class Thread
-  # all thread objects, so the GC can see them (it doesn't scan thread locals)
-  @@threads = Thread::LinkedList(Thread).new
-
-  @exception : Exception?
-  @detached = Atomic(UInt8).new(0)
   @main_fiber : Fiber?
-  @func : (Proc(Nil))?
-
-  # :nodoc:
-  property next : Thread?
-
-  # :nodoc:
-  property previous : Thread?
-
-  def self.unsafe_each
-    @@threads.unsafe_each { |thread| yield thread }
-  end
 
   def initialize
     @main_fiber = Fiber.new(stack_address, self)
-    @@threads.push(self)
 
     # TODO: Create thread
   end
 
-  def initialize(&@func : ->)
+  def initialize(&func : ->)
     initialize
   end
 
@@ -36,15 +19,15 @@ class Thread
     raise NotImplementedError.new("Thread.yield")
   end
 
-  @@current : Thread? = Thread.new
+  @@current = Thread.new
 
   # Associates the Thread object to the running system thread.
   protected def self.current=(@@current : Thread) : Thread
   end
 
   # Returns the Thread object associated to the running system thread.
   def self.current : Thread
-    @@current || raise "BUG: Thread.current returned NULL"
+    @@current
   end
 
   # Create the thread object for the current thread (aka the main thread of the
@@ -64,18 +47,7 @@ class Thread
   end
 
   protected def start
-    Thread.current = self
-    @main_fiber = fiber = Fiber.new(stack_address, self)
-
-    begin
-      @func.call
-    rescue ex
-      @exception = ex
-    ensure
-      @@threads.delete(self)
-      Fiber.inactive(fiber)
-      detach_self
-    end
+    raise NotImplementedError.new("Thread#start")
   end
 
   private def stack_address : Void*