aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for support win64.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2015-09-20 13:20:21 +03:00
parent 305818bd8e
commit e0cad4e732
1 changed files with 43 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/libs/vmisc/debugbreak.h
View File

@ -40,9 +40,9 @@ extern "C" {
#endif #endif
enum { enum {
/* gcc optimizers consider code after __builtin_trap() dead. /* gcc optimizers consider code after __builtin_trap() dead.
* Making __builtin_trap() unsuitable for breaking into the debugger */ * Making __builtin_trap() unsuitable for breaking into the debugger */
DEBUG_BREAK_PREFER_BUILTIN_TRAP_TO_SIGTRAP = 0, DEBUG_BREAK_PREFER_BUILTIN_TRAP_TO_SIGTRAP = 0,
}; };
#if defined(__i386__) || defined(__x86_64__) #if defined(__i386__) || defined(__x86_64__)
@ -50,7 +50,7 @@ enum { HAVE_TRAP_INSTRUCTION = 1, };
__attribute__((gnu_inline, always_inline)) __attribute__((gnu_inline, always_inline))
static void __inline__ trap_instruction(void) static void __inline__ trap_instruction(void)
{ {
__asm__ volatile("int $0x03"); __asm__ volatile("int $0x03");
} }
#elif defined(__thumb__) #elif defined(__thumb__)
enum { HAVE_TRAP_INSTRUCTION = 1, }; enum { HAVE_TRAP_INSTRUCTION = 1, };
@ -58,47 +58,47 @@ enum { HAVE_TRAP_INSTRUCTION = 1, };
__attribute__((gnu_inline, always_inline)) __attribute__((gnu_inline, always_inline))
static void __inline__ trap_instruction(void) static void __inline__ trap_instruction(void)
{ {
/* See 'arm-linux-tdep.c' in GDB source. /* See 'arm-linux-tdep.c' in GDB source.
* Both instruction sequences below work. */ * Both instruction sequences below work. */
#if 1 #if 1
/* 'eabi_linux_thumb_le_breakpoint' */ /* 'eabi_linux_thumb_le_breakpoint' */
__asm__ volatile(".inst 0xde01"); __asm__ volatile(".inst 0xde01");
#else #else
/* 'eabi_linux_thumb2_le_breakpoint' */ /* 'eabi_linux_thumb2_le_breakpoint' */
__asm__ volatile(".inst.w 0xf7f0a000"); __asm__ volatile(".inst.w 0xf7f0a000");
#endif #endif
/* Known problem: /* Known problem:
* After a breakpoint hit, can't stepi, step, or continue in GDB. * After a breakpoint hit, can't stepi, step, or continue in GDB.
* 'step' stuck on the same instruction. * 'step' stuck on the same instruction.
* *
* Workaround: a new GDB command, * Workaround: a new GDB command,
* 'debugbreak-step' is defined in debugbreak-gdb.py * 'debugbreak-step' is defined in debugbreak-gdb.py
* that does: * that does:
* (gdb) set $instruction_len = 2 * (gdb) set $instruction_len = 2
* (gdb) tbreak *($pc + $instruction_len) * (gdb) tbreak *($pc + $instruction_len)
* (gdb) jump *($pc + $instruction_len) * (gdb) jump *($pc + $instruction_len)
*/ */
} }
#elif defined(__arm__) && !defined(__thumb__) #elif defined(__arm__) && !defined(__thumb__)
enum { HAVE_TRAP_INSTRUCTION = 1, }; enum { HAVE_TRAP_INSTRUCTION = 1, };
__attribute__((gnu_inline, always_inline)) __attribute__((gnu_inline, always_inline))
static void __inline__ trap_instruction(void) static void __inline__ trap_instruction(void)
{ {
/* See 'arm-linux-tdep.c' in GDB source, /* See 'arm-linux-tdep.c' in GDB source,
* 'eabi_linux_arm_le_breakpoint' */ * 'eabi_linux_arm_le_breakpoint' */
__asm__ volatile(".inst 0xe7f001f0"); __asm__ volatile(".inst 0xe7f001f0");
/* Has same known problem and workaround /* Has same known problem and workaround
* as Thumb mode */ * as Thumb mode */
} }
#elif defined(__aarch64__) #elif defined(__aarch64__)
enum { HAVE_TRAP_INSTRUCTION = 1, }; enum { HAVE_TRAP_INSTRUCTION = 1, };
__attribute__((gnu_inline, always_inline)) __attribute__((gnu_inline, always_inline))
static void __inline__ trap_instruction(void) static void __inline__ trap_instruction(void)
{ {
/* See 'aarch64-tdep.c' in GDB source, /* See 'aarch64-tdep.c' in GDB source,
* 'aarch64_default_breakpoint' */ * 'aarch64_default_breakpoint' */
__asm__ volatile(".inst 0xd4200000"); __asm__ volatile(".inst 0xd4200000");
} }
#else #else
enum { HAVE_TRAP_INSTRUCTION = 0, }; enum { HAVE_TRAP_INSTRUCTION = 0, };
@ -107,15 +107,17 @@ enum { HAVE_TRAP_INSTRUCTION = 0, };
__attribute__((gnu_inline, always_inline)) __attribute__((gnu_inline, always_inline))
static void __inline__ debug_break(void) static void __inline__ debug_break(void)
{ {
if (HAVE_TRAP_INSTRUCTION) { if (HAVE_TRAP_INSTRUCTION) {
trap_instruction(); trap_instruction();
} else if (DEBUG_BREAK_PREFER_BUILTIN_TRAP_TO_SIGTRAP) { } else if (DEBUG_BREAK_PREFER_BUILTIN_TRAP_TO_SIGTRAP) {
/* raises SIGILL on Linux x86{,-64}, to continue in gdb: /* raises SIGILL on Linux x86{,-64}, to continue in gdb:
* (gdb) handle SIGILL stop nopass * (gdb) handle SIGILL stop nopass
* */ * */
__builtin_trap(); __builtin_trap();
} else { } else {
#ifdef _WIN32 #if defined(_WIN32) || defined(_WIN64)
/* SIGTRAP available only on POSIX-compliant operating systems
* use builtin trap instead */
__builtin_trap(); __builtin_trap();
#else #else
raise(SIGTRAP); raise(SIGTRAP);