jasonmolenda created this revision.
jasonmolenda added a reviewer: JDevlieghere.
jasonmolenda added a project: LLDB.
Herald added a subscriber: kristof.beyls.
Herald added a project: All.
jasonmolenda requested review of this revision.
Herald added a subscriber: lldb-commits.
Right now to clear unaddressable bits (AArch64 TBI or ptrauth, armv7 0th bit
setting for arm/thumb) everyone needs to take a Process, get the ABI, then call
the method. As David and I had discussed in another patch, this is unnecessary
friction that should be simplified.
This patch adds those same methods to Process, so the callers can skip the
extra step of getting the ABI when working with these values.
I'm only adding the Process methods in this patch, leaving all the existing
callers as-is, I'll look at updating those separately, but new users can start
using these methods once they're in place.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D152863
Files:
lldb/include/lldb/Target/Process.h
lldb/source/Target/Process.cpp
Index: lldb/source/Target/Process.cpp
===================================================================
--- lldb/source/Target/Process.cpp
+++ lldb/source/Target/Process.cpp
@@ -5688,6 +5688,24 @@
return GetDataAddressMask();
}
+addr_t Process::FixCodeAddress(addr_t addr) {
+ if (ABISP abi_sp = GetABI())
+ addr = abi_sp->FixCodeAddress(addr);
+ return addr;
+}
+
+addr_t Process::FixDataAddress(addr_t addr) {
+ if (ABISP abi_sp = GetABI())
+ addr = abi_sp->FixDataAddress(addr);
+ return addr;
+}
+
+addr_t Process::FixAnyAddress(addr_t addr) {
+ if (ABISP abi_sp = GetABI())
+ addr = abi_sp->FixAnyAddress(addr);
+ return addr;
+}
+
void Process::DidExec() {
Log *log = GetLog(LLDBLog::Process);
LLDB_LOGF(log, "Process::%s()", __FUNCTION__);
Index: lldb/include/lldb/Target/Process.h
===================================================================
--- lldb/include/lldb/Target/Process.h
+++ lldb/include/lldb/Target/Process.h
@@ -1392,6 +1392,22 @@
m_highmem_data_address_mask = data_address_mask;
}
+ /// Some targets might use bits in a code address to indicate a mode switch,
+ /// ARM uses bit zero to signify a code address is thumb, so any ARM ABI
+ /// plug-ins would strip those bits.
+ /// Or use the high bits to authenticate a pointer value.
+ lldb::addr_t FixCodeAddress(lldb::addr_t pc);
+ lldb::addr_t FixDataAddress(lldb::addr_t pc);
+
+ /// Use this method when you do not know, or do not care what kind of address
+ /// you are fixing. On platforms where there would be a difference between
the
+ /// two types, it will pick the safest option.
+ ///
+ /// Its purpose is to signal that no specific choice was made and provide an
+ /// alternative to randomly picking FixCode/FixData address. Which could
break
+ /// platforms where there is a difference (only Arm Thumb at this time).
+ lldb::addr_t FixAnyAddress(lldb::addr_t pc);
+
/// Get the Modification ID of the process.
///
/// \return
Index: lldb/source/Target/Process.cpp
===================================================================
--- lldb/source/Target/Process.cpp
+++ lldb/source/Target/Process.cpp
@@ -5688,6 +5688,24 @@
return GetDataAddressMask();
}
+addr_t Process::FixCodeAddress(addr_t addr) {
+ if (ABISP abi_sp = GetABI())
+ addr = abi_sp->FixCodeAddress(addr);
+ return addr;
+}
+
+addr_t Process::FixDataAddress(addr_t addr) {
+ if (ABISP abi_sp = GetABI())
+ addr = abi_sp->FixDataAddress(addr);
+ return addr;
+}
+
+addr_t Process::FixAnyAddress(addr_t addr) {
+ if (ABISP abi_sp = GetABI())
+ addr = abi_sp->FixAnyAddress(addr);
+ return addr;
+}
+
void Process::DidExec() {
Log *log = GetLog(LLDBLog::Process);
LLDB_LOGF(log, "Process::%s()", __FUNCTION__);
Index: lldb/include/lldb/Target/Process.h
===================================================================
--- lldb/include/lldb/Target/Process.h
+++ lldb/include/lldb/Target/Process.h
@@ -1392,6 +1392,22 @@
m_highmem_data_address_mask = data_address_mask;
}
+ /// Some targets might use bits in a code address to indicate a mode switch,
+ /// ARM uses bit zero to signify a code address is thumb, so any ARM ABI
+ /// plug-ins would strip those bits.
+ /// Or use the high bits to authenticate a pointer value.
+ lldb::addr_t FixCodeAddress(lldb::addr_t pc);
+ lldb::addr_t FixDataAddress(lldb::addr_t pc);
+
+ /// Use this method when you do not know, or do not care what kind of address
+ /// you are fixing. On platforms where there would be a difference between the
+ /// two types, it will pick the safest option.
+ ///
+ /// Its purpose is to signal that no specific choice was made and provide an
+ /// alternative to randomly picking FixCode/FixData address. Which could break
+ /// platforms where there is a difference (only Arm Thumb at this time).
+ lldb::addr_t FixAnyAddress(lldb::addr_t pc);
+
/// Get the Modification ID of the process.
///
/// \return
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
