Skip to content

Sync with wasi-common #155

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

Merged
sunfishcode merged 1 commit into from
May 19, 2019
Merged

Sync with wasi-common #155

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
55 changes: 7 additions & 48 deletions wasmtime-wasi/src/syscalls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,12 +356,7 @@ syscalls! {
Err(e) => return return_encoded_errno(e),
};

let memory = match get_memory(&mut *vmctx) {
Ok(memory) => memory,
Err(e) => return return_encoded_errno(e),
};

hostcalls::fd_datasync(wasi_ctx, memory, fd)
hostcalls::fd_datasync(wasi_ctx, fd)
}

pub unsafe extern "C" fn fd_pread(
Expand Down Expand Up @@ -480,12 +475,7 @@ syscalls! {
Err(e) => return return_encoded_errno(e),
};

let memory = match get_memory(&mut *vmctx) {
Ok(memory) => memory,
Err(e) => return return_encoded_errno(e),
};

hostcalls::fd_renumber(wasi_ctx, memory, from, to)
hostcalls::fd_renumber(wasi_ctx, from, to)
}

pub unsafe extern "C" fn fd_seek(
Expand Down Expand Up @@ -593,14 +583,8 @@ syscalls! {
Err(e) => return return_encoded_errno(e),
};

let memory = match get_memory(&mut *vmctx) {
Ok(memory) => memory,
Err(e) => return return_encoded_errno(e),
};

hostcalls::fd_fdstat_set_rights(
wasi_ctx,
memory,
fd,
fs_rights_base,
fs_rights_inheriting
Expand All @@ -618,12 +602,7 @@ syscalls! {
Err(e) => return return_encoded_errno(e),
};

let memory = match get_memory(&mut *vmctx) {
Ok(memory) => memory,
Err(e) => return return_encoded_errno(e),
};

hostcalls::fd_sync(wasi_ctx, memory, fd)
hostcalls::fd_sync(wasi_ctx, fd)
}

pub unsafe extern "C" fn fd_write(
Expand Down Expand Up @@ -674,12 +653,7 @@ syscalls! {
Err(e) => return return_encoded_errno(e),
};

let memory = match get_memory(&mut *vmctx) {
Ok(memory) => memory,
Err(e) => return return_encoded_errno(e),
};

hostcalls::fd_advise(wasi_ctx, memory, fd, offset, len, advice)
hostcalls::fd_advise(wasi_ctx, fd, offset, len, advice)
}

pub unsafe extern "C" fn fd_allocate(
Expand All @@ -695,12 +669,7 @@ syscalls! {
Err(e) => return return_encoded_errno(e),
};

let memory = match get_memory(&mut *vmctx) {
Ok(memory) => memory,
Err(e) => return return_encoded_errno(e),
};

hostcalls::fd_allocate(wasi_ctx, memory, fd, offset, len)
hostcalls::fd_allocate(wasi_ctx, fd, offset, len)
}

pub unsafe extern "C" fn path_create_directory(
Expand Down Expand Up @@ -984,12 +953,7 @@ syscalls! {
Err(e) => return return_encoded_errno(e),
};

let memory = match get_memory(&mut *vmctx) {
Ok(memory) => memory,
Err(e) => return return_encoded_errno(e),
};

hostcalls::fd_filestat_set_times(wasi_ctx, memory, fd, st_atim, st_mtim, fstflags)
hostcalls::fd_filestat_set_times(wasi_ctx, fd, st_atim, st_mtim, fstflags)
}

pub unsafe extern "C" fn fd_filestat_set_size(
Expand All @@ -1008,12 +972,7 @@ syscalls! {
Err(e) => return return_encoded_errno(e),
};

let memory = match get_memory(&mut *vmctx) {
Ok(memory) => memory,
Err(e) => return return_encoded_errno(e),
};

hostcalls::fd_filestat_set_size(wasi_ctx, memory, fd, size)
hostcalls::fd_filestat_set_size(wasi_ctx, fd, size)
}

pub unsafe extern "C" fn path_filestat_get(
Expand Down