[Lldb-commits] [lldb] d93e1d8 - [debugserver] Fix ARM64 logs
Alex Langford via lldb-commits
lldb-commits at lists.llvm.org
Fri Mar 31 14:44:59 PDT 2023
Author: Alex Langford
Date: 2023-03-31T14:44:23-07:00
New Revision: d93e1d87fb6578c104a0163a051280863e644d57
URL: https://github.com/llvm/llvm-project/commit/d93e1d87fb6578c104a0163a051280863e644d57
DIFF: https://github.com/llvm/llvm-project/commit/d93e1d87fb6578c104a0163a051280863e644d57.diff
LOG: [debugserver] Fix ARM64 logs
DNBArchImplARM64.cpp had a ton of logs referring to DNBArchMachARM and
one log referring to DNBArchMachX86_64. I've changed these all to ARM64.
Added:
Modified:
lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp
Removed:
################################################################################
diff --git a/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp b/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp
index c195a145c3be4..583417bbb01d1 100644
--- a/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp
+++ b/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp
@@ -486,8 +486,9 @@ void DNBArchMachARM64::ThreadWillResume() {
}
DisableHardwareWatchpoint(m_watchpoint_hw_index, false);
- DNBLogThreadedIf(LOG_WATCHPOINTS, "DNBArchMachARM::ThreadWillResume() "
- "DisableHardwareWatchpoint(%d) called",
+ DNBLogThreadedIf(LOG_WATCHPOINTS,
+ "DNBArchMachARM64::ThreadWillResume() "
+ "DisableHardwareWatchpoint(%d) called",
m_watchpoint_hw_index);
// Enable hardware single step to move past the watchpoint-triggering
@@ -505,12 +506,12 @@ void DNBArchMachARM64::ThreadWillResume() {
// Reset the two watchpoint member variables.
m_watchpoint_did_occur = false;
m_watchpoint_hw_index = -1;
- DNBLogThreadedIf(
- LOG_WATCHPOINTS,
- "DNBArchMachARM::ThreadWillResume() failed to enable single step");
+ DNBLogThreadedIf(LOG_WATCHPOINTS, "DNBArchMachARM64::ThreadWillResume()"
+ " failed to enable single step");
} else
- DNBLogThreadedIf(LOG_WATCHPOINTS, "DNBArchMachARM::ThreadWillResume() "
- "succeeded to enable single step");
+ DNBLogThreadedIf(LOG_WATCHPOINTS,
+ "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
// of the two-parter, find the address of the 1st half and report that --
// that's what lldb is going to expect to see.
- DNBLogThreadedIf(LOG_WATCHPOINTS, "DNBArchMachARM::NotifyException "
- "watchpoint %d was hit on address "
- "0x%llx",
+ DNBLogThreadedIf(LOG_WATCHPOINTS,
+ "DNBArchMachARM64::NotifyException "
+ "watchpoint %d was hit on address "
+ "0x%llx",
hw_index, (uint64_t)addr);
const uint32_t num_watchpoints = NumSupportedHardwareWatchpoints();
for (uint32_t i = 0; i < num_watchpoints; i++) {
if (LoHi[i] != 0 && LoHi[i] == hw_index && LoHi[i] != i &&
GetWatchpointAddressByIndex(i) != INVALID_NUB_ADDRESS) {
addr = GetWatchpointAddressByIndex(i);
- DNBLogThreadedIf(LOG_WATCHPOINTS, "DNBArchMachARM::NotifyException "
- "It is a linked watchpoint; "
- "rewritten to index %d addr 0x%llx",
+ DNBLogThreadedIf(LOG_WATCHPOINTS,
+ "DNBArchMachARM64::NotifyException "
+ "It is a linked watchpoint; "
+ "rewritten to index %d addr 0x%llx",
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);
uint32_t byte_mask = bits(debug_state.__wcr[i], 12, 5);
- DNBLogThreadedIf(LOG_WATCHPOINTS, "DNBArchImplX86_64::"
+ DNBLogThreadedIf(LOG_WATCHPOINTS,
+ "DNBArchImplARM64::"
"GetHardwareWatchpointHit() slot: %u "
"(addr = 0x%llx; byte_mask = 0x%x)",
- i, static_cast<uint64_t>(wp_addr),
- byte_mask);
+ i, static_cast<uint64_t>(wp_addr), byte_mask);
if (!IsWatchpointEnabled(debug_state, i))
continue;
More information about the lldb-commits
mailing list