| author |  Shritesh Bhattarai <shritesh@shritesh.com> 2019-04-15 17:14:21-05:00 |
| committer |  Andrew Kelley <andrew@ziglang.org> 2019-04-15 18:44:33-04:00 |
| log | f5d84250a3cbe113c46d9f07b8edf634e39afcec |
| tree | f1bfccc49becbfb1e17409f50259a16f29600092 |
| parent | 3b8a85c94182f5600d5bec27b4061803869b4fe8 |
wasi: switch to "standard" wasi_unstable module fn
4 files changed, 14 insertions(+), 14 deletions(-)
std
special
std/os/wasi.zig+3-3
| ... | @@ -92,17 +92,17 @@ pub fn getErrno(r: usize) usize { | ... | @@ -92,17 +92,17 @@ pub fn getErrno(r: usize) usize { |
| 92 | } | 92 | } |
| 93 | 93 | ||
| 94 | pub fn exit(status: i32) noreturn { | 94 | pub fn exit(status: i32) noreturn { |
| 95 | __wasi_proc_exit(@bitCast(__wasi_exitcode_t, isize(status))); | 95 | proc_exit(@bitCast(exitcode_t, isize(status))); |
| 96 | } | 96 | } |
| 97 | 97 | ||
| 98 | pub fn write(fd: i32, buf: [*]const u8, count: usize) usize { | 98 | pub fn write(fd: i32, buf: [*]const u8, count: usize) usize { |
| 99 | var nwritten: usize = undefined; | 99 | var nwritten: usize = undefined; |
| 100 | 100 | ||
| 101 | const iovs = []__wasi_ciovec_t{__wasi_ciovec_t{ | 101 | const iovs = []ciovec_t{ciovec_t{ |
| 102 | .buf = buf, | 102 | .buf = buf, |
| 103 | .buf_len = count, | 103 | .buf_len = count, |
| 104 | }}; | 104 | }}; |
| 105 | 105 | ||
| 106 | _ = __wasi_fd_write(@bitCast(__wasi_fd_t, isize(fd)), &iovs[0], iovs.len, &nwritten); | 106 | _ = fd_write(@bitCast(fd_t, isize(fd)), &iovs[0], iovs.len, &nwritten); |
| 107 | return nwritten; | 107 | return nwritten; |
| 108 | } | 108 | } |
std/os/wasi/core.zig+9-9
| ... | @@ -1,17 +1,17 @@ | ... | @@ -1,17 +1,17 @@ |
| 1 | pub const __wasi_errno_t = u16; | 1 | pub const errno_t = u16; |
| 2 | pub const __wasi_exitcode_t = u32; | 2 | pub const exitcode_t = u32; |
| 3 | pub const __wasi_fd_t = u32; | 3 | pub const fd_t = u32; |
| 4 | pub const __wasi_signal_t = u8; | 4 | pub const signal_t = u8; |
| 5 | 5 | ||
| 6 | pub const __wasi_ciovec_t = extern struct { | 6 | pub const ciovec_t = extern struct { |
| 7 | buf: [*]const u8, | 7 | buf: [*]const u8, |
| 8 | buf_len: usize, | 8 | buf_len: usize, |
| 9 | }; | 9 | }; |
| 10 | 10 | ||
| 11 | pub const __WASI_SIGABRT: __wasi_signal_t = 6; | 11 | pub const SIGABRT: signal_t = 6; |
| 12 | 12 | ||
| 13 | pub extern "wasi" fn __wasi_proc_raise(sig: __wasi_signal_t) __wasi_errno_t; | 13 | pub extern "wasi_unstable" fn proc_raise(sig: signal_t) errno_t; |
| 14 | 14 | ||
| 15 | pub extern "wasi" fn __wasi_proc_exit(rval: __wasi_exitcode_t) noreturn; | 15 | pub extern "wasi_unstable" fn proc_exit(rval: exitcode_t) noreturn; |
| 16 | 16 | ||
| 17 | pub extern "wasi" fn __wasi_fd_write(fd: __wasi_fd_t, iovs: *const __wasi_ciovec_t, iovs_len: usize, nwritten: *usize) __wasi_errno_t; | 17 | pub extern "wasi_unstable" fn fd_write(fd: fd_t, iovs: *const ciovec_t, iovs_len: usize, nwritten: *usize) errno_t; |
std/special/bootstrap.zig+1-1
| ... | @@ -21,7 +21,7 @@ comptime { | ... | @@ -21,7 +21,7 @@ comptime { |
| 21 | 21 | ||
| 22 | nakedcc fn _start() noreturn { | 22 | nakedcc fn _start() noreturn { |
| 23 | if (builtin.os == builtin.Os.wasi) { | 23 | if (builtin.os == builtin.Os.wasi) { |
| 24 | std.os.wasi.__wasi_proc_exit(callMain()); | 24 | std.os.wasi.proc_exit(callMain()); |
| 25 | } | 25 | } |
| 26 | 26 | ||
| 27 | switch (builtin.arch) { | 27 | switch (builtin.arch) { |
std/special/panic.zig+1-1
| ... | @@ -15,7 +15,7 @@ pub fn panic(msg: []const u8, error_return_trace: ?*builtin.StackTrace) noreturn | ... | @@ -15,7 +15,7 @@ pub fn panic(msg: []const u8, error_return_trace: ?*builtin.StackTrace) noreturn |
| 15 | }, | 15 | }, |
| 16 | builtin.Os.wasi => { | 16 | builtin.Os.wasi => { |
| 17 | std.debug.warn("{}", msg); | 17 | std.debug.warn("{}", msg); |
| 18 | _ = std.os.wasi.__wasi_proc_raise(std.os.wasi.__WASI_SIGABRT); | 18 | _ = std.os.wasi.proc_raise(std.os.wasi.SIGABRT); |
| 19 | unreachable; | 19 | unreachable; |
| 20 | }, | 20 | }, |
| 21 | builtin.Os.uefi => { | 21 | builtin.Os.uefi => { |