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

runtime: handle traps on Windows x32. (#1740)

Browse Source
This commit is contained in:
whitequark
2020-05-21 20:07:05 +00:00
committed by GitHub
parent 036c8ec8c5
commit 26ee986c2f
3 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
crates/runtime/src/traphandlers.rs
View File

@@ -224,10 +224,16 @@ cfg_if::cfg_if! {
Some(info) => info,
None => return EXCEPTION_CONTINUE_SEARCH,
};
let jmp_buf = info.handle_trap(
(*(*exception_info).ContextRecord).Rip as *const u8,
|handler| handler(exception_info),
);
cfg_if::cfg_if! {
if #[cfg(target_arch = "x86_64")] {
let ip = (*(*exception_info).ContextRecord).Rip as *const u8;
} else if #[cfg(target_arch = "x86")] {
let ip = (*(*exception_info).ContextRecord).Eip as *const u8;
} else {
compile_error!("unsupported platform");
}
}
let jmp_buf = info.handle_trap(ip, |handler| handler(exception_info));
if jmp_buf.is_null() {
EXCEPTION_CONTINUE_SEARCH
} else if jmp_buf as usize == 1 {