Skip to content

[lldb][NFC] Simplify logic in ABIMacOSX_arm64::FixDataAddress #159612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 18, 2025
Merged

[lldb][NFC] Simplify logic in ABIMacOSX_arm64::FixDataAddress #159612

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9214bba
[lldb][NFC] Simplify logic in ABIMacOSX_arm64::FixDataAddress
felipepiovezan Sep 15, 2025
3243ab7
fixup! Reuse code across functions
felipepiovezan Sep 18, 2025
1ce7987
fixup! add comment
felipepiovezan Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 25 additions & 30 deletions lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,42 +757,37 @@ ValueObjectSP ABIMacOSX_arm64::GetReturnValueObjectImpl(
return return_valobj_sp;
}

addr_t ABIMacOSX_arm64::FixCodeAddress(addr_t pc) {
addr_t pac_sign_extension = 0x0080000000000000ULL;
addr_t tbi_mask = 0xff80000000000000ULL;
addr_t mask = 0;

if (ProcessSP process_sp = GetProcessSP()) {
mask = process_sp->GetCodeAddressMask();
if (pc & pac_sign_extension) {
addr_t highmem_mask = process_sp->GetHighmemCodeAddressMask();
if (highmem_mask != LLDB_INVALID_ADDRESS_MASK)
mask = highmem_mask;
}
}
constexpr addr_t tbi_mask = 0xff80000000000000ULL;
constexpr addr_t pac_sign_extension = 0x0080000000000000ULL;

static addr_t DoFixAddr(addr_t addr, bool is_code, ProcessSP process_sp) {
if (!process_sp)
return addr;

addr_t mask = is_code ? process_sp->GetCodeAddressMask()
: process_sp->GetDataAddressMask();
if (mask == LLDB_INVALID_ADDRESS_MASK)
mask = tbi_mask;

return (pc & pac_sign_extension) ? pc | mask : pc & (~mask);
if (addr & pac_sign_extension) {
addr_t highmem_mask = is_code ? process_sp->GetHighmemCodeAddressMask()
: process_sp->GetHighmemCodeAddressMask();
if (highmem_mask != LLDB_INVALID_ADDRESS_MASK)
return addr | highmem_mask;
return addr | mask;
}

return addr & (~mask);
}

addr_t ABIMacOSX_arm64::FixDataAddress(addr_t pc) {
addr_t pac_sign_extension = 0x0080000000000000ULL;
addr_t tbi_mask = 0xff80000000000000ULL;
addr_t mask = 0;

if (ProcessSP process_sp = GetProcessSP()) {
mask = process_sp->GetDataAddressMask();
if (pc & pac_sign_extension) {
addr_t highmem_mask = process_sp->GetHighmemDataAddressMask();
if (highmem_mask != LLDB_INVALID_ADDRESS_MASK)
mask = highmem_mask;
}
}
if (mask == LLDB_INVALID_ADDRESS_MASK)
mask = tbi_mask;
addr_t ABIMacOSX_arm64::FixCodeAddress(addr_t pc) {
ProcessSP process_sp = GetProcessSP();
return DoFixAddr(pc, true /*is_code*/, GetProcessSP());
}

return (pc & pac_sign_extension) ? pc | mask : pc & (~mask);
addr_t ABIMacOSX_arm64::FixDataAddress(addr_t addr) {
ProcessSP process_sp = GetProcessSP();
return DoFixAddr(addr, false /*is_code*/, GetProcessSP());
}

void ABIMacOSX_arm64::Initialize() {
Expand Down
Loading