summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lldb/lldb.xcodeproj/project.pbxproj32
-rw-r--r--lldb/source/Host/macosx/Host.mm6
-rw-r--r--lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp2
-rw-r--r--lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp18
-rw-r--r--lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp8
-rw-r--r--lldb/source/lldb.cpp3
6 files changed, 56 insertions, 13 deletions
diff --git a/lldb/lldb.xcodeproj/project.pbxproj b/lldb/lldb.xcodeproj/project.pbxproj
index 61b15f78305..f508290fd93 100644
--- a/lldb/lldb.xcodeproj/project.pbxproj
+++ b/lldb/lldb.xcodeproj/project.pbxproj
@@ -388,6 +388,12 @@
26F5C32C10F3DFDD009D5894 /* libedit.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 26F5C32A10F3DFDD009D5894 /* libedit.dylib */; };
26F5C32D10F3DFDD009D5894 /* libtermcap.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 26F5C32B10F3DFDD009D5894 /* libtermcap.dylib */; };
26F73062139D8FDB00FD51C7 /* History.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F73061139D8FDB00FD51C7 /* History.cpp */; };
+ 26FFC19914FC072100087D58 /* AuxVector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26FFC19314FC072100087D58 /* AuxVector.cpp */; };
+ 26FFC19A14FC072100087D58 /* AuxVector.h in Headers */ = {isa = PBXBuildFile; fileRef = 26FFC19414FC072100087D58 /* AuxVector.h */; };
+ 26FFC19B14FC072100087D58 /* DYLDRendezvous.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26FFC19514FC072100087D58 /* DYLDRendezvous.cpp */; };
+ 26FFC19C14FC072100087D58 /* DYLDRendezvous.h in Headers */ = {isa = PBXBuildFile; fileRef = 26FFC19614FC072100087D58 /* DYLDRendezvous.h */; };
+ 26FFC19D14FC072100087D58 /* DynamicLoaderPOSIXDYLD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26FFC19714FC072100087D58 /* DynamicLoaderPOSIXDYLD.cpp */; };
+ 26FFC19E14FC072100087D58 /* DynamicLoaderPOSIXDYLD.h in Headers */ = {isa = PBXBuildFile; fileRef = 26FFC19814FC072100087D58 /* DynamicLoaderPOSIXDYLD.h */; };
494260DA14579144003C1C78 /* VerifyDecl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 494260D914579144003C1C78 /* VerifyDecl.cpp */; };
4966DCC4148978A10028481B /* ClangExternalASTSourceCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4966DCC3148978A10028481B /* ClangExternalASTSourceCommon.cpp */; };
49A1CAC51430E8DE00306AC9 /* ExpressionSourceCode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49A1CAC31430E8BD00306AC9 /* ExpressionSourceCode.cpp */; };
@@ -1177,6 +1183,12 @@
26F996A8119B79C300412154 /* ARM_GCC_Registers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ARM_GCC_Registers.h; path = source/Utility/ARM_GCC_Registers.h; sourceTree = "<group>"; };
26FA4315130103F400E71120 /* FileSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileSpec.h; path = include/lldb/Host/FileSpec.h; sourceTree = "<group>"; };
26FA43171301048600E71120 /* FileSpec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileSpec.cpp; sourceTree = "<group>"; };
+ 26FFC19314FC072100087D58 /* AuxVector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AuxVector.cpp; sourceTree = "<group>"; };
+ 26FFC19414FC072100087D58 /* AuxVector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuxVector.h; sourceTree = "<group>"; };
+ 26FFC19514FC072100087D58 /* DYLDRendezvous.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DYLDRendezvous.cpp; sourceTree = "<group>"; };
+ 26FFC19614FC072100087D58 /* DYLDRendezvous.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DYLDRendezvous.h; sourceTree = "<group>"; };
+ 26FFC19714FC072100087D58 /* DynamicLoaderPOSIXDYLD.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DynamicLoaderPOSIXDYLD.cpp; sourceTree = "<group>"; };
+ 26FFC19814FC072100087D58 /* DynamicLoaderPOSIXDYLD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DynamicLoaderPOSIXDYLD.h; sourceTree = "<group>"; };
4906FD4012F2255300A2A77C /* ASTDumper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ASTDumper.cpp; path = source/Expression/ASTDumper.cpp; sourceTree = "<group>"; };
4906FD4412F2257600A2A77C /* ASTDumper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASTDumper.h; path = include/lldb/Expression/ASTDumper.h; sourceTree = "<group>"; };
4911934B1226383D00578B7F /* ASTStructExtractor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASTStructExtractor.h; path = include/lldb/Expression/ASTStructExtractor.h; sourceTree = "<group>"; };
@@ -1602,6 +1614,7 @@
children = (
26274FA414030F79006BA130 /* Darwin-Kernel */,
260C897910F57C5600BB2B04 /* MacOSX-DYLD */,
+ 26FFC19214FC072100087D58 /* POSIX-DYLD */,
268A683C1321B505000E3FB8 /* Static */,
);
path = DynamicLoader;
@@ -2851,6 +2864,19 @@
sourceTree = "<group>";
usesTabs = 0;
};
+ 26FFC19214FC072100087D58 /* POSIX-DYLD */ = {
+ isa = PBXGroup;
+ children = (
+ 26FFC19314FC072100087D58 /* AuxVector.cpp */,
+ 26FFC19414FC072100087D58 /* AuxVector.h */,
+ 26FFC19514FC072100087D58 /* DYLDRendezvous.cpp */,
+ 26FFC19614FC072100087D58 /* DYLDRendezvous.h */,
+ 26FFC19714FC072100087D58 /* DynamicLoaderPOSIXDYLD.cpp */,
+ 26FFC19814FC072100087D58 /* DynamicLoaderPOSIXDYLD.h */,
+ );
+ path = "POSIX-DYLD";
+ sourceTree = "<group>";
+ };
4CCA643A13B40B82003BDF98 /* LanguageRuntime */ = {
isa = PBXGroup;
children = (
@@ -3027,6 +3053,9 @@
26A527C414E24F5F00F3A14A /* ThreadMachCore.h in Headers */,
4C6649A014EEE7F100B0316F /* StreamCallback.h in Headers */,
26B7564F14F89356008D9CB3 /* PlatformiOSSimulator.h in Headers */,
+ 26FFC19A14FC072100087D58 /* AuxVector.h in Headers */,
+ 26FFC19C14FC072100087D58 /* DYLDRendezvous.h in Headers */,
+ 26FFC19E14FC072100087D58 /* DynamicLoaderPOSIXDYLD.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -3749,6 +3778,9 @@
4C6649A314EEE81000B0316F /* StreamCallback.cpp in Sources */,
B299580B14F2FA1400050A04 /* DisassemblerLLVMC.cpp in Sources */,
26B7564E14F89356008D9CB3 /* PlatformiOSSimulator.cpp in Sources */,
+ 26FFC19914FC072100087D58 /* AuxVector.cpp in Sources */,
+ 26FFC19B14FC072100087D58 /* DYLDRendezvous.cpp in Sources */,
+ 26FFC19D14FC072100087D58 /* DynamicLoaderPOSIXDYLD.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
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();
OpenPOWER on IntegriCloud