Fix x86_64 libcall trampoline in engine-universal

wasmerio · Mar 14, 2022 · a280914 · a280914
1 parent 657bbae
commit a280914
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/lib/engine-universal/src/trampoline.rs b/lib/engine-universal/src/trampoline.rs
@@ -23,7 +23,7 @@ const AARCH64_TRAMPOLINE: [u8; 16] = [
 // JMP [RIP + 2]   FF 25 02 00 00 00 [00 00]
 // 64-bit ADDR     00 00 00 00 00 00 00 00
 const X86_64_TRAMPOLINE: [u8; 16] = [
-    0xff, 0x25, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xff, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 ];
 
 fn make_trampoline(

diff --git a/tests/ignores.txt b/tests/ignores.txt
@@ -43,8 +43,6 @@ singlepass multi_value_imports::dynamic # Singlepass doesn't support multivalue
 # https://github.com/wasmerio/wasmer/issues/2808
 cranelift+aarch64 spec::skip_stack_guard_page
 llvm+aarch64      spec::skip_stack_guard_page
-# Stack probing doesn't seem to be working correctly on Windows with Cranelift
-cranelift+windows spec::skip_stack_guard_page
 # TODO: Needs more investigation
 cranelift+macos spec::skip_stack_guard_page
 llvm+macos spec::skip_stack_guard_page