[Lldb-commits] [lldb] r138283 - in /lldb/trunk: lldb.xcodeproj/project.pbxproj source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.h source/Plugins/OperatingSystem/Darwin-Kernel/OperatingSystemDarwinKernel.cpp source/Plugins/OperatingSystem/Darwin-Kernel/OperatingSystemDarwinKernel.h source/lldb.cpp
Greg Clayton
gclayton at apple.com
Mon Aug 22 15:30:57 PDT 2011
Author: gclayton
Date: Mon Aug 22 17:30:57 2011
New Revision: 138283
URL: http://llvm.org/viewvc/llvm-project?rev=138283&view=rev
Log:
Finishing the renaming from "MacOSX-Kernel" to "Darwin-Kernel".
Modified:
lldb/trunk/lldb.xcodeproj/project.pbxproj
lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.h
lldb/trunk/source/Plugins/OperatingSystem/Darwin-Kernel/OperatingSystemDarwinKernel.cpp
lldb/trunk/source/Plugins/OperatingSystem/Darwin-Kernel/OperatingSystemDarwinKernel.h
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=138283&r1=138282&r2=138283&view=diff
==============================================================================
--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Mon Aug 22 17:30:57 2011
@@ -12,6 +12,8 @@
260E07C8136FAB9200CF21D3 /* OptionGroupFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260E07C7136FAB9200CF21D3 /* OptionGroupFile.cpp */; };
261744781168585B005ADD65 /* SBType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 261744771168585B005ADD65 /* SBType.cpp */; };
2617447A11685869005ADD65 /* SBType.h in Headers */ = {isa = PBXBuildFile; fileRef = 2617447911685869005ADD65 /* SBType.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 26274FA214030EEF006BA130 /* OperatingSystemDarwinKernel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26274FA014030EEF006BA130 /* OperatingSystemDarwinKernel.cpp */; };
+ 26274FA714030F79006BA130 /* DynamicLoaderDarwinKernel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26274FA514030F79006BA130 /* DynamicLoaderDarwinKernel.cpp */; };
2628A4D513D4977900F5487A /* ThreadKDP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2628A4D313D4977900F5487A /* ThreadKDP.cpp */; };
262CFC7711A4510000946C6C /* debugserver in Resources */ = {isa = PBXBuildFile; fileRef = 26CE05A0115C31E50022F371 /* debugserver */; };
262D24E613FB8710002D1960 /* RegisterContextMemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 262D24E413FB8710002D1960 /* RegisterContextMemory.cpp */; };
@@ -71,7 +73,6 @@
26680336116005EF008E1FE4 /* SBBreakpointLocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AF16CC7114086A1007A7B3F /* SBBreakpointLocation.cpp */; };
26680337116005F1008E1FE4 /* SBBreakpoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AF16A9C11402D5B007A7B3F /* SBBreakpoint.cpp */; };
2668035C11601108008E1FE4 /* LLDB.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26680207115FD0ED008E1FE4 /* LLDB.framework */; };
- 266DFE9413FD64D200D0C574 /* OperatingSystemMacOSXKernel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 266DFE9213FD64D200D0C574 /* OperatingSystemMacOSXKernel.cpp */; };
266DFE9713FD656E00D0C574 /* OperatingSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 266DFE9613FD656E00D0C574 /* OperatingSystem.cpp */; };
266E8C6A13528ABC000C2042 /* lldb-platform in Resources */ = {isa = PBXBuildFile; fileRef = 26DC6A101337FE6900FF7998 /* lldb-platform */; };
2671A0D013482601003A87BB /* ConnectionMachPort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2671A0CF13482601003A87BB /* ConnectionMachPort.cpp */; };
@@ -383,7 +384,6 @@
26DE20651161904E00A093E2 /* SBSymbol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26DE20641161904E00A093E2 /* SBSymbol.cpp */; };
26ECA04313665FED008D1F18 /* ARM_DWARF_Registers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26ECA04213665FED008D1F18 /* ARM_DWARF_Registers.cpp */; };
26ED3D6D13C563810017D45E /* OptionGroupVariable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26ED3D6C13C563810017D45E /* OptionGroupVariable.cpp */; };
- 26F4214413C6515B00E04E5E /* DynamicLoaderMacOSXKernel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F4214113C6515B00E04E5E /* DynamicLoaderMacOSXKernel.cpp */; };
26F4A21C13FBA31A0064B613 /* ThreadMemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F4A21A13FBA31A0064B613 /* ThreadMemory.cpp */; };
26F5C27710F3D9E4009D5894 /* Driver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F5C27310F3D9E4009D5894 /* Driver.cpp */; };
26F5C27810F3D9E4009D5894 /* IOChannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F5C27510F3D9E4009D5894 /* IOChannel.cpp */; };
@@ -606,6 +606,10 @@
26217930133BC8640083B112 /* lldb-private-types.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "lldb-private-types.h"; path = "include/lldb/lldb-private-types.h"; sourceTree = "<group>"; };
26217932133BCB850083B112 /* lldb-private-enumerations.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "lldb-private-enumerations.h"; path = "include/lldb/lldb-private-enumerations.h"; sourceTree = "<group>"; };
2623096E13D0EFFB006381D9 /* StreamBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = StreamBuffer.h; path = include/lldb/Core/StreamBuffer.h; sourceTree = "<group>"; };
+ 26274FA014030EEF006BA130 /* OperatingSystemDarwinKernel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OperatingSystemDarwinKernel.cpp; sourceTree = "<group>"; };
+ 26274FA114030EEF006BA130 /* OperatingSystemDarwinKernel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OperatingSystemDarwinKernel.h; sourceTree = "<group>"; };
+ 26274FA514030F79006BA130 /* DynamicLoaderDarwinKernel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DynamicLoaderDarwinKernel.cpp; sourceTree = "<group>"; };
+ 26274FA614030F79006BA130 /* DynamicLoaderDarwinKernel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DynamicLoaderDarwinKernel.h; sourceTree = "<group>"; };
2628A4D313D4977900F5487A /* ThreadKDP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThreadKDP.cpp; sourceTree = "<group>"; };
2628A4D413D4977900F5487A /* ThreadKDP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadKDP.h; sourceTree = "<group>"; };
262D24E413FB8710002D1960 /* RegisterContextMemory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RegisterContextMemory.cpp; path = Utility/RegisterContextMemory.cpp; sourceTree = "<group>"; };
@@ -664,8 +668,6 @@
266960631199F4230075C61A /* sed-sources */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = "sed-sources"; sourceTree = "<group>"; };
266A42D5128E3FFB0090CF7C /* ClangNamespaceDecl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ClangNamespaceDecl.cpp; path = source/Symbol/ClangNamespaceDecl.cpp; sourceTree = "<group>"; };
266A42D7128E40040090CF7C /* ClangNamespaceDecl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ClangNamespaceDecl.h; path = include/lldb/Symbol/ClangNamespaceDecl.h; sourceTree = "<group>"; };
- 266DFE9213FD64D200D0C574 /* OperatingSystemMacOSXKernel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OperatingSystemMacOSXKernel.cpp; sourceTree = "<group>"; };
- 266DFE9313FD64D200D0C574 /* OperatingSystemMacOSXKernel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OperatingSystemMacOSXKernel.h; sourceTree = "<group>"; };
266DFE9613FD656E00D0C574 /* OperatingSystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = OperatingSystem.cpp; path = source/Target/OperatingSystem.cpp; sourceTree = "<group>"; };
266DFE9813FD658300D0C574 /* OperatingSystem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OperatingSystem.h; path = include/lldb/Target/OperatingSystem.h; sourceTree = "<group>"; };
266F5CBB12FC846200DFCE33 /* Config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Config.h; path = include/lldb/Host/Config.h; sourceTree = "<group>"; };
@@ -1057,8 +1059,6 @@
26ECA04213665FED008D1F18 /* ARM_DWARF_Registers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ARM_DWARF_Registers.cpp; path = source/Utility/ARM_DWARF_Registers.cpp; sourceTree = "<group>"; };
26ED3D6C13C563810017D45E /* OptionGroupVariable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = OptionGroupVariable.cpp; path = source/Interpreter/OptionGroupVariable.cpp; sourceTree = "<group>"; };
26ED3D6F13C5638A0017D45E /* OptionGroupVariable.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OptionGroupVariable.h; path = include/lldb/Interpreter/OptionGroupVariable.h; sourceTree = "<group>"; };
- 26F4214113C6515B00E04E5E /* DynamicLoaderMacOSXKernel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DynamicLoaderMacOSXKernel.cpp; sourceTree = "<group>"; };
- 26F4214213C6515B00E04E5E /* DynamicLoaderMacOSXKernel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DynamicLoaderMacOSXKernel.h; sourceTree = "<group>"; };
26F4A21A13FBA31A0064B613 /* ThreadMemory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ThreadMemory.cpp; path = Utility/ThreadMemory.cpp; sourceTree = "<group>"; };
26F4A21B13FBA31A0064B613 /* ThreadMemory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ThreadMemory.h; path = Utility/ThreadMemory.h; sourceTree = "<group>"; };
26F5C26A10F3D9A4009D5894 /* lldb */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = lldb; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1433,8 +1433,8 @@
260C897810F57C5600BB2B04 /* DynamicLoader */ = {
isa = PBXGroup;
children = (
+ 26274FA414030F79006BA130 /* Darwin-Kernel */,
260C897910F57C5600BB2B04 /* MacOSX-DYLD */,
- 26F4214013C6515B00E04E5E /* MacOSX-Kernel */,
268A683C1321B505000E3FB8 /* Static */,
);
path = DynamicLoader;
@@ -1595,6 +1595,24 @@
path = MacOSX;
sourceTree = "<group>";
};
+ 26274F9F14030EEF006BA130 /* Darwin-Kernel */ = {
+ isa = PBXGroup;
+ children = (
+ 26274FA014030EEF006BA130 /* OperatingSystemDarwinKernel.cpp */,
+ 26274FA114030EEF006BA130 /* OperatingSystemDarwinKernel.h */,
+ );
+ path = "Darwin-Kernel";
+ sourceTree = "<group>";
+ };
+ 26274FA414030F79006BA130 /* Darwin-Kernel */ = {
+ isa = PBXGroup;
+ children = (
+ 26274FA514030F79006BA130 /* DynamicLoaderDarwinKernel.cpp */,
+ 26274FA614030F79006BA130 /* DynamicLoaderDarwinKernel.h */,
+ );
+ path = "Darwin-Kernel";
+ sourceTree = "<group>";
+ };
262D3190111B4341004E6F88 /* API */ = {
isa = PBXGroup;
children = (
@@ -1763,20 +1781,11 @@
266DFE9013FD64D200D0C574 /* OperatingSystem */ = {
isa = PBXGroup;
children = (
- 266DFE9113FD64D200D0C574 /* MacOSX-Kernel */,
+ 26274F9F14030EEF006BA130 /* Darwin-Kernel */,
);
path = OperatingSystem;
sourceTree = "<group>";
};
- 266DFE9113FD64D200D0C574 /* MacOSX-Kernel */ = {
- isa = PBXGroup;
- children = (
- 266DFE9213FD64D200D0C574 /* OperatingSystemMacOSXKernel.cpp */,
- 266DFE9313FD64D200D0C574 /* OperatingSystemMacOSXKernel.h */,
- );
- path = "MacOSX-Kernel";
- sourceTree = "<group>";
- };
2682F168115ED9C800CCFF99 /* Utility */ = {
isa = PBXGroup;
children = (
@@ -2507,15 +2516,6 @@
name = "lldb-platform";
sourceTree = "<group>";
};
- 26F4214013C6515B00E04E5E /* MacOSX-Kernel */ = {
- isa = PBXGroup;
- children = (
- 26F4214113C6515B00E04E5E /* DynamicLoaderMacOSXKernel.cpp */,
- 26F4214213C6515B00E04E5E /* DynamicLoaderMacOSXKernel.h */,
- );
- path = "MacOSX-Kernel";
- sourceTree = "<group>";
- };
26F5C22410F3D950009D5894 /* Tools */ = {
isa = PBXGroup;
children = (
@@ -3278,7 +3278,6 @@
49D8FB3913B5598F00411094 /* ClangASTImporter.cpp in Sources */,
9467E65213C3D97600B3B6F3 /* TypeHierarchyNavigator.cpp in Sources */,
26ED3D6D13C563810017D45E /* OptionGroupVariable.cpp in Sources */,
- 26F4214413C6515B00E04E5E /* DynamicLoaderMacOSXKernel.cpp in Sources */,
94611EB213CCA4A4003A22AF /* RefCounter.cpp in Sources */,
94031A9E13CF486700DCFF3C /* InputReaderEZ.cpp in Sources */,
2642FBAE13D003B400ED6808 /* CommunicationKDP.cpp in Sources */,
@@ -3296,10 +3295,11 @@
94B6E76213D88365005F417F /* ValueObjectSyntheticFilter.cpp in Sources */,
262D24E613FB8710002D1960 /* RegisterContextMemory.cpp in Sources */,
26F4A21C13FBA31A0064B613 /* ThreadMemory.cpp in Sources */,
- 266DFE9413FD64D200D0C574 /* OperatingSystemMacOSXKernel.cpp in Sources */,
266DFE9713FD656E00D0C574 /* OperatingSystem.cpp in Sources */,
26954EBE1401EE8B00294D09 /* DynamicRegisterInfo.cpp in Sources */,
9470A8F01402DFFB0056FF61 /* DataVisualization.cpp in Sources */,
+ 26274FA214030EEF006BA130 /* OperatingSystemDarwinKernel.cpp in Sources */,
+ 26274FA714030F79006BA130 /* DynamicLoaderDarwinKernel.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Modified: lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp?rev=138283&r1=138282&r2=138283&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp (original)
+++ lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp Mon Aug 22 17:30:57 2011
@@ -1,4 +1,4 @@
-//===-- DynamicLoaderMacOSXKernel.cpp -----------------------------*- C++ -*-===//
+//===-- DynamicLoaderDarwinKernel.cpp -----------------------------*- C++ -*-===//
//
// The LLVM Compiler Infrastructure
//
@@ -23,7 +23,7 @@
#include "lldb/Target/ThreadPlanRunToAddress.h"
#include "lldb/Target/StackFrame.h"
-#include "DynamicLoaderMacOSXKernel.h"
+#include "DynamicLoaderDarwinKernel.h"
//#define ENABLE_DEBUG_PRINTF // COMMENT THIS LINE OUT PRIOR TO CHECKIN
#ifdef ENABLE_DEBUG_PRINTF
@@ -47,7 +47,7 @@
// allows the lldb to instantiate an instance of this class.
//----------------------------------------------------------------------
DynamicLoader *
-DynamicLoaderMacOSXKernel::CreateInstance (Process* process, bool force)
+DynamicLoaderDarwinKernel::CreateInstance (Process* process, bool force)
{
bool create = force;
if (!create)
@@ -78,14 +78,14 @@
}
if (create)
- return new DynamicLoaderMacOSXKernel (process);
+ return new DynamicLoaderDarwinKernel (process);
return NULL;
}
//----------------------------------------------------------------------
// Constructor
//----------------------------------------------------------------------
-DynamicLoaderMacOSXKernel::DynamicLoaderMacOSXKernel (Process* process) :
+DynamicLoaderDarwinKernel::DynamicLoaderDarwinKernel (Process* process) :
DynamicLoader(process),
m_kernel(),
m_kext_summary_header_ptr_addr (),
@@ -100,13 +100,13 @@
//----------------------------------------------------------------------
// Destructor
//----------------------------------------------------------------------
-DynamicLoaderMacOSXKernel::~DynamicLoaderMacOSXKernel()
+DynamicLoaderDarwinKernel::~DynamicLoaderDarwinKernel()
{
Clear(true);
}
void
-DynamicLoaderMacOSXKernel::UpdateIfNeeded()
+DynamicLoaderDarwinKernel::UpdateIfNeeded()
{
LoadKernelModuleIfNeeded();
SetNotificationBreakpointIfNeeded ();
@@ -118,7 +118,7 @@
/// attaching to a process.
//------------------------------------------------------------------
void
-DynamicLoaderMacOSXKernel::DidAttach ()
+DynamicLoaderDarwinKernel::DidAttach ()
{
PrivateInitialize(m_process);
UpdateIfNeeded();
@@ -131,7 +131,7 @@
/// attaching to a process.
//------------------------------------------------------------------
void
-DynamicLoaderMacOSXKernel::DidLaunch ()
+DynamicLoaderDarwinKernel::DidLaunch ()
{
PrivateInitialize(m_process);
UpdateIfNeeded();
@@ -142,7 +142,7 @@
// Clear out the state of this class.
//----------------------------------------------------------------------
void
-DynamicLoaderMacOSXKernel::Clear (bool clear_process)
+DynamicLoaderDarwinKernel::Clear (bool clear_process)
{
Mutex::Locker locker(m_mutex);
@@ -166,7 +166,7 @@
// already loaded).
//----------------------------------------------------------------------
void
-DynamicLoaderMacOSXKernel::LoadKernelModuleIfNeeded()
+DynamicLoaderDarwinKernel::LoadKernelModuleIfNeeded()
{
if (!m_kext_summary_header_ptr_addr.IsValid())
{
@@ -209,7 +209,7 @@
}
bool
-DynamicLoaderMacOSXKernel::FindTargetModule (OSKextLoadedKextSummary &image_info, bool can_create, bool *did_create_ptr)
+DynamicLoaderDarwinKernel::FindTargetModule (OSKextLoadedKextSummary &image_info, bool can_create, bool *did_create_ptr)
{
if (did_create_ptr)
*did_create_ptr = false;
@@ -252,7 +252,7 @@
}
bool
-DynamicLoaderMacOSXKernel::UpdateCommPageLoadAddress(Module *module)
+DynamicLoaderDarwinKernel::UpdateCommPageLoadAddress(Module *module)
{
bool changed = false;
if (module)
@@ -290,7 +290,7 @@
// updated INFO that is passed in.
//----------------------------------------------------------------------
bool
-DynamicLoaderMacOSXKernel::UpdateImageLoadAddress (OSKextLoadedKextSummary& info)
+DynamicLoaderDarwinKernel::UpdateImageLoadAddress (OSKextLoadedKextSummary& info)
{
Module *module = info.module_sp.get();
bool changed = false;
@@ -362,7 +362,7 @@
// updated INFO that is passed in.
//----------------------------------------------------------------------
bool
-DynamicLoaderMacOSXKernel::UnloadImageLoadAddress (OSKextLoadedKextSummary& info)
+DynamicLoaderDarwinKernel::UnloadImageLoadAddress (OSKextLoadedKextSummary& info)
{
Module *module = info.module_sp.get();
bool changed = false;
@@ -407,22 +407,22 @@
// or not (based on global preference).
//----------------------------------------------------------------------
bool
-DynamicLoaderMacOSXKernel::BreakpointHitCallback (void *baton,
+DynamicLoaderDarwinKernel::BreakpointHitCallback (void *baton,
StoppointCallbackContext *context,
user_id_t break_id,
user_id_t break_loc_id)
{
- return static_cast<DynamicLoaderMacOSXKernel*>(baton)->BreakpointHit (context, break_id, break_loc_id);
+ return static_cast<DynamicLoaderDarwinKernel*>(baton)->BreakpointHit (context, break_id, break_loc_id);
}
bool
-DynamicLoaderMacOSXKernel::BreakpointHit (StoppointCallbackContext *context,
+DynamicLoaderDarwinKernel::BreakpointHit (StoppointCallbackContext *context,
user_id_t break_id,
user_id_t break_loc_id)
{
LogSP log(GetLogIfAnyCategoriesSet (LIBLLDB_LOG_DYNAMIC_LOADER));
if (log)
- log->Printf ("DynamicLoaderMacOSXKernel::BreakpointHit (...)\n");
+ log->Printf ("DynamicLoaderDarwinKernel::BreakpointHit (...)\n");
ReadAllKextSummaries ();
@@ -434,7 +434,7 @@
bool
-DynamicLoaderMacOSXKernel::ReadKextSummaryHeader ()
+DynamicLoaderDarwinKernel::ReadKextSummaryHeader ()
{
Mutex::Locker locker(m_mutex);
@@ -487,7 +487,7 @@
bool
-DynamicLoaderMacOSXKernel::ParseKextSummaries (const Address &kext_summary_addr,
+DynamicLoaderDarwinKernel::ParseKextSummaries (const Address &kext_summary_addr,
uint32_t count)
{
OSKextLoadedKextSummary::collection kext_summaries;
@@ -544,7 +544,7 @@
// NB don't call this passing in m_kext_summaries.
bool
-DynamicLoaderMacOSXKernel::AddModulesUsingImageInfos (OSKextLoadedKextSummary::collection &image_infos)
+DynamicLoaderDarwinKernel::AddModulesUsingImageInfos (OSKextLoadedKextSummary::collection &image_infos)
{
// Now add these images to the main list.
ModuleList loaded_module_list;
@@ -588,7 +588,7 @@
}
}
// if (log)
-// loaded_module_list.LogUUIDAndPaths (log, "DynamicLoaderMacOSXKernel::ModulesDidLoad");
+// loaded_module_list.LogUUIDAndPaths (log, "DynamicLoaderDarwinKernel::ModulesDidLoad");
m_process->GetTarget().ModulesDidLoad (loaded_module_list);
}
return true;
@@ -596,7 +596,7 @@
uint32_t
-DynamicLoaderMacOSXKernel::ReadKextSummaries (const Address &kext_summary_addr,
+DynamicLoaderDarwinKernel::ReadKextSummaries (const Address &kext_summary_addr,
uint32_t image_infos_count,
OSKextLoadedKextSummary::collection &image_infos)
{
@@ -660,7 +660,7 @@
}
bool
-DynamicLoaderMacOSXKernel::ReadAllKextSummaries ()
+DynamicLoaderDarwinKernel::ReadAllKextSummaries ()
{
LogSP log(GetLogIfAnyCategoriesSet (LIBLLDB_LOG_DYNAMIC_LOADER));
@@ -689,7 +689,7 @@
// Returns true if we succeed, false if we fail for any reason.
//----------------------------------------------------------------------
bool
-DynamicLoaderMacOSXKernel::ReadMachHeader (OSKextLoadedKextSummary& kext_summary, DataExtractor *load_command_data)
+DynamicLoaderDarwinKernel::ReadMachHeader (OSKextLoadedKextSummary& kext_summary, DataExtractor *load_command_data)
{
DataBufferHeap header_bytes(sizeof(llvm::MachO::mach_header), 0);
Error error;
@@ -708,7 +708,7 @@
DataExtractor data(header_bytes.GetBytes(), header_bytes.GetByteSize(), endian::InlHostByteOrder(), 4);
kext_summary.header.magic = data.GetU32(&offset);
Address load_cmd_addr = kext_summary.so_address;
- data.SetByteOrder(DynamicLoaderMacOSXKernel::GetByteOrderFromMagic(kext_summary.header.magic));
+ data.SetByteOrder(DynamicLoaderDarwinKernel::GetByteOrderFromMagic(kext_summary.header.magic));
switch (kext_summary.header.magic)
{
case llvm::MachO::HeaderMagic32:
@@ -762,7 +762,7 @@
// Parse the load commands for an image
//----------------------------------------------------------------------
uint32_t
-DynamicLoaderMacOSXKernel::ParseLoadCommands (const DataExtractor& data, OSKextLoadedKextSummary& image_info)
+DynamicLoaderDarwinKernel::ParseLoadCommands (const DataExtractor& data, OSKextLoadedKextSummary& image_info)
{
uint32_t offset = 0;
uint32_t cmd_idx;
@@ -860,7 +860,7 @@
// Dump a Segment to the file handle provided.
//----------------------------------------------------------------------
void
-DynamicLoaderMacOSXKernel::Segment::PutToLog (Log *log, addr_t slide) const
+DynamicLoaderDarwinKernel::Segment::PutToLog (Log *log, addr_t slide) const
{
if (log)
{
@@ -878,8 +878,8 @@
}
}
-const DynamicLoaderMacOSXKernel::Segment *
-DynamicLoaderMacOSXKernel::OSKextLoadedKextSummary::FindSegment (const ConstString &name) const
+const DynamicLoaderDarwinKernel::Segment *
+DynamicLoaderDarwinKernel::OSKextLoadedKextSummary::FindSegment (const ConstString &name) const
{
const size_t num_segments = segments.size();
for (size_t i=0; i<num_segments; ++i)
@@ -895,7 +895,7 @@
// Dump an image info structure to the file handle provided.
//----------------------------------------------------------------------
void
-DynamicLoaderMacOSXKernel::OSKextLoadedKextSummary::PutToLog (Log *log) const
+DynamicLoaderDarwinKernel::OSKextLoadedKextSummary::PutToLog (Log *log) const
{
if (log == NULL)
return;
@@ -941,7 +941,7 @@
// that we have parsed to the file handle provided.
//----------------------------------------------------------------------
void
-DynamicLoaderMacOSXKernel::PutToLog(Log *log) const
+DynamicLoaderDarwinKernel::PutToLog(Log *log) const
{
if (log == NULL)
return;
@@ -964,20 +964,20 @@
}
void
-DynamicLoaderMacOSXKernel::PrivateInitialize(Process *process)
+DynamicLoaderDarwinKernel::PrivateInitialize(Process *process)
{
- DEBUG_PRINTF("DynamicLoaderMacOSXKernel::%s() process state = %s\n", __FUNCTION__, StateAsCString(m_process->GetState()));
+ DEBUG_PRINTF("DynamicLoaderDarwinKernel::%s() process state = %s\n", __FUNCTION__, StateAsCString(m_process->GetState()));
Clear(true);
m_process = process;
m_process->GetTarget().GetSectionLoadList().Clear();
}
void
-DynamicLoaderMacOSXKernel::SetNotificationBreakpointIfNeeded ()
+DynamicLoaderDarwinKernel::SetNotificationBreakpointIfNeeded ()
{
if (m_break_id == LLDB_INVALID_BREAK_ID)
{
- DEBUG_PRINTF("DynamicLoaderMacOSXKernel::%s() process state = %s\n", __FUNCTION__, StateAsCString(m_process->GetState()));
+ DEBUG_PRINTF("DynamicLoaderDarwinKernel::%s() process state = %s\n", __FUNCTION__, StateAsCString(m_process->GetState()));
const bool internal_bp = false;
@@ -988,7 +988,7 @@
internal_bp,
skip_prologue).get();
- bp->SetCallback (DynamicLoaderMacOSXKernel::BreakpointHitCallback, this, true);
+ bp->SetCallback (DynamicLoaderDarwinKernel::BreakpointHitCallback, this, true);
m_break_id = bp->GetID();
}
}
@@ -997,9 +997,9 @@
// Member function that gets called when the process state changes.
//----------------------------------------------------------------------
void
-DynamicLoaderMacOSXKernel::PrivateProcessStateChanged (Process *process, StateType state)
+DynamicLoaderDarwinKernel::PrivateProcessStateChanged (Process *process, StateType state)
{
- DEBUG_PRINTF("DynamicLoaderMacOSXKernel::%s(%s)\n", __FUNCTION__, StateAsCString(state));
+ DEBUG_PRINTF("DynamicLoaderDarwinKernel::%s(%s)\n", __FUNCTION__, StateAsCString(state));
switch (state)
{
case eStateConnected:
@@ -1028,7 +1028,7 @@
}
ThreadPlanSP
-DynamicLoaderMacOSXKernel::GetStepThroughTrampolinePlan (Thread &thread, bool stop_others)
+DynamicLoaderDarwinKernel::GetStepThroughTrampolinePlan (Thread &thread, bool stop_others)
{
ThreadPlanSP thread_plan_sp;
LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP));
@@ -1038,7 +1038,7 @@
}
Error
-DynamicLoaderMacOSXKernel::CanLoadImage ()
+DynamicLoaderDarwinKernel::CanLoadImage ()
{
Error error;
error.SetErrorString("always unsafe to load or unload shared libraries in the darwin kernel");
@@ -1046,7 +1046,7 @@
}
void
-DynamicLoaderMacOSXKernel::Initialize()
+DynamicLoaderDarwinKernel::Initialize()
{
PluginManager::RegisterPlugin (GetPluginNameStatic(),
GetPluginDescriptionStatic(),
@@ -1054,20 +1054,20 @@
}
void
-DynamicLoaderMacOSXKernel::Terminate()
+DynamicLoaderDarwinKernel::Terminate()
{
PluginManager::UnregisterPlugin (CreateInstance);
}
const char *
-DynamicLoaderMacOSXKernel::GetPluginNameStatic()
+DynamicLoaderDarwinKernel::GetPluginNameStatic()
{
return "dynamic-loader.macosx-kernel";
}
const char *
-DynamicLoaderMacOSXKernel::GetPluginDescriptionStatic()
+DynamicLoaderDarwinKernel::GetPluginDescriptionStatic()
{
return "Dynamic loader plug-in that watches for shared library loads/unloads in the MacOSX kernel.";
}
@@ -1077,19 +1077,19 @@
// PluginInterface protocol
//------------------------------------------------------------------
const char *
-DynamicLoaderMacOSXKernel::GetPluginName()
+DynamicLoaderDarwinKernel::GetPluginName()
{
- return "DynamicLoaderMacOSXKernel";
+ return "DynamicLoaderDarwinKernel";
}
const char *
-DynamicLoaderMacOSXKernel::GetShortPluginName()
+DynamicLoaderDarwinKernel::GetShortPluginName()
{
return GetPluginNameStatic();
}
uint32_t
-DynamicLoaderMacOSXKernel::GetPluginVersion()
+DynamicLoaderDarwinKernel::GetPluginVersion()
{
return 1;
}
Modified: lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.h?rev=138283&r1=138282&r2=138283&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.h (original)
+++ lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.h Mon Aug 22 17:30:57 2011
@@ -1,4 +1,4 @@
-//===-- DynamicLoaderMacOSXKernel.h -----------------------------*- C++ -*-===//
+//===-- DynamicLoaderDarwinKernel.h -----------------------------*- C++ -*-===//
//
// The LLVM Compiler Infrastructure
//
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef liblldb_DynamicLoaderMacOSXKernel_h_
-#define liblldb_DynamicLoaderMacOSXKernel_h_
+#ifndef liblldb_DynamicLoaderDarwinKernel_h_
+#define liblldb_DynamicLoaderDarwinKernel_h_
// C Includes
// C++ Includes
@@ -26,7 +26,7 @@
#include "lldb/Host/Mutex.h"
#include "lldb/Target/Process.h"
-class DynamicLoaderMacOSXKernel : public lldb_private::DynamicLoader
+class DynamicLoaderDarwinKernel : public lldb_private::DynamicLoader
{
public:
//------------------------------------------------------------------
@@ -47,10 +47,10 @@
static lldb_private::DynamicLoader *
CreateInstance (lldb_private::Process *process, bool force);
- DynamicLoaderMacOSXKernel (lldb_private::Process *process);
+ DynamicLoaderDarwinKernel (lldb_private::Process *process);
virtual
- ~DynamicLoaderMacOSXKernel ();
+ ~DynamicLoaderDarwinKernel ();
//------------------------------------------------------------------
/// Called after attaching a process.
///
@@ -437,7 +437,7 @@
lldb::user_id_t m_break_id;
private:
- DISALLOW_COPY_AND_ASSIGN (DynamicLoaderMacOSXKernel);
+ DISALLOW_COPY_AND_ASSIGN (DynamicLoaderDarwinKernel);
};
-#endif // liblldb_DynamicLoaderMacOSXKernel_h_
+#endif // liblldb_DynamicLoaderDarwinKernel_h_
Modified: lldb/trunk/source/Plugins/OperatingSystem/Darwin-Kernel/OperatingSystemDarwinKernel.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/OperatingSystem/Darwin-Kernel/OperatingSystemDarwinKernel.cpp?rev=138283&r1=138282&r2=138283&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/OperatingSystem/Darwin-Kernel/OperatingSystemDarwinKernel.cpp (original)
+++ lldb/trunk/source/Plugins/OperatingSystem/Darwin-Kernel/OperatingSystemDarwinKernel.cpp Mon Aug 22 17:30:57 2011
@@ -1,4 +1,4 @@
-//===-- OperatingSystemMacOSXKernel.cpp --------------------------------*- C++ -*-===//
+//===-- OperatingSystemDarwinKernel.cpp --------------------------------*- C++ -*-===//
//
// The LLVM Compiler Infrastructure
//
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-#include "OperatingSystemMacOSXKernel.h"
+#include "OperatingSystemDarwinKernel.h"
// C Includes
// C++ Includes
// Other libraries and framework includes
@@ -41,7 +41,7 @@
}
void
-OperatingSystemMacOSXKernel::Initialize()
+OperatingSystemDarwinKernel::Initialize()
{
PluginManager::RegisterPlugin (GetPluginNameStatic(),
GetPluginDescriptionStatic(),
@@ -49,13 +49,13 @@
}
void
-OperatingSystemMacOSXKernel::Terminate()
+OperatingSystemDarwinKernel::Terminate()
{
PluginManager::UnregisterPlugin (CreateInstance);
}
OperatingSystem *
-OperatingSystemMacOSXKernel::CreateInstance (Process *process, bool force)
+OperatingSystemDarwinKernel::CreateInstance (Process *process, bool force)
{
#if 0
bool create = force;
@@ -89,38 +89,38 @@
}
if (create)
- return new OperatingSystemMacOSXKernel (process);
+ return new OperatingSystemDarwinKernel (process);
#endif
return NULL;
}
const char *
-OperatingSystemMacOSXKernel::GetPluginNameStatic()
+OperatingSystemDarwinKernel::GetPluginNameStatic()
{
return "macosx-kernel";
}
const char *
-OperatingSystemMacOSXKernel::GetPluginDescriptionStatic()
+OperatingSystemDarwinKernel::GetPluginDescriptionStatic()
{
return "Operating system plug-in that gathers OS information from darwin kernels.";
}
-OperatingSystemMacOSXKernel::OperatingSystemMacOSXKernel (lldb_private::Process *process) :
+OperatingSystemDarwinKernel::OperatingSystemDarwinKernel (lldb_private::Process *process) :
OperatingSystem (process),
m_thread_list_valobj_sp (),
m_register_info_ap ()
{
}
-OperatingSystemMacOSXKernel::~OperatingSystemMacOSXKernel ()
+OperatingSystemDarwinKernel::~OperatingSystemDarwinKernel ()
{
}
ValueObjectSP
-OperatingSystemMacOSXKernel::GetThreadListValueObject ()
+OperatingSystemDarwinKernel::GetThreadListValueObject ()
{
if (m_thread_list_valobj_sp.get() == NULL)
{
@@ -144,7 +144,7 @@
}
DynamicRegisterInfo *
-OperatingSystemMacOSXKernel::GetDynamicRegisterInfo ()
+OperatingSystemDarwinKernel::GetDynamicRegisterInfo ()
{
if (m_register_info_ap.get() == NULL && m_thread_list_valobj_sp)
{
@@ -209,25 +209,25 @@
// PluginInterface protocol
//------------------------------------------------------------------
const char *
-OperatingSystemMacOSXKernel::GetPluginName()
+OperatingSystemDarwinKernel::GetPluginName()
{
- return "OperatingSystemMacOSXKernel";
+ return "OperatingSystemDarwinKernel";
}
const char *
-OperatingSystemMacOSXKernel::GetShortPluginName()
+OperatingSystemDarwinKernel::GetShortPluginName()
{
return GetPluginNameStatic();
}
uint32_t
-OperatingSystemMacOSXKernel::GetPluginVersion()
+OperatingSystemDarwinKernel::GetPluginVersion()
{
return 1;
}
uint32_t
-OperatingSystemMacOSXKernel::UpdateThreadList (ThreadList &old_thread_list, ThreadList &new_thread_list)
+OperatingSystemDarwinKernel::UpdateThreadList (ThreadList &old_thread_list, ThreadList &new_thread_list)
{
// Make any constant strings once and cache the uniqued C string values
// so we don't have to rehash them each time through this function call
@@ -270,12 +270,12 @@
}
void
-OperatingSystemMacOSXKernel::ThreadWasSelected (Thread *thread)
+OperatingSystemDarwinKernel::ThreadWasSelected (Thread *thread)
{
}
RegisterContextSP
-OperatingSystemMacOSXKernel::CreateRegisterContextForThread (Thread *thread)
+OperatingSystemDarwinKernel::CreateRegisterContextForThread (Thread *thread)
{
ThreadMemory *generic_thread = (ThreadMemory *)thread;
RegisterContextSP reg_ctx_sp;
@@ -300,7 +300,7 @@
}
StopInfoSP
-OperatingSystemMacOSXKernel::CreateThreadStopReason (lldb_private::Thread *thread)
+OperatingSystemDarwinKernel::CreateThreadStopReason (lldb_private::Thread *thread)
{
StopInfoSP stop_info_sp; //(StopInfo::CreateStopReasonWithSignal (*thread, SIGSTOP));
return stop_info_sp;
Modified: lldb/trunk/source/Plugins/OperatingSystem/Darwin-Kernel/OperatingSystemDarwinKernel.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/OperatingSystem/Darwin-Kernel/OperatingSystemDarwinKernel.h?rev=138283&r1=138282&r2=138283&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/OperatingSystem/Darwin-Kernel/OperatingSystemDarwinKernel.h (original)
+++ lldb/trunk/source/Plugins/OperatingSystem/Darwin-Kernel/OperatingSystemDarwinKernel.h Mon Aug 22 17:30:57 2011
@@ -1,4 +1,4 @@
-//===-- OperatingSystemMacOSXKernel.h ----------------------------------*- C++ -*-===//
+//===-- OperatingSystemDarwinKernel.h ---------------------------*- C++ -*-===//
//
// The LLVM Compiler Infrastructure
//
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef liblldb_OperatingSystemMacOSXKernel_h_
-#define liblldb_OperatingSystemMacOSXKernel_h_
+#ifndef liblldb_OperatingSystemDarwinKernel_h_
+#define liblldb_OperatingSystemDarwinKernel_h_
// C Includes
// C++ Includes
@@ -17,7 +17,7 @@
class DynamicRegisterInfo;
-class OperatingSystemMacOSXKernel : public lldb_private::OperatingSystem
+class OperatingSystemDarwinKernel : public lldb_private::OperatingSystem
{
public:
//------------------------------------------------------------------
@@ -41,10 +41,10 @@
//------------------------------------------------------------------
// Class Methods
//------------------------------------------------------------------
- OperatingSystemMacOSXKernel (lldb_private::Process *process);
+ OperatingSystemDarwinKernel (lldb_private::Process *process);
virtual
- ~OperatingSystemMacOSXKernel ();
+ ~OperatingSystemDarwinKernel ();
//------------------------------------------------------------------
// lldb_private::PluginInterface Methods
@@ -87,4 +87,4 @@
};
-#endif // #ifndef liblldb_OperatingSystemMacOSXKernel_h_
\ No newline at end of file
+#endif // #ifndef liblldb_OperatingSystemDarwinKernel_h_
\ No newline at end of file
Modified: lldb/trunk/source/lldb.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/lldb.cpp?rev=138283&r1=138282&r2=138283&view=diff
==============================================================================
--- lldb/trunk/source/lldb.cpp (original)
+++ lldb/trunk/source/lldb.cpp Mon Aug 22 17:30:57 2011
@@ -38,8 +38,8 @@
#if defined (__APPLE__)
#include "Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.h"
-#include "Plugins/DynamicLoader/MacOSX-Kernel/DynamicLoaderMacOSXKernel.h"
-#include "Plugins/OperatingSystem/MacOSX-Kernel/OperatingSystemMacOSXKernel.h"
+#include "Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.h"
+#include "Plugins/OperatingSystem/Darwin-Kernel/OperatingSystemDarwinKernel.h"
#include "Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h"
#include "Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.h"
#include "Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h"
@@ -100,8 +100,8 @@
// Apple/Darwin hosted plugins
//----------------------------------------------------------------------
DynamicLoaderMacOSXDYLD::Initialize();
- DynamicLoaderMacOSXKernel::Initialize();
- OperatingSystemMacOSXKernel::Initialize();
+ DynamicLoaderDarwinKernel::Initialize();
+ OperatingSystemDarwinKernel::Initialize();
SymbolFileDWARFDebugMap::Initialize();
ItaniumABILanguageRuntime::Initialize();
AppleObjCRuntimeV2::Initialize();
@@ -169,8 +169,8 @@
#if defined (__APPLE__)
DynamicLoaderMacOSXDYLD::Terminate();
- DynamicLoaderMacOSXKernel::Terminate();
- OperatingSystemMacOSXKernel::Terminate();
+ DynamicLoaderDarwinKernel::Terminate();
+ OperatingSystemDarwinKernel::Terminate();
SymbolFileDWARFDebugMap::Terminate();
ItaniumABILanguageRuntime::Terminate();
AppleObjCRuntimeV2::Terminate();
More information about the lldb-commits
mailing list