Author: Emmmer Date: 2022-08-22T18:01:44+08:00 New Revision: 65f6a8c23b5315628c980149be73e692be8e2aa6
URL: https://github.com/llvm/llvm-project/commit/65f6a8c23b5315628c980149be73e692be8e2aa6 DIFF: https://github.com/llvm/llvm-project/commit/65f6a8c23b5315628c980149be73e692be8e2aa6.diff LOG: [LLDB] Fix: make m_target_arch private Using GetTargetArchitecture() instead of m_target_arch, and set m_target_arch to private. Reviewed By: DavidSpickett Differential Revision: https://reviews.llvm.org/D132353 Added: Modified: lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_i386.cpp lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_mips64.cpp lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_powerpc.cpp lldb/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp lldb/source/Plugins/Process/Utility/RegisterContextNetBSD_i386.cpp lldb/source/Plugins/Process/Utility/RegisterContextOpenBSD_i386.cpp lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_s390x.cpp lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_x86.cpp lldb/source/Plugins/Process/Utility/RegisterInfoInterface.h Removed: ################################################################################ diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_i386.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_i386.cpp index acebe9d535687..df6a82c11255e 100644 --- a/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_i386.cpp +++ b/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_i386.cpp @@ -68,7 +68,7 @@ RegisterContextFreeBSD_i386::RegisterContextFreeBSD_i386( size_t RegisterContextFreeBSD_i386::GetGPRSize() const { return sizeof(GPR); } const RegisterInfo *RegisterContextFreeBSD_i386::GetRegisterInfo() const { - switch (m_target_arch.GetMachine()) { + switch (GetTargetArchitecture().GetMachine()) { case llvm::Triple::x86: return g_register_infos_i386; default: diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_mips64.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_mips64.cpp index 7b4c7be21f747..1f52c09df12e7 100644 --- a/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_mips64.cpp +++ b/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_mips64.cpp @@ -169,7 +169,7 @@ size_t RegisterContextFreeBSD_mips64::GetRegisterSetCount() const { } const RegisterInfo *RegisterContextFreeBSD_mips64::GetRegisterInfo() const { - assert(m_target_arch.GetCore() == ArchSpec::eCore_mips64); + assert(GetTargetArchitecture().GetCore() == ArchSpec::eCore_mips64); return g_register_infos_mips64; } diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_powerpc.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_powerpc.cpp index 2991bd3c5f2cf..d8dfa434335be 100644 --- a/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_powerpc.cpp +++ b/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_powerpc.cpp @@ -186,7 +186,6 @@ size_t RegisterContextFreeBSD_powerpc::GetGPRSize() const { } const RegisterInfo *RegisterContextFreeBSD_powerpc::GetRegisterInfo() const { - // assert (m_target_arch.GetCore() == ArchSpec::eCore_powerpc); llvm_unreachable("Abstract class!"); return nullptr; } @@ -204,7 +203,6 @@ size_t RegisterContextFreeBSD_powerpc32::GetGPRSize() const { } const RegisterInfo *RegisterContextFreeBSD_powerpc32::GetRegisterInfo() const { - // assert (m_target_arch.GetCore() == ArchSpec::eCore_powerpc); return g_register_infos_powerpc32; } @@ -224,8 +222,7 @@ size_t RegisterContextFreeBSD_powerpc64::GetGPRSize() const { } const RegisterInfo *RegisterContextFreeBSD_powerpc64::GetRegisterInfo() const { - // assert (m_target_arch.GetCore() == ArchSpec::eCore_powerpc); - if (m_target_arch.GetMachine() == llvm::Triple::ppc) + if (GetTargetArchitecture().GetMachine() == llvm::Triple::ppc) return g_register_infos_powerpc64_32; return g_register_infos_powerpc64; } diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp index bb3bb01bdf02c..0b3953e1ec2c1 100644 --- a/lldb/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp +++ b/lldb/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp @@ -107,7 +107,7 @@ RegisterContextLinux_i386::RegisterContextLinux_i386( size_t RegisterContextLinux_i386::GetGPRSizeStatic() { return sizeof(GPR); } const RegisterInfo *RegisterContextLinux_i386::GetRegisterInfo() const { - switch (m_target_arch.GetMachine()) { + switch (GetTargetArchitecture().GetMachine()) { case llvm::Triple::x86: case llvm::Triple::x86_64: return g_register_infos_i386; diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextNetBSD_i386.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextNetBSD_i386.cpp index bd7830e42b42a..ba089190bd220 100644 --- a/lldb/source/Plugins/Process/Utility/RegisterContextNetBSD_i386.cpp +++ b/lldb/source/Plugins/Process/Utility/RegisterContextNetBSD_i386.cpp @@ -80,7 +80,7 @@ RegisterContextNetBSD_i386::RegisterContextNetBSD_i386( size_t RegisterContextNetBSD_i386::GetGPRSize() const { return sizeof(GPR); } const RegisterInfo *RegisterContextNetBSD_i386::GetRegisterInfo() const { - switch (m_target_arch.GetMachine()) { + switch (GetTargetArchitecture().GetMachine()) { case llvm::Triple::x86: case llvm::Triple::x86_64: return g_register_infos_i386; diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextOpenBSD_i386.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextOpenBSD_i386.cpp index 7183ffcfd0f62..ddf6cc5c3c65b 100644 --- a/lldb/source/Plugins/Process/Utility/RegisterContextOpenBSD_i386.cpp +++ b/lldb/source/Plugins/Process/Utility/RegisterContextOpenBSD_i386.cpp @@ -62,7 +62,7 @@ RegisterContextOpenBSD_i386::RegisterContextOpenBSD_i386( size_t RegisterContextOpenBSD_i386::GetGPRSize() const { return sizeof(GPR); } const RegisterInfo *RegisterContextOpenBSD_i386::GetRegisterInfo() const { - switch (m_target_arch.GetMachine()) { + switch (GetTargetArchitecture().GetMachine()) { case llvm::Triple::x86: return g_register_infos_i386; default: diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_s390x.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_s390x.cpp index 21c8160e5b412..b85da39b4c45c 100644 --- a/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_s390x.cpp +++ b/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_s390x.cpp @@ -83,7 +83,7 @@ RegisterContextPOSIX_s390x::RegisterContextPOSIX_s390x( : RegisterContext(thread, concrete_frame_idx) { m_register_info_up.reset(register_info); - switch (register_info->m_target_arch.GetMachine()) { + switch (register_info->GetTargetArchitecture().GetMachine()) { case llvm::Triple::systemz: m_reg_info.num_registers = k_num_registers_s390x; m_reg_info.num_gpr_registers = k_num_gpr_registers_s390x; @@ -151,7 +151,7 @@ size_t RegisterContextPOSIX_s390x::GetRegisterSetCount() { const RegisterSet *RegisterContextPOSIX_s390x::GetRegisterSet(size_t set) { if (IsRegisterSetAvailable(set)) { - switch (m_register_info_up->m_target_arch.GetMachine()) { + switch (m_register_info_up->GetTargetArchitecture().GetMachine()) { case llvm::Triple::systemz: return &g_reg_sets_s390x[set]; default: diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_x86.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_x86.cpp index 40f70e8a0a75f..0e0db843c8b45 100644 --- a/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_x86.cpp +++ b/lldb/source/Plugins/Process/Utility/RegisterContextPOSIX_x86.cpp @@ -399,7 +399,7 @@ RegisterContextPOSIX_x86::RegisterContextPOSIX_x86( : RegisterContext(thread, concrete_frame_idx) { m_register_info_up.reset(register_info); - switch (register_info->m_target_arch.GetMachine()) { + switch (register_info->GetTargetArchitecture().GetMachine()) { case llvm::Triple::x86: m_reg_info.num_registers = k_num_registers_i386; m_reg_info.num_gpr_registers = k_num_gpr_registers_i386; @@ -518,7 +518,7 @@ size_t RegisterContextPOSIX_x86::GetRegisterSetCount() { const RegisterSet *RegisterContextPOSIX_x86::GetRegisterSet(size_t set) { if (IsRegisterSetAvailable(set)) { - switch (m_register_info_up->m_target_arch.GetMachine()) { + switch (m_register_info_up->GetTargetArchitecture().GetMachine()) { case llvm::Triple::x86: return &g_reg_sets_i386[set]; case llvm::Triple::x86_64: diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfoInterface.h b/lldb/source/Plugins/Process/Utility/RegisterInfoInterface.h index c05438338c883..d8414c594d246 100644 --- a/lldb/source/Plugins/Process/Utility/RegisterInfoInterface.h +++ b/lldb/source/Plugins/Process/Utility/RegisterInfoInterface.h @@ -61,9 +61,9 @@ class RegisterInfoInterface { return nullptr; } - // FIXME make private. +private: lldb_private::ArchSpec m_target_arch; }; -} +} // namespace lldb_private #endif _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
