Skip to content

Commit bee9276

Browse files
committed
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> git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@374264 91177308-0d34-0410-b5e6-96231b3b80d8 (cherry picked from commit fdebaf769010c566ad3050b20894e9a3b0d4510d) apple-llvm-split-commit: 904336cc11325b509be197b30484721b9ab05f61 apple-llvm-split-dir: lldb/
1 parent f96cfda commit bee9276

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@
4949

5050
static const uint8_t g_arm64_breakpoint_opcode[] = {
5151
0x00, 0x00, 0x20, 0xD4}; // "brk #0", 0xd4200000 in BE byte order
52-
static const uint8_t g_arm_breakpoint_opcode[] = {
53-
0xFE, 0xDE, 0xFF, 0xE7}; // this armv7 insn also works in arm64
5452

5553
// If we need to set one logical watchpoint by using
5654
// two hardware watchpoint registers, the watchpoint
@@ -79,7 +77,7 @@ DNBArchProtocol *DNBArchMachARM64::Create(MachThread *thread) {
7977

8078
const uint8_t *
8179
DNBArchMachARM64::SoftwareBreakpointOpcode(nub_size_t byte_size) {
82-
return g_arm_breakpoint_opcode;
80+
return g_arm64_breakpoint_opcode;
8381
}
8482

8583
uint32_t DNBArchMachARM64::GetCPUType() { return CPU_TYPE_ARM64; }

0 commit comments

Comments
 (0)