From bc537c7581fecc88cee80d5554c16dfc1d5c6a94 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Sat, 15 Oct 2016 15:46:50 +0100 Subject: [PATCH] Properly define trap_instruction --- libdevcore/debugbreak.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libdevcore/debugbreak.h b/libdevcore/debugbreak.h index 65612a340..f8838a5fe 100644 --- a/libdevcore/debugbreak.h +++ b/libdevcore/debugbreak.h @@ -93,6 +93,13 @@ static void __inline__ trap_instruction(void) /* Has same known problem and workaround * as Thumb mode */ } +#elif defined(ETH_EMSCRIPTEN) +enum { HAVE_TRAP_INSTRUCTION = 1, }; +__attribute__((gnu_inline, always_inline)) +static void __inline__ trap_instruction(void) +{ + asm("debugger"); +} #else enum { HAVE_TRAP_INSTRUCTION = 0, }; #endif @@ -101,11 +108,7 @@ __attribute__((gnu_inline, always_inline)) static void __inline__ debug_break(void) { if (HAVE_TRAP_INSTRUCTION) { -#if defined(ETH_EMSCRIPTEN) - asm("debugger"); -#else trap_instruction(); -#endif } else if (DEBUG_BREAK_PREFER_BUILTIN_TRAP_TO_SIGTRAP) { /* raises SIGILL on Linux x86{,-64}, to continue in gdb: * (gdb) handle SIGILL stop nopass