From a2809145a1af7efa6cffc565f2144475e8af5305 Mon Sep 17 00:00:00 2001 From: Amanieu d'Antras Date: Thu, 3 Mar 2022 17:11:07 +0000 Subject: [PATCH] Fix x86_64 libcall trampoline in engine-universal --- lib/engine-universal/src/trampoline.rs | 2 +- tests/ignores.txt | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/engine-universal/src/trampoline.rs b/lib/engine-universal/src/trampoline.rs index e90a7c92f98..7c4c62b9729 100644 --- 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 index e1143d1457b..ba4976b9a03 100644 --- 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