diff options
Diffstat (limited to 'lldb/source')
5 files changed, 24 insertions, 13 deletions
diff --git a/lldb/source/Host/macosx/Host.mm b/lldb/source/Host/macosx/Host.mm index 8d845b47fbc..c7212e046d0 100644 --- a/lldb/source/Host/macosx/Host.mm +++ b/lldb/source/Host/macosx/Host.mm @@ -1830,3 +1830,9 @@ Host::SystemLog (SystemLogType type, const char *format, va_list args) ::asl_vlog (NULL, g_aslmsg, asl_level, format, args); } } + +lldb::DataBufferSP +Host::GetAuxvData(lldb_private::Process *process) +{ + return lldb::DataBufferSP(); +} diff --git a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp index 9311e70ca33..7f41cfac580 100644 --- a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp +++ b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp @@ -113,7 +113,7 @@ AuxVector::DumpToLog(LogSP log) const log->PutCString("AuxVector: "); for (iterator I = begin(); I != end(); ++I) { - log->Printf(" %s [%d]: %lx", GetEntryName(*I), I->type, I->value); + log->Printf(" %s [%llu]: %llx", GetEntryName(*I), I->type, I->value); } } diff --git a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp index aa00f54560f..ee643327c5b 100644 --- a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp +++ b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp @@ -302,11 +302,11 @@ DYLDRendezvous::DumpToLog(LogSP log) const return; log->PutCString("DYLDRendezvous:"); - log->Printf(" Address: %lx", GetRendezvousAddress()); + log->Printf(" Address: %llx", GetRendezvousAddress()); log->Printf(" Version: %d", GetVersion()); - log->Printf(" Link : %lx", GetLinkMapAddress()); - log->Printf(" Break : %lx", GetBreakAddress()); - log->Printf(" LDBase : %lx", GetLDBase()); + log->Printf(" Link : %llx", GetLinkMapAddress()); + log->Printf(" Break : %llx", GetBreakAddress()); + log->Printf(" LDBase : %llx", GetLDBase()); log->Printf(" State : %s", (state == eConsistent) ? "consistent" : (state == eAdd) ? "add" : @@ -321,10 +321,10 @@ DYLDRendezvous::DumpToLog(LogSP log) const for (int i = 1; I != E; ++I, ++i) { log->Printf("\n SOEntry [%d] %s", i, I->path.c_str()); - log->Printf(" Base : %lx", I->base_addr); - log->Printf(" Path : %lx", I->path_addr); - log->Printf(" Dyn : %lx", I->dyn_addr); - log->Printf(" Next : %lx", I->next); - log->Printf(" Prev : %lx", I->prev); + log->Printf(" Base : %llx", I->base_addr); + log->Printf(" Path : %llx", I->path_addr); + log->Printf(" Dyn : %llx", I->dyn_addr); + log->Printf(" Next : %llx", I->next); + log->Printf(" Prev : %llx", I->prev); } } diff --git a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp index a9987c0096d..f4de4e52b38 100644 --- a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp +++ b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp @@ -280,8 +280,9 @@ DynamicLoaderPOSIXDYLD::RefreshModules() for (I = m_rendezvous.unloaded_begin(); I != E; ++I) { FileSpec file(I->path.c_str(), true); + ModuleSpec module_spec (file); ModuleSP module_sp = - loaded_modules.FindFirstModuleForFileSpec(file, NULL, NULL); + loaded_modules.FindFirstModule (module_spec); if (module_sp.get()) old_modules.Append(module_sp); } @@ -371,11 +372,12 @@ DynamicLoaderPOSIXDYLD::LoadModuleAtAddress(const FileSpec &file, addr_t base_ad ModuleList &modules = target.GetImages(); ModuleSP module_sp; - if ((module_sp = modules.FindFirstModuleForFileSpec(file, NULL, NULL))) + ModuleSpec module_spec (file, target.GetArchitecture()); + if ((module_sp = modules.FindFirstModule (module_spec))) { UpdateLoadedSections(module_sp, base_addr); } - else if ((module_sp = target.GetSharedModule(file, target.GetArchitecture()))) + else if ((module_sp = target.GetSharedModule(module_spec))) { UpdateLoadedSections(module_sp, base_addr); modules.Append(module_sp); diff --git a/lldb/source/lldb.cpp b/lldb/source/lldb.cpp index d4eb7820a00..1576063071c 100644 --- a/lldb/source/lldb.cpp +++ b/lldb/source/lldb.cpp @@ -37,6 +37,7 @@ #include "Plugins/UnwindAssembly/x86/UnwindAssembly-x86.h" #include "Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.h" #include "Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h" +#include "Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h" #if defined (__APPLE__) #include "Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.h" #include "Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.h" @@ -107,6 +108,7 @@ lldb_private::Initialize () UnwindAssembly_x86::Initialize(); EmulateInstructionARM::Initialize (); ObjectFilePECOFF::Initialize (); + DynamicLoaderPOSIXDYLD::Initialize (); #if defined (__APPLE__) //---------------------------------------------------------------------- // Apple/Darwin hosted plugins @@ -187,6 +189,7 @@ lldb_private::Terminate () UnwindAssemblyInstEmulation::Terminate(); EmulateInstructionARM::Terminate (); ObjectFilePECOFF::Terminate (); + DynamicLoaderPOSIXDYLD::Terminate (); #if defined (__APPLE__) DynamicLoaderMacOSXDYLD::Terminate(); |
