Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -810,10 +810,6 @@ __wasi_errno_t wasmtime_ssp_poll_oneoff(
size_t *nevents
) WASMTIME_SSP_SYSCALL_NAME(poll_oneoff) __attribute__((__warn_unused_result__));

_Noreturn void wasmtime_ssp_proc_exit(
__wasi_exitcode_t rval
) WASMTIME_SSP_SYSCALL_NAME(proc_exit);

__wasi_errno_t wasmtime_ssp_proc_raise(
__wasi_signal_t sig
) WASMTIME_SSP_SYSCALL_NAME(proc_raise) __attribute__((__warn_unused_result__));
Expand Down
6 changes: 0 additions & 6 deletions wasmtime-wasi/sandboxed-system-primitives/src/posix.c
Original file line number Diff line number Diff line change
Expand Up @@ -2530,12 +2530,6 @@ __wasi_errno_t wasmtime_ssp_poll_oneoff(
return error;
}

void wasmtime_ssp_proc_exit(
__wasi_exitcode_t rval
) {
_Exit(rval);
}

__wasi_errno_t wasmtime_ssp_proc_raise(
__wasi_signal_t sig
) {
Expand Down
5 changes: 5 additions & 0 deletions wasmtime-wasi/src/host_impls.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
use super::wasm32;

pub fn wasmtime_ssp_proc_exit(rval: wasm32::__wasi_exitcode_t) {
::std::process::exit(rval as i32)
}
1 change: 1 addition & 0 deletions wasmtime-wasi/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ extern crate wasmtime_runtime;
extern crate log;

mod host;
mod host_impls;
mod instantiate;
mod syscalls;
mod translate;
Expand Down
3 changes: 2 additions & 1 deletion wasmtime-wasi/src/syscalls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ use crate::host::{argv_environ_values, fd_prestats, fd_table};
use crate::instantiate::WASIState;
use cranelift_codegen::ir::types::{Type, I32, I64};
use host;
use host_impls;
use std::{ptr, slice, str};
use translate::*;
use wasm32;
Expand Down Expand Up @@ -1383,7 +1384,7 @@ syscalls! {

// TODO: Rather than call __wasi_proc_exit here, we should trigger a
// stack unwind similar to a trap.
host::wasmtime_ssp_proc_exit(rval);
host_impls::wasmtime_ssp_proc_exit(rval);
}

pub unsafe extern "C" fn proc_raise(
Expand Down