Wasi run tests

lib/std/build.zig

@@ -1064,6 +1064,9 @@ pub const LibExeObjStep = struct {
     /// Uses system QEMU installation to run cross compiled foreign architecture build artifacts.
     enable_qemu: bool = false,
 
+    /// Uses system Wasmtime installation to run cross compiled wasm/wasi build artifacts.
+    enable_wasmtime: bool = false,
+
     /// After following the steps in https://github.com/ziglang/zig/wiki/Updating-libc#glibc,
     /// this will be the directory $glibc-build-dir/install/glibcs
     /// Given the example of the aarch64 target, this is the directory
@@ -1863,6 +1866,11 @@ pub const LibExeObjStep = struct {
                 try zig_args.append(bin_name);
                 try zig_args.append("--test-cmd-bin");
             },
+            .wasmtime => |bin_name| if (self.enable_wasmtime) {
+                try zig_args.append("--test-cmd");
+                try zig_args.append(bin_name);
+                try zig_args.append("--test-cmd-bin");
+            },
         }
         for (self.packages.toSliceConst()) |pkg| {
             zig_args.append("--pkg-begin") catch unreachable;

lib/std/debug.zig

@@ -213,7 +213,8 @@ pub fn assert(ok: bool) void {
 
 pub fn panic(comptime format: []const u8, args: ...) noreturn {
     @setCold(true);
-    const first_trace_addr = @returnAddress();
+    // TODO: remove conditional once wasi / LLVM defines __builtin_return_address
+    const first_trace_addr = if (builtin.os == .wasi) null else @returnAddress();
     panicExtra(null, first_trace_addr, format, args);
 }
 

lib/std/heap.zig

@@ -33,7 +33,7 @@ fn cShrink(self: *Allocator, old_mem: []u8, old_align: u29, new_size: usize, new
 
 /// This allocator makes a syscall directly for every allocation and free.
 /// Thread-safe and lock-free.
-pub const direct_allocator = &direct_allocator_state;
+pub const direct_allocator = if (builtin.arch == .wasm32) wasm_allocator else &direct_allocator_state;
 var direct_allocator_state = Allocator{
     .reallocFn = DirectAllocator.realloc,
     .shrinkFn = DirectAllocator.shrink,

lib/std/os.zig

@@ -1522,7 +1522,7 @@ pub fn isatty(handle: fd_t) bool {
         return system.isatty(handle) != 0;
     }
     if (builtin.os == .wasi) {
-        @compileError("TODO implement std.os.isatty for WASI");
+        return system.isatty(handle);
     }
     if (builtin.os == .linux) {
         var wsz: linux.winsize = undefined;

lib/std/os/bits/wasi.zig

@@ -138,7 +138,7 @@ pub const FDFLAG_NONBLOCK: fdflags_t = 0x0004;
 pub const FDFLAG_RSYNC: fdflags_t = 0x0008;
 pub const FDFLAG_SYNC: fdflags_t = 0x0010;
 
-const fdstat_t = extern struct {
+pub const fdstat_t = extern struct {
     fs_filetype: filetype_t,
     fs_flags: fdflags_t,
     fs_rights_base: rights_t,
@@ -298,10 +298,16 @@ pub const subscription_t = extern struct {
 };
 
 pub const timestamp_t = u64;
+pub const time_t = i64; // match https://github.com/CraneStation/wasi-libc
 
 pub const userdata_t = u64;
 
 pub const whence_t = u8;
 pub const WHENCE_CUR: whence_t = 0;
 pub const WHENCE_END: whence_t = 1;
 pub const WHENCE_SET: whence_t = 2;
+
+pub const timespec = extern struct {
+    tv_sec: time_t,
+    tv_nsec: isize,
+};

lib/std/os/wasi.zig

@@ -76,3 +76,54 @@ pub extern "wasi_unstable" fn sched_yield() errno_t;
 pub extern "wasi_unstable" fn sock_recv(sock: fd_t, ri_data: *const iovec_t, ri_data_len: usize, ri_flags: riflags_t, ro_datalen: *usize, ro_flags: *roflags_t) errno_t;
 pub extern "wasi_unstable" fn sock_send(sock: fd_t, si_data: *const ciovec_t, si_data_len: usize, si_flags: siflags_t, so_datalen: *usize) errno_t;
 pub extern "wasi_unstable" fn sock_shutdown(sock: fd_t, how: sdflags_t) errno_t;
+
+/// Get the errno from a syscall return value, or 0 for no error.
+pub fn getErrno(r: usize) usize {
+    const signed_r = @bitCast(isize, r);
+    return if (signed_r > -4096 and signed_r < 0) @intCast(usize, -signed_r) else 0;
+}
+
+pub fn clock_getres(clock_id: i32, res: *timespec) errno_t {
+    var ts: timestamp_t = undefined;
+    const err = clock_res_get(@bitCast(u32, clock_id), &ts);
+    if (err != 0) {
+        return err;
+    }
+    res.* = .{
+        .tv_sec = @intCast(i64, ts / std.time.ns_per_s),
+        .tv_nsec = @intCast(isize, ts % std.time.ns_per_s),
+    };
+    return 0;
+}
+
+pub fn clock_gettime(clock_id: i32, tp: *timespec) errno_t {
+    var ts: timestamp_t = undefined;
+    const err = clock_time_get(@bitCast(u32, clock_id), 1, &ts);
+    if (err != 0) {
+        return err;
+    }
+    tp.* = .{
+        .tv_sec = @intCast(i64, ts / std.time.ns_per_s),
+        .tv_nsec = @intCast(isize, ts % std.time.ns_per_s),
+    };
+    return 0;
+}
+
+pub fn isatty(fd: fd_t) bool {
+    var statbuf: fdstat_t = undefined;
+    const err = fd_fdstat_get(fd, &statbuf);
+    if (err != 0) {
+        // errno = err;
+        return false;
+    }
+
+    // A tty is a character device that we can't seek or tell on.
+    if (statbuf.fs_filetype != FILETYPE_CHARACTER_DEVICE or
+        (statbuf.fs_rights_base & (RIGHT_FD_SEEK | RIGHT_FD_TELL)) != 0)
+    {
+        // errno = ENOTTY;
+        return false;
+    }
+
+    return true;
+}

lib/std/target.zig

@@ -611,6 +611,7 @@ pub const Target = union(enum) {
         native,
         qemu: []const u8,
         wine: []const u8,
+        wasmtime: []const u8,
         unavailable,
     };
 
@@ -649,6 +650,13 @@ pub const Target = union(enum) {
             }
         }
 
+        if (self.isWasm()) {
+            switch (self.getArchPtrBitWidth()) {
+                32 => return Executor{ .wasmtime = "wasmtime" },
+                else => return .unavailable,
+            }
+        }
+
         return .unavailable;
     }
 };