From 1127d847a1b52402b7a224caaabe647883287115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Sun, 15 May 2022 23:15:07 +0200 Subject: [PATCH] Use better instruction for CATCH_TRAP on ARM Macs The old instruction would cause the debugger to be stuck at the triggering source line forever, while the new one should have the expected semantics, where the debugger can then single-step, continue. or generally do things, afterwards. Closes #2422 --- include/internal/catch_debugger.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/internal/catch_debugger.h b/include/internal/catch_debugger.h index a0148aa8..a5a59b3b 100644 --- a/include/internal/catch_debugger.h +++ b/include/internal/catch_debugger.h @@ -20,7 +20,7 @@ namespace Catch { #if defined(__i386__) || defined(__x86_64__) #define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */ #elif defined(__aarch64__) - #define CATCH_TRAP() __asm__(".inst 0xd4200000") + #define CATCH_TRAP() __asm__(".inst 0xd43e0000") #endif #elif defined(CATCH_PLATFORM_IPHONE)