justincohen updated this revision to Diff 330665.
justincohen added a comment.
Move logic to ABIMacOSX_arm64.h
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D98529/new/
https://reviews.llvm.org/D98529
Files:
lldb/source/Plugins/ABI/AArch64/ABIAArch64.cpp
lldb/source/Plugins/ABI/AArch64/ABIAArch64.h
lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.h
Index: lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.h
===================================================================
--- lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.h
+++ lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.h
@@ -62,6 +62,12 @@
return true;
}
+ lldb::addr_t FixCodeAddress(lldb::addr_t pc) override {
+ // Short term workaround to remove any pointer authentication codes. This
+ // should be removed once full PAC support is added.
+ return pc & 0x0000000FFFFFFFFF;
+ }
+
// Static Functions
static void Initialize();
Index: lldb/source/Plugins/ABI/AArch64/ABIAArch64.h
===================================================================
--- lldb/source/Plugins/ABI/AArch64/ABIAArch64.h
+++ lldb/source/Plugins/ABI/AArch64/ABIAArch64.h
@@ -24,8 +24,6 @@
uint32_t GetGenericNum(llvm::StringRef name) override;
- lldb::addr_t FixCodeAddress(lldb::addr_t pc) override;
-
using lldb_private::MCBasedABI::MCBasedABI;
};
#endif
Index: lldb/source/Plugins/ABI/AArch64/ABIAArch64.cpp
===================================================================
--- lldb/source/Plugins/ABI/AArch64/ABIAArch64.cpp
+++ lldb/source/Plugins/ABI/AArch64/ABIAArch64.cpp
@@ -56,9 +56,3 @@
.Case("x7", LLDB_REGNUM_GENERIC_ARG8)
.Default(LLDB_INVALID_REGNUM);
}
-
-lldb::addr_t ABIAArch64::FixCodeAddress(lldb::addr_t pc) {
- // Short term workaround to remove any pointer authentication codes. This
- // should be removed once full PAC support is added.
- return pc & 0x0000000FFFFFFFFF;
-}
Index: lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.h
===================================================================
--- lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.h
+++ lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.h
@@ -62,6 +62,12 @@
return true;
}
+ lldb::addr_t FixCodeAddress(lldb::addr_t pc) override {
+ // Short term workaround to remove any pointer authentication codes. This
+ // should be removed once full PAC support is added.
+ return pc & 0x0000000FFFFFFFFF;
+ }
+
// Static Functions
static void Initialize();
Index: lldb/source/Plugins/ABI/AArch64/ABIAArch64.h
===================================================================
--- lldb/source/Plugins/ABI/AArch64/ABIAArch64.h
+++ lldb/source/Plugins/ABI/AArch64/ABIAArch64.h
@@ -24,8 +24,6 @@
uint32_t GetGenericNum(llvm::StringRef name) override;
- lldb::addr_t FixCodeAddress(lldb::addr_t pc) override;
-
using lldb_private::MCBasedABI::MCBasedABI;
};
#endif
Index: lldb/source/Plugins/ABI/AArch64/ABIAArch64.cpp
===================================================================
--- lldb/source/Plugins/ABI/AArch64/ABIAArch64.cpp
+++ lldb/source/Plugins/ABI/AArch64/ABIAArch64.cpp
@@ -56,9 +56,3 @@
.Case("x7", LLDB_REGNUM_GENERIC_ARG8)
.Default(LLDB_INVALID_REGNUM);
}
-
-lldb::addr_t ABIAArch64::FixCodeAddress(lldb::addr_t pc) {
- // Short term workaround to remove any pointer authentication codes. This
- // should be removed once full PAC support is added.
- return pc & 0x0000000FFFFFFFFF;
-}
_______________________________________________
lldb-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
