Commit 611a1436f022e777caf4eea8d1e6c81edc22a43f | zig

author	Jakub Konka <kubkon@jakubkonka.com> 2020-04-29 20:42:18+02:00
committer	Andrew Kelley <andrew@ziglang.org> 2020-04-30 01:52:12-04:00
log	611a1436f022e777caf4eea8d1e6c81edc22a43f
tree	d2355e2587d059b2c69a04cd8f80a4a3d3659c85
parent	a08675723cd39e3001327aa52b8af4b1c7bb0f32

Update WASI snapshot to preview1

This commit updates the WASI imports to use `wasi_snapshot_preview1`
instead of the old `wasi_unstable`. There are some minor ABI
differences between the two, however, the main motivator for using
the latest "stable" snapshot (aka preview1) is that, at least in
Wasmtime, there has been a lot of improvement work put into preview1
and unfortunately I might add, the improvements were not (in full)
backported to `wasi_unstable` snapshot.

Also, this commit removes the optional bound on the pointer to
`environ_get` syscall.

1 files changed, 59 insertions(+), 58 deletions(-)

lib
- std
  - os
    wasi.zig

lib/std/os/wasi.zig+59-58

...	@@ -1,5 +1,6 @@	...	@@ -1,5 +1,6 @@
1	// Based on https://github.com/CraneStation/wasi-sysroot/blob/wasi/libc-bottom-half/headers/public/wasi/core.h	1	// wasi_snapshot_preview1 spec available (in witx format) here:
2	// and https://github.com/WebAssembly/WASI/blob/master/design/WASI-core.md	2	// * typenames -- https://github.com/WebAssembly/WASI/blob/master/phases/snapshot/witx/typenames.witx
		3	// * module -- https://github.com/WebAssembly/WASI/blob/master/phases/snapshot/witx/wasi_snapshot_preview1.witx
3	const std = @import("std");	4	const std = @import("std");
4	const assert = std.debug.assert;	5	const assert = std.debug.assert;
5		6
...	@@ -19,62 +20,62 @@ comptime {	...	@@ -19,62 +20,62 @@ comptime {
19	pub const iovec_t = iovec;	20	pub const iovec_t = iovec;
20	pub const ciovec_t = iovec_const;	21	pub const ciovec_t = iovec_const;
21		22
22	pub extern "wasi_unstable" fn args_get(argv: [][:0]u8, argv_buf: [*]u8) errno_t;	23	pub extern "wasi_snapshot_preview1" fn args_get(argv: [][:0]u8, argv_buf: [*]u8) errno_t;
23	pub extern "wasi_unstable" fn args_sizes_get(argc: usize, argv_buf_size: usize) errno_t;	24	pub extern "wasi_snapshot_preview1" fn args_sizes_get(argc: usize, argv_buf_size: usize) errno_t;
24		25
25	pub extern "wasi_unstable" fn clock_res_get(clock_id: clockid_t, resolution: *timestamp_t) errno_t;	26	pub extern "wasi_snapshot_preview1" fn clock_res_get(clock_id: clockid_t, resolution: *timestamp_t) errno_t;
26	pub extern "wasi_unstable" fn clock_time_get(clock_id: clockid_t, precision: timestamp_t, timestamp: *timestamp_t) errno_t;	27	pub extern "wasi_snapshot_preview1" fn clock_time_get(clock_id: clockid_t, precision: timestamp_t, timestamp: *timestamp_t) errno_t;
27		28
28	pub extern "wasi_unstable" fn environ_get(environ: []?[:0]u8, environ_buf: [*]u8) errno_t;	29	pub extern "wasi_snapshot_preview1" fn environ_get(environ: [][:0]u8, environ_buf: [*]u8) errno_t;
29	pub extern "wasi_unstable" fn environ_sizes_get(environ_count: usize, environ_buf_size: usize) errno_t;	30	pub extern "wasi_snapshot_preview1" fn environ_sizes_get(environ_count: usize, environ_buf_size: usize) errno_t;
30		31
31	pub extern "wasi_unstable" fn fd_advise(fd: fd_t, offset: filesize_t, len: filesize_t, advice: advice_t) errno_t;	32	pub extern "wasi_snapshot_preview1" fn fd_advise(fd: fd_t, offset: filesize_t, len: filesize_t, advice: advice_t) errno_t;
32	pub extern "wasi_unstable" fn fd_allocate(fd: fd_t, offset: filesize_t, len: filesize_t) errno_t;	33	pub extern "wasi_snapshot_preview1" fn fd_allocate(fd: fd_t, offset: filesize_t, len: filesize_t) errno_t;
33	pub extern "wasi_unstable" fn fd_close(fd: fd_t) errno_t;	34	pub extern "wasi_snapshot_preview1" fn fd_close(fd: fd_t) errno_t;
34	pub extern "wasi_unstable" fn fd_datasync(fd: fd_t) errno_t;	35	pub extern "wasi_snapshot_preview1" fn fd_datasync(fd: fd_t) errno_t;
35	pub extern "wasi_unstable" fn fd_pread(fd: fd_t, iovs: []const iovec_t, iovs_len: usize, offset: filesize_t, nread: usize) errno_t;	36	pub extern "wasi_snapshot_preview1" fn fd_pread(fd: fd_t, iovs: []const iovec_t, iovs_len: usize, offset: filesize_t, nread: usize) errno_t;
36	pub extern "wasi_unstable" fn fd_pwrite(fd: fd_t, iovs: []const ciovec_t, iovs_len: usize, offset: filesize_t, nwritten: usize) errno_t;	37	pub extern "wasi_snapshot_preview1" fn fd_pwrite(fd: fd_t, iovs: []const ciovec_t, iovs_len: usize, offset: filesize_t, nwritten: usize) errno_t;
37	pub extern "wasi_unstable" fn fd_read(fd: fd_t, iovs: []const iovec_t, iovs_len: usize, nread: usize) errno_t;	38	pub extern "wasi_snapshot_preview1" fn fd_read(fd: fd_t, iovs: []const iovec_t, iovs_len: usize, nread: usize) errno_t;
38	pub extern "wasi_unstable" fn fd_readdir(fd: fd_t, buf: []u8, buf_len: usize, cookie: dircookie_t, bufused: usize) errno_t;	39	pub extern "wasi_snapshot_preview1" fn fd_readdir(fd: fd_t, buf: []u8, buf_len: usize, cookie: dircookie_t, bufused: usize) errno_t;
39	pub extern "wasi_unstable" fn fd_renumber(from: fd_t, to: fd_t) errno_t;	40	pub extern "wasi_snapshot_preview1" fn fd_renumber(from: fd_t, to: fd_t) errno_t;
40	pub extern "wasi_unstable" fn fd_seek(fd: fd_t, offset: filedelta_t, whence: whence_t, newoffset: *filesize_t) errno_t;	41	pub extern "wasi_snapshot_preview1" fn fd_seek(fd: fd_t, offset: filedelta_t, whence: whence_t, newoffset: *filesize_t) errno_t;
41	pub extern "wasi_unstable" fn fd_sync(fd: fd_t) errno_t;	42	pub extern "wasi_snapshot_preview1" fn fd_sync(fd: fd_t) errno_t;
42	pub extern "wasi_unstable" fn fd_tell(fd: fd_t, newoffset: *filesize_t) errno_t;	43	pub extern "wasi_snapshot_preview1" fn fd_tell(fd: fd_t, newoffset: *filesize_t) errno_t;
43	pub extern "wasi_unstable" fn fd_write(fd: fd_t, iovs: []const ciovec_t, iovs_len: usize, nwritten: usize) errno_t;	44	pub extern "wasi_snapshot_preview1" fn fd_write(fd: fd_t, iovs: []const ciovec_t, iovs_len: usize, nwritten: usize) errno_t;
44		45
45	pub extern "wasi_unstable" fn fd_fdstat_get(fd: fd_t, buf: *fdstat_t) errno_t;	46	pub extern "wasi_snapshot_preview1" fn fd_fdstat_get(fd: fd_t, buf: *fdstat_t) errno_t;
46	pub extern "wasi_unstable" fn fd_fdstat_set_flags(fd: fd_t, flags: fdflags_t) errno_t;	47	pub extern "wasi_snapshot_preview1" fn fd_fdstat_set_flags(fd: fd_t, flags: fdflags_t) errno_t;
47	pub extern "wasi_unstable" fn fd_fdstat_set_rights(fd: fd_t, fs_rights_base: rights_t, fs_rights_inheriting: rights_t) errno_t;	48	pub extern "wasi_snapshot_preview1" fn fd_fdstat_set_rights(fd: fd_t, fs_rights_base: rights_t, fs_rights_inheriting: rights_t) errno_t;
48		49
49	pub extern "wasi_unstable" fn fd_filestat_get(fd: fd_t, buf: *filestat_t) errno_t;	50	pub extern "wasi_snapshot_preview1" fn fd_filestat_get(fd: fd_t, buf: *filestat_t) errno_t;
50	pub extern "wasi_unstable" fn fd_filestat_set_size(fd: fd_t, st_size: filesize_t) errno_t;	51	pub extern "wasi_snapshot_preview1" fn fd_filestat_set_size(fd: fd_t, st_size: filesize_t) errno_t;
51	pub extern "wasi_unstable" fn fd_filestat_set_times(fd: fd_t, st_atim: timestamp_t, st_mtim: timestamp_t, fstflags: fstflags_t) errno_t;	52	pub extern "wasi_snapshot_preview1" fn fd_filestat_set_times(fd: fd_t, st_atim: timestamp_t, st_mtim: timestamp_t, fstflags: fstflags_t) errno_t;
52		53
53	pub extern "wasi_unstable" fn fd_prestat_get(fd: fd_t, buf: *prestat_t) errno_t;	54	pub extern "wasi_snapshot_preview1" fn fd_prestat_get(fd: fd_t, buf: *prestat_t) errno_t;
54	pub extern "wasi_unstable" fn fd_prestat_dir_name(fd: fd_t, path: [*]u8, path_len: usize) errno_t;	55	pub extern "wasi_snapshot_preview1" fn fd_prestat_dir_name(fd: fd_t, path: [*]u8, path_len: usize) errno_t;
55		56
56	pub extern "wasi_unstable" fn path_create_directory(fd: fd_t, path: [*]const u8, path_len: usize) errno_t;	57	pub extern "wasi_snapshot_preview1" fn path_create_directory(fd: fd_t, path: [*]const u8, path_len: usize) errno_t;
57	pub extern "wasi_unstable" fn path_filestat_get(fd: fd_t, flags: lookupflags_t, path: []const u8, path_len: usize, buf: filestat_t) errno_t;	58	pub extern "wasi_snapshot_preview1" fn path_filestat_get(fd: fd_t, flags: lookupflags_t, path: []const u8, path_len: usize, buf: filestat_t) errno_t;
58	pub extern "wasi_unstable" fn path_filestat_set_times(fd: fd_t, flags: lookupflags_t, path: [*]const u8, path_len: usize, st_atim: timestamp_t, st_mtim: timestamp_t, fstflags: fstflags_t) errno_t;	59	pub extern "wasi_snapshot_preview1" fn path_filestat_set_times(fd: fd_t, flags: lookupflags_t, path: [*]const u8, path_len: usize, st_atim: timestamp_t, st_mtim: timestamp_t, fstflags: fstflags_t) errno_t;
59	pub extern "wasi_unstable" fn path_link(old_fd: fd_t, old_flags: lookupflags_t, old_path: []const u8, old_path_len: usize, new_fd: fd_t, new_path: []const u8, new_path_len: usize) errno_t;	60	pub extern "wasi_snapshot_preview1" fn path_link(old_fd: fd_t, old_flags: lookupflags_t, old_path: []const u8, old_path_len: usize, new_fd: fd_t, new_path: []const u8, new_path_len: usize) errno_t;
60	pub extern "wasi_unstable" fn path_open(dirfd: fd_t, dirflags: lookupflags_t, path: []const u8, path_len: usize, oflags: oflags_t, fs_rights_base: rights_t, fs_rights_inheriting: rights_t, fs_flags: fdflags_t, fd: fd_t) errno_t;	61	pub extern "wasi_snapshot_preview1" fn path_open(dirfd: fd_t, dirflags: lookupflags_t, path: []const u8, path_len: usize, oflags: oflags_t, fs_rights_base: rights_t, fs_rights_inheriting: rights_t, fs_flags: fdflags_t, fd: fd_t) errno_t;
61	pub extern "wasi_unstable" fn path_readlink(fd: fd_t, path: []const u8, path_len: usize, buf: []u8, buf_len: usize, bufused: *usize) errno_t;	62	pub extern "wasi_snapshot_preview1" fn path_readlink(fd: fd_t, path: []const u8, path_len: usize, buf: []u8, buf_len: usize, bufused: *usize) errno_t;
62	pub extern "wasi_unstable" fn path_remove_directory(fd: fd_t, path: [*]const u8, path_len: usize) errno_t;	63	pub extern "wasi_snapshot_preview1" fn path_remove_directory(fd: fd_t, path: [*]const u8, path_len: usize) errno_t;
63	pub extern "wasi_unstable" fn path_rename(old_fd: fd_t, old_path: []const u8, old_path_len: usize, new_fd: fd_t, new_path: []const u8, new_path_len: usize) errno_t;	64	pub extern "wasi_snapshot_preview1" fn path_rename(old_fd: fd_t, old_path: []const u8, old_path_len: usize, new_fd: fd_t, new_path: []const u8, new_path_len: usize) errno_t;
64	pub extern "wasi_unstable" fn path_symlink(old_path: []const u8, old_path_len: usize, fd: fd_t, new_path: []const u8, new_path_len: usize) errno_t;	65	pub extern "wasi_snapshot_preview1" fn path_symlink(old_path: []const u8, old_path_len: usize, fd: fd_t, new_path: []const u8, new_path_len: usize) errno_t;
65	pub extern "wasi_unstable" fn path_unlink_file(fd: fd_t, path: [*]const u8, path_len: usize) errno_t;	66	pub extern "wasi_snapshot_preview1" fn path_unlink_file(fd: fd_t, path: [*]const u8, path_len: usize) errno_t;
66		67
67	pub extern "wasi_unstable" fn poll_oneoff(in: const subscription_t, out: event_t, nsubscriptions: usize, nevents: *usize) errno_t;	68	pub extern "wasi_snapshot_preview1" fn poll_oneoff(in: const subscription_t, out: event_t, nsubscriptions: usize, nevents: *usize) errno_t;
68		69
69	pub extern "wasi_unstable" fn proc_exit(rval: exitcode_t) noreturn;	70	pub extern "wasi_snapshot_preview1" fn proc_exit(rval: exitcode_t) noreturn;
70		71
71	pub extern "wasi_unstable" fn random_get(buf: [*]u8, buf_len: usize) errno_t;	72	pub extern "wasi_snapshot_preview1" fn random_get(buf: [*]u8, buf_len: usize) errno_t;
72		73
73	pub extern "wasi_unstable" fn sched_yield() errno_t;	74	pub extern "wasi_snapshot_preview1" fn sched_yield() errno_t;
74		75
75	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;	76	pub extern "wasi_snapshot_preview1" 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;
76	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;	77	pub extern "wasi_snapshot_preview1" fn sock_send(sock: fd_t, si_data: const ciovec_t, si_data_len: usize, si_flags: siflags_t, so_datalen: usize) errno_t;
77	pub extern "wasi_unstable" fn sock_shutdown(sock: fd_t, how: sdflags_t) errno_t;	78	pub extern "wasi_snapshot_preview1" fn sock_shutdown(sock: fd_t, how: sdflags_t) errno_t;
78		79
79	/// Get the errno from a syscall return value, or 0 for no error.	80	/// Get the errno from a syscall return value, or 0 for no error.
80	pub fn getErrno(r: errno_t) usize {	81	pub fn getErrno(r: errno_t) usize {