fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-21 04:31:33 +00:00
Code Issues Projects Releases Wiki Activity

Attempt #2 for windows building

Browse Source
This commit is contained in:
Lachlan Sneff
2019-04-09 16:50:33 -07:00
parent 751dff0f9d
commit 654fce9354
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/win-exception-handler/src/exception_handling.rs
View File

@ -1,7 +1,8 @@
use std::ffi::c_void; use std::ffi::c_void;
use std::ptr::NonNull;
use wasmer_runtime_core::vm::{Ctx, Func}; use wasmer_runtime_core::vm::{Ctx, Func};
type Trampoline = unsafe extern "C" fn(*mut Ctx, *const Func, *const u64, *mut u64) -> c_void; type Trampoline = unsafe extern "C" fn(*mut Ctx, NonNull<Func>, *const u64, *mut u64) -> c_void;
type CallProtectedResult = Result<(), CallProtectedData>; type CallProtectedResult = Result<(), CallProtectedData>;
#[repr(C)] #[repr(C)]
@ -16,7 +17,7 @@ extern "C" {
pub fn __call_protected( pub fn __call_protected(
trampoline: Trampoline, trampoline: Trampoline,
ctx: *mut Ctx, ctx: *mut Ctx,
func: *const Func, func: NonNull<Func>,
param_vec: *const u64, param_vec: *const u64,
return_vec: *mut u64, return_vec: *mut u64,
out_result: *mut CallProtectedData, out_result: *mut CallProtectedData,
@ -26,7 +27,7 @@ extern "C" {
pub fn _call_protected( pub fn _call_protected(
trampoline: Trampoline, trampoline: Trampoline,
ctx: *mut Ctx, ctx: *mut Ctx,
func: *const Func, func: NonNull<Func>,
param_vec: *const u64, param_vec: *const u64,
return_vec: *mut u64, return_vec: *mut u64,
) -> CallProtectedResult { ) -> CallProtectedResult {