summaryrefslogtreecommitdiffstats
path: root/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp')
-rw-r--r--lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp82
1 files changed, 40 insertions, 42 deletions
diff --git a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp
index 57d87eb145e..61afe51034e 100644
--- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp
+++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp
@@ -135,9 +135,8 @@ void DynamicLoaderDarwin::UnloadImages(
Log *log(lldb_private::GetLogIfAnyCategoriesSet(LIBLLDB_LOG_DYNAMIC_LOADER));
Target &target = m_process->GetTarget();
- if (log)
- log->Printf("Removing %" PRId64 " modules.",
- (uint64_t)solib_addresses.size());
+ LLDB_LOGF(log, "Removing %" PRId64 " modules.",
+ (uint64_t)solib_addresses.size());
ModuleList unloaded_module_list;
@@ -147,8 +146,7 @@ void DynamicLoaderDarwin::UnloadImages(
if (header.GetOffset() == 0) {
ModuleSP module_to_remove(header.GetModule());
if (module_to_remove.get()) {
- if (log)
- log->Printf("Removing module at address 0x%" PRIx64, solib_addr);
+ LLDB_LOGF(log, "Removing module at address 0x%" PRIx64, solib_addr);
// remove the sections from the Target
UnloadSections(module_to_remove);
// add this to the list of modules to remove
@@ -537,9 +535,8 @@ void DynamicLoaderDarwin::UpdateSpecialBinariesFromNewImageInfos(
ModuleSP exe_module_sp(FindTargetModuleForImageInfo(image_infos[exe_idx],
can_create, nullptr));
if (exe_module_sp) {
- if (log)
- log->Printf("Found executable module: %s",
- exe_module_sp->GetFileSpec().GetPath().c_str());
+ LLDB_LOGF(log, "Found executable module: %s",
+ exe_module_sp->GetFileSpec().GetPath().c_str());
target.GetImages().AppendIfNeeded(exe_module_sp);
UpdateImageLoadAddress(exe_module_sp.get(), image_infos[exe_idx]);
if (exe_module_sp.get() != target.GetExecutableModulePointer()) {
@@ -553,9 +550,8 @@ void DynamicLoaderDarwin::UpdateSpecialBinariesFromNewImageInfos(
ModuleSP dyld_sp = FindTargetModuleForImageInfo(image_infos[dyld_idx],
can_create, nullptr);
if (dyld_sp.get()) {
- if (log)
- log->Printf("Found dyld module: %s",
- dyld_sp->GetFileSpec().GetPath().c_str());
+ LLDB_LOGF(log, "Found dyld module: %s",
+ dyld_sp->GetFileSpec().GetPath().c_str());
target.GetImages().AppendIfNeeded(dyld_sp);
UpdateImageLoadAddress(dyld_sp.get(), image_infos[dyld_idx]);
SetDYLDModule(dyld_sp);
@@ -598,8 +594,8 @@ bool DynamicLoaderDarwin::AddModulesUsingImageInfos(
for (uint32_t idx = 0; idx < image_infos.size(); ++idx) {
if (log) {
- log->Printf("Adding new image at address=0x%16.16" PRIx64 ".",
- image_infos[idx].address);
+ LLDB_LOGF(log, "Adding new image at address=0x%16.16" PRIx64 ".",
+ image_infos[idx].address);
image_infos[idx].PutToLog(log);
}
@@ -704,13 +700,14 @@ void DynamicLoaderDarwin::Segment::PutToLog(Log *log,
lldb::addr_t slide) const {
if (log) {
if (slide == 0)
- log->Printf("\t\t%16s [0x%16.16" PRIx64 " - 0x%16.16" PRIx64 ")",
- name.AsCString(""), vmaddr + slide, vmaddr + slide + vmsize);
+ LLDB_LOGF(log, "\t\t%16s [0x%16.16" PRIx64 " - 0x%16.16" PRIx64 ")",
+ name.AsCString(""), vmaddr + slide, vmaddr + slide + vmsize);
else
- log->Printf("\t\t%16s [0x%16.16" PRIx64 " - 0x%16.16" PRIx64
- ") slide = 0x%" PRIx64,
- name.AsCString(""), vmaddr + slide, vmaddr + slide + vmsize,
- slide);
+ LLDB_LOGF(log,
+ "\t\t%16s [0x%16.16" PRIx64 " - 0x%16.16" PRIx64
+ ") slide = 0x%" PRIx64,
+ name.AsCString(""), vmaddr + slide, vmaddr + slide + vmsize,
+ slide);
}
}
@@ -820,9 +817,9 @@ DynamicLoaderDarwin::GetStepThroughTrampolinePlan(Thread &thread,
addr_t load_addr =
addr_range.GetBaseAddress().GetLoadAddress(target_sp.get());
- log->Printf("Found a trampoline target symbol at 0x%" PRIx64
- ".",
- load_addr);
+ LLDB_LOGF(log,
+ "Found a trampoline target symbol at 0x%" PRIx64 ".",
+ load_addr);
}
}
}
@@ -847,7 +844,8 @@ DynamicLoaderDarwin::GetStepThroughTrampolinePlan(Thread &thread,
if (log) {
lldb::addr_t load_addr =
actual_symbol_addr.GetLoadAddress(target_sp.get());
- log->Printf(
+ LLDB_LOGF(
+ log,
"Found a re-exported symbol: %s at 0x%" PRIx64 ".",
actual_symbol->GetName().GetCString(), load_addr);
}
@@ -874,8 +872,9 @@ DynamicLoaderDarwin::GetStepThroughTrampolinePlan(Thread &thread,
addr_t load_addr =
addr_range.GetBaseAddress().GetLoadAddress(target_sp.get());
- log->Printf("Found an indirect target symbol at 0x%" PRIx64 ".",
- load_addr);
+ LLDB_LOGF(log,
+ "Found an indirect target symbol at 0x%" PRIx64 ".",
+ load_addr);
}
}
}
@@ -890,13 +889,13 @@ DynamicLoaderDarwin::GetStepThroughTrampolinePlan(Thread &thread,
if (actual_symbol) {
Address target_addr(actual_symbol->GetAddress());
if (target_addr.IsValid()) {
- if (log)
- log->Printf(
- "Found a re-exported symbol: %s pointing to: %s at 0x%" PRIx64
- ".",
- current_symbol->GetName().GetCString(),
- actual_symbol->GetName().GetCString(),
- target_addr.GetLoadAddress(target_sp.get()));
+ LLDB_LOGF(
+ log,
+ "Found a re-exported symbol: %s pointing to: %s at 0x%" PRIx64
+ ".",
+ current_symbol->GetName().GetCString(),
+ actual_symbol->GetName().GetCString(),
+ target_addr.GetLoadAddress(target_sp.get()));
addresses.push_back(target_addr.GetLoadAddress(target_sp.get()));
}
}
@@ -915,10 +914,10 @@ DynamicLoaderDarwin::GetStepThroughTrampolinePlan(Thread &thread,
&symbol_address, error);
if (error.Success()) {
load_addrs.push_back(resolved_addr);
- if (log)
- log->Printf("ResolveIndirectFunction found resolved target for "
- "%s at 0x%" PRIx64 ".",
- symbol->GetName().GetCString(), resolved_addr);
+ LLDB_LOGF(log,
+ "ResolveIndirectFunction found resolved target for "
+ "%s at 0x%" PRIx64 ".",
+ symbol->GetName().GetCString(), resolved_addr);
}
} else {
load_addrs.push_back(address.GetLoadAddress(target_sp.get()));
@@ -928,8 +927,7 @@ DynamicLoaderDarwin::GetStepThroughTrampolinePlan(Thread &thread,
thread, load_addrs, stop_others);
}
} else {
- if (log)
- log->Printf("Could not find symbol for step through.");
+ LLDB_LOGF(log, "Could not find symbol for step through.");
}
return thread_plan_sp;
@@ -1109,11 +1107,11 @@ bool DynamicLoaderDarwin::UseDYLDSPI(Process *process) {
if (log) {
if (use_new_spi_interface)
- log->Printf(
- "DynamicLoaderDarwin::UseDYLDSPI: Use new DynamicLoader plugin");
+ LLDB_LOGF(
+ log, "DynamicLoaderDarwin::UseDYLDSPI: Use new DynamicLoader plugin");
else
- log->Printf(
- "DynamicLoaderDarwin::UseDYLDSPI: Use old DynamicLoader plugin");
+ LLDB_LOGF(
+ log, "DynamicLoaderDarwin::UseDYLDSPI: Use old DynamicLoader plugin");
}
return use_new_spi_interface;
}
OpenPOWER on IntegriCloud