From fdebaf769010c566ad3050b20894e9a3b0d4510d Mon Sep 17 00:00:00 2001 From: Jason Molenda Date: Thu, 10 Oct 2019 00:12:05 +0000 Subject: 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. git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@374264 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp b/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp index 8856e9219..1bf14d970 100644 --- a/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp +++ b/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp @@ -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::Create(MachThread *thread) { 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; } -- cgit v1.2.3