diff --git a/lib/runtime-core/build.rs b/lib/runtime-core/build.rs
index 20532e13c..35aafc835 100644
--- a/lib/runtime-core/build.rs
+++ b/lib/runtime-core/build.rs
@@ -1,5 +1,4 @@
 use blake2b_simd::blake2bp;
-use cc::Build;
 use std::{env, fs, io::Write, path::PathBuf};
 
 const WASMER_VERSION: &'static str = env!("CARGO_PKG_VERSION");
@@ -30,7 +29,15 @@ fn main() {
         println!("cargo:rustc-cfg=nightly");
     }
 
-    cc::Build::new()
-        .file("image-loading.s")
-        .compile("image-loading");
+    if cfg!(all(target_os = "linux", target_arch = "x86_64")) {
+        cc::Build::new()
+            .file("image-loading-linux-x86-64.s")
+            .compile("image-loading");
+    } else if cfg!(all(target_os = "macos", target_arch = "x86_64")) {
+        cc::Build::new()
+            .file("image-loading-macos-x86-64.s")
+            .compile("image-loading");
+    } else {
+
+    }
 }
diff --git a/lib/runtime-core/image-loading-linux-x86-64.s b/lib/runtime-core/image-loading-linux-x86-64.s
new file mode 100644
index 000000000..b43c0f78c
--- /dev/null
+++ b/lib/runtime-core/image-loading-linux-x86-64.s
@@ -0,0 +1,33 @@
+.globl run_on_wasm_stack
+run_on_wasm_stack:
+# (stack_end, stack_begin)
+# We need to ensure 16-byte alignment here.
+pushq %r15
+pushq %r14
+pushq %r13
+pushq %r12
+pushq %rbx
+pushq %rbp
+movq %rsp, -16(%rdi)
+
+leaq run_on_wasm_stack.returning(%rip), %rax
+movq %rax, -24(%rdi)
+
+movq %rsi, %rsp
+popq %rbp
+popq %rbx
+popq %r12
+popq %r13
+popq %r14
+popq %r15
+retq
+
+run_on_wasm_stack.returning:
+movq (%rsp), %rsp
+popq %rbp
+popq %rbx
+popq %r12
+popq %r13
+popq %r14
+popq %r15
+retq
diff --git a/lib/runtime-core/image-loading.s b/lib/runtime-core/image-loading-macos-x86-64.s
similarity index 100%
rename from lib/runtime-core/image-loading.s
rename to lib/runtime-core/image-loading-macos-x86-64.s
diff --git a/lib/singlepass-backend/src/protect_unix.rs b/lib/singlepass-backend/src/protect_unix.rs
index b4aac41ae..b93c881fd 100644
--- a/lib/singlepass-backend/src/protect_unix.rs
+++ b/lib/singlepass-backend/src/protect_unix.rs
@@ -189,11 +189,11 @@ pub struct FaultInfo {
 }
 
 #[cfg(all(target_os = "linux", target_arch = "x86_64"))]
-unsafe fn get_faulting_addr_and_ip(
-    siginfo: *const c_void,
-    ucontext: *const c_void,
-) -> (*const c_void, *const c_void) {
-    use libc::{ucontext_t, RIP};
+unsafe fn get_fault_info(siginfo: *const c_void, ucontext: *const c_void) -> FaultInfo {
+    use libc::{
+        ucontext_t, R10, R11, R12, R13, R14, R15, R8, R9, RAX, RBP, RBX, RCX, RDI, RDX, RIP, RSI,
+        RSP,
+    };
 
     #[allow(dead_code)]
     #[repr(C)]
@@ -209,9 +209,35 @@ unsafe fn get_faulting_addr_and_ip(
     let si_addr = (*siginfo).si_addr;
 
     let ucontext = ucontext as *const ucontext_t;
-    let rip = (*ucontext).uc_mcontext.gregs[RIP as usize];
+    let gregs = &(*ucontext).uc_mcontext.gregs;
 
-    (si_addr as _, rip as _)
+    let mut known_registers: [Option<u64>; 24] = [None; 24];
+
+    known_registers[X64Register::GPR(GPR::R15).to_index().0] = Some(gregs[R15 as usize] as _);
+    known_registers[X64Register::GPR(GPR::R14).to_index().0] = Some(gregs[R14 as usize] as _);
+    known_registers[X64Register::GPR(GPR::R13).to_index().0] = Some(gregs[R13 as usize] as _);
+    known_registers[X64Register::GPR(GPR::R12).to_index().0] = Some(gregs[R12 as usize] as _);
+    known_registers[X64Register::GPR(GPR::R11).to_index().0] = Some(gregs[R11 as usize] as _);
+    known_registers[X64Register::GPR(GPR::R10).to_index().0] = Some(gregs[R10 as usize] as _);
+    known_registers[X64Register::GPR(GPR::R9).to_index().0] = Some(gregs[R9 as usize] as _);
+    known_registers[X64Register::GPR(GPR::R8).to_index().0] = Some(gregs[R8 as usize] as _);
+    known_registers[X64Register::GPR(GPR::RSI).to_index().0] = Some(gregs[RSI as usize] as _);
+    known_registers[X64Register::GPR(GPR::RDI).to_index().0] = Some(gregs[RDI as usize] as _);
+    known_registers[X64Register::GPR(GPR::RDX).to_index().0] = Some(gregs[RDX as usize] as _);
+    known_registers[X64Register::GPR(GPR::RCX).to_index().0] = Some(gregs[RCX as usize] as _);
+    known_registers[X64Register::GPR(GPR::RBX).to_index().0] = Some(gregs[RBX as usize] as _);
+    known_registers[X64Register::GPR(GPR::RAX).to_index().0] = Some(gregs[RAX as usize] as _);
+
+    known_registers[X64Register::GPR(GPR::RBP).to_index().0] = Some(gregs[RBP as usize] as _);
+    known_registers[X64Register::GPR(GPR::RSP).to_index().0] = Some(gregs[RSP as usize] as _);
+
+    // TODO: XMM registers
+
+    FaultInfo {
+        faulting_addr: si_addr as usize as _,
+        ip: gregs[RIP as usize] as _,
+        known_registers,
+    }
 }
 
 #[cfg(all(target_os = "macos", target_arch = "x86_64"))]
@@ -291,6 +317,8 @@ unsafe fn get_fault_info(siginfo: *const c_void, ucontext: *const c_void) -> Fau
     known_registers[X64Register::GPR(GPR::RBP).to_index().0] = Some(ss.rbp);
     known_registers[X64Register::GPR(GPR::RSP).to_index().0] = Some(ss.rsp);
 
+    // TODO: XMM registers
+
     FaultInfo {
         faulting_addr: si_addr,
         ip: ss.rip as _,