From 1b6dacbb86d9c426bd3cb009a446e7da441fd97c Mon Sep 17 00:00:00 2001 From: Tamas Berghammer Date: Wed, 10 Feb 2016 10:42:00 +0000 Subject: Use BKPT instead of UDF for arm/thumb breakpoints The UDF instruction is deprecated in armv7 and in case of thumb2 instructions set it don't work well together with the IT instruction. Differential revision: http://reviews.llvm.org/D16853 llvm-svn: 260367 --- lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp') diff --git a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp index 87c76f5..3cd0200 100644 --- a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp +++ b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp @@ -1294,8 +1294,10 @@ NativeProcessLinux::MonitorSIGTRAP(const siginfo_t &info, NativeThreadLinux &thr break; } - // Otherwise, report step over - MonitorTrace(thread); + if (m_arch.GetMachine() == llvm::Triple::arm) + MonitorBreakpoint(thread); // Arm linux reports trace for breakpoint hits + else + MonitorTrace(thread); // Report the trace break; } @@ -2289,13 +2291,11 @@ NativeProcessLinux::GetSoftwareBreakpointTrapOpcode (size_t trap_opcode_size_hin // FIXME put this behind a breakpoint protocol class that can be set per // architecture. Need MIPS support here. static const uint8_t g_aarch64_opcode[] = { 0x00, 0x00, 0x20, 0xd4 }; - // The ARM reference recommends the use of 0xe7fddefe and 0xdefe but the - // linux kernel does otherwise. - static const uint8_t g_arm_breakpoint_opcode[] = { 0xf0, 0x01, 0xf0, 0xe7 }; + static const uint8_t g_arm_breakpoint_opcode[] = { 0x70, 0xbe, 0x20, 0xe1 }; static const uint8_t g_i386_opcode [] = { 0xCC }; static const uint8_t g_mips64_opcode[] = { 0x00, 0x00, 0x00, 0x0d }; static const uint8_t g_mips64el_opcode[] = { 0x0d, 0x00, 0x00, 0x00 }; - static const uint8_t g_thumb_breakpoint_opcode[] = { 0x01, 0xde }; + static const uint8_t g_thumb_breakpoint_opcode[] = { 0x70, 0xbe }; switch (m_arch.GetMachine ()) { -- cgit v1.1