[wasm] Enable trap handling on ARM64 Windows

paolosevMSFT · V8 LUCI CQ · commit cee178fe7c94 · 2024-10-15T15:34:10.000Z
Improve the speed of Wasm on Windows/ARM64 by enabling bounds-checking via trap-handling. Change-Id: I85a6cb59d8482d19f409515e26e641d333bf7b90 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5824747 Commit-Queue: Paolo Severini <paolosev@microsoft.com> Reviewed-by: Mark Mentovai <mark@chromium.org> Reviewed-by: Andreas Haas <ahaas@chromium.org> Cr-Commit-Position: refs/heads/main@{#96606}
diff --git a/BUILD.gn b/BUILD.gn
@@ -6071,15 +6071,14 @@ v8_source_set("v8_base_without_compiler") {
       "src/regexp/arm64/regexp-macro-assembler-arm64.cc",
     ]
     if (v8_enable_webassembly) {
-      # Trap handling is enabled on arm64 Mac and Linux and in simulators on
-      # x64 on Linux, Mac, and Windows.
+      # Trap handling is enabled on arm64 and x64, on Linux, Mac and Windows.
       if ((current_cpu == "arm64" && (is_linux || is_chromeos || is_apple)) ||
           (current_cpu == "x64" && (is_linux || is_chromeos || is_mac))) {
         sources += [
           "src/trap-handler/handler-inside-posix.cc",
           "src/trap-handler/handler-outside-posix.cc",
         ]
-      } else if (current_cpu == "x64" && is_win) {
+      } else if ((current_cpu == "arm64" || current_cpu == "x64") && is_win) {
         sources += [
           "src/trap-handler/handler-inside-win.cc",
           "src/trap-handler/handler-outside-win.cc",
diff --git a/src/trap-handler/handler-inside-win.cc b/src/trap-handler/handler-inside-win.cc
@@ -119,9 +119,16 @@ bool TryHandleWasmTrap(EXCEPTION_POINTERS* exception) {
 
   TH_DCHECK(gLandingPad != 0);
   // Tell the caller to return to the landing pad.
+#if V8_HOST_ARCH_X64
   exception->ContextRecord->Rip = gLandingPad;
   exception->ContextRecord->R10 = fault_addr;
-#endif
+#elif V8_HOST_ARCH_ARM64
+  exception->ContextRecord->Pc = gLandingPad;
+  exception->ContextRecord->X16 = fault_addr;
+#else
+#error Unsupported architecture
+#endif  // V8_HOST_ARCH_X64
+#endif  // V8_TRAP_HANDLER_VIA_SIMULATOR
   // We will return to wasm code, so restore the g_thread_in_wasm_code flag.
   g_thread_in_wasm_code = true;
   return true;
diff --git a/src/trap-handler/trap-handler.h b/src/trap-handler/trap-handler.h
@@ -22,9 +22,9 @@ namespace trap_handler {
     ((V8_OS_LINUX && !V8_OS_ANDROID) || V8_OS_WIN || V8_OS_DARWIN || \
      V8_OS_FREEBSD)
 #define V8_TRAP_HANDLER_SUPPORTED true
-// Arm64 (non-simulator) on Mac and Linux.
+// Arm64 (non-simulator) on Linux, Windows, MacOS.
 #elif V8_TARGET_ARCH_ARM64 && V8_HOST_ARCH_ARM64 && \
-    (V8_OS_DARWIN || (V8_OS_LINUX && !V8_OS_ANDROID))
+    ((V8_OS_LINUX && !V8_OS_ANDROID) || V8_OS_WIN || V8_OS_DARWIN)
 #define V8_TRAP_HANDLER_SUPPORTED true
 // Arm64 simulator on x64 on Linux, Mac, or Windows.
 //
diff --git a/test/unittests/wasm/trap-handler-native-unittest.cc b/test/unittests/wasm/trap-handler-native-unittest.cc
@@ -35,7 +35,7 @@
 
 #if V8_TRAP_HANDLER_SUPPORTED
 
-#if V8_HOST_ARCH_ARM64 && (!V8_OS_LINUX && !V8_OS_DARWIN)
+#if V8_HOST_ARCH_ARM64 && (!V8_OS_LINUX && !V8_OS_DARWIN && !V8_OS_WIN)
 #error Unsupported platform
 #endif
 
@@ -247,7 +247,13 @@ class TrapHandlerTest : public TestWithIsolate,
     RemoveVectoredExceptionHandler(g_registered_handler);
     g_registered_handler = nullptr;
     g_test_handler_executed = true;
+#if V8_HOST_ARCH_X64
     exception->ContextRecord->Rip = g_recovery_address;
+#elif V8_HOST_ARCH_ARM64
+    exception->ContextRecord->Pc = g_recovery_address;
+#else
+#error Unsupported architecture
+#endif  // V8_HOST_ARCH_X64
     return EXCEPTION_CONTINUE_EXECUTION;
   }
 #endif
