Skip to content

Commit b1ebed5

Browse files
authored
Merge pull request #7983 from jasonmolenda/r120926000-correctly-use-high-memory-process-plugin-address-masks
Return high address masks correctly in Process (llvm#78379)
2 parents 367a230 + 6863992 commit b1ebed5

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

lldb/source/Target/Process.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5850,12 +5850,16 @@ lldb::addr_t Process::GetDataAddressMask() {
58505850
lldb::addr_t Process::GetHighmemCodeAddressMask() {
58515851
if (uint32_t num_bits_setting = GetHighmemVirtualAddressableBits())
58525852
return ~((1ULL << num_bits_setting) - 1);
5853+
if (m_highmem_code_address_mask)
5854+
return m_highmem_code_address_mask;
58535855
return GetCodeAddressMask();
58545856
}
58555857

58565858
lldb::addr_t Process::GetHighmemDataAddressMask() {
58575859
if (uint32_t num_bits_setting = GetHighmemVirtualAddressableBits())
58585860
return ~((1ULL << num_bits_setting) - 1);
5861+
if (m_highmem_data_address_mask)
5862+
return m_highmem_data_address_mask;
58595863
return GetDataAddressMask();
58605864
}
58615865

0 commit comments

Comments
 (0)