Skip to content

Commit a610d45

Browse files
authored
Merge pull request #7006 from apple/cp/log-addressing-bits-changes-trytwo-59
lldb [NFC] Add logging to Process when address masks are updated
2 parents 6cad9c0 + 537d6a7 commit a610d45

File tree

2 files changed

+32
-14
lines changed

2 files changed

+32
-14
lines changed

lldb/include/lldb/Target/Process.h

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1393,21 +1393,11 @@ class Process : public std::enable_shared_from_this<Process>,
13931393
lldb::addr_t GetHighmemCodeAddressMask();
13941394
lldb::addr_t GetHighmemDataAddressMask();
13951395

1396-
void SetCodeAddressMask(lldb::addr_t code_address_mask) {
1397-
m_code_address_mask = code_address_mask;
1398-
}
1399-
1400-
void SetDataAddressMask(lldb::addr_t data_address_mask) {
1401-
m_data_address_mask = data_address_mask;
1402-
}
1396+
void SetCodeAddressMask(lldb::addr_t code_address_mask);
1397+
void SetDataAddressMask(lldb::addr_t data_address_mask);
14031398

1404-
void SetHighmemCodeAddressMask(lldb::addr_t code_address_mask) {
1405-
m_highmem_code_address_mask = code_address_mask;
1406-
}
1407-
1408-
void SetHighmemDataAddressMask(lldb::addr_t data_address_mask) {
1409-
m_highmem_data_address_mask = data_address_mask;
1410-
}
1399+
void SetHighmemCodeAddressMask(lldb::addr_t code_address_mask);
1400+
void SetHighmemDataAddressMask(lldb::addr_t data_address_mask);
14111401

14121402
/// Some targets might use bits in a code address to indicate a mode switch,
14131403
/// ARM uses bit zero to signify a code address is thumb, so any ARM ABI

lldb/source/Target/Process.cpp

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5854,6 +5854,34 @@ lldb::addr_t Process::GetHighmemDataAddressMask() {
58545854
return GetDataAddressMask();
58555855
}
58565856

5857+
void Process::SetCodeAddressMask(lldb::addr_t code_address_mask) {
5858+
Log *log = GetLog(LLDBLog::Process);
5859+
LLDB_LOGF(log, "Setting Process code address mask to 0x%" PRIx64,
5860+
code_address_mask);
5861+
m_code_address_mask = code_address_mask;
5862+
}
5863+
5864+
void Process::SetDataAddressMask(lldb::addr_t data_address_mask) {
5865+
Log *log = GetLog(LLDBLog::Process);
5866+
LLDB_LOGF(log, "Setting Process data address mask to 0x%" PRIx64,
5867+
data_address_mask);
5868+
m_data_address_mask = data_address_mask;
5869+
}
5870+
5871+
void Process::SetHighmemCodeAddressMask(lldb::addr_t code_address_mask) {
5872+
Log *log = GetLog(LLDBLog::Process);
5873+
LLDB_LOGF(log, "Setting Process highmem code address mask to 0x%" PRIx64,
5874+
code_address_mask);
5875+
m_highmem_code_address_mask = code_address_mask;
5876+
}
5877+
5878+
void Process::SetHighmemDataAddressMask(lldb::addr_t data_address_mask) {
5879+
Log *log = GetLog(LLDBLog::Process);
5880+
LLDB_LOGF(log, "Setting Process highmem data address mask to 0x%" PRIx64,
5881+
data_address_mask);
5882+
m_highmem_data_address_mask = data_address_mask;
5883+
}
5884+
58575885
addr_t Process::FixCodeAddress(addr_t addr) {
58585886
if (ABISP abi_sp = GetABI())
58595887
addr = abi_sp->FixCodeAddress(addr);

0 commit comments

Comments
 (0)