T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wig: bugfixes (sorry, thought i had tested before committimg)

Browse Source
This commit is contained in:
Pat Hickey
2020-05-21 14:21:47 -07:00
parent d19a09a4be
commit 561f9e084a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/wasi-common/wig/src/wasi.rs
View File

@@ -473,7 +473,7 @@ pub fn define_struct_for_wiggle(args: TokenStream) -> TokenStream {
// Therefore, creating a new BorrowChecker at the // Therefore, creating a new BorrowChecker at the
// root of each function invocation is correct. // root of each function invocation is correct.
let bc = wiggle::BorrowChecker::new(); let bc = wiggle::BorrowChecker::new();
let mem: WasiMemory { mem, bc }; let mem = WasiMemory { mem, bc };
wasi_common::wasi::#module_id::#name_ident( wasi_common::wasi::#module_id::#name_ident(
&mut my_cx.borrow_mut(), &mut my_cx.borrow_mut(),
&mem, &mem,
@@ -493,11 +493,11 @@ pub fn define_struct_for_wiggle(args: TokenStream) -> TokenStream {
struct WasiMemory { struct WasiMemory {
mem: wasmtime::Memory, mem: wasmtime::Memory,
bc: wiggle::BorrowChecker, bc: wiggle::BorrowChecker,
}; }
unsafe impl wiggle::GuestMemory for WasiMemory { unsafe impl wiggle::GuestMemory for WasiMemory {
fn base(&self) -> (*mut u8, u32) { fn base(&self) -> (*mut u8, u32) {
(self.0.data_ptr(), self.0.data_size() as _) (self.mem.data_ptr(), self.mem.data_size() as _)
} }
fn borrow_checker(&self) -> &wiggle::BorrowChecker { fn borrow_checker(&self) -> &wiggle::BorrowChecker {
&self.bc &self.bc