[Lldb-commits] [lldb] [lldb][NFC] Make the target's SectionLoadList private. (PR #113278)
Greg Clayton via lldb-commits
lldb-commits at lists.llvm.org
Thu Dec 5 16:50:33 PST 2024
https://github.com/clayborg updated https://github.com/llvm/llvm-project/pull/113278
>From dab763afbe46a59020ae10530c062e9420f45605 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 1/3] 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 0d1943450d622b..717490dc475ce4 100644
--- a/lldb/include/lldb/Target/Target.h
+++ b/lldb/include/lldb/Target/Target.h
@@ -1151,9 +1151,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);
@@ -1666,6 +1671,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 6db4b2665bd84a..563ce745ab2d9b 100644
--- a/lldb/source/Commands/CommandObjectDisassemble.cpp
+++ b/lldb/source/Commands/CommandObjectDisassemble.cpp
@@ -269,10 +269,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 c8295fd10cf221..09b68cdfc33858 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()) !=
@@ -959,7 +959,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();
@@ -987,8 +987,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 307f4f683e3b27..9488c8f84e305f 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 68e52144eb6ef8..1bdda9ffc0deb8 100644
--- a/lldb/source/Core/Disassembler.cpp
+++ b/lldb/source/Core/Disassembler.cpp
@@ -107,11 +107,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 565ee3a0ae40a4..dd727238b8adf5 100644
--- a/lldb/source/Core/DumpDataExtractor.cpp
+++ b/lldb/source/Core/DumpDataExtractor.cpp
@@ -136,10 +136,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);
}
@@ -707,8 +707,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);
@@ -719,8 +718,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 d76fc97caa0133..fde9657e3b19c9 100644
--- a/lldb/source/Core/FormatEntity.cpp
+++ b/lldb/source/Core/FormatEntity.cpp
@@ -412,7 +412,7 @@ static bool DumpAddressAndContent(Stream &s, const SymbolContext *sc,
Target *target = Target::GetTargetFromContexts(exe_ctx, sc);
addr_t vaddr = LLDB_INVALID_ADDRESS;
- if (target && !target->GetSectionLoadList().IsEmpty())
+ if (target && !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 6d56e39fa97333..97df424e696739 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 27ba10524141ed..0f9a30cede5703 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 81c122146764d3..2d0bf9f2c50824 100644
--- a/lldb/source/Plugins/Disassembler/LLVMC/DisassemblerLLVMC.cpp
+++ b/lldb/source/Plugins/Disassembler/LLVMC/DisassemblerLLVMC.cpp
@@ -1787,9 +1787,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 6d3e5b7e5573c4..70e36801c3fd75 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 eac9ab4577d3eb..e246253e00d4cb 100644
--- a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
+++ b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
@@ -762,8 +762,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 daffa1379fe575..bc69c81d94e425 100644
--- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
+++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
@@ -6245,9 +6245,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;
}
}
@@ -6268,8 +6268,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 4bac94f35d6cfb..482ee188cd1260 100644
--- a/lldb/source/Target/Target.cpp
+++ b/lldb/source/Target/Target.cpp
@@ -5146,3 +5146,17 @@ Target::ReportStatistics(const lldb_private::StatisticsOptions &options) {
}
void Target::ResetStatistics() { m_stats.Reset(*this); }
+
+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 224a17d896ccf0..b199fbd425ee86 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 ff9f49c6d4bb68..356ce379c29938 100644
--- a/lldb/source/Target/ThreadPlanTracer.cpp
+++ b/lldb/source/Target/ThreadPlanTracer.cpp
@@ -140,8 +140,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);
>From 91691334c128fe3779656913f737414f91b9d267 Mon Sep 17 00:00:00 2001
From: Greg Clayton <clayborg at gmail.com>
Date: Tue, 22 Oct 2024 23:57:54 -0700
Subject: [PATCH 2/3] Respond to user feedback:
- Rename Target::SectionLoadListIsEmpty() to Target::HasLoadedSections() and invert all call sites
- Change Target::HasLoadedSections() to not be const and avoid the const cast.
---
lldb/include/lldb/Target/Target.h | 3 +--
lldb/source/Commands/CommandObjectDisassemble.cpp | 4 ++--
lldb/source/Commands/CommandObjectRegister.cpp | 2 +-
lldb/source/Commands/CommandObjectSource.cpp | 4 ++--
lldb/source/Commands/CommandObjectTarget.cpp | 6 +++---
lldb/source/Core/Address.cpp | 2 +-
lldb/source/Core/Disassembler.cpp | 6 +++++-
lldb/source/Core/DumpDataExtractor.cpp | 2 +-
lldb/source/Core/FormatEntity.cpp | 2 +-
lldb/source/Core/Section.cpp | 3 +--
lldb/source/Core/Value.cpp | 2 +-
lldb/source/DataFormatters/CXXFunctionPointer.cpp | 2 +-
lldb/source/Expression/ObjectFileJIT.cpp | 2 +-
.../source/Plugins/Architecture/Mips/ArchitectureMips.cpp | 2 +-
.../Plugins/Disassembler/LLVMC/DisassemblerLLVMC.cpp | 2 +-
.../Plugins/DynamicLoader/Static/DynamicLoaderStatic.cpp | 2 +-
.../LanguageRuntime/CPlusPlus/CPPLanguageRuntime.cpp | 8 ++++----
lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp | 4 ++--
.../Plugins/Trace/intel-pt/TraceIntelPTBundleSaver.cpp | 3 +--
lldb/source/Target/Target.cpp | 4 +---
20 files changed, 32 insertions(+), 33 deletions(-)
diff --git a/lldb/include/lldb/Target/Target.h b/lldb/include/lldb/Target/Target.h
index 717490dc475ce4..e9562386251412 100644
--- a/lldb/include/lldb/Target/Target.h
+++ b/lldb/include/lldb/Target/Target.h
@@ -1151,8 +1151,7 @@ class Target : public std::enable_shared_from_this<Target>,
Address &pointer_addr,
bool force_live_memory = false);
-
- bool SectionLoadListIsEmpty() const;
+ bool HasLoadedSections();
lldb::addr_t GetSectionLoadAddress(const lldb::SectionSP §ion_sp);
diff --git a/lldb/source/Commands/CommandObjectDisassemble.cpp b/lldb/source/Commands/CommandObjectDisassemble.cpp
index 563ce745ab2d9b..5b131fe86dedba 100644
--- a/lldb/source/Commands/CommandObjectDisassemble.cpp
+++ b/lldb/source/Commands/CommandObjectDisassemble.cpp
@@ -269,9 +269,9 @@ CommandObjectDisassemble::GetContainingAddressRanges() {
};
Target &target = GetTarget();
- if (!target.SectionLoadListIsEmpty()) {
+ if (target.HasLoadedSections()) {
Address symbol_containing_address;
- if (target.ResolveLoadAddress(m_options.symbol_containing_addr,
+ if (target.ResolveLoadAddress(m_options.symbol_containing_addr,
symbol_containing_address)) {
get_range(symbol_containing_address);
}
diff --git a/lldb/source/Commands/CommandObjectRegister.cpp b/lldb/source/Commands/CommandObjectRegister.cpp
index cb53d7c21b8cd9..fbb92e5c638773 100644
--- a/lldb/source/Commands/CommandObjectRegister.cpp
+++ b/lldb/source/Commands/CommandObjectRegister.cpp
@@ -95,7 +95,7 @@ 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().ResolveLoadAddress(reg_addr,
+ if (exe_ctx.GetTargetRef().ResolveLoadAddress(reg_addr,
so_reg_addr)) {
strm.PutCString(" ");
so_reg_addr.Dump(&strm, exe_ctx.GetBestExecutionContextScope(),
diff --git a/lldb/source/Commands/CommandObjectSource.cpp b/lldb/source/Commands/CommandObjectSource.cpp
index 09b68cdfc33858..936783216f6ff5 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.SectionLoadListIsEmpty()) {
+ if (!target.HasLoadedSections()) {
// 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();
@@ -959,7 +959,7 @@ class CommandObjectSourceList : public CommandObjectParsed {
StreamString error_strm;
SymbolContextList sc_list;
- if (target.SectionLoadListIsEmpty()) {
+ if (!target.HasLoadedSections()) {
// The target isn't loaded yet, we need to lookup the file address in
// all modules
const ModuleList &module_list = target.GetImages();
diff --git a/lldb/source/Commands/CommandObjectTarget.cpp b/lldb/source/Commands/CommandObjectTarget.cpp
index 9488c8f84e305f..d8265e41a7384e 100644
--- a/lldb/source/Commands/CommandObjectTarget.cpp
+++ b/lldb/source/Commands/CommandObjectTarget.cpp
@@ -1522,7 +1522,7 @@ static bool LookupAddressInModule(CommandInterpreter &interpreter, Stream &strm,
Address so_addr;
SymbolContext sc;
Target *target = interpreter.GetExecutionContext().GetTargetPtr();
- if (target && !target->SectionLoadListIsEmpty()) {
+ if (target && target->HasLoadedSections()) {
if (!target->ResolveLoadAddress(addr, so_addr))
return false;
else if (so_addr.GetModule().get() != module)
@@ -2974,7 +2974,7 @@ class CommandObjectTargetModulesLoad
sect_name);
break;
} else {
- if (target.SetSectionLoadAddress(section_sp,
+ if (target.SetSectionLoadAddress(section_sp,
load_addr))
changed = true;
result.AppendMessageWithFormat(
@@ -3329,7 +3329,7 @@ class CommandObjectTargetModulesList : public CommandObjectParsed {
if (objfile) {
Address base_addr(objfile->GetBaseAddress());
if (base_addr.IsValid()) {
- if (!target.SectionLoadListIsEmpty()) {
+ if (target.HasLoadedSections()) {
lldb::addr_t load_addr = base_addr.GetLoadAddress(&target);
if (load_addr == LLDB_INVALID_ADDRESS) {
base_addr.Dump(&strm, &target,
diff --git a/lldb/source/Core/Address.cpp b/lldb/source/Core/Address.cpp
index e8363f0a7c077e..c50badeae3bd41 100644
--- a/lldb/source/Core/Address.cpp
+++ b/lldb/source/Core/Address.cpp
@@ -138,7 +138,7 @@ 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->SectionLoadListIsEmpty()) {
+ if (target && target->HasLoadedSections()) {
if (target->ResolveLoadAddress(deref_addr, deref_so_addr))
return true;
} else {
diff --git a/lldb/source/Core/Disassembler.cpp b/lldb/source/Core/Disassembler.cpp
index 1bdda9ffc0deb8..b3e7c4c13061de 100644
--- a/lldb/source/Core/Disassembler.cpp
+++ b/lldb/source/Core/Disassembler.cpp
@@ -107,7 +107,11 @@ 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.SectionLoadListIsEmpty() ? target.GetImages().ResolveFileAddress(addr.GetOffset(), resolved_addr) : target.ResolveLoadAddress(addr.GetOffset(), resolved_addr);
+ bool is_resolved =
+ target.HasLoadedSections()
+ ? target.ResolveLoadAddress(addr.GetOffset(), resolved_addr)
+ : target.GetImages().ResolveFileAddress(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 dd727238b8adf5..72140736d8877e 100644
--- a/lldb/source/Core/DumpDataExtractor.cpp
+++ b/lldb/source/Core/DumpDataExtractor.cpp
@@ -139,7 +139,7 @@ static lldb::offset_t DumpInstructions(const DataExtractor &DE, Stream *s,
if (target_sp->ResolveLoadAddress(addr, so_addr)) {
data_from_file = false;
} else {
- if (target_sp->SectionLoadListIsEmpty() ||
+ if (!target_sp->HasLoadedSections() ||
!target_sp->GetImages().ResolveFileAddress(addr, so_addr))
so_addr.SetRawAddress(addr);
}
diff --git a/lldb/source/Core/FormatEntity.cpp b/lldb/source/Core/FormatEntity.cpp
index fde9657e3b19c9..e13284832cf571 100644
--- a/lldb/source/Core/FormatEntity.cpp
+++ b/lldb/source/Core/FormatEntity.cpp
@@ -412,7 +412,7 @@ static bool DumpAddressAndContent(Stream &s, const SymbolContext *sc,
Target *target = Target::GetTargetFromContexts(exe_ctx, sc);
addr_t vaddr = LLDB_INVALID_ADDRESS;
- if (target && !target->SectionLoadListIsEmpty())
+ if (target && target->HasLoadedSections())
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 12a78ffea2721e..5bcfd64505418a 100644
--- a/lldb/source/Core/Section.cpp
+++ b/lldb/source/Core/Section.cpp
@@ -637,8 +637,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->SectionLoadListIsEmpty();
+ bool target_has_loaded_sections = target && target->HasLoadedSections();
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 00647e75c38f3a..70299cb8455a12 100644
--- a/lldb/source/Core/Value.cpp
+++ b/lldb/source/Core/Value.cpp
@@ -364,7 +364,7 @@ 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.
- if (!target->SectionLoadListIsEmpty()) {
+ if (target->HasLoadedSections()) {
address = m_value.ULongLong(LLDB_INVALID_ADDRESS);
if (target->ResolveLoadAddress(address, file_so_addr)) {
address_type = eAddressTypeLoad;
diff --git a/lldb/source/DataFormatters/CXXFunctionPointer.cpp b/lldb/source/DataFormatters/CXXFunctionPointer.cpp
index 97df424e696739..e17659ad0f2f09 100644
--- a/lldb/source/DataFormatters/CXXFunctionPointer.cpp
+++ b/lldb/source/DataFormatters/CXXFunctionPointer.cpp
@@ -39,7 +39,7 @@ bool lldb_private::formatters::CXXFunctionPointerSummaryProvider(
Address so_addr;
Target *target = exe_ctx.GetTargetPtr();
- if (target && !target->SectionLoadListIsEmpty()) {
+ if (target && target->HasLoadedSections()) {
target->ResolveLoadAddress(func_ptr_address, so_addr);
if (so_addr.GetSection() == nullptr) {
// If we have an address that doesn't correspond to any symbol,
diff --git a/lldb/source/Expression/ObjectFileJIT.cpp b/lldb/source/Expression/ObjectFileJIT.cpp
index 224f420787f491..e4a613551d22e9 100644
--- a/lldb/source/Expression/ObjectFileJIT.cpp
+++ b/lldb/source/Expression/ObjectFileJIT.cpp
@@ -178,7 +178,7 @@ 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.SetSectionLoadAddress(section_sp,
+ 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 0f9a30cede5703..a756cc6ba0c98f 100644
--- a/lldb/source/Plugins/Architecture/Mips/ArchitectureMips.cpp
+++ b/lldb/source/Plugins/Architecture/Mips/ArchitectureMips.cpp
@@ -76,7 +76,7 @@ lldb::addr_t ArchitectureMips::GetBreakableLoadAddress(lldb::addr_t addr,
Address resolved_addr;
- if (target.SectionLoadListIsEmpty())
+ if (!target.HasLoadedSections())
// 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 2d0bf9f2c50824..76f2db086476fc 100644
--- a/lldb/source/Plugins/Disassembler/LLVMC/DisassemblerLLVMC.cpp
+++ b/lldb/source/Plugins/Disassembler/LLVMC/DisassemblerLLVMC.cpp
@@ -1787,7 +1787,7 @@ 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->SectionLoadListIsEmpty()) {
+ } else if (target && target->HasLoadedSections()) {
target->ResolveLoadAddress(value, value_so_addr);
target->ResolveLoadAddress(pc, pc_so_addr);
}
diff --git a/lldb/source/Plugins/DynamicLoader/Static/DynamicLoaderStatic.cpp b/lldb/source/Plugins/DynamicLoader/Static/DynamicLoaderStatic.cpp
index 25051ec557120f..643c9653f26ec6 100644
--- a/lldb/source/Plugins/DynamicLoader/Static/DynamicLoaderStatic.cpp
+++ b/lldb/source/Plugins/DynamicLoader/Static/DynamicLoaderStatic.cpp
@@ -103,7 +103,7 @@ 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.GetSectionLoadAddress(section_sp) !=
+ if (target.GetSectionLoadAddress(section_sp) !=
LLDB_INVALID_ADDRESS) {
no_load_addresses = false;
break;
diff --git a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.cpp
index 60badbbf91db84..fb706544ea560d 100644
--- a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.cpp
+++ b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.cpp
@@ -266,12 +266,12 @@ CPPLanguageRuntime::FindLibCppStdFunctionCallableInfo(
Target &target = process->GetTarget();
- if (target.SectionLoadListIsEmpty())
+ if (!target.HasLoadedSections())
return optional_info;
Address vtable_first_entry_resolved;
- if (!target.ResolveLoadAddress(vtable_address_first_entry,
+ if (!target.ResolveLoadAddress(vtable_address_first_entry,
vtable_first_entry_resolved))
return optional_info;
@@ -321,7 +321,7 @@ 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.ResolveLoadAddress(possible_function_address,
+ if (target.ResolveLoadAddress(possible_function_address,
function_address_resolved)) {
target.GetImages().ResolveSymbolContextForAddress(
function_address_resolved, eSymbolContextEverything, sc);
@@ -417,7 +417,7 @@ CPPLanguageRuntime::GetStepThroughTrampolinePlan(Thread &thread,
TargetSP target_sp(thread.CalculateTarget());
- if (target_sp->SectionLoadListIsEmpty())
+ if (!target_sp->HasLoadedSections())
return ret_plan_sp;
Address pc_addr_resolved;
diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
index bc69c81d94e425..74c36091c7ddf5 100644
--- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
+++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
@@ -6245,7 +6245,7 @@ bool ObjectFileMachO::SetLoadAddress(Target &target, lldb::addr_t value,
"0x%" PRIx64,
section_sp->GetName().AsCString(),
section_sp->GetFileAddress() + value);
- if (target.SetSectionLoadAddress(section_sp,
+ if (target.SetSectionLoadAddress(section_sp,
section_sp->GetFileAddress() + value,
warn_multiple))
++num_loaded_sections;
@@ -6268,7 +6268,7 @@ 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.SetSectionLoadAddress(section_sp, section_load_addr,
+ if (target.SetSectionLoadAddress(section_sp, section_load_addr,
warn_multiple))
++num_loaded_sections;
}
diff --git a/lldb/source/Plugins/Trace/intel-pt/TraceIntelPTBundleSaver.cpp b/lldb/source/Plugins/Trace/intel-pt/TraceIntelPTBundleSaver.cpp
index 295c710c9049d7..3b1535a9319996 100644
--- a/lldb/source/Plugins/Trace/intel-pt/TraceIntelPTBundleSaver.cpp
+++ b/lldb/source/Plugins/Trace/intel-pt/TraceIntelPTBundleSaver.cpp
@@ -263,8 +263,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().SectionLoadListIsEmpty())
+ if (base_addr.IsValid() && process.GetTarget().HasLoadedSections())
load_addr = base_addr.GetLoadAddress(&process.GetTarget());
if (load_addr == LLDB_INVALID_ADDRESS)
diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp
index 482ee188cd1260..a777d6ea02afcb 100644
--- a/lldb/source/Target/Target.cpp
+++ b/lldb/source/Target/Target.cpp
@@ -5147,9 +5147,7 @@ Target::ReportStatistics(const lldb_private::StatisticsOptions &options) {
void Target::ResetStatistics() { m_stats.Reset(*this); }
-bool Target::SectionLoadListIsEmpty() const {
- return const_cast<Target *>(this)->GetSectionLoadList().IsEmpty();
-}
+bool Target::HasLoadedSections() { return !GetSectionLoadList().IsEmpty(); }
lldb::addr_t Target::GetSectionLoadAddress(const lldb::SectionSP §ion_sp) {
return GetSectionLoadList().GetSectionLoadAddress(section_sp);
>From 88db7202fd6a05bb4136c095d4494d4a7399ae56 Mon Sep 17 00:00:00 2001
From: Greg Clayton <clayborg at gmail.com>
Date: Thu, 5 Dec 2024 16:49:33 -0800
Subject: [PATCH 3/3] Fix issue with test suite.
Now that we are using Target::ResolveLoadAddress, we had an implicit conversion going on that I found that was causing many failures in the test suite. Fixed now.
---
lldb/include/lldb/Target/SectionLoadHistory.h | 2 +-
lldb/include/lldb/Target/Target.h | 3 ++-
lldb/source/Core/Address.cpp | 4 +++-
lldb/source/Target/SectionLoadHistory.cpp | 3 ++-
lldb/source/Target/Target.cpp | 5 +++--
5 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/lldb/include/lldb/Target/SectionLoadHistory.h b/lldb/include/lldb/Target/SectionLoadHistory.h
index 64bb828d4254a8..4380d6f2cf1219 100644
--- a/lldb/include/lldb/Target/SectionLoadHistory.h
+++ b/lldb/include/lldb/Target/SectionLoadHistory.h
@@ -45,7 +45,7 @@ class SectionLoadHistory {
const lldb::SectionSP §ion_sp);
bool ResolveLoadAddress(uint32_t stop_id, lldb::addr_t load_addr,
- Address &so_addr);
+ Address &so_addr, bool allow_section_end = false);
bool SetSectionLoadAddress(uint32_t stop_id,
const lldb::SectionSP §ion_sp,
diff --git a/lldb/include/lldb/Target/Target.h b/lldb/include/lldb/Target/Target.h
index e9562386251412..f31ac381391b45 100644
--- a/lldb/include/lldb/Target/Target.h
+++ b/lldb/include/lldb/Target/Target.h
@@ -1222,7 +1222,8 @@ class Target : public std::enable_shared_from_this<Target>,
bool ResolveFileAddress(lldb::addr_t load_addr, Address &so_addr);
bool ResolveLoadAddress(lldb::addr_t load_addr, Address &so_addr,
- uint32_t stop_id = SectionLoadHistory::eStopIDNow);
+ uint32_t stop_id = SectionLoadHistory::eStopIDNow,
+ bool allow_section_end = false);
bool SetSectionLoadAddress(const lldb::SectionSP §ion,
lldb::addr_t load_addr,
diff --git a/lldb/source/Core/Address.cpp b/lldb/source/Core/Address.cpp
index c50badeae3bd41..1dab874a96583c 100644
--- a/lldb/source/Core/Address.cpp
+++ b/lldb/source/Core/Address.cpp
@@ -1045,7 +1045,9 @@ AddressClass Address::GetAddressClass() const {
bool Address::SetLoadAddress(lldb::addr_t load_addr, Target *target,
bool allow_section_end) {
- if (target && target->ResolveLoadAddress(load_addr, *this, allow_section_end))
+ if (target && target->ResolveLoadAddress(load_addr, *this,
+ SectionLoadHistory::eStopIDNow,
+ allow_section_end))
return true;
m_section_wp.reset();
m_offset = load_addr;
diff --git a/lldb/source/Target/SectionLoadHistory.cpp b/lldb/source/Target/SectionLoadHistory.cpp
index f329d425e34b25..b44c518dbd3ac6 100644
--- a/lldb/source/Target/SectionLoadHistory.cpp
+++ b/lldb/source/Target/SectionLoadHistory.cpp
@@ -112,7 +112,8 @@ SectionLoadHistory::GetSectionLoadAddress(uint32_t stop_id,
}
bool SectionLoadHistory::ResolveLoadAddress(uint32_t stop_id, addr_t load_addr,
- Address &so_addr) {
+ Address &so_addr,
+ bool allow_section_end) {
// First find the top level section that this load address exists in
std::lock_guard<std::recursive_mutex> guard(m_mutex);
const bool read_only = true;
diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp
index a777d6ea02afcb..17eeafded67bfd 100644
--- a/lldb/source/Target/Target.cpp
+++ b/lldb/source/Target/Target.cpp
@@ -3216,8 +3216,9 @@ Status Target::Install(ProcessLaunchInfo *launch_info) {
}
bool Target::ResolveLoadAddress(addr_t load_addr, Address &so_addr,
- uint32_t stop_id) {
- return m_section_load_history.ResolveLoadAddress(stop_id, load_addr, so_addr);
+ uint32_t stop_id, bool allow_section_end) {
+ return m_section_load_history.ResolveLoadAddress(stop_id, load_addr, so_addr,
+ allow_section_end);
}
bool Target::ResolveFileAddress(lldb::addr_t file_addr,
More information about the lldb-commits
mailing list