Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some fixes for the wasi interpreter for macOS #13587

Merged
merged 2 commits into from
Nov 19, 2022
Merged

Some fixes for the wasi interpreter for macOS #13587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebf8c1e
Remove usage of O_PATH, ifdef for macos stat struct, and integer form…
mattnite Nov 19, 2022
40efe8f
don't set compile commands
mattnite Nov 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,8 +713,8 @@ if(MSVC)
set(ZIG2_COMPILE_FLAGS "/std:c99")
set(ZIG2_LINK_FLAGS "/STACK:16777216")
else()
set(ZIG1_COMPILE_FLAGS "-std=c99 -O1 -march=native")
set(ZIG2_COMPILE_FLAGS "-std=c99 -O1 -march=native")
set(ZIG1_COMPILE_FLAGS "-std=c99 -O1")
set(ZIG2_COMPILE_FLAGS "-std=c99 -O1")
set(ZIG2_LINK_FLAGS "-Wl,-z,stack-size=0x10000000")
endif()

Expand Down
16 changes: 12 additions & 4 deletions stage1/zig1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <inttypes.h>

#include <fcntl.h>
#include <sys/mman.h>
Expand Down Expand Up @@ -859,9 +860,16 @@ static enum wasi_errno_t finish_wasi_stat(struct VirtualMachine *vm,
write_u64_le(vm->memory + buf + 0x10, to_wasi_filetype(st.st_mode));
write_u64_le(vm->memory + buf + 0x18, 1); // nlink
write_u64_le(vm->memory + buf + 0x20, st.st_size);
#if defined(__APPLE__)
write_u64_le(vm->memory + buf + 0x28, to_wasi_timestamp(st.st_atimespec));
write_u64_le(vm->memory + buf + 0x30, to_wasi_timestamp(st.st_mtimespec));
write_u64_le(vm->memory + buf + 0x38, to_wasi_timestamp(st.st_ctimespec));
#else
write_u64_le(vm->memory + buf + 0x28, to_wasi_timestamp(st.st_atim));
write_u64_le(vm->memory + buf + 0x30, to_wasi_timestamp(st.st_mtim));
write_u64_le(vm->memory + buf + 0x38, to_wasi_timestamp(st.st_ctim));
#endif

return WASI_ESUCCESS;
}

Expand Down Expand Up @@ -1173,7 +1181,7 @@ static enum wasi_errno_t wasi_clock_time_get(struct VirtualMachine *vm,

///pub extern "wasi_snapshot_preview1" fn debug(string: [*:0]const u8, x: u64) void;
void wasi_debug(struct VirtualMachine *vm, uint32_t text, uint64_t n) {
fprintf(stderr, "wasi_debug: '%s' number=%lu %lx\n", vm->memory + text, n, n);
fprintf(stderr, "wasi_debug: '%s' number=%" PRIu64" %" PRIx64 "\n", vm->memory + text, n, n);
}

/// pub extern "wasi_snapshot_preview1" fn debug_slice(ptr: [*]const u8, len: usize) void;
Expand Down Expand Up @@ -4082,7 +4090,7 @@ int main(int argc, char **argv) {

mkdir(cache_dir_buf, 0777);
cache_dir = err_wrap("opening cache dir",
open(cache_dir_buf, O_DIRECTORY|O_RDONLY|O_CLOEXEC|O_PATH));
open(cache_dir_buf, O_DIRECTORY|O_RDONLY|O_CLOEXEC));
}

// Construct a new argv for the WASI code which has absolute paths
Expand Down Expand Up @@ -4171,8 +4179,8 @@ int main(int argc, char **argv) {
size_t mod_len = ZSTD_decompress(mod_ptr, max_uncompressed_size,
compressed_bytes.ptr, compressed_bytes.len);

int cwd = err_wrap("opening cwd", open(".", O_DIRECTORY|O_RDONLY|O_CLOEXEC|O_PATH));
int zig_lib_dir = err_wrap("opening zig lib dir", open(zig_lib_dir_path, O_DIRECTORY|O_RDONLY|O_CLOEXEC|O_PATH));
int cwd = err_wrap("opening cwd", open(".", O_DIRECTORY|O_RDONLY|O_CLOEXEC));
int zig_lib_dir = err_wrap("opening zig lib dir", open(zig_lib_dir_path, O_DIRECTORY|O_RDONLY|O_CLOEXEC));

add_preopen(0, "stdin", STDIN_FILENO);
add_preopen(1, "stdout", STDOUT_FILENO);
Expand Down