Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-04-04 06:12:19 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[debugserver] Fix ARM64 logs

Browse Source 
DNBArchImplARM64.cpp had a ton of logs referring to DNBArchMachARM and
one log referring to DNBArchMachX86_64. I've changed these all to ARM64.
This commit is contained in:
Alex Langford 2023-03-31 14:42:49 -07:00
parent c9f37c4500
commit d93e1d87fb
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp
View File

@ -486,8 +486,9 @@ void DNBArchMachARM64::ThreadWillResume() {
} }
DisableHardwareWatchpoint(m_watchpoint_hw_index, false); DisableHardwareWatchpoint(m_watchpoint_hw_index, false);
DNBLogThreadedIf(LOG_WATCHPOINTS, "DNBArchMachARM::ThreadWillResume() " DNBLogThreadedIf(LOG_WATCHPOINTS,
"DisableHardwareWatchpoint(%d) called", "DNBArchMachARM64::ThreadWillResume() "
"DisableHardwareWatchpoint(%d) called",
m_watchpoint_hw_index); m_watchpoint_hw_index);
// Enable hardware single step to move past the watchpoint-triggering // Enable hardware single step to move past the watchpoint-triggering
@ -505,12 +506,12 @@ void DNBArchMachARM64::ThreadWillResume() {
// Reset the two watchpoint member variables. // Reset the two watchpoint member variables.
m_watchpoint_did_occur = false; m_watchpoint_did_occur = false;
m_watchpoint_hw_index = -1; m_watchpoint_hw_index = -1;
DNBLogThreadedIf( DNBLogThreadedIf(LOG_WATCHPOINTS, "DNBArchMachARM64::ThreadWillResume()"
LOG_WATCHPOINTS, " failed to enable single step");
"DNBArchMachARM::ThreadWillResume() failed to enable single step");
} else } else
DNBLogThreadedIf(LOG_WATCHPOINTS, "DNBArchMachARM::ThreadWillResume() " DNBLogThreadedIf(LOG_WATCHPOINTS,
"succeeded to enable single step"); "DNBArchMachARM64::ThreadWillResume() "
"succeeded to enable single step");
} }
} }
} }
@ -532,18 +533,20 @@ bool DNBArchMachARM64::NotifyException(MachException::Data &exc) {
// it was too big. If the watchpoint exception is indicating the 2nd half // it was too big. If the watchpoint exception is indicating the 2nd half
// of the two-parter, find the address of the 1st half and report that -- // of the two-parter, find the address of the 1st half and report that --
// that's what lldb is going to expect to see. // that's what lldb is going to expect to see.
DNBLogThreadedIf(LOG_WATCHPOINTS, "DNBArchMachARM::NotifyException " DNBLogThreadedIf(LOG_WATCHPOINTS,
"watchpoint %d was hit on address " "DNBArchMachARM64::NotifyException "
"0x%llx", "watchpoint %d was hit on address "
"0x%llx",
hw_index, (uint64_t)addr); hw_index, (uint64_t)addr);
const uint32_t num_watchpoints = NumSupportedHardwareWatchpoints(); const uint32_t num_watchpoints = NumSupportedHardwareWatchpoints();
for (uint32_t i = 0; i < num_watchpoints; i++) { for (uint32_t i = 0; i < num_watchpoints; i++) {
if (LoHi[i] != 0 && LoHi[i] == hw_index && LoHi[i] != i && if (LoHi[i] != 0 && LoHi[i] == hw_index && LoHi[i] != i &&
GetWatchpointAddressByIndex(i) != INVALID_NUB_ADDRESS) { GetWatchpointAddressByIndex(i) != INVALID_NUB_ADDRESS) {
addr = GetWatchpointAddressByIndex(i); addr = GetWatchpointAddressByIndex(i);
DNBLogThreadedIf(LOG_WATCHPOINTS, "DNBArchMachARM::NotifyException " DNBLogThreadedIf(LOG_WATCHPOINTS,
"It is a linked watchpoint; " "DNBArchMachARM64::NotifyException "
"rewritten to index %d addr 0x%llx", "It is a linked watchpoint; "
"rewritten to index %d addr 0x%llx",
LoHi[i], (uint64_t)addr); LoHi[i], (uint64_t)addr);
} }
} }
@ -1129,11 +1132,11 @@ uint32_t DNBArchMachARM64::GetHardwareWatchpointHit(nub_addr_t &addr) {
nub_addr_t wp_addr = GetWatchAddress(debug_state, i); nub_addr_t wp_addr = GetWatchAddress(debug_state, i);
uint32_t byte_mask = bits(debug_state.__wcr[i], 12, 5); uint32_t byte_mask = bits(debug_state.__wcr[i], 12, 5);
DNBLogThreadedIf(LOG_WATCHPOINTS, "DNBArchImplX86_64::" DNBLogThreadedIf(LOG_WATCHPOINTS,
"DNBArchImplARM64::"
"GetHardwareWatchpointHit() slot: %u " "GetHardwareWatchpointHit() slot: %u "
"(addr = 0x%llx; byte_mask = 0x%x)", "(addr = 0x%llx; byte_mask = 0x%x)",
i, static_cast<uint64_t>(wp_addr), i, static_cast<uint64_t>(wp_addr), byte_mask);
byte_mask);
if (!IsWatchpointEnabled(debug_state, i)) if (!IsWatchpointEnabled(debug_state, i))
continue; continue;