[Lldb-commits] [lldb] r151536 - in /lldb/trunk: lldb.xcodeproj/project.pbxproj source/Host/macosx/Host.mm source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp source/lldb.cpp
Greg Clayton
gclayton at apple.com
Mon Feb 27 11:00:34 PST 2012
Author: gclayton
Date: Mon Feb 27 13:00:34 2012
New Revision: 151536
URL: http://llvm.org/viewvc/llvm-project?rev=151536&view=rev
Log:
Added the POSIX-DYLD as a plug-in in the darwin build in the Xcode project
so that we don't break it with code changes.
After doing this I was able to fix the POSIX-DYLD plug-in so that it builds
after recent ModuleSpec changes.
Modified:
lldb/trunk/lldb.xcodeproj/project.pbxproj
lldb/trunk/source/Host/macosx/Host.mm
lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp
lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp
lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp
lldb/trunk/source/lldb.cpp
Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=151536&r1=151535&r2=151536&view=diff
==============================================================================
--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Mon Feb 27 13:00:34 2012
@@ -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;
};
Modified: lldb/trunk/source/Host/macosx/Host.mm
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/macosx/Host.mm?rev=151536&r1=151535&r2=151536&view=diff
==============================================================================
--- lldb/trunk/source/Host/macosx/Host.mm (original)
+++ lldb/trunk/source/Host/macosx/Host.mm Mon Feb 27 13:00:34 2012
@@ -1830,3 +1830,9 @@
::asl_vlog (NULL, g_aslmsg, asl_level, format, args);
}
}
+
+lldb::DataBufferSP
+Host::GetAuxvData(lldb_private::Process *process)
+{
+ return lldb::DataBufferSP();
+}
Modified: lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp?rev=151536&r1=151535&r2=151536&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp (original)
+++ lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp Mon Feb 27 13:00:34 2012
@@ -113,7 +113,7 @@
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);
}
}
Modified: lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp?rev=151536&r1=151535&r2=151536&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp (original)
+++ lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp Mon Feb 27 13:00:34 2012
@@ -302,11 +302,11 @@
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 @@
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);
}
}
Modified: lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp?rev=151536&r1=151535&r2=151536&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp (original)
+++ lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp Mon Feb 27 13:00:34 2012
@@ -280,8 +280,9 @@
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 @@
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);
Modified: lldb/trunk/source/lldb.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/lldb.cpp?rev=151536&r1=151535&r2=151536&view=diff
==============================================================================
--- lldb/trunk/source/lldb.cpp (original)
+++ lldb/trunk/source/lldb.cpp Mon Feb 27 13:00:34 2012
@@ -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 @@
UnwindAssembly_x86::Initialize();
EmulateInstructionARM::Initialize ();
ObjectFilePECOFF::Initialize ();
+ DynamicLoaderPOSIXDYLD::Initialize ();
#if defined (__APPLE__)
//----------------------------------------------------------------------
// Apple/Darwin hosted plugins
@@ -187,6 +189,7 @@
UnwindAssemblyInstEmulation::Terminate();
EmulateInstructionARM::Terminate ();
ObjectFilePECOFF::Terminate ();
+ DynamicLoaderPOSIXDYLD::Terminate ();
#if defined (__APPLE__)
DynamicLoaderMacOSXDYLD::Terminate();
More information about the lldb-commits
mailing list