[Lldb-commits] [lldb] Make the target's SectionLoadList private. (PR #113278)
Greg Clayton via lldb-commits
lldb-commits at lists.llvm.org
Tue Oct 22 01:24:13 PDT 2024
https://github.com/clayborg created https://github.com/llvm/llvm-project/pull/113278
Lots of code around LLDB was directly accessing the target's section load list. This NFC patch makes the section load list private to the Target class can access it, but everyone else now uses accessor functions. This allows us to control the resolving of addresses and will allow for functionality in LLDB which can lazily resolve addresses in JIT plug-ins with a future patch.
>From 851ee7a3fd4f1ae294f3e0baaf0944caeadb7d05 Mon Sep 17 00:00:00 2001
From: Greg Clayton <clayborg at gmail.com>
Date: Tue, 22 Oct 2024 01:16:40 -0700
Subject: [PATCH] Make the target's SectionLoadList private.
Lots of code around LLDB was directly accessing the target's section load list. This NFC patch makes the section load list private to the Target class can access it, but everyone else now uses accessor functions. This allows us to control the resolving of addresses and will allow for functionality in LLDB which can lazily resolve addresses in JIT plug-ins with a future patch.
---
lldb/include/lldb/Target/Target.h | 15 ++++++++++++---
lldb/source/API/SBBreakpoint.cpp | 4 ++--
.../Breakpoint/BreakpointLocationList.cpp | 3 +--
.../Commands/CommandObjectDisassemble.cpp | 6 +++---
lldb/source/Commands/CommandObjectRegister.cpp | 4 ++--
lldb/source/Commands/CommandObjectSource.cpp | 9 ++++-----
lldb/source/Commands/CommandObjectTarget.cpp | 15 +++++++--------
lldb/source/Core/Address.cpp | 8 +++-----
lldb/source/Core/Disassembler.cpp | 6 +-----
lldb/source/Core/DumpDataExtractor.cpp | 10 ++++------
lldb/source/Core/FormatEntity.cpp | 2 +-
lldb/source/Core/Section.cpp | 4 ++--
lldb/source/Core/Value.cpp | 5 ++---
.../DataFormatters/CXXFunctionPointer.cpp | 5 ++---
lldb/source/Expression/ObjectFileJIT.cpp | 4 ++--
.../Architecture/Mips/ArchitectureMips.cpp | 3 +--
.../Disassembler/LLVMC/DisassemblerLLVMC.cpp | 6 +++---
.../MacOSX-DYLD/DynamicLoaderMacOS.cpp | 2 +-
.../Static/DynamicLoaderStatic.cpp | 4 ++--
.../TSan/InstrumentationRuntimeTSan.cpp | 9 +++------
.../Plugins/JITLoader/GDB/JITLoaderGDB.cpp | 2 +-
.../CPlusPlus/CPPLanguageRuntime.cpp | 18 ++++++++----------
.../Plugins/ObjectFile/ELF/ObjectFileELF.cpp | 3 +--
.../ObjectFile/Mach-O/ObjectFileMachO.cpp | 10 +++++-----
.../ObjectFile/PECOFF/ObjectFilePECOFF.cpp | 2 +-
.../Placeholder/ObjectFilePlaceholder.cpp | 3 +--
.../Process/minidump/ProcessMinidump.cpp | 4 ++--
.../Trace/intel-pt/TraceIntelPTBundleSaver.cpp | 2 +-
lldb/source/Symbol/ObjectFile.cpp | 3 +--
lldb/source/Target/ProcessTrace.cpp | 2 +-
lldb/source/Target/Target.cpp | 14 ++++++++++++++
lldb/source/Target/ThreadPlanStepInRange.cpp | 3 +--
lldb/source/Target/ThreadPlanTracer.cpp | 3 +--
33 files changed, 96 insertions(+), 97 deletions(-)
diff --git a/lldb/include/lldb/Target/Target.h b/lldb/include/lldb/Target/Target.h
index e4848f19e64d62..5f43b4f5060d0a 100644
--- a/lldb/include/lldb/Target/Target.h
+++ b/lldb/include/lldb/Target/Target.h
@@ -1140,9 +1140,14 @@ class Target : public std::enable_shared_from_this<Target>,
Address &pointer_addr,
bool force_live_memory = false);
- SectionLoadList &GetSectionLoadList() {
- return m_section_load_history.GetCurrentSectionLoadList();
- }
+
+ bool SectionLoadListIsEmpty() const;
+
+ lldb::addr_t GetSectionLoadAddress(const lldb::SectionSP §ion_sp);
+
+ void ClearSectionLoadList();
+
+ void DumpSectionLoadList(Stream &s);
static Target *GetTargetFromContexts(const ExecutionContext *exe_ctx_ptr,
const SymbolContext *sc_ptr);
@@ -1653,6 +1658,10 @@ class Target : public std::enable_shared_from_this<Target>,
Target(const Target &) = delete;
const Target &operator=(const Target &) = delete;
+
+ SectionLoadList &GetSectionLoadList() {
+ return m_section_load_history.GetCurrentSectionLoadList();
+ }
};
} // namespace lldb_private
diff --git a/lldb/source/API/SBBreakpoint.cpp b/lldb/source/API/SBBreakpoint.cpp
index b2ed034d19983c..87fadbcec4f26b 100644
--- a/lldb/source/API/SBBreakpoint.cpp
+++ b/lldb/source/API/SBBreakpoint.cpp
@@ -137,7 +137,7 @@ SBBreakpointLocation SBBreakpoint::FindLocationByAddress(addr_t vm_addr) {
bkpt_sp->GetTarget().GetAPIMutex());
Address address;
Target &target = bkpt_sp->GetTarget();
- if (!target.GetSectionLoadList().ResolveLoadAddress(vm_addr, address)) {
+ if (!target.ResolveLoadAddress(vm_addr, address)) {
address.SetRawAddress(vm_addr);
}
sb_bp_location.SetLocation(bkpt_sp->FindLocationByAddress(address));
@@ -157,7 +157,7 @@ break_id_t SBBreakpoint::FindLocationIDByAddress(addr_t vm_addr) {
bkpt_sp->GetTarget().GetAPIMutex());
Address address;
Target &target = bkpt_sp->GetTarget();
- if (!target.GetSectionLoadList().ResolveLoadAddress(vm_addr, address)) {
+ if (!target.ResolveLoadAddress(vm_addr, address)) {
address.SetRawAddress(vm_addr);
}
break_id = bkpt_sp->FindLocationIDByAddress(address);
diff --git a/lldb/source/Breakpoint/BreakpointLocationList.cpp b/lldb/source/Breakpoint/BreakpointLocationList.cpp
index e0f1b9b2c80883..0240305d6f2920 100644
--- a/lldb/source/Breakpoint/BreakpointLocationList.cpp
+++ b/lldb/source/Breakpoint/BreakpointLocationList.cpp
@@ -103,8 +103,7 @@ BreakpointLocationList::FindByAddress(const Address &addr) const {
so_addr = addr;
} else {
// Try and resolve as a load address if possible.
- m_owner.GetTarget().GetSectionLoadList().ResolveLoadAddress(
- addr.GetOffset(), so_addr);
+ m_owner.GetTarget().ResolveLoadAddress(addr.GetOffset(), so_addr);
if (!so_addr.IsValid()) {
// The address didn't resolve, so just set to passed in addr.
so_addr = addr;
diff --git a/lldb/source/Commands/CommandObjectDisassemble.cpp b/lldb/source/Commands/CommandObjectDisassemble.cpp
index 250f849ac04c55..22b29b1e8a8cdf 100644
--- a/lldb/source/Commands/CommandObjectDisassemble.cpp
+++ b/lldb/source/Commands/CommandObjectDisassemble.cpp
@@ -254,10 +254,10 @@ CommandObjectDisassemble::GetContainingAddressRanges() {
};
Target &target = GetTarget();
- if (!target.GetSectionLoadList().IsEmpty()) {
+ if (!target.SectionLoadListIsEmpty()) {
Address symbol_containing_address;
- if (target.GetSectionLoadList().ResolveLoadAddress(
- m_options.symbol_containing_addr, symbol_containing_address)) {
+ if (target.ResolveLoadAddress(m_options.symbol_containing_addr,
+ symbol_containing_address)) {
get_range(symbol_containing_address);
}
} else {
diff --git a/lldb/source/Commands/CommandObjectRegister.cpp b/lldb/source/Commands/CommandObjectRegister.cpp
index 4e047ccbc10b92..cb53d7c21b8cd9 100644
--- a/lldb/source/Commands/CommandObjectRegister.cpp
+++ b/lldb/source/Commands/CommandObjectRegister.cpp
@@ -95,8 +95,8 @@ class CommandObjectRegisterRead : public CommandObjectParsed {
addr_t reg_addr = reg_value.GetAsUInt64(LLDB_INVALID_ADDRESS);
if (reg_addr != LLDB_INVALID_ADDRESS) {
Address so_reg_addr;
- if (exe_ctx.GetTargetRef().GetSectionLoadList().ResolveLoadAddress(
- reg_addr, so_reg_addr)) {
+ if (exe_ctx.GetTargetRef().ResolveLoadAddress(reg_addr,
+ so_reg_addr)) {
strm.PutCString(" ");
so_reg_addr.Dump(&strm, exe_ctx.GetBestExecutionContextScope(),
Address::DumpStyleResolvedDescription);
diff --git a/lldb/source/Commands/CommandObjectSource.cpp b/lldb/source/Commands/CommandObjectSource.cpp
index 86c090f9f36c16..5a3b8c49f1cf33 100644
--- a/lldb/source/Commands/CommandObjectSource.cpp
+++ b/lldb/source/Commands/CommandObjectSource.cpp
@@ -302,7 +302,7 @@ class CommandObjectSourceInfo : public CommandObjectParsed {
size_t num_matches = 0;
assert(module_list.GetSize() > 0);
Target &target = GetTarget();
- if (target.GetSectionLoadList().IsEmpty()) {
+ if (target.SectionLoadListIsEmpty()) {
// The target isn't loaded yet, we need to lookup the file address in all
// modules. Note: the module list option does not apply to addresses.
const size_t num_modules = module_list.GetSize();
@@ -328,7 +328,7 @@ class CommandObjectSourceInfo : public CommandObjectParsed {
} else {
// The target has some things loaded, resolve this address to a compile
// unit + file + line and display
- if (target.GetSectionLoadList().ResolveLoadAddress(addr, so_addr)) {
+ if (target.ResolveLoadAddress(addr, so_addr)) {
ModuleSP module_sp(so_addr.GetModule());
// Check to make sure this module is in our list.
if (module_sp && module_list.GetIndexForModule(module_sp.get()) !=
@@ -961,7 +961,7 @@ class CommandObjectSourceList : public CommandObjectParsed {
StreamString error_strm;
SymbolContextList sc_list;
- if (target.GetSectionLoadList().IsEmpty()) {
+ if (target.SectionLoadListIsEmpty()) {
// The target isn't loaded yet, we need to lookup the file address in
// all modules
const ModuleList &module_list = target.GetImages();
@@ -989,8 +989,7 @@ class CommandObjectSourceList : public CommandObjectParsed {
} else {
// The target has some things loaded, resolve this address to a compile
// unit + file + line and display
- if (target.GetSectionLoadList().ResolveLoadAddress(m_options.address,
- so_addr)) {
+ if (target.ResolveLoadAddress(m_options.address, so_addr)) {
ModuleSP module_sp(so_addr.GetModule());
if (module_sp) {
SymbolContext sc;
diff --git a/lldb/source/Commands/CommandObjectTarget.cpp b/lldb/source/Commands/CommandObjectTarget.cpp
index e950fb346c253b..3642d22a9b644e 100644
--- a/lldb/source/Commands/CommandObjectTarget.cpp
+++ b/lldb/source/Commands/CommandObjectTarget.cpp
@@ -1522,8 +1522,8 @@ static bool LookupAddressInModule(CommandInterpreter &interpreter, Stream &strm,
Address so_addr;
SymbolContext sc;
Target *target = interpreter.GetExecutionContext().GetTargetPtr();
- if (target && !target->GetSectionLoadList().IsEmpty()) {
- if (!target->GetSectionLoadList().ResolveLoadAddress(addr, so_addr))
+ if (target && !target->SectionLoadListIsEmpty()) {
+ if (!target->ResolveLoadAddress(addr, so_addr))
return false;
else if (so_addr.GetModule().get() != module)
return false;
@@ -2974,8 +2974,8 @@ class CommandObjectTargetModulesLoad
sect_name);
break;
} else {
- if (target.GetSectionLoadList().SetSectionLoadAddress(
- section_sp, load_addr))
+ if (target.SetSectionLoadAddress(section_sp,
+ load_addr))
changed = true;
result.AppendMessageWithFormat(
"section '%s' loaded at 0x%" PRIx64 "\n",
@@ -3329,7 +3329,7 @@ class CommandObjectTargetModulesList : public CommandObjectParsed {
if (objfile) {
Address base_addr(objfile->GetBaseAddress());
if (base_addr.IsValid()) {
- if (!target.GetSectionLoadList().IsEmpty()) {
+ if (!target.SectionLoadListIsEmpty()) {
lldb::addr_t load_addr = base_addr.GetLoadAddress(&target);
if (load_addr == LLDB_INVALID_ADDRESS) {
base_addr.Dump(&strm, &target,
@@ -3544,8 +3544,7 @@ class CommandObjectTargetModulesShowUnwind : public CommandObjectParsed {
function_options, sc_list);
} else if (m_options.m_type == eLookupTypeAddress && target) {
Address addr;
- if (target->GetSectionLoadList().ResolveLoadAddress(m_options.m_addr,
- addr)) {
+ if (target->ResolveLoadAddress(m_options.m_addr, addr)) {
SymbolContext sc;
ModuleSP module_sp(addr.GetModule());
module_sp->ResolveSymbolContextForAddress(addr,
@@ -5270,7 +5269,7 @@ class CommandObjectTargetDumpSectionLoadList : public CommandObjectParsed {
protected:
void DoExecute(Args &command, CommandReturnObject &result) override {
Target &target = GetTarget();
- target.GetSectionLoadList().Dump(result.GetOutputStream(), &target);
+ target.DumpSectionLoadList(result.GetOutputStream());
result.SetStatus(eReturnStatusSuccessFinishResult);
}
};
diff --git a/lldb/source/Core/Address.cpp b/lldb/source/Core/Address.cpp
index 5a4751bd5256eb..e8363f0a7c077e 100644
--- a/lldb/source/Core/Address.cpp
+++ b/lldb/source/Core/Address.cpp
@@ -138,9 +138,8 @@ static bool ReadAddress(ExecutionContextScope *exe_scope,
// If we have any sections that are loaded, try and resolve using the
// section load list
Target *target = exe_ctx.GetTargetPtr();
- if (target && !target->GetSectionLoadList().IsEmpty()) {
- if (target->GetSectionLoadList().ResolveLoadAddress(deref_addr,
- deref_so_addr))
+ if (target && !target->SectionLoadListIsEmpty()) {
+ if (target->ResolveLoadAddress(deref_addr, deref_so_addr))
return true;
} else {
// If we were not running, yet able to read an integer, we must have a
@@ -1046,8 +1045,7 @@ AddressClass Address::GetAddressClass() const {
bool Address::SetLoadAddress(lldb::addr_t load_addr, Target *target,
bool allow_section_end) {
- if (target && target->GetSectionLoadList().ResolveLoadAddress(
- load_addr, *this, allow_section_end))
+ if (target && target->ResolveLoadAddress(load_addr, *this, allow_section_end))
return true;
m_section_wp.reset();
m_offset = load_addr;
diff --git a/lldb/source/Core/Disassembler.cpp b/lldb/source/Core/Disassembler.cpp
index d071e3bfe4f77d..6c4f43ca06b6d0 100644
--- a/lldb/source/Core/Disassembler.cpp
+++ b/lldb/source/Core/Disassembler.cpp
@@ -102,11 +102,7 @@ static Address ResolveAddress(Target &target, const Address &addr) {
Address resolved_addr;
// If we weren't passed in a section offset address range, try and resolve
// it to something
- bool is_resolved = target.GetSectionLoadList().IsEmpty()
- ? target.GetImages().ResolveFileAddress(
- addr.GetOffset(), resolved_addr)
- : target.GetSectionLoadList().ResolveLoadAddress(
- addr.GetOffset(), resolved_addr);
+ bool is_resolved = target.SectionLoadListIsEmpty() ? target.GetImages().ResolveFileAddress(addr.GetOffset(), resolved_addr) : target.ResolveLoadAddress(addr.GetOffset(), resolved_addr);
// We weren't able to resolve the address, just treat it as a raw address
if (is_resolved && resolved_addr.IsValid())
diff --git a/lldb/source/Core/DumpDataExtractor.cpp b/lldb/source/Core/DumpDataExtractor.cpp
index 826edd7bab046e..d02ee63aeefa85 100644
--- a/lldb/source/Core/DumpDataExtractor.cpp
+++ b/lldb/source/Core/DumpDataExtractor.cpp
@@ -135,10 +135,10 @@ static lldb::offset_t DumpInstructions(const DataExtractor &DE, Stream *s,
lldb::addr_t addr = base_addr + start_offset;
lldb_private::Address so_addr;
bool data_from_file = true;
- if (target_sp->GetSectionLoadList().ResolveLoadAddress(addr, so_addr)) {
+ if (target_sp->ResolveLoadAddress(addr, so_addr)) {
data_from_file = false;
} else {
- if (target_sp->GetSectionLoadList().IsEmpty() ||
+ if (target_sp->SectionLoadListIsEmpty() ||
!target_sp->GetImages().ResolveFileAddress(addr, so_addr))
so_addr.SetRawAddress(addr);
}
@@ -706,8 +706,7 @@ lldb::offset_t lldb_private::DumpDataExtractor(
TargetSP target_sp(exe_scope->CalculateTarget());
lldb_private::Address so_addr;
if (target_sp) {
- if (target_sp->GetSectionLoadList().ResolveLoadAddress(addr,
- so_addr)) {
+ if (target_sp->ResolveLoadAddress(addr, so_addr)) {
s->PutChar(' ');
so_addr.Dump(s, exe_scope, Address::DumpStyleResolvedDescription,
Address::DumpStyleModuleWithFileAddress);
@@ -718,8 +717,7 @@ lldb::offset_t lldb_private::DumpDataExtractor(
if (ProcessSP process_sp = exe_scope->CalculateProcess()) {
if (ABISP abi_sp = process_sp->GetABI()) {
addr_t addr_fixed = abi_sp->FixCodeAddress(addr);
- if (target_sp->GetSectionLoadList().ResolveLoadAddress(
- addr_fixed, so_addr)) {
+ if (target_sp->ResolveLoadAddress(addr_fixed, so_addr)) {
s->PutChar(' ');
s->Printf("(0x%*.*" PRIx64 ")", (int)(2 * item_byte_size),
(int)(2 * item_byte_size), addr_fixed);
diff --git a/lldb/source/Core/FormatEntity.cpp b/lldb/source/Core/FormatEntity.cpp
index 8f28cd4b5fb255..e6ced91a9be369 100644
--- a/lldb/source/Core/FormatEntity.cpp
+++ b/lldb/source/Core/FormatEntity.cpp
@@ -411,7 +411,7 @@ static bool DumpAddressAndContent(Stream &s, const SymbolContext *sc,
bool print_file_addr_or_load_addr) {
Target *target = Target::GetTargetFromContexts(exe_ctx, sc);
addr_t vaddr = LLDB_INVALID_ADDRESS;
- if (exe_ctx && !target->GetSectionLoadList().IsEmpty())
+ if (exe_ctx && !target->SectionLoadListIsEmpty())
vaddr = addr.GetLoadAddress(target);
if (vaddr == LLDB_INVALID_ADDRESS)
vaddr = addr.GetFileAddress();
diff --git a/lldb/source/Core/Section.cpp b/lldb/source/Core/Section.cpp
index 0763e88d4608f4..12a78ffea2721e 100644
--- a/lldb/source/Core/Section.cpp
+++ b/lldb/source/Core/Section.cpp
@@ -234,7 +234,7 @@ addr_t Section::GetLoadBaseAddress(Target *target) const {
load_base_addr += GetOffset();
}
if (load_base_addr == LLDB_INVALID_ADDRESS) {
- load_base_addr = target->GetSectionLoadList().GetSectionLoadAddress(
+ load_base_addr = target->GetSectionLoadAddress(
const_cast<Section *>(this)->shared_from_this());
}
return load_base_addr;
@@ -638,7 +638,7 @@ bool SectionList::ContainsSection(user_id_t sect_id) const {
void SectionList::Dump(llvm::raw_ostream &s, unsigned indent, Target *target,
bool show_header, uint32_t depth) const {
bool target_has_loaded_sections =
- target && !target->GetSectionLoadList().IsEmpty();
+ target && !target->SectionLoadListIsEmpty();
if (show_header && !m_sections.empty()) {
s.indent(indent);
s << llvm::formatv(
diff --git a/lldb/source/Core/Value.cpp b/lldb/source/Core/Value.cpp
index bd93c04c16d24f..00647e75c38f3a 100644
--- a/lldb/source/Core/Value.cpp
+++ b/lldb/source/Core/Value.cpp
@@ -364,10 +364,9 @@ Status Value::GetValueAsData(ExecutionContext *exe_ctx, DataExtractor &data,
// memory sections loaded. This allows you to use "target modules
// load" to load your executable and any shared libraries, then
// execute commands where you can look at types in data sections.
- const SectionLoadList &target_sections = target->GetSectionLoadList();
- if (!target_sections.IsEmpty()) {
+ if (!target->SectionLoadListIsEmpty()) {
address = m_value.ULongLong(LLDB_INVALID_ADDRESS);
- if (target_sections.ResolveLoadAddress(address, file_so_addr)) {
+ if (target->ResolveLoadAddress(address, file_so_addr)) {
address_type = eAddressTypeLoad;
data.SetByteOrder(target->GetArchitecture().GetByteOrder());
data.SetAddressByteSize(
diff --git a/lldb/source/DataFormatters/CXXFunctionPointer.cpp b/lldb/source/DataFormatters/CXXFunctionPointer.cpp
index 6543433d17ff45..323b560b084b83 100644
--- a/lldb/source/DataFormatters/CXXFunctionPointer.cpp
+++ b/lldb/source/DataFormatters/CXXFunctionPointer.cpp
@@ -39,9 +39,8 @@ bool lldb_private::formatters::CXXFunctionPointerSummaryProvider(
Address so_addr;
Target *target = exe_ctx.GetTargetPtr();
- if (target && !target->GetSectionLoadList().IsEmpty()) {
- target->GetSectionLoadList().ResolveLoadAddress(func_ptr_address,
- so_addr);
+ if (target && !target->SectionLoadListIsEmpty()) {
+ target->ResolveLoadAddress(func_ptr_address, so_addr);
if (so_addr.GetSection() == nullptr) {
// If we have an address that doesn't correspond to any symbol,
// it might have authentication bits. Strip them & see if it
diff --git a/lldb/source/Expression/ObjectFileJIT.cpp b/lldb/source/Expression/ObjectFileJIT.cpp
index 9a839866096bdd..224f420787f491 100644
--- a/lldb/source/Expression/ObjectFileJIT.cpp
+++ b/lldb/source/Expression/ObjectFileJIT.cpp
@@ -178,8 +178,8 @@ bool ObjectFileJIT::SetLoadAddress(Target &target, lldb::addr_t value,
SectionSP section_sp(section_list->GetSectionAtIndex(sect_idx));
if (section_sp && section_sp->GetFileSize() > 0 &&
!section_sp->IsThreadSpecific()) {
- if (target.GetSectionLoadList().SetSectionLoadAddress(
- section_sp, section_sp->GetFileAddress() + value))
+ if (target.SetSectionLoadAddress(section_sp,
+ section_sp->GetFileAddress() + value))
++num_loaded_sections;
}
}
diff --git a/lldb/source/Plugins/Architecture/Mips/ArchitectureMips.cpp b/lldb/source/Plugins/Architecture/Mips/ArchitectureMips.cpp
index a9f2e7af601db9..f56153e1f857ef 100644
--- a/lldb/source/Plugins/Architecture/Mips/ArchitectureMips.cpp
+++ b/lldb/source/Plugins/Architecture/Mips/ArchitectureMips.cpp
@@ -76,8 +76,7 @@ lldb::addr_t ArchitectureMips::GetBreakableLoadAddress(lldb::addr_t addr,
Address resolved_addr;
- SectionLoadList §ion_load_list = target.GetSectionLoadList();
- if (section_load_list.IsEmpty())
+ if (target.SectionLoadListIsEmpty())
// No sections are loaded, so we must assume we are not running yet and
// need to operate only on file address.
target.ResolveFileAddress(addr, resolved_addr);
diff --git a/lldb/source/Plugins/Disassembler/LLVMC/DisassemblerLLVMC.cpp b/lldb/source/Plugins/Disassembler/LLVMC/DisassemblerLLVMC.cpp
index 31edd8d46c444e..6aba1c781da61b 100644
--- a/lldb/source/Plugins/Disassembler/LLVMC/DisassemblerLLVMC.cpp
+++ b/lldb/source/Plugins/Disassembler/LLVMC/DisassemblerLLVMC.cpp
@@ -1780,9 +1780,9 @@ const char *DisassemblerLLVMC::SymbolLookup(uint64_t value, uint64_t *type_ptr,
module_sp->ResolveFileAddress(value, value_so_addr);
module_sp->ResolveFileAddress(pc, pc_so_addr);
}
- } else if (target && !target->GetSectionLoadList().IsEmpty()) {
- target->GetSectionLoadList().ResolveLoadAddress(value, value_so_addr);
- target->GetSectionLoadList().ResolveLoadAddress(pc, pc_so_addr);
+ } else if (target && !target->SectionLoadListIsEmpty()) {
+ target->ResolveLoadAddress(value, value_so_addr);
+ target->ResolveLoadAddress(pc, pc_so_addr);
}
SymbolContext sym_ctx;
diff --git a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp
index 82555d1e028b4c..5b11059bcc50cb 100644
--- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp
+++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp
@@ -368,7 +368,7 @@ bool DynamicLoaderMacOS::NotifyBreakpointHit(void *baton,
dyld_instance->UnloadAllImages();
dyld_instance->ClearDYLDModule();
process->GetTarget().GetImages().Clear();
- process->GetTarget().GetSectionLoadList().Clear();
+ process->GetTarget().ClearSectionLoadList();
addr_t all_image_infos = process->GetImageInfoAddress();
int addr_size =
diff --git a/lldb/source/Plugins/DynamicLoader/Static/DynamicLoaderStatic.cpp b/lldb/source/Plugins/DynamicLoader/Static/DynamicLoaderStatic.cpp
index e8b92373ef0fa8..25051ec557120f 100644
--- a/lldb/source/Plugins/DynamicLoader/Static/DynamicLoaderStatic.cpp
+++ b/lldb/source/Plugins/DynamicLoader/Static/DynamicLoaderStatic.cpp
@@ -103,8 +103,8 @@ void DynamicLoaderStatic::LoadAllImagesAtFileAddresses() {
for (size_t sect_idx = 0; sect_idx < num_sections; ++sect_idx) {
SectionSP section_sp(section_list->GetSectionAtIndex(sect_idx));
if (section_sp) {
- if (target.GetSectionLoadList().GetSectionLoadAddress(
- section_sp) != LLDB_INVALID_ADDRESS) {
+ if (target.GetSectionLoadAddress(section_sp) !=
+ LLDB_INVALID_ADDRESS) {
no_load_addresses = false;
break;
}
diff --git a/lldb/source/Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.cpp b/lldb/source/Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.cpp
index 5516de19d8630b..80cb320cbbf9f8 100644
--- a/lldb/source/Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.cpp
+++ b/lldb/source/Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.cpp
@@ -546,8 +546,7 @@ static std::string Sprintf(const char *format, ...) {
static std::string GetSymbolNameFromAddress(ProcessSP process_sp, addr_t addr) {
lldb_private::Address so_addr;
- if (!process_sp->GetTarget().GetSectionLoadList().ResolveLoadAddress(addr,
- so_addr))
+ if (!process_sp->GetTarget().ResolveLoadAddress(addr, so_addr))
return "";
lldb_private::Symbol *symbol = so_addr.CalculateSymbolContextSymbol();
@@ -561,8 +560,7 @@ static std::string GetSymbolNameFromAddress(ProcessSP process_sp, addr_t addr) {
static void GetSymbolDeclarationFromAddress(ProcessSP process_sp, addr_t addr,
Declaration &decl) {
lldb_private::Address so_addr;
- if (!process_sp->GetTarget().GetSectionLoadList().ResolveLoadAddress(addr,
- so_addr))
+ if (!process_sp->GetTarget().ResolveLoadAddress(addr, so_addr))
return;
lldb_private::Symbol *symbol = so_addr.CalculateSymbolContextSymbol();
@@ -600,8 +598,7 @@ addr_t InstrumentationRuntimeTSan::GetFirstNonInternalFramePc(
addr_t addr = *maybe_addr;
lldb_private::Address so_addr;
- if (!process_sp->GetTarget().GetSectionLoadList().ResolveLoadAddress(
- addr, so_addr))
+ if (!process_sp->GetTarget().ResolveLoadAddress(addr, so_addr))
continue;
if (so_addr.GetModule() == runtime_module_sp)
diff --git a/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp b/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp
index 1688fb27430a7a..b6487d4e8ed4b3 100644
--- a/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp
+++ b/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp
@@ -377,7 +377,7 @@ bool JITLoaderGDB::ReadJITDescriptorImpl(bool all_entries) {
for (uint32_t i = 0; i < num_sections; ++i) {
SectionSP section_sp(section_list->GetSectionAtIndex(i));
if (section_sp) {
- target.GetSectionLoadList().SetSectionUnloaded(section_sp);
+ target.SetSectionUnloaded(section_sp);
}
}
}
diff --git a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.cpp
index e7ca3f655f237c..60badbbf91db84 100644
--- a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.cpp
+++ b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.cpp
@@ -266,21 +266,20 @@ CPPLanguageRuntime::FindLibCppStdFunctionCallableInfo(
Target &target = process->GetTarget();
- if (target.GetSectionLoadList().IsEmpty())
+ if (target.SectionLoadListIsEmpty())
return optional_info;
Address vtable_first_entry_resolved;
- if (!target.GetSectionLoadList().ResolveLoadAddress(
- vtable_address_first_entry, vtable_first_entry_resolved))
+ if (!target.ResolveLoadAddress(vtable_address_first_entry,
+ vtable_first_entry_resolved))
return optional_info;
Address vtable_addr_resolved;
SymbolContext sc;
Symbol *symbol = nullptr;
- if (!target.GetSectionLoadList().ResolveLoadAddress(vtable_address,
- vtable_addr_resolved))
+ if (!target.ResolveLoadAddress(vtable_address, vtable_addr_resolved))
return optional_info;
target.GetImages().ResolveSymbolContextForAddress(
@@ -322,8 +321,8 @@ CPPLanguageRuntime::FindLibCppStdFunctionCallableInfo(
// Setup for cases 2, 4 and 5 we have a pointer to a function after the
// vtable. We will use a process of elimination to drop through each case
// and obtain the data we need.
- if (target.GetSectionLoadList().ResolveLoadAddress(
- possible_function_address, function_address_resolved)) {
+ if (target.ResolveLoadAddress(possible_function_address,
+ function_address_resolved)) {
target.GetImages().ResolveSymbolContextForAddress(
function_address_resolved, eSymbolContextEverything, sc);
symbol = sc.symbol;
@@ -418,15 +417,14 @@ CPPLanguageRuntime::GetStepThroughTrampolinePlan(Thread &thread,
TargetSP target_sp(thread.CalculateTarget());
- if (target_sp->GetSectionLoadList().IsEmpty())
+ if (target_sp->SectionLoadListIsEmpty())
return ret_plan_sp;
Address pc_addr_resolved;
SymbolContext sc;
Symbol *symbol;
- if (!target_sp->GetSectionLoadList().ResolveLoadAddress(curr_pc,
- pc_addr_resolved))
+ if (!target_sp->ResolveLoadAddress(curr_pc, pc_addr_resolved))
return ret_plan_sp;
target_sp->GetImages().ResolveSymbolContextForAddress(
diff --git a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
index 10d09662c0a47a..8c151f9c793fd1 100644
--- a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
+++ b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
@@ -761,8 +761,7 @@ bool ObjectFileELF::SetLoadAddress(Target &target, lldb::addr_t value,
if (GetAddressByteSize() == 4)
load_addr &= 0xFFFFFFFF;
- if (target.GetSectionLoadList().SetSectionLoadAddress(section_sp,
- load_addr))
+ if (target.SetSectionLoadAddress(section_sp, load_addr))
++num_loaded_sections;
}
}
diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
index b542e237f023d4..0b7d5401e790b8 100644
--- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
+++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
@@ -6238,9 +6238,9 @@ bool ObjectFileMachO::SetLoadAddress(Target &target, lldb::addr_t value,
"0x%" PRIx64,
section_sp->GetName().AsCString(),
section_sp->GetFileAddress() + value);
- if (target.GetSectionLoadList().SetSectionLoadAddress(
- section_sp, section_sp->GetFileAddress() + value,
- warn_multiple))
+ if (target.SetSectionLoadAddress(section_sp,
+ section_sp->GetFileAddress() + value,
+ warn_multiple))
++num_loaded_sections;
}
}
@@ -6261,8 +6261,8 @@ bool ObjectFileMachO::SetLoadAddress(Target &target, lldb::addr_t value,
"ObjectFileMachO::SetLoadAddress segment '%s' load addr is "
"0x%" PRIx64,
section_sp->GetName().AsCString(), section_load_addr);
- if (target.GetSectionLoadList().SetSectionLoadAddress(
- section_sp, section_load_addr, warn_multiple))
+ if (target.SetSectionLoadAddress(section_sp, section_load_addr,
+ warn_multiple))
++num_loaded_sections;
}
}
diff --git a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
index 8d9c919bc9b101..eb4beac1904fd9 100644
--- a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
+++ b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
@@ -482,7 +482,7 @@ bool ObjectFilePECOFF::SetLoadAddress(Target &target, addr_t value,
// that have SHF_ALLOC in their flag bits.
SectionSP section_sp(section_list->GetSectionAtIndex(sect_idx));
if (section_sp && !section_sp->IsThreadSpecific()) {
- if (target.GetSectionLoadList().SetSectionLoadAddress(
+ if (target.SetSectionLoadAddress(
section_sp, section_sp->GetFileAddress() + value))
++num_loaded_sections;
}
diff --git a/lldb/source/Plugins/ObjectFile/Placeholder/ObjectFilePlaceholder.cpp b/lldb/source/Plugins/ObjectFile/Placeholder/ObjectFilePlaceholder.cpp
index ec1f3f61892d3e..e8745d6dd6b83c 100644
--- a/lldb/source/Plugins/ObjectFile/Placeholder/ObjectFilePlaceholder.cpp
+++ b/lldb/source/Plugins/ObjectFile/Placeholder/ObjectFilePlaceholder.cpp
@@ -59,8 +59,7 @@ bool ObjectFilePlaceholder::SetLoadAddress(Target &target, addr_t value,
GetModule()->GetSectionList();
assert(m_sections_up->GetNumSections(0) == 1);
- target.GetSectionLoadList().SetSectionLoadAddress(
- m_sections_up->GetSectionAtIndex(0), m_base);
+ target.SetSectionLoadAddress(m_sections_up->GetSectionAtIndex(0), m_base);
return true;
}
diff --git a/lldb/source/Plugins/Process/minidump/ProcessMinidump.cpp b/lldb/source/Plugins/Process/minidump/ProcessMinidump.cpp
index 5b0df72130c161..e4b8f6c7c7bdba 100644
--- a/lldb/source/Plugins/Process/minidump/ProcessMinidump.cpp
+++ b/lldb/source/Plugins/Process/minidump/ProcessMinidump.cpp
@@ -367,12 +367,12 @@ void ProcessMinidump::BuildMemoryRegions() {
MemoryRegionInfos to_add;
ModuleList &modules = GetTarget().GetImages();
- SectionLoadList &load_list = GetTarget().GetSectionLoadList();
+ Target &target = GetTarget();
modules.ForEach([&](const ModuleSP &module_sp) {
SectionList *sections = module_sp->GetSectionList();
for (size_t i = 0; i < sections->GetSize(); ++i) {
SectionSP section_sp = sections->GetSectionAtIndex(i);
- addr_t load_addr = load_list.GetSectionLoadAddress(section_sp);
+ addr_t load_addr = target.GetSectionLoadAddress(section_sp);
if (load_addr == LLDB_INVALID_ADDRESS)
continue;
MemoryRegionInfo::RangeType section_range(load_addr,
diff --git a/lldb/source/Plugins/Trace/intel-pt/TraceIntelPTBundleSaver.cpp b/lldb/source/Plugins/Trace/intel-pt/TraceIntelPTBundleSaver.cpp
index a09bb372bb01c0..295c710c9049d7 100644
--- a/lldb/source/Plugins/Trace/intel-pt/TraceIntelPTBundleSaver.cpp
+++ b/lldb/source/Plugins/Trace/intel-pt/TraceIntelPTBundleSaver.cpp
@@ -264,7 +264,7 @@ BuildModulesSection(Process &process, FileSpec directory) {
lldb::addr_t load_addr = LLDB_INVALID_ADDRESS;
Address base_addr(objfile->GetBaseAddress());
if (base_addr.IsValid() &&
- !process.GetTarget().GetSectionLoadList().IsEmpty())
+ !process.GetTarget().SectionLoadListIsEmpty())
load_addr = base_addr.GetLoadAddress(&process.GetTarget());
if (load_addr == LLDB_INVALID_ADDRESS)
diff --git a/lldb/source/Symbol/ObjectFile.cpp b/lldb/source/Symbol/ObjectFile.cpp
index 35317d209de1f9..758f0dcccf98ac 100644
--- a/lldb/source/Symbol/ObjectFile.cpp
+++ b/lldb/source/Symbol/ObjectFile.cpp
@@ -644,8 +644,7 @@ ObjectFile::GetLoadableData(Target &target) {
for (size_t i = 0; i < section_count; ++i) {
LoadableData loadable;
SectionSP section_sp = section_list->GetSectionAtIndex(i);
- loadable.Dest =
- target.GetSectionLoadList().GetSectionLoadAddress(section_sp);
+ loadable.Dest = target.GetSectionLoadAddress(section_sp);
if (loadable.Dest == LLDB_INVALID_ADDRESS)
continue;
// We can skip sections like bss
diff --git a/lldb/source/Target/ProcessTrace.cpp b/lldb/source/Target/ProcessTrace.cpp
index 4718a7ca50a7cb..f1313399054742 100644
--- a/lldb/source/Target/ProcessTrace.cpp
+++ b/lldb/source/Target/ProcessTrace.cpp
@@ -123,7 +123,7 @@ bool ProcessTrace::GetProcessInfo(ProcessInstanceInfo &info) {
size_t ProcessTrace::DoReadMemory(addr_t addr, void *buf, size_t size,
Status &error) {
Address resolved_address;
- GetTarget().GetSectionLoadList().ResolveLoadAddress(addr, resolved_address);
+ GetTarget().ResolveLoadAddress(addr, resolved_address);
return GetTarget().ReadMemoryFromFileCache(resolved_address, buf, size,
error);
diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp
index 04395e37f0425d..ebfac29242b4cf 100644
--- a/lldb/source/Target/Target.cpp
+++ b/lldb/source/Target/Target.cpp
@@ -5066,3 +5066,17 @@ llvm::json::Value
Target::ReportStatistics(const lldb_private::StatisticsOptions &options) {
return m_stats.ToJSON(*this, options);
}
+
+bool Target::SectionLoadListIsEmpty() const {
+ return const_cast<Target *>(this)->GetSectionLoadList().IsEmpty();
+}
+
+lldb::addr_t Target::GetSectionLoadAddress(const lldb::SectionSP §ion_sp) {
+ return GetSectionLoadList().GetSectionLoadAddress(section_sp);
+}
+
+void Target::ClearSectionLoadList() { GetSectionLoadList().Clear(); }
+
+void Target::DumpSectionLoadList(Stream &s) {
+ GetSectionLoadList().Dump(s, this);
+}
diff --git a/lldb/source/Target/ThreadPlanStepInRange.cpp b/lldb/source/Target/ThreadPlanStepInRange.cpp
index 567dcc26d0d372..bf602481a458a6 100644
--- a/lldb/source/Target/ThreadPlanStepInRange.cpp
+++ b/lldb/source/Target/ThreadPlanStepInRange.cpp
@@ -263,8 +263,7 @@ bool ThreadPlanStepInRange::ShouldStop(Event *event_ptr) {
const Architecture *arch = GetTarget().GetArchitecturePlugin();
if (arch) {
Address curr_sec_addr;
- GetTarget().GetSectionLoadList().ResolveLoadAddress(curr_addr,
- curr_sec_addr);
+ GetTarget().ResolveLoadAddress(curr_addr, curr_sec_addr);
bytes_to_skip = arch->GetBytesToSkip(*sc.symbol, curr_sec_addr);
}
}
diff --git a/lldb/source/Target/ThreadPlanTracer.cpp b/lldb/source/Target/ThreadPlanTracer.cpp
index acadda8f582f9d..d1b2eca0469fb2 100644
--- a/lldb/source/Target/ThreadPlanTracer.cpp
+++ b/lldb/source/Target/ThreadPlanTracer.cpp
@@ -139,8 +139,7 @@ void ThreadPlanAssemblyTracer::Log() {
Address pc_addr;
bool addr_valid = false;
uint8_t buffer[16] = {0}; // Must be big enough for any single instruction
- addr_valid = m_process.GetTarget().GetSectionLoadList().ResolveLoadAddress(
- pc, pc_addr);
+ addr_valid = m_process.GetTarget().ResolveLoadAddress(pc, pc_addr);
pc_addr.Dump(stream, &GetThread(), Address::DumpStyleResolvedDescription,
Address::DumpStyleModuleWithFileAddress);
More information about the lldb-commits
mailing list