[Lldb-commits] [lldb] r374264 - Change debugserver to use the brk #0 for breakpoints.

[Jason Molenda via lldb-commits]

Author: jmolenda
Date: Wed Oct  9 17:12:05 2019
New Revision: 374264

URL: http://llvm.org/viewvc/llvm-project?rev=374264&view=rev
Log:
Change debugserver to use the brk #0 for breakpoints.
    
debugserver had been using an instruction that would work
for armv7 or aarch64 processes, but we don't have armv7 code
running on arm64 devices any more so this is unnecessary.

<rdar://problem/56133118>


Modified:
    lldb/trunk/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp

Modified: lldb/trunk/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp?rev=374264&r1=374263&r2=374264&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp (original)
+++ lldb/trunk/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp Wed Oct  9 17:12:05 2019
@@ -49,8 +49,6 @@
 
 static const uint8_t g_arm64_breakpoint_opcode[] = {
     0x00, 0x00, 0x20, 0xD4}; // "brk #0", 0xd4200000 in BE byte order
-static const uint8_t g_arm_breakpoint_opcode[] = {
-    0xFE, 0xDE, 0xFF, 0xE7}; // this armv7 insn also works in arm64
 
 // If we need to set one logical watchpoint by using
 // two hardware watchpoint registers, the watchpoint
@@ -87,7 +85,7 @@ DNBArchProtocol *DNBArchMachARM64::Creat
 
 const uint8_t *
 DNBArchMachARM64::SoftwareBreakpointOpcode(nub_size_t byte_size) {
-  return g_arm_breakpoint_opcode;
+  return g_arm64_breakpoint_opcode;
 }
 
 uint32_t DNBArchMachARM64::GetCPUType() { return CPU_TYPE_ARM64; }