fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-05-26 00:31:19 +00:00
Code Issues Projects Releases Wiki Activity

Fixed typed func implementation

Browse Source
This commit is contained in:
Syrus 2019-02-12 11:14:20 -08:00
parent 44d1a0d1f9
commit b7c3cc09d1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/runtime-core/src/typed_func.rs
View File

@ -138,9 +138,9 @@ impl<A: WasmExternType> WasmTypeList for (A,) {
} }
#[allow(non_snake_case)] #[allow(non_snake_case)]
unsafe fn call<Rets: WasmTypeList>(self, f: *const (), ctx: *mut Ctx) -> Rets { unsafe fn call<Rets: WasmTypeList>(self, f: *const (), ctx: *mut Ctx) -> Rets {
let f: extern "C" fn(A, *mut Ctx) -> Rets = mem::transmute(f); let f: extern "C" fn(*mut Ctx, A) -> Rets = mem::transmute(f);
let (a,) = self; let (a,) = self;
f(a, ctx) f(ctx, a)
} }
} }
@ -175,10 +175,10 @@ macro_rules! impl_traits {
} }
#[allow(non_snake_case)] #[allow(non_snake_case)]
unsafe fn call<Rets: WasmTypeList>(self, f: *const (), ctx: *mut Ctx) -> Rets { unsafe fn call<Rets: WasmTypeList>(self, f: *const (), ctx: *mut Ctx) -> Rets {
let f: extern fn( $( $x, )* *mut Ctx) -> Rets::CStruct = mem::transmute(f); let f: extern fn(*mut Ctx $( ,$x )*) -> Rets::CStruct = mem::transmute(f);
#[allow(unused_parens)] #[allow(unused_parens)]
let ( $( $x ),* ) = self; let ( $( $x ),* ) = self;
let c_struct = f( $( $x, )* ctx); let c_struct = f(ctx $( ,$x )*);
Rets::from_c_struct(c_struct) Rets::from_c_struct(c_struct)
} }
} }