[Lldb-commits] [lldb] r130135 - in /lldb/trunk: include/lldb/Target/ include/lldb/Utility/ lldb.xcodeproj/ source/ source/Plugins/ArchDefaultUnwindPlan/ source/Plugins/ArchVolatileRegs/ source/Plugins/Process/Utility/ source/Plugins/UnwindAssembly/ source/Symbol/ source/Target/ source/Utility/ tools/debugserver/debugserver.xcodeproj/
Greg Clayton
gclayton at apple.com
Mon Apr 25 11:36:37 PDT 2011
Author: gclayton
Date: Mon Apr 25 13:36:36 2011
New Revision: 130135
URL: http://llvm.org/viewvc/llvm-project?rev=130135&view=rev
Log:
Put plug-ins into the correct directories as they were incorrectly located
in a Utility directory.
Added:
lldb/trunk/include/lldb/Target/ArchDefaultUnwindPlan.h
- copied, changed from r130129, lldb/trunk/include/lldb/Utility/ArchDefaultUnwindPlan.h
lldb/trunk/include/lldb/Target/ArchVolatileRegs.h
- copied, changed from r130129, lldb/trunk/include/lldb/Utility/ArchVolatileRegs.h
lldb/trunk/include/lldb/Target/UnwindAssemblyProfiler.h
- copied, changed from r130129, lldb/trunk/include/lldb/Utility/UnwindAssemblyProfiler.h
lldb/trunk/source/Plugins/ArchDefaultUnwindPlan/
lldb/trunk/source/Plugins/ArchDefaultUnwindPlan/ArchDefaultUnwindPlan-x86.cpp
- copied, changed from r130129, lldb/trunk/source/Plugins/Process/Utility/ArchDefaultUnwindPlan-x86.cpp
lldb/trunk/source/Plugins/ArchDefaultUnwindPlan/ArchDefaultUnwindPlan-x86.h
- copied, changed from r130129, lldb/trunk/source/Plugins/Process/Utility/ArchDefaultUnwindPlan-x86.h
lldb/trunk/source/Plugins/ArchVolatileRegs/
lldb/trunk/source/Plugins/ArchVolatileRegs/ArchVolatileRegs-x86.cpp
- copied, changed from r130129, lldb/trunk/source/Plugins/Process/Utility/ArchVolatileRegs-x86.cpp
lldb/trunk/source/Plugins/ArchVolatileRegs/ArchVolatileRegs-x86.h
- copied, changed from r130129, lldb/trunk/source/Plugins/Process/Utility/ArchVolatileRegs-x86.h
lldb/trunk/source/Plugins/UnwindAssembly/
lldb/trunk/source/Plugins/UnwindAssembly/UnwindAssemblyProfiler-x86.cpp
- copied, changed from r130129, lldb/trunk/source/Plugins/Process/Utility/UnwindAssemblyProfiler-x86.cpp
lldb/trunk/source/Plugins/UnwindAssembly/UnwindAssemblyProfiler-x86.h
- copied, changed from r130129, lldb/trunk/source/Plugins/Process/Utility/UnwindAssemblyProfiler-x86.h
lldb/trunk/source/Target/ArchDefaultUnwindPlan.cpp
- copied, changed from r130129, lldb/trunk/source/Utility/ArchDefaultUnwindPlan.cpp
lldb/trunk/source/Target/ArchVolatileRegs.cpp
- copied, changed from r130129, lldb/trunk/source/Utility/ArchVolatileRegs.cpp
lldb/trunk/source/Target/UnwindAssemblyProfiler.cpp
- copied, changed from r130129, lldb/trunk/source/Utility/UnwindAssemblyProfiler.cpp
Removed:
lldb/trunk/include/lldb/Utility/ArchDefaultUnwindPlan.h
lldb/trunk/include/lldb/Utility/ArchVolatileRegs.h
lldb/trunk/include/lldb/Utility/UnwindAssemblyProfiler.h
lldb/trunk/source/Plugins/Process/Utility/ArchDefaultUnwindPlan-x86.cpp
lldb/trunk/source/Plugins/Process/Utility/ArchDefaultUnwindPlan-x86.h
lldb/trunk/source/Plugins/Process/Utility/ArchVolatileRegs-x86.cpp
lldb/trunk/source/Plugins/Process/Utility/ArchVolatileRegs-x86.h
lldb/trunk/source/Plugins/Process/Utility/UnwindAssemblyProfiler-x86.cpp
lldb/trunk/source/Plugins/Process/Utility/UnwindAssemblyProfiler-x86.h
lldb/trunk/source/Utility/ArchDefaultUnwindPlan.cpp
lldb/trunk/source/Utility/ArchVolatileRegs.cpp
lldb/trunk/source/Utility/UnwindAssemblyProfiler.cpp
Modified:
lldb/trunk/lldb.xcodeproj/project.pbxproj
lldb/trunk/source/Plugins/Process/Utility/RegisterContextLLDB.cpp
lldb/trunk/source/Plugins/Process/Utility/UnwindLLDB.cpp
lldb/trunk/source/Symbol/FuncUnwinders.cpp
lldb/trunk/source/Symbol/UnwindTable.cpp
lldb/trunk/source/lldb.cpp
lldb/trunk/tools/debugserver/debugserver.xcodeproj/project.pbxproj
Copied: lldb/trunk/include/lldb/Target/ArchDefaultUnwindPlan.h (from r130129, lldb/trunk/include/lldb/Utility/ArchDefaultUnwindPlan.h)
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/ArchDefaultUnwindPlan.h?p2=lldb/trunk/include/lldb/Target/ArchDefaultUnwindPlan.h&p1=lldb/trunk/include/lldb/Utility/ArchDefaultUnwindPlan.h&r1=130129&r2=130135&rev=130135&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Utility/ArchDefaultUnwindPlan.h (original)
+++ lldb/trunk/include/lldb/Target/ArchDefaultUnwindPlan.h Mon Apr 25 13:36:36 2011
@@ -1,4 +1,4 @@
-//===---------------------ArchDefaultUnwindPlan.h ---------------*- C++ -*-===//
+//===-- ArchDefaultUnwindPlan.h ---------------------------------*- C++ -*-===//
//
// The LLVM Compiler Infrastructure
//
Copied: lldb/trunk/include/lldb/Target/ArchVolatileRegs.h (from r130129, lldb/trunk/include/lldb/Utility/ArchVolatileRegs.h)
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/ArchVolatileRegs.h?p2=lldb/trunk/include/lldb/Target/ArchVolatileRegs.h&p1=lldb/trunk/include/lldb/Utility/ArchVolatileRegs.h&r1=130129&r2=130135&rev=130135&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Utility/ArchVolatileRegs.h (original)
+++ lldb/trunk/include/lldb/Target/ArchVolatileRegs.h Mon Apr 25 13:36:36 2011
@@ -1,4 +1,4 @@
-//===---------------------ArchVolatileRegs.h----- ---------------*- C++ -*-===//
+//===-- ArchVolatileRegs.h --------------------------------------*- C++ -*-===//
//
// The LLVM Compiler Infrastructure
//
Copied: lldb/trunk/include/lldb/Target/UnwindAssemblyProfiler.h (from r130129, lldb/trunk/include/lldb/Utility/UnwindAssemblyProfiler.h)
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/UnwindAssemblyProfiler.h?p2=lldb/trunk/include/lldb/Target/UnwindAssemblyProfiler.h&p1=lldb/trunk/include/lldb/Utility/UnwindAssemblyProfiler.h&r1=130129&r2=130135&rev=130135&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Utility/UnwindAssemblyProfiler.h (original)
+++ lldb/trunk/include/lldb/Target/UnwindAssemblyProfiler.h Mon Apr 25 13:36:36 2011
@@ -1,4 +1,4 @@
-//===---------------------UnwindAssemblyProfiler.h --------------------------*- C++ -*-===//
+//===-- UnwindAssemblyProfiler.h --------------------------------*- C++ -*-===//
//
// The LLVM Compiler Infrastructure
//
@@ -19,22 +19,28 @@
public PluginInterface
{
public:
+ static UnwindAssemblyProfiler*
+ FindPlugin (const ArchSpec &arch);
virtual
~UnwindAssemblyProfiler();
virtual bool
- GetNonCallSiteUnwindPlanFromAssembly (lldb_private::AddressRange& func, Thread& thread, lldb_private::UnwindPlan& unwind_plan) = 0;
+ GetNonCallSiteUnwindPlanFromAssembly (AddressRange& func,
+ Thread& thread,
+ UnwindPlan& unwind_plan) = 0;
virtual bool
- GetFastUnwindPlan (lldb_private::AddressRange& func, Thread& thread, lldb_private::UnwindPlan &unwind_plan) = 0;
+ GetFastUnwindPlan (AddressRange& func,
+ Thread& thread,
+ UnwindPlan &unwind_plan) = 0;
// thread may be NULL in which case we only use the Target (e.g. if this is called pre-process-launch).
virtual bool
- FirstNonPrologueInsn (lldb_private::AddressRange& func, Target& target, Thread* thread, lldb_private::Address& first_non_prologue_insn) = 0;
-
- static UnwindAssemblyProfiler*
- FindPlugin (const ArchSpec &arch);
+ FirstNonPrologueInsn (AddressRange& func,
+ Target& target,
+ Thread* thread,
+ Address& first_non_prologue_insn) = 0;
protected:
UnwindAssemblyProfiler();
Removed: lldb/trunk/include/lldb/Utility/ArchDefaultUnwindPlan.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/ArchDefaultUnwindPlan.h?rev=130134&view=auto
==============================================================================
--- lldb/trunk/include/lldb/Utility/ArchDefaultUnwindPlan.h (original)
+++ lldb/trunk/include/lldb/Utility/ArchDefaultUnwindPlan.h (removed)
@@ -1,42 +0,0 @@
-//===---------------------ArchDefaultUnwindPlan.h ---------------*- C++ -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef utility_ArchDefaultUnwindPlan_h_
-#define utility_ArchDefaultUnwindPlan_h_
-
-#include "lldb/lldb-private.h"
-#include "lldb/Core/PluginInterface.h"
-
-namespace lldb_private {
-
-class ArchDefaultUnwindPlan :
- public PluginInterface
-{
-public:
-
- virtual
- ~ArchDefaultUnwindPlan();
-
- virtual lldb::UnwindPlanSP
- GetArchDefaultUnwindPlan (Thread& thread, Address current_pc) = 0;
-
- static lldb::ArchDefaultUnwindPlanSP
- FindPlugin (const ArchSpec &arch);
-
-protected:
- ArchDefaultUnwindPlan();
-private:
- DISALLOW_COPY_AND_ASSIGN (ArchDefaultUnwindPlan);
-};
-
-} // namespace lldb_private
-
-#endif //utility_ArchDefaultUnwindPlan_h_
-
-
Removed: lldb/trunk/include/lldb/Utility/ArchVolatileRegs.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/ArchVolatileRegs.h?rev=130134&view=auto
==============================================================================
--- lldb/trunk/include/lldb/Utility/ArchVolatileRegs.h (original)
+++ lldb/trunk/include/lldb/Utility/ArchVolatileRegs.h (removed)
@@ -1,53 +0,0 @@
-//===---------------------ArchVolatileRegs.h----- ---------------*- C++ -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef utility_ArchVolatileRegs_h_
-#define utility_ArchVolatileRegs_h_
-
-#include "lldb/lldb-private.h"
-#include "lldb/Core/PluginInterface.h"
-
-namespace lldb_private {
-
-class ArchVolatileRegs :
- public PluginInterface
-{
-public:
-
- virtual
- ~ArchVolatileRegs();
-
- // Given a register number (in the eRegisterKindLLDB register numbering
- // scheme), returns true if the register is defined to be "volatile" in
- // this architecture -- that is, a function is not required to preserve
- // the contents of the register.
- // If r8 is defined to be volatile, it means that a function can put
- // values in that register without saving the previous contents.
- // If r8 is defined to be non-volatile (preseved), a function must save
- // the value in the register before it is used.
-
- // The thread reference is needed to get a RegisterContext to look up by
- // register names.
-
- virtual bool
- RegisterIsVolatile (lldb_private::Thread& thread, uint32_t regnum) = 0;
-
- static ArchVolatileRegs*
- FindPlugin (const ArchSpec &arch);
-
-protected:
- ArchVolatileRegs();
-private:
- DISALLOW_COPY_AND_ASSIGN (ArchVolatileRegs);
-};
-
-} // namespace lldb_private
-
-#endif //utility_ArchVolatileRegs_h_
-
Removed: lldb/trunk/include/lldb/Utility/UnwindAssemblyProfiler.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/UnwindAssemblyProfiler.h?rev=130134&view=auto
==============================================================================
--- lldb/trunk/include/lldb/Utility/UnwindAssemblyProfiler.h (original)
+++ lldb/trunk/include/lldb/Utility/UnwindAssemblyProfiler.h (removed)
@@ -1,49 +0,0 @@
-//===---------------------UnwindAssemblyProfiler.h --------------------------*- C++ -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef utility_UnwindAssemblyProfiler_h_
-#define utility_UnwindAssemblyProfiler_h_
-
-#include "lldb/lldb-private.h"
-#include "lldb/Core/PluginInterface.h"
-
-namespace lldb_private {
-
-class UnwindAssemblyProfiler :
- public PluginInterface
-{
-public:
-
- virtual
- ~UnwindAssemblyProfiler();
-
- virtual bool
- GetNonCallSiteUnwindPlanFromAssembly (lldb_private::AddressRange& func, Thread& thread, lldb_private::UnwindPlan& unwind_plan) = 0;
-
- virtual bool
- GetFastUnwindPlan (lldb_private::AddressRange& func, Thread& thread, lldb_private::UnwindPlan &unwind_plan) = 0;
-
- // thread may be NULL in which case we only use the Target (e.g. if this is called pre-process-launch).
- virtual bool
- FirstNonPrologueInsn (lldb_private::AddressRange& func, Target& target, Thread* thread, lldb_private::Address& first_non_prologue_insn) = 0;
-
- static UnwindAssemblyProfiler*
- FindPlugin (const ArchSpec &arch);
-
-protected:
- UnwindAssemblyProfiler();
-private:
- DISALLOW_COPY_AND_ASSIGN (UnwindAssemblyProfiler);
-};
-
-} // namespace lldb_private
-
-#endif //utility_UnwindAssemblyProfiler_h_
-
-
Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=130135&r1=130134&r2=130135&view=diff
==============================================================================
--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Mon Apr 25 13:36:36 2011
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 45;
+ objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
@@ -11,6 +11,9 @@
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, ); }; };
262CFC7711A4510000946C6C /* debugserver in Resources */ = {isa = PBXBuildFile; fileRef = 26CE05A0115C31E50022F371 /* debugserver */; };
+ 2630BFA91365F28C0070C534 /* UnwindAssemblyProfiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2630BFA81365F28C0070C534 /* UnwindAssemblyProfiler.cpp */; };
+ 2630BFAF1365F3220070C534 /* ArchDefaultUnwindPlan.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2630BFAD1365F3220070C534 /* ArchDefaultUnwindPlan.cpp */; };
+ 2630BFB01365F3220070C534 /* ArchVolatileRegs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2630BFAE1365F3220070C534 /* ArchVolatileRegs.cpp */; };
26368A3C126B697600E8659F /* darwin-debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26368A3B126B697600E8659F /* darwin-debug.cpp */; };
26368AF7126B960500E8659F /* darwin-debug in Resources */ = {isa = PBXBuildFile; fileRef = 26579F68126A25920007C5CB /* darwin-debug */; };
264A97BF133918BC0017F0BE /* PlatformRemoteGDBServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 264A97BD133918BC0017F0BE /* PlatformRemoteGDBServer.cpp */; };
@@ -243,9 +246,6 @@
268900AE13353E5000698AC0 /* ThreadMacOSX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260C89AF10F57C5600BB2B04 /* ThreadMacOSX.cpp */; };
268900AF13353E5000698AC0 /* UnwindLLDB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AF68D32F1255A110002FF25B /* UnwindLLDB.cpp */; };
268900B013353E5000698AC0 /* RegisterContextLLDB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AF68D2541255416E002FF25B /* RegisterContextLLDB.cpp */; };
- 268900B113353E5000698AC0 /* ArchVolatileRegs-x86.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96A6D9C71249D98800250B38 /* ArchVolatileRegs-x86.cpp */; };
- 268900B213353E5000698AC0 /* ArchDefaultUnwindPlan-x86.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 961FAC1C12360C7D00F93A47 /* ArchDefaultUnwindPlan-x86.cpp */; };
- 268900B313353E5000698AC0 /* UnwindAssemblyProfiler-x86.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 961FABE81235F26800F93A47 /* UnwindAssemblyProfiler-x86.cpp */; };
268900B413353E5000698AC0 /* RegisterContextMacOSXFrameBackchain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26E3EEF711A994E800FBADB6 /* RegisterContextMacOSXFrameBackchain.cpp */; };
268900B513353E5000698AC0 /* StopInfoMachException.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2615DBC81208B5FC0021781D /* StopInfoMachException.cpp */; };
268900B613353E5000698AC0 /* UnwindMacOSXFrameBackchain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26E3EEE311A9901300FBADB6 /* UnwindMacOSXFrameBackchain.cpp */; };
@@ -335,9 +335,6 @@
2689010A13353E6F00698AC0 /* ThreadPlanTracer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CC2A148128C73ED001531C4 /* ThreadPlanTracer.cpp */; };
2689010B13353E6F00698AC0 /* ThreadSpec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C08CDE711C81EF8001610A8 /* ThreadSpec.cpp */; };
2689010C13353E6F00698AC0 /* UnixSignals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C00987011500B4300F316B0 /* UnixSignals.cpp */; };
- 2689010D13353E8200698AC0 /* ArchVolatileRegs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96A6D9C51249D96F00250B38 /* ArchVolatileRegs.cpp */; };
- 2689010E13353E8200698AC0 /* ArchDefaultUnwindPlan.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 961FAC18123605A200F93A47 /* ArchDefaultUnwindPlan.cpp */; };
- 2689010F13353E8200698AC0 /* UnwindAssemblyProfiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 961FABE41235F15900F93A47 /* UnwindAssemblyProfiler.cpp */; };
2689011013353E8200698AC0 /* SharingPtr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 261B5A5211C3F2AD00AABD0A /* SharingPtr.cpp */; };
2689011113353E8200698AC0 /* StringExtractor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2660D9F611922A1300958FBD /* StringExtractor.cpp */; };
2689011213353E8200698AC0 /* StringExtractorGDBRemote.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2676A093119C93C8008A98EF /* StringExtractorGDBRemote.cpp */; };
@@ -368,6 +365,9 @@
2697A54D133A6305004E4240 /* PlatformDarwin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2697A54B133A6305004E4240 /* PlatformDarwin.cpp */; };
2697A54E133A6305004E4240 /* PlatformDarwin.h in Headers */ = {isa = PBXBuildFile; fileRef = 2697A54C133A6305004E4240 /* PlatformDarwin.h */; };
26A7A035135E6E4200FB369E /* NamedOptionValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26A7A034135E6E4200FB369E /* NamedOptionValue.cpp */; };
+ 26AC3F471365F43F0065C7EF /* UnwindAssemblyProfiler-x86.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26AC3F451365F4390065C7EF /* UnwindAssemblyProfiler-x86.cpp */; };
+ 26AC3F4B1365F4EC0065C7EF /* ArchDefaultUnwindPlan-x86.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26AC3F491365F4E90065C7EF /* ArchDefaultUnwindPlan-x86.cpp */; };
+ 26AC3F4F1365F53B0065C7EF /* ArchVolatileRegs-x86.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26AC3F4D1365F5380065C7EF /* ArchVolatileRegs-x86.cpp */; };
26B1FA1413380E61002886E2 /* LLDBWrapPython.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26A4EEB511682AAC007A372A /* LLDBWrapPython.cpp */; };
26B1FCB813381071002886E2 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26F5C39010F3FA26009D5894 /* CoreFoundation.framework */; };
26B1FCB913381071002886E2 /* DebugSymbols.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 265ABF6210F42EE900531910 /* DebugSymbols.framework */; };
@@ -632,6 +632,12 @@
261B5A5311C3F2AD00AABD0A /* SharingPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SharingPtr.h; path = include/lldb/Utility/SharingPtr.h; sourceTree = "<group>"; };
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>"; };
+ 2630BFA81365F28C0070C534 /* UnwindAssemblyProfiler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UnwindAssemblyProfiler.cpp; path = source/Target/UnwindAssemblyProfiler.cpp; sourceTree = "<group>"; };
+ 2630BFAA1365F2BA0070C534 /* UnwindAssemblyProfiler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = UnwindAssemblyProfiler.h; path = include/lldb/Target/UnwindAssemblyProfiler.h; sourceTree = "<group>"; };
+ 2630BFAB1365F3140070C534 /* ArchDefaultUnwindPlan.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ArchDefaultUnwindPlan.h; path = include/lldb/Target/ArchDefaultUnwindPlan.h; sourceTree = "<group>"; };
+ 2630BFAC1365F3140070C534 /* ArchVolatileRegs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ArchVolatileRegs.h; path = include/lldb/Target/ArchVolatileRegs.h; sourceTree = "<group>"; };
+ 2630BFAD1365F3220070C534 /* ArchDefaultUnwindPlan.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ArchDefaultUnwindPlan.cpp; path = source/Target/ArchDefaultUnwindPlan.cpp; sourceTree = "<group>"; };
+ 2630BFAE1365F3220070C534 /* ArchVolatileRegs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ArchVolatileRegs.cpp; path = source/Target/ArchVolatileRegs.cpp; sourceTree = "<group>"; };
263664921140A4930075843B /* Debugger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Debugger.cpp; path = source/Core/Debugger.cpp; sourceTree = "<group>"; };
263664941140A4C10075843B /* Debugger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Debugger.h; path = include/lldb/Core/Debugger.h; sourceTree = "<group>"; };
26368A3B126B697600E8659F /* darwin-debug.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "darwin-debug.cpp"; path = "tools/darwin-debug/darwin-debug.cpp"; sourceTree = "<group>"; };
@@ -714,6 +720,12 @@
26A4EEB511682AAC007A372A /* LLDBWrapPython.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LLDBWrapPython.cpp; path = source/LLDBWrapPython.cpp; sourceTree = "<group>"; };
26A7A034135E6E4200FB369E /* NamedOptionValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NamedOptionValue.cpp; path = source/Interpreter/NamedOptionValue.cpp; sourceTree = "<group>"; };
26A7A036135E6E5300FB369E /* NamedOptionValue.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = NamedOptionValue.h; path = include/lldb/Interpreter/NamedOptionValue.h; sourceTree = "<group>"; };
+ 26AC3F451365F4390065C7EF /* UnwindAssemblyProfiler-x86.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "UnwindAssemblyProfiler-x86.cpp"; path = "source/Plugins/UnwindAssembly/UnwindAssemblyProfiler-x86.cpp"; sourceTree = SOURCE_ROOT; };
+ 26AC3F461365F4390065C7EF /* UnwindAssemblyProfiler-x86.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "UnwindAssemblyProfiler-x86.h"; path = "source/Plugins/UnwindAssembly/UnwindAssemblyProfiler-x86.h"; sourceTree = SOURCE_ROOT; };
+ 26AC3F491365F4E90065C7EF /* ArchDefaultUnwindPlan-x86.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "ArchDefaultUnwindPlan-x86.cpp"; path = "ArchDefaultUnwindPlan/ArchDefaultUnwindPlan-x86.cpp"; sourceTree = "<group>"; };
+ 26AC3F4A1365F4E90065C7EF /* ArchDefaultUnwindPlan-x86.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "ArchDefaultUnwindPlan-x86.h"; path = "ArchDefaultUnwindPlan/ArchDefaultUnwindPlan-x86.h"; sourceTree = "<group>"; };
+ 26AC3F4D1365F5380065C7EF /* ArchVolatileRegs-x86.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "ArchVolatileRegs-x86.cpp"; path = "ArchVolatileRegs/ArchVolatileRegs-x86.cpp"; sourceTree = "<group>"; };
+ 26AC3F4E1365F5380065C7EF /* ArchVolatileRegs-x86.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "ArchVolatileRegs-x86.h"; path = "ArchVolatileRegs/ArchVolatileRegs-x86.h"; sourceTree = "<group>"; };
26B167A41123BF5500DC7B4F /* ThreadSafeValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ThreadSafeValue.h; path = include/lldb/Core/ThreadSafeValue.h; sourceTree = "<group>"; };
26B42C4C1187ABA50079C8C8 /* LLDB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LLDB.h; path = include/lldb/API/LLDB.h; sourceTree = "<group>"; };
26B4E26E112F35F700AB3F64 /* TimeValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TimeValue.h; path = include/lldb/Host/TimeValue.h; sourceTree = "<group>"; };
@@ -1142,15 +1154,6 @@
961FABB81235DE1600F93A47 /* FuncUnwinders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FuncUnwinders.cpp; path = source/Symbol/FuncUnwinders.cpp; sourceTree = "<group>"; };
961FABB91235DE1600F93A47 /* UnwindPlan.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UnwindPlan.cpp; path = source/Symbol/UnwindPlan.cpp; sourceTree = "<group>"; };
961FABBA1235DE1600F93A47 /* UnwindTable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UnwindTable.cpp; path = source/Symbol/UnwindTable.cpp; sourceTree = "<group>"; };
- 961FABE41235F15900F93A47 /* UnwindAssemblyProfiler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UnwindAssemblyProfiler.cpp; path = source/Utility/UnwindAssemblyProfiler.cpp; sourceTree = "<group>"; };
- 961FABE81235F26800F93A47 /* UnwindAssemblyProfiler-x86.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "UnwindAssemblyProfiler-x86.cpp"; path = "Utility/UnwindAssemblyProfiler-x86.cpp"; sourceTree = "<group>"; };
- 961FABE91235F26800F93A47 /* UnwindAssemblyProfiler-x86.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UnwindAssemblyProfiler-x86.h"; path = "Utility/UnwindAssemblyProfiler-x86.h"; sourceTree = "<group>"; };
- 961FAC18123605A200F93A47 /* ArchDefaultUnwindPlan.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ArchDefaultUnwindPlan.cpp; path = source/Utility/ArchDefaultUnwindPlan.cpp; sourceTree = "<group>"; };
- 961FAC1C12360C7D00F93A47 /* ArchDefaultUnwindPlan-x86.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "ArchDefaultUnwindPlan-x86.cpp"; path = "Utility/ArchDefaultUnwindPlan-x86.cpp"; sourceTree = "<group>"; };
- 961FAC1D12360C7D00F93A47 /* ArchDefaultUnwindPlan-x86.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "ArchDefaultUnwindPlan-x86.h"; path = "Utility/ArchDefaultUnwindPlan-x86.h"; sourceTree = "<group>"; };
- 96A6D9C51249D96F00250B38 /* ArchVolatileRegs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ArchVolatileRegs.cpp; path = source/Utility/ArchVolatileRegs.cpp; sourceTree = "<group>"; };
- 96A6D9C71249D98800250B38 /* ArchVolatileRegs-x86.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "ArchVolatileRegs-x86.cpp"; path = "Utility/ArchVolatileRegs-x86.cpp"; sourceTree = "<group>"; };
- 96A6D9C81249D98800250B38 /* ArchVolatileRegs-x86.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "ArchVolatileRegs-x86.h"; path = "Utility/ArchVolatileRegs-x86.h"; sourceTree = "<group>"; };
9A19A6A51163BB7E00E0D453 /* SBValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBValue.h; path = include/lldb/API/SBValue.h; sourceTree = "<group>"; };
9A19A6AD1163BB9800E0D453 /* SBValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SBValue.cpp; path = source/API/SBValue.cpp; sourceTree = "<group>"; };
9A22A15D135E30370024DDC3 /* EmulateInstructionARM.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EmulateInstructionARM.cpp; sourceTree = "<group>"; };
@@ -1341,6 +1344,8 @@
260C897110F57C5600BB2B04 /* Plugins */ = {
isa = PBXGroup;
children = (
+ 26AC3F481365F4620065C7EF /* ArchDefaultUnwindPlan */,
+ 26AC3F4C1365F5260065C7EF /* ArchVolatileRegs */,
493C63D711891A8000914D5E /* ABI */,
260C897210F57C5600BB2B04 /* Disassembler */,
260C897810F57C5600BB2B04 /* DynamicLoader */,
@@ -1352,6 +1357,7 @@
260C898A10F57C5600BB2B04 /* Process */,
260C89B110F57C5600BB2B04 /* SymbolFile */,
260C89E010F57C5600BB2B04 /* SymbolVendor */,
+ 26AC3F441365F40E0065C7EF /* UnwindAssembly */,
);
name = Plugins;
path = source/Plugins;
@@ -1746,9 +1752,6 @@
2682F168115ED9C800CCFF99 /* Utility */ = {
isa = PBXGroup;
children = (
- 96A6D9C51249D96F00250B38 /* ArchVolatileRegs.cpp */,
- 961FAC18123605A200F93A47 /* ArchDefaultUnwindPlan.cpp */,
- 961FABE41235F15900F93A47 /* UnwindAssemblyProfiler.cpp */,
264723A511FA076E00DE380C /* CleanUp.h */,
261B5A5211C3F2AD00AABD0A /* SharingPtr.cpp */,
4C2FAE2E135E3A70001EDE44 /* SharedCluster.h */,
@@ -1783,6 +1786,34 @@
path = "BSD-Archive";
sourceTree = "<group>";
};
+ 26AC3F441365F40E0065C7EF /* UnwindAssembly */ = {
+ isa = PBXGroup;
+ children = (
+ 26AC3F451365F4390065C7EF /* UnwindAssemblyProfiler-x86.cpp */,
+ 26AC3F461365F4390065C7EF /* UnwindAssemblyProfiler-x86.h */,
+ );
+ name = UnwindAssembly;
+ path = Process;
+ sourceTree = "<group>";
+ };
+ 26AC3F481365F4620065C7EF /* ArchDefaultUnwindPlan */ = {
+ isa = PBXGroup;
+ children = (
+ 26AC3F491365F4E90065C7EF /* ArchDefaultUnwindPlan-x86.cpp */,
+ 26AC3F4A1365F4E90065C7EF /* ArchDefaultUnwindPlan-x86.h */,
+ );
+ name = ArchDefaultUnwindPlan;
+ sourceTree = "<group>";
+ };
+ 26AC3F4C1365F5260065C7EF /* ArchVolatileRegs */ = {
+ isa = PBXGroup;
+ children = (
+ 26AC3F4D1365F5380065C7EF /* ArchVolatileRegs-x86.cpp */,
+ 26AC3F4E1365F5380065C7EF /* ArchVolatileRegs-x86.h */,
+ );
+ name = ArchVolatileRegs;
+ sourceTree = "<group>";
+ };
26B4666E11A2080F00CF6220 /* Utility */ = {
isa = PBXGroup;
children = (
@@ -1793,12 +1824,6 @@
AF68D3301255A110002FF25B /* UnwindLLDB.h */,
AF68D2541255416E002FF25B /* RegisterContextLLDB.cpp */,
AF68D2551255416E002FF25B /* RegisterContextLLDB.h */,
- 96A6D9C71249D98800250B38 /* ArchVolatileRegs-x86.cpp */,
- 96A6D9C81249D98800250B38 /* ArchVolatileRegs-x86.h */,
- 961FAC1C12360C7D00F93A47 /* ArchDefaultUnwindPlan-x86.cpp */,
- 961FAC1D12360C7D00F93A47 /* ArchDefaultUnwindPlan-x86.h */,
- 961FABE81235F26800F93A47 /* UnwindAssemblyProfiler-x86.cpp */,
- 961FABE91235F26800F93A47 /* UnwindAssemblyProfiler-x86.h */,
26E3EEF811A994E800FBADB6 /* RegisterContextMacOSXFrameBackchain.h */,
26E3EEF711A994E800FBADB6 /* RegisterContextMacOSXFrameBackchain.cpp */,
2615DBC91208B5FC0021781D /* StopInfoMachException.h */,
@@ -2200,6 +2225,10 @@
children = (
497E7B331188ED300065CCA1 /* ABI.h */,
497E7B9D1188F6690065CCA1 /* ABI.cpp */,
+ 2630BFAB1365F3140070C534 /* ArchDefaultUnwindPlan.h */,
+ 2630BFAD1365F3220070C534 /* ArchDefaultUnwindPlan.cpp */,
+ 2630BFAC1365F3140070C534 /* ArchVolatileRegs.h */,
+ 2630BFAE1365F3220070C534 /* ArchVolatileRegs.cpp */,
4CB443BB1249920C00C13DC2 /* CPPLanguageRuntime.h */,
4CB443BC1249920C00C13DC2 /* CPPLanguageRuntime.cpp */,
26BC7DF110F1B81A00F91463 /* DynamicLoader.h */,
@@ -2274,6 +2303,8 @@
4C00986F11500B4300F316B0 /* UnixSignals.h */,
4C00987011500B4300F316B0 /* UnixSignals.cpp */,
26E3EEBD11A9870400FBADB6 /* Unwind.h */,
+ 2630BFAA1365F2BA0070C534 /* UnwindAssemblyProfiler.h */,
+ 2630BFA81365F28C0070C534 /* UnwindAssemblyProfiler.cpp */,
);
name = Target;
sourceTree = "<group>";
@@ -2694,8 +2725,11 @@
/* Begin PBXProject section */
08FB7793FE84155DC02AAC07 /* Project object */ = {
isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0420;
+ };
buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "lldb" */;
- compatibilityVersion = "Xcode 3.1";
+ compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
@@ -3043,9 +3077,6 @@
268900AE13353E5000698AC0 /* ThreadMacOSX.cpp in Sources */,
268900AF13353E5000698AC0 /* UnwindLLDB.cpp in Sources */,
268900B013353E5000698AC0 /* RegisterContextLLDB.cpp in Sources */,
- 268900B113353E5000698AC0 /* ArchVolatileRegs-x86.cpp in Sources */,
- 268900B213353E5000698AC0 /* ArchDefaultUnwindPlan-x86.cpp in Sources */,
- 268900B313353E5000698AC0 /* UnwindAssemblyProfiler-x86.cpp in Sources */,
268900B413353E5000698AC0 /* RegisterContextMacOSXFrameBackchain.cpp in Sources */,
268900B513353E5000698AC0 /* StopInfoMachException.cpp in Sources */,
268900B613353E5000698AC0 /* UnwindMacOSXFrameBackchain.cpp in Sources */,
@@ -3135,9 +3166,6 @@
2689010A13353E6F00698AC0 /* ThreadPlanTracer.cpp in Sources */,
2689010B13353E6F00698AC0 /* ThreadSpec.cpp in Sources */,
2689010C13353E6F00698AC0 /* UnixSignals.cpp in Sources */,
- 2689010D13353E8200698AC0 /* ArchVolatileRegs.cpp in Sources */,
- 2689010E13353E8200698AC0 /* ArchDefaultUnwindPlan.cpp in Sources */,
- 2689010F13353E8200698AC0 /* UnwindAssemblyProfiler.cpp in Sources */,
2689011013353E8200698AC0 /* SharingPtr.cpp in Sources */,
2689011113353E8200698AC0 /* StringExtractor.cpp in Sources */,
2689011213353E8200698AC0 /* StringExtractorGDBRemote.cpp in Sources */,
@@ -3158,6 +3186,12 @@
26A7A035135E6E4200FB369E /* NamedOptionValue.cpp in Sources */,
9A22A161135E30370024DDC3 /* EmulateInstructionARM.cpp in Sources */,
9A22A163135E30370024DDC3 /* EmulationStateARM.cpp in Sources */,
+ 2630BFA91365F28C0070C534 /* UnwindAssemblyProfiler.cpp in Sources */,
+ 2630BFAF1365F3220070C534 /* ArchDefaultUnwindPlan.cpp in Sources */,
+ 2630BFB01365F3220070C534 /* ArchVolatileRegs.cpp in Sources */,
+ 26AC3F471365F43F0065C7EF /* UnwindAssemblyProfiler-x86.cpp in Sources */,
+ 26AC3F4B1365F4EC0065C7EF /* ArchDefaultUnwindPlan-x86.cpp in Sources */,
+ 26AC3F4F1365F53B0065C7EF /* ArchVolatileRegs-x86.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -3283,7 +3317,6 @@
LLVM_BUILD_DIR_ARCH = "";
LLVM_CONFIGURATION = Release;
LLVM_SOURCE_DIR = "$(SRCROOT)/llvm";
- PREBINDING = NO;
VALID_ARCHS = "x86_64 i386";
};
name = Release;
@@ -3309,7 +3342,6 @@
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
FRAMEWORK_SEARCH_PATHS = /System/Library/PrivateFrameworks;
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
INSTALL_PATH = /Developer/usr/bin;
ONLY_ACTIVE_ARCH = NO;
PRODUCT_NAME = "darwin-debug";
@@ -3322,7 +3354,6 @@
ALWAYS_SEARCH_USER_PATHS = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
FRAMEWORK_SEARCH_PATHS = /System/Library/PrivateFrameworks;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
INSTALL_PATH = /Developer/usr/bin;
ONLY_ACTIVE_ARCH = NO;
PRODUCT_NAME = "darwin-debug";
@@ -3580,7 +3611,6 @@
LLVM_BUILD_DIR_ARCH = "$(CURRENT_ARCH)/";
LLVM_CONFIGURATION = Release;
LLVM_SOURCE_DIR = "$(SRCROOT)/llvm";
- PREBINDING = NO;
VALID_ARCHS = "x86_64 i386";
};
name = BuildAndIntegration;
Copied: lldb/trunk/source/Plugins/ArchDefaultUnwindPlan/ArchDefaultUnwindPlan-x86.cpp (from r130129, lldb/trunk/source/Plugins/Process/Utility/ArchDefaultUnwindPlan-x86.cpp)
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ArchDefaultUnwindPlan/ArchDefaultUnwindPlan-x86.cpp?p2=lldb/trunk/source/Plugins/ArchDefaultUnwindPlan/ArchDefaultUnwindPlan-x86.cpp&p1=lldb/trunk/source/Plugins/Process/Utility/ArchDefaultUnwindPlan-x86.cpp&r1=130129&r2=130135&rev=130135&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/Utility/ArchDefaultUnwindPlan-x86.cpp (original)
+++ lldb/trunk/source/Plugins/ArchDefaultUnwindPlan/ArchDefaultUnwindPlan-x86.cpp Mon Apr 25 13:36:36 2011
@@ -10,7 +10,7 @@
#include "ArchDefaultUnwindPlan-x86.h"
#include "lldb/Core/ArchSpec.h"
#include "lldb/Core/PluginManager.h"
-#include "lldb/Utility/ArchDefaultUnwindPlan.h"
+#include "lldb/Target/ArchDefaultUnwindPlan.h"
using namespace lldb;
using namespace lldb_private;
Copied: lldb/trunk/source/Plugins/ArchDefaultUnwindPlan/ArchDefaultUnwindPlan-x86.h (from r130129, lldb/trunk/source/Plugins/Process/Utility/ArchDefaultUnwindPlan-x86.h)
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ArchDefaultUnwindPlan/ArchDefaultUnwindPlan-x86.h?p2=lldb/trunk/source/Plugins/ArchDefaultUnwindPlan/ArchDefaultUnwindPlan-x86.h&p1=lldb/trunk/source/Plugins/Process/Utility/ArchDefaultUnwindPlan-x86.h&r1=130129&r2=130135&rev=130135&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/Utility/ArchDefaultUnwindPlan-x86.h (original)
+++ lldb/trunk/source/Plugins/ArchDefaultUnwindPlan/ArchDefaultUnwindPlan-x86.h Mon Apr 25 13:36:36 2011
@@ -11,7 +11,7 @@
#define liblldb_ArchDefaultUnwindPlan_x86_h_
#include "lldb/lldb-private.h"
-#include "lldb/Utility/ArchDefaultUnwindPlan.h"
+#include "lldb/Target/ArchDefaultUnwindPlan.h"
#include "lldb/Target/Thread.h"
#include "lldb/Symbol/UnwindPlan.h"
Copied: lldb/trunk/source/Plugins/ArchVolatileRegs/ArchVolatileRegs-x86.cpp (from r130129, lldb/trunk/source/Plugins/Process/Utility/ArchVolatileRegs-x86.cpp)
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ArchVolatileRegs/ArchVolatileRegs-x86.cpp?p2=lldb/trunk/source/Plugins/ArchVolatileRegs/ArchVolatileRegs-x86.cpp&p1=lldb/trunk/source/Plugins/Process/Utility/ArchVolatileRegs-x86.cpp&r1=130129&r2=130135&rev=130135&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/Utility/ArchVolatileRegs-x86.cpp (original)
+++ lldb/trunk/source/Plugins/ArchVolatileRegs/ArchVolatileRegs-x86.cpp Mon Apr 25 13:36:36 2011
@@ -8,15 +8,17 @@
//===----------------------------------------------------------------------===//
#include "ArchVolatileRegs-x86.h"
+
+#include <set>
+
#include "llvm/Support/MachO.h"
-#include "lldb/lldb-private.h"
-#include "lldb/Utility/ArchVolatileRegs.h"
+
#include "lldb/Core/ArchSpec.h"
#include "lldb/Core/PluginManager.h"
-#include "lldb/lldb-enumerations.h"
+#include "lldb/Target/ArchVolatileRegs.h"
#include "lldb/Target/Thread.h"
#include "lldb/Target/RegisterContext.h"
-#include <set>
+
using namespace lldb;
using namespace lldb_private;
Copied: lldb/trunk/source/Plugins/ArchVolatileRegs/ArchVolatileRegs-x86.h (from r130129, lldb/trunk/source/Plugins/Process/Utility/ArchVolatileRegs-x86.h)
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ArchVolatileRegs/ArchVolatileRegs-x86.h?p2=lldb/trunk/source/Plugins/ArchVolatileRegs/ArchVolatileRegs-x86.h&p1=lldb/trunk/source/Plugins/Process/Utility/ArchVolatileRegs-x86.h&r1=130129&r2=130135&rev=130135&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/Utility/ArchVolatileRegs-x86.h (original)
+++ lldb/trunk/source/Plugins/ArchVolatileRegs/ArchVolatileRegs-x86.h Mon Apr 25 13:36:36 2011
@@ -12,7 +12,7 @@
#include "lldb/lldb-private.h"
#include "lldb/Core/ArchSpec.h"
-#include "lldb/Utility/ArchVolatileRegs.h"
+#include "lldb/Target/ArchVolatileRegs.h"
#include <set>
namespace lldb_private {
Removed: lldb/trunk/source/Plugins/Process/Utility/ArchDefaultUnwindPlan-x86.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Utility/ArchDefaultUnwindPlan-x86.cpp?rev=130134&view=auto
==============================================================================
--- lldb/trunk/source/Plugins/Process/Utility/ArchDefaultUnwindPlan-x86.cpp (original)
+++ lldb/trunk/source/Plugins/Process/Utility/ArchDefaultUnwindPlan-x86.cpp (removed)
@@ -1,192 +0,0 @@
-//===-- ArchDefaultUnwindPlan-x86.cpp --------------------------*- C++ -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "ArchDefaultUnwindPlan-x86.h"
-#include "lldb/Core/ArchSpec.h"
-#include "lldb/Core/PluginManager.h"
-#include "lldb/Utility/ArchDefaultUnwindPlan.h"
-
-using namespace lldb;
-using namespace lldb_private;
-
-lldb_private::ArchDefaultUnwindPlan *
-ArchDefaultUnwindPlan_x86_64::CreateInstance (const lldb_private::ArchSpec &arch)
-{
- if (arch.GetMachine () == llvm::Triple::x86_64)
- return new ArchDefaultUnwindPlan_x86_64 ();
- return NULL;
-}
-
-ArchDefaultUnwindPlan_x86_64::ArchDefaultUnwindPlan_x86_64() :
- lldb_private::ArchDefaultUnwindPlan(),
- m_unwind_plan_sp (new UnwindPlan)
-{
- UnwindPlan::Row row;
- UnwindPlan::Row::RegisterLocation regloc;
-
- m_unwind_plan_sp->SetRegisterKind (eRegisterKindGeneric);
- row.SetCFARegister (LLDB_REGNUM_GENERIC_FP);
- row.SetCFAOffset (2 * 8);
- row.SetOffset (0);
-
- regloc.SetAtCFAPlusOffset (2 * -8);
- row.SetRegisterInfo (LLDB_REGNUM_GENERIC_FP, regloc);
- regloc.SetAtCFAPlusOffset (1 * -8);
- row.SetRegisterInfo (LLDB_REGNUM_GENERIC_PC, regloc);
- regloc.SetIsCFAPlusOffset (0);
- row.SetRegisterInfo (LLDB_REGNUM_GENERIC_SP, regloc);
-
- m_unwind_plan_sp->AppendRow (row);
- m_unwind_plan_sp->SetSourceName ("x86_64 architectural default");
-}
-
-//------------------------------------------------------------------
-// PluginInterface protocol in UnwindAssemblyParser_x86
-//------------------------------------------------------------------
-
-const char *
-ArchDefaultUnwindPlan_x86_64::GetPluginName()
-{
- return "ArchDefaultUnwindPlan_x86_64";
-}
-
-const char *
-ArchDefaultUnwindPlan_x86_64::GetShortPluginName()
-{
- return "lldb.arch-default-unwind-plan.x86-64";
-}
-
-
-uint32_t
-ArchDefaultUnwindPlan_x86_64::GetPluginVersion()
-{
- return 1;
-}
-void
-ArchDefaultUnwindPlan_x86_64::Initialize()
-{
- PluginManager::RegisterPlugin (GetPluginNameStatic(),
- GetPluginDescriptionStatic(),
- CreateInstance);
-}
-
-void
-ArchDefaultUnwindPlan_x86_64::Terminate()
-{
- PluginManager::UnregisterPlugin (CreateInstance);
-}
-
-
-const char *
-ArchDefaultUnwindPlan_x86_64::GetPluginNameStatic()
-{
- return "ArchDefaultUnwindPlan_x86_64";
-}
-
-const char *
-ArchDefaultUnwindPlan_x86_64::GetPluginDescriptionStatic()
-{
- return "x86_64 architecture default unwind plan assembly plugin.";
-}
-
-UnwindPlanSP
-ArchDefaultUnwindPlan_x86_64::GetArchDefaultUnwindPlan (Thread& thread, Address current_pc)
-{
- return m_unwind_plan_sp;
-}
-
-
-
-lldb_private::ArchDefaultUnwindPlan *
-ArchDefaultUnwindPlan_i386::CreateInstance (const lldb_private::ArchSpec &arch)
-{
- if (arch.GetMachine () == llvm::Triple::x86)
- return new ArchDefaultUnwindPlan_i386 ();
- return NULL;
-}
-
-ArchDefaultUnwindPlan_i386::ArchDefaultUnwindPlan_i386() :
- lldb_private::ArchDefaultUnwindPlan(),
- m_unwind_plan_sp (new UnwindPlan)
-{
- UnwindPlan::Row row;
- UnwindPlan::Row::RegisterLocation regloc;
-
- m_unwind_plan_sp->SetRegisterKind (eRegisterKindGeneric);
- row.SetCFARegister (LLDB_REGNUM_GENERIC_FP);
- row.SetCFAOffset (2 * 4);
- row.SetOffset (0);
-
- regloc.SetAtCFAPlusOffset (2 * -4);
- row.SetRegisterInfo (LLDB_REGNUM_GENERIC_FP, regloc);
- regloc.SetAtCFAPlusOffset (1 * -4);
- row.SetRegisterInfo (LLDB_REGNUM_GENERIC_PC, regloc);
- regloc.SetIsCFAPlusOffset (0);
- row.SetRegisterInfo (LLDB_REGNUM_GENERIC_SP, regloc);
-
- m_unwind_plan_sp->AppendRow (row);
- m_unwind_plan_sp->SetSourceName ("i386 architectural default");
-}
-
-//------------------------------------------------------------------
-// PluginInterface protocol in UnwindAssemblyParser_x86
-//------------------------------------------------------------------
-
-const char *
-ArchDefaultUnwindPlan_i386::GetPluginName()
-{
- return "ArchDefaultUnwindPlan_i386";
-}
-
-const char *
-ArchDefaultUnwindPlan_i386::GetShortPluginName()
-{
- return "archdefaultunwindplan.x86";
-}
-
-
-uint32_t
-ArchDefaultUnwindPlan_i386::GetPluginVersion()
-{
- return 1;
-}
-
-void
-ArchDefaultUnwindPlan_i386::Initialize()
-{
- PluginManager::RegisterPlugin (GetPluginNameStatic(),
- GetPluginDescriptionStatic(),
- CreateInstance);
-}
-
-void
-ArchDefaultUnwindPlan_i386::Terminate()
-{
- PluginManager::UnregisterPlugin (CreateInstance);
-}
-
-
-const char *
-ArchDefaultUnwindPlan_i386::GetPluginNameStatic()
-{
- return "ArchDefaultUnwindPlan_i386";
-}
-
-const char *
-ArchDefaultUnwindPlan_i386::GetPluginDescriptionStatic()
-{
- return "i386 architecture default unwind plan assembly plugin.";
-}
-
-UnwindPlanSP
-ArchDefaultUnwindPlan_i386::GetArchDefaultUnwindPlan (Thread& thread, Address current_pc)
-{
- return m_unwind_plan_sp;
-}
-
Removed: lldb/trunk/source/Plugins/Process/Utility/ArchDefaultUnwindPlan-x86.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Utility/ArchDefaultUnwindPlan-x86.h?rev=130134&view=auto
==============================================================================
--- lldb/trunk/source/Plugins/Process/Utility/ArchDefaultUnwindPlan-x86.h (original)
+++ lldb/trunk/source/Plugins/Process/Utility/ArchDefaultUnwindPlan-x86.h (removed)
@@ -1,107 +0,0 @@
-//===-- ArchDefaultUnwindPlan-x86.h ----------------------------*- C++ -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef liblldb_ArchDefaultUnwindPlan_x86_h_
-#define liblldb_ArchDefaultUnwindPlan_x86_h_
-
-#include "lldb/lldb-private.h"
-#include "lldb/Utility/ArchDefaultUnwindPlan.h"
-#include "lldb/Target/Thread.h"
-#include "lldb/Symbol/UnwindPlan.h"
-
-namespace lldb_private {
-
-class ArchDefaultUnwindPlan_x86_64 : public lldb_private::ArchDefaultUnwindPlan
-{
-public:
-
- ~ArchDefaultUnwindPlan_x86_64 () { }
-
- virtual lldb::UnwindPlanSP
- GetArchDefaultUnwindPlan (Thread& thread, Address current_pc);
-
- static lldb_private::ArchDefaultUnwindPlan *
- CreateInstance (const lldb_private::ArchSpec &arch);
-
- //------------------------------------------------------------------
- // PluginInterface protocol
- //------------------------------------------------------------------
- static void
- Initialize();
-
- static void
- Terminate();
-
- static const char *
- GetPluginNameStatic();
-
- static const char *
- GetPluginDescriptionStatic();
-
- virtual const char *
- GetPluginName();
-
- virtual const char *
- GetShortPluginName();
-
- virtual uint32_t
- GetPluginVersion();
-
-private:
- ArchDefaultUnwindPlan_x86_64(); // Call CreateInstance instead.
-
- lldb::UnwindPlanSP m_unwind_plan_sp;
-};
-
-class ArchDefaultUnwindPlan_i386 : public lldb_private::ArchDefaultUnwindPlan
-{
-public:
-
- ~ArchDefaultUnwindPlan_i386 () { }
-
- virtual lldb::UnwindPlanSP
- GetArchDefaultUnwindPlan (Thread& thread, Address current_pc);
-
- static lldb_private::ArchDefaultUnwindPlan *
- CreateInstance (const lldb_private::ArchSpec &arch);
-
- //------------------------------------------------------------------
- // PluginInterface protocol
- //------------------------------------------------------------------
- static void
- Initialize();
-
- static void
- Terminate();
-
- static const char *
- GetPluginNameStatic();
-
- static const char *
- GetPluginDescriptionStatic();
-
- virtual const char *
- GetPluginName();
-
- virtual const char *
- GetShortPluginName();
-
- virtual uint32_t
- GetPluginVersion();
-
-private:
- ArchDefaultUnwindPlan_i386(); // Call CreateInstance instead.
-
- lldb::UnwindPlanSP m_unwind_plan_sp;
-};
-
-
-} // namespace lldb_private
-
-#endif // liblldb_UnwindAssemblyProfiler_x86_h_
Removed: lldb/trunk/source/Plugins/Process/Utility/ArchVolatileRegs-x86.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Utility/ArchVolatileRegs-x86.cpp?rev=130134&view=auto
==============================================================================
--- lldb/trunk/source/Plugins/Process/Utility/ArchVolatileRegs-x86.cpp (original)
+++ lldb/trunk/source/Plugins/Process/Utility/ArchVolatileRegs-x86.cpp (removed)
@@ -1,148 +0,0 @@
-//===-- ArchVolatileRegs-x86.cpp --------------------------------*- C++ -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "ArchVolatileRegs-x86.h"
-#include "llvm/Support/MachO.h"
-#include "lldb/lldb-private.h"
-#include "lldb/Utility/ArchVolatileRegs.h"
-#include "lldb/Core/ArchSpec.h"
-#include "lldb/Core/PluginManager.h"
-#include "lldb/lldb-enumerations.h"
-#include "lldb/Target/Thread.h"
-#include "lldb/Target/RegisterContext.h"
-#include <set>
-
-using namespace lldb;
-using namespace lldb_private;
-
-bool
-ArchVolatileRegs_x86::RegisterIsVolatile (Thread& thread, uint32_t regnum)
-{
- initialize_regset (thread);
- if (m_non_volatile_regs.find (regnum) == m_non_volatile_regs.end())
- return true;
- else
- return false;
-}
-
-lldb_private::ArchVolatileRegs *
-ArchVolatileRegs_x86::CreateInstance (const lldb_private::ArchSpec &arch)
-{
- llvm::Triple::ArchType cpu = arch.GetMachine ();
- if (cpu == llvm::Triple::x86 || cpu == llvm::Triple::x86_64)
- return new ArchVolatileRegs_x86 (cpu);
- return NULL;
-}
-
-ArchVolatileRegs_x86::ArchVolatileRegs_x86(llvm::Triple::ArchType cpu) :
- lldb_private::ArchVolatileRegs(),
- m_cpu(cpu),
- m_non_volatile_regs()
-{
-}
-
-void
-ArchVolatileRegs_x86::initialize_regset(Thread& thread)
-{
- if (m_non_volatile_regs.size() > 0)
- return;
-
-
- RegisterContext *reg_ctx = thread.GetRegisterContext().get();
- const RegisterInfo *ri;
-
- const char *x86_64_regnames[] = { "rbx",
- "rsp",
- "rbp",
- "r12",
- "r13",
- "r14",
- "r15",
- "rip" };
-
- const char *i386_regnames[] = { "ebx",
- "ebp",
- "esi",
- "edi",
- "esp",
- "eip" };
-
-
- const char **names;
- int namecount;
- if (m_cpu == llvm::Triple::x86_64)
- {
- names = x86_64_regnames;
- namecount = sizeof (x86_64_regnames) / sizeof (char *);
- }
- else
- {
- assert (m_cpu == llvm::Triple::x86);
- names = i386_regnames;
- namecount = sizeof (i386_regnames) / sizeof (char *);
- }
-
- for (int i = 0; i < namecount; i++)
- {
- ri = reg_ctx->GetRegisterInfoByName (names[i]);
- if (ri)
- m_non_volatile_regs.insert (ri->kinds[eRegisterKindLLDB]);
- }
-}
-
-
-//------------------------------------------------------------------
-// PluginInterface protocol in ArchVolatileRegs_x86
-//------------------------------------------------------------------
-
-const char *
-ArchVolatileRegs_x86::GetPluginName()
-{
- return "ArchVolatileRegs_x86";
-}
-
-const char *
-ArchVolatileRegs_x86::GetShortPluginName()
-{
- return "archvolatileregs.x86";
-}
-
-
-uint32_t
-ArchVolatileRegs_x86::GetPluginVersion()
-{
- return 1;
-}
-
-void
-ArchVolatileRegs_x86::Initialize()
-{
- PluginManager::RegisterPlugin (GetPluginNameStatic(),
- GetPluginDescriptionStatic(),
- CreateInstance);
-}
-
-void
-ArchVolatileRegs_x86::Terminate()
-{
- PluginManager::UnregisterPlugin (CreateInstance);
-}
-
-
-const char *
-ArchVolatileRegs_x86::GetPluginNameStatic()
-{
- return "ArchVolatileRegs_x86";
-}
-
-const char *
-ArchVolatileRegs_x86::GetPluginDescriptionStatic()
-{
- return "i386 and x86_64 architecture volatile register information.";
-}
Removed: lldb/trunk/source/Plugins/Process/Utility/ArchVolatileRegs-x86.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Utility/ArchVolatileRegs-x86.h?rev=130134&view=auto
==============================================================================
--- lldb/trunk/source/Plugins/Process/Utility/ArchVolatileRegs-x86.h (original)
+++ lldb/trunk/source/Plugins/Process/Utility/ArchVolatileRegs-x86.h (removed)
@@ -1,68 +0,0 @@
-//===-- ArchVolatileRegs-x86.h ----------------------------------*- C++ -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef liblldb_ArchVolatileRegs_x86_h_
-#define liblldb_ArchVolatileRegs_x86_h_
-
-#include "lldb/lldb-private.h"
-#include "lldb/Core/ArchSpec.h"
-#include "lldb/Utility/ArchVolatileRegs.h"
-#include <set>
-
-namespace lldb_private {
-
-class ArchVolatileRegs_x86 : public lldb_private::ArchVolatileRegs
-{
-public:
-
- ~ArchVolatileRegs_x86 () { }
-
- bool
- RegisterIsVolatile (lldb_private::Thread& thread, uint32_t regnum);
-
- static lldb_private::ArchVolatileRegs *
- CreateInstance (const lldb_private::ArchSpec &arch);
-
- //------------------------------------------------------------------
- // PluginInterface protocol
- //------------------------------------------------------------------
- static void
- Initialize();
-
- static void
- Terminate();
-
- static const char *
- GetPluginNameStatic();
-
- static const char *
- GetPluginDescriptionStatic();
-
- virtual const char *
- GetPluginName();
-
- virtual const char *
- GetShortPluginName();
-
- virtual uint32_t
- GetPluginVersion();
-
-private:
- ArchVolatileRegs_x86(llvm::Triple::ArchType cpu); // Call CreateInstance instead.
-
- void initialize_regset(lldb_private::Thread& thread);
-
- llvm::Triple::ArchType m_cpu;
- std::set<int> m_non_volatile_regs;
-};
-
-
-} // namespace lldb_private
-
-#endif // liblldb_ArchVolatileRegs_x86_h_
Modified: lldb/trunk/source/Plugins/Process/Utility/RegisterContextLLDB.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Utility/RegisterContextLLDB.cpp?rev=130135&r1=130134&r2=130135&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/Utility/RegisterContextLLDB.cpp (original)
+++ lldb/trunk/source/Plugins/Process/Utility/RegisterContextLLDB.cpp Mon Apr 25 13:36:36 2011
@@ -7,25 +7,26 @@
//
//===----------------------------------------------------------------------===//
-#include "lldb/lldb-private.h"
#include "RegisterContextLLDB.h"
-#include "lldb/Target/Thread.h"
-#include "lldb/Symbol/Function.h"
-#include "lldb/Symbol/SymbolContext.h"
-#include "lldb/Symbol/Symbol.h"
+
+#include "lldb/lldb-private.h"
#include "lldb/Core/Address.h"
#include "lldb/Core/AddressRange.h"
-#include "lldb/Target/Target.h"
-#include "lldb/Target/Process.h"
-#include "lldb/Utility/ArchDefaultUnwindPlan.h"
-#include "lldb/Symbol/FuncUnwinders.h"
#include "lldb/Core/DataBufferHeap.h"
-#include "lldb/Utility/ArchVolatileRegs.h"
#include "lldb/Core/Log.h"
-#include "lldb/Expression/DWARFExpression.h"
#include "lldb/Core/Value.h"
+#include "lldb/Symbol/FuncUnwinders.h"
+#include "lldb/Symbol/Function.h"
+#include "lldb/Symbol/SymbolContext.h"
+#include "lldb/Symbol/Symbol.h"
+#include "lldb/Expression/DWARFExpression.h"
+#include "lldb/Target/ArchDefaultUnwindPlan.h"
+#include "lldb/Target/ArchVolatileRegs.h"
#include "lldb/Target/ExecutionContext.h"
+#include "lldb/Target/Process.h"
#include "lldb/Target/StackFrame.h"
+#include "lldb/Target/Target.h"
+#include "lldb/Target/Thread.h"
using namespace lldb;
using namespace lldb_private;
Removed: lldb/trunk/source/Plugins/Process/Utility/UnwindAssemblyProfiler-x86.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Utility/UnwindAssemblyProfiler-x86.cpp?rev=130134&view=auto
==============================================================================
--- lldb/trunk/source/Plugins/Process/Utility/UnwindAssemblyProfiler-x86.cpp (original)
+++ lldb/trunk/source/Plugins/Process/Utility/UnwindAssemblyProfiler-x86.cpp (removed)
@@ -1,907 +0,0 @@
-//===-- UnwindAssemblyProfiler-x86.cpp --------------------------*- C++ -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "UnwindAssemblyProfiler-x86.h"
-
-#include "lldb/lldb-private.h"
-#include "lldb/Utility/UnwindAssemblyProfiler.h"
-#include "lldb/Core/Address.h"
-#include "lldb/Core/Error.h"
-#include "lldb/Core/ArchSpec.h"
-#include "lldb/Core/PluginManager.h"
-#include "lldb/Target/ExecutionContext.h"
-#include "lldb/Target/Process.h"
-#include "lldb/Target/RegisterContext.h"
-#include "lldb/Target/Thread.h"
-#include "lldb/Target/Target.h"
-#include "lldb/Symbol/UnwindPlan.h"
-
-#include "lldb/lldb-enumerations.h"
-#include "llvm-c/EnhancedDisassembly.h"
-
-#include "UnwindAssemblyProfiler-x86.h"
-
-
-using namespace lldb;
-using namespace lldb_private;
-
-enum CPU {
- k_i386,
- k_x86_64
-};
-
-enum i386_register_numbers {
- k_machine_eax = 0,
- k_machine_ecx = 1,
- k_machine_edx = 2,
- k_machine_ebx = 3,
- k_machine_esp = 4,
- k_machine_ebp = 5,
- k_machine_esi = 6,
- k_machine_edi = 7,
- k_machine_eip = 8
-};
-
-enum x86_64_register_numbers {
- k_machine_rax = 0,
- k_machine_rcx = 1,
- k_machine_rdx = 2,
- k_machine_rbx = 3,
- k_machine_rsp = 4,
- k_machine_rbp = 5,
- k_machine_rsi = 6,
- k_machine_rdi = 7,
- k_machine_r8 = 8,
- k_machine_r9 = 9,
- k_machine_r10 = 10,
- k_machine_r11 = 11,
- k_machine_r12 = 12,
- k_machine_r13 = 13,
- k_machine_r14 = 14,
- k_machine_r15 = 15,
- k_machine_rip = 16
-};
-
-struct regmap_ent {
- const char *name;
- int machine_regno;
- int lldb_regno;
-};
-
-static struct regmap_ent i386_register_map[] = {
- {"eax", k_machine_eax, -1},
- {"ecx", k_machine_ecx, -1},
- {"edx", k_machine_edx, -1},
- {"ebx", k_machine_ebx, -1},
- {"esp", k_machine_esp, -1},
- {"ebp", k_machine_ebp, -1},
- {"esi", k_machine_esi, -1},
- {"edi", k_machine_edi, -1},
- {"eip", k_machine_eip, -1}
-};
-
-const int size_of_i386_register_map = sizeof (i386_register_map) / sizeof (struct regmap_ent);
-
-static int i386_register_map_initialized = 0;
-
-static struct regmap_ent x86_64_register_map[] = {
- {"rax", k_machine_rax, -1},
- {"rcx", k_machine_rcx, -1},
- {"rdx", k_machine_rdx, -1},
- {"rbx", k_machine_rbx, -1},
- {"rsp", k_machine_rsp, -1},
- {"rbp", k_machine_rbp, -1},
- {"rsi", k_machine_rsi, -1},
- {"rdi", k_machine_rdi, -1},
- {"r8", k_machine_r8, -1},
- {"r9", k_machine_r9, -1},
- {"r10", k_machine_r10, -1},
- {"r11", k_machine_r11, -1},
- {"r12", k_machine_r12, -1},
- {"r13", k_machine_r13, -1},
- {"r14", k_machine_r14, -1},
- {"r15", k_machine_r15, -1},
- {"rip", k_machine_rip, -1}
-};
-
-const int size_of_x86_64_register_map = sizeof (x86_64_register_map) / sizeof (struct regmap_ent);
-
-static int x86_64_register_map_initialized = 0;
-
-//-----------------------------------------------------------------------------------------------
-// AssemblyParse_x86 local-file class definition & implementation functions
-//-----------------------------------------------------------------------------------------------
-
-class AssemblyParse_x86 {
-public:
-
- AssemblyParse_x86 (Target &target, Thread *thread, int cpu, AddressRange func);
-
- bool get_non_call_site_unwind_plan (UnwindPlan &unwind_plan);
-
- bool get_fast_unwind_plan (AddressRange& func, UnwindPlan &unwind_plan);
-
- bool find_first_non_prologue_insn (Address &address);
-
-private:
- enum { kMaxInstructionByteSize = 32 };
-
- bool nonvolatile_reg_p (int machine_regno);
- bool push_rbp_pattern_p ();
- bool push_0_pattern_p ();
- bool mov_rsp_rbp_pattern_p ();
- bool sub_rsp_pattern_p (int& amount);
- bool push_reg_p (int& regno);
- bool mov_reg_to_local_stack_frame_p (int& regno, int& fp_offset);
- bool ret_pattern_p ();
- uint32_t extract_4 (uint8_t *b);
- bool machine_regno_to_lldb_regno (int machine_regno, uint32_t& lldb_regno);
- bool instruction_length (Address addr, int &length);
-
- Target &m_target;
- Thread* m_thread;
-
- AddressRange m_func_bounds;
-
- Address m_cur_insn;
- uint8_t m_cur_insn_bytes[kMaxInstructionByteSize];
-
- int m_machine_ip_regnum;
- int m_machine_sp_regnum;
- int m_machine_fp_regnum;
-
- int m_lldb_ip_regnum;
- int m_lldb_sp_regnum;
- int m_lldb_fp_regnum;
-
- int m_wordsize;
- int m_cpu;
-
- DISALLOW_COPY_AND_ASSIGN (AssemblyParse_x86);
-};
-
-AssemblyParse_x86::AssemblyParse_x86 (Target& target, Thread* thread, int cpu, AddressRange func) :
- m_target (target), m_thread (thread), m_func_bounds(func), m_cur_insn (),
- m_machine_ip_regnum (-1), m_machine_sp_regnum (-1), m_machine_fp_regnum (-1),
- m_lldb_ip_regnum (-1), m_lldb_sp_regnum (-1), m_lldb_fp_regnum (-1),
- m_wordsize (-1), m_cpu(cpu)
-{
- int *initialized_flag = NULL;
- m_lldb_ip_regnum = m_lldb_sp_regnum = m_lldb_fp_regnum = -1;
- if (cpu == k_i386)
- {
- m_machine_ip_regnum = k_machine_eip;
- m_machine_sp_regnum = k_machine_esp;
- m_machine_fp_regnum = k_machine_ebp;
- m_wordsize = 4;
- initialized_flag = &i386_register_map_initialized;
- }
- else
- {
- m_machine_ip_regnum = k_machine_rip;
- m_machine_sp_regnum = k_machine_rsp;
- m_machine_fp_regnum = k_machine_rbp;
- m_wordsize = 8;
- initialized_flag = &x86_64_register_map_initialized;
- }
-
- // we only look at prologue - it will be complete earlier than 512 bytes into func
- if (m_func_bounds.GetByteSize() == 0)
- m_func_bounds.SetByteSize(512);
-
- if (m_thread && *initialized_flag == 0)
- {
- RegisterContext *reg_ctx = m_thread->GetRegisterContext().get();
- if (reg_ctx)
- {
- struct regmap_ent *ent;
- int count, i;
- if (cpu == k_i386)
- {
- ent = i386_register_map;
- count = size_of_i386_register_map;
- }
- else
- {
- ent = x86_64_register_map;
- count = size_of_x86_64_register_map;
- }
- for (i = 0; i < count; i++, ent++)
- {
- const RegisterInfo *ri = reg_ctx->GetRegisterInfoByName (ent->name);
- if (ri)
- ent->lldb_regno = ri->kinds[eRegisterKindLLDB];
- }
- *initialized_flag = 1;
- }
- }
-
- // on initial construction we may not have a Thread so these have to remain
- // uninitialized until we can get a RegisterContext to set up the register map table
- if (*initialized_flag == 1)
- {
- uint32_t lldb_regno;
- if (machine_regno_to_lldb_regno (m_machine_sp_regnum, lldb_regno))
- m_lldb_sp_regnum = lldb_regno;
- if (machine_regno_to_lldb_regno (m_machine_fp_regnum, lldb_regno))
- m_lldb_fp_regnum = lldb_regno;
- if (machine_regno_to_lldb_regno (m_machine_ip_regnum, lldb_regno))
- m_lldb_ip_regnum = lldb_regno;
- }
-}
-
-
-// This function expects an x86 native register number (i.e. the bits stripped out of the
-// actual instruction), not an lldb register number.
-
-bool
-AssemblyParse_x86::nonvolatile_reg_p (int machine_regno)
-{
- if (m_cpu == k_i386)
- {
- switch (machine_regno) {
- case k_machine_ebx:
- case k_machine_ebp: // not actually a nonvolatile but often treated as such by convention
- case k_machine_esi:
- case k_machine_edi:
- case k_machine_esp:
- return true;
- default:
- return false;
- }
- }
- if (m_cpu == k_x86_64)
- {
- switch (machine_regno) {
- case k_machine_rbx:
- case k_machine_rsp:
- case k_machine_rbp: // not actually a nonvolatile but often treated as such by convention
- case k_machine_r12:
- case k_machine_r13:
- case k_machine_r14:
- case k_machine_r15:
- return true;
- default:
- return false;
- }
- }
- return false;
-}
-
-
-// Macro to detect if this is a REX mode prefix byte.
-#define REX_W_PREFIX_P(opcode) (((opcode) & (~0x5)) == 0x48)
-
-// The high bit which should be added to the source register number (the "R" bit)
-#define REX_W_SRCREG(opcode) (((opcode) & 0x4) >> 2)
-
-// The high bit which should be added to the destination register number (the "B" bit)
-#define REX_W_DSTREG(opcode) ((opcode) & 0x1)
-
-// pushq %rbp [0x55]
-bool AssemblyParse_x86::push_rbp_pattern_p () {
- uint8_t *p = m_cur_insn_bytes;
- if (*p == 0x55)
- return true;
- return false;
-}
-
-// pushq $0 ; the first instruction in start() [0x6a 0x00]
-bool AssemblyParse_x86::push_0_pattern_p ()
-{
- uint8_t *p = m_cur_insn_bytes;
- if (*p == 0x6a && *(p + 1) == 0x0)
- return true;
- return false;
-}
-
-// movq %rsp, %rbp [0x48 0x8b 0xec] or [0x48 0x89 0xe5]
-// movl %esp, %ebp [0x8b 0xec] or [0x89 0xe5]
-bool AssemblyParse_x86::mov_rsp_rbp_pattern_p () {
- uint8_t *p = m_cur_insn_bytes;
- if (m_wordsize == 8 && *p == 0x48)
- p++;
- if (*(p) == 0x8b && *(p + 1) == 0xec)
- return true;
- if (*(p) == 0x89 && *(p + 1) == 0xe5)
- return true;
- return false;
-}
-
-// subq $0x20, %rsp
-bool AssemblyParse_x86::sub_rsp_pattern_p (int& amount) {
- uint8_t *p = m_cur_insn_bytes;
- if (m_wordsize == 8 && *p == 0x48)
- p++;
- // 8-bit immediate operand
- if (*p == 0x83 && *(p + 1) == 0xec) {
- amount = (int8_t) *(p + 2);
- return true;
- }
- // 32-bit immediate operand
- if (*p == 0x81 && *(p + 1) == 0xec) {
- amount = (int32_t) extract_4 (p + 2);
- return true;
- }
- // Not handled: [0x83 0xc4] for imm8 with neg values
- // [0x81 0xc4] for imm32 with neg values
- return false;
-}
-
-// pushq %rbx
-// pushl $ebx
-bool AssemblyParse_x86::push_reg_p (int& regno) {
- uint8_t *p = m_cur_insn_bytes;
- int regno_prefix_bit = 0;
- // If we have a rex prefix byte, check to see if a B bit is set
- if (m_wordsize == 8 && *p == 0x41) {
- regno_prefix_bit = 1 << 3;
- p++;
- }
- if (*p >= 0x50 && *p <= 0x57) {
- regno = (*p - 0x50) | regno_prefix_bit;
- return true;
- }
- return false;
-}
-
-// Look for an instruction sequence storing a nonvolatile register
-// on to the stack frame.
-
-// movq %rax, -0x10(%rbp) [0x48 0x89 0x45 0xf0]
-// movl %eax, -0xc(%ebp) [0x89 0x45 0xf4]
-bool AssemblyParse_x86::mov_reg_to_local_stack_frame_p (int& regno, int& rbp_offset) {
- uint8_t *p = m_cur_insn_bytes;
- int src_reg_prefix_bit = 0;
- int target_reg_prefix_bit = 0;
-
- if (m_wordsize == 8 && REX_W_PREFIX_P (*p)) {
- src_reg_prefix_bit = REX_W_SRCREG (*p) << 3;
- target_reg_prefix_bit = REX_W_DSTREG (*p) << 3;
- if (target_reg_prefix_bit == 1) {
- // rbp/ebp don't need a prefix bit - we know this isn't the
- // reg we care about.
- return false;
- }
- p++;
- }
-
- if (*p == 0x89) {
- /* Mask off the 3-5 bits which indicate the destination register
- if this is a ModR/M byte. */
- int opcode_destreg_masked_out = *(p + 1) & (~0x38);
-
- /* Is this a ModR/M byte with Mod bits 01 and R/M bits 101
- and three bits between them, e.g. 01nnn101
- We're looking for a destination of ebp-disp8 or ebp-disp32. */
- int immsize;
- if (opcode_destreg_masked_out == 0x45)
- immsize = 2;
- else if (opcode_destreg_masked_out == 0x85)
- immsize = 4;
- else
- return false;
-
- int offset = 0;
- if (immsize == 2)
- offset = (int8_t) *(p + 2);
- if (immsize == 4)
- offset = (uint32_t) extract_4 (p + 2);
- if (offset > 0)
- return false;
-
- regno = ((*(p + 1) >> 3) & 0x7) | src_reg_prefix_bit;
- rbp_offset = offset > 0 ? offset : -offset;
- return true;
- }
- return false;
-}
-
-// ret [0xc9] or [0xc2 imm8] or [0xca imm8]
-bool
-AssemblyParse_x86::ret_pattern_p ()
-{
- uint8_t *p = m_cur_insn_bytes;
- if (*p == 0xc9 || *p == 0xc2 || *p == 0xca || *p == 0xc3)
- return true;
- return false;
-}
-
-uint32_t
-AssemblyParse_x86::extract_4 (uint8_t *b)
-{
- uint32_t v = 0;
- for (int i = 3; i >= 0; i--)
- v = (v << 8) | b[i];
- return v;
-}
-
-bool
-AssemblyParse_x86::machine_regno_to_lldb_regno (int machine_regno, uint32_t &lldb_regno)
-{
- struct regmap_ent *ent;
- int count, i;
- if (m_cpu == k_i386)
- {
- ent = i386_register_map;
- count = size_of_i386_register_map;
- }
- else
- {
- ent = x86_64_register_map;
- count = size_of_x86_64_register_map;
- }
- for (i = 0; i < count; i++, ent++)
- {
- if (ent->machine_regno == machine_regno)
- if (ent->lldb_regno != -1)
- {
- lldb_regno = ent->lldb_regno;
- return true;
- }
- }
- return false;
-}
-
-struct edis_byte_read_token
-{
- Address *address;
- Target *target;
-};
-
-
-static int
-read_byte_for_edis (uint8_t *buf, uint64_t offset_address, void *arg)
-{
- if (arg == 0)
- return -1;
- struct edis_byte_read_token *tok = (edis_byte_read_token *) arg;
- Address *base_address = tok->address;
- Target *target = tok->target;
-
- Address read_addr = *base_address;
- read_addr.SetOffset (offset_address);
-
- uint8_t onebyte_buf[1];
- Error error;
- const bool prefer_file_cache = true;
- if (target->ReadMemory (read_addr, prefer_file_cache, onebyte_buf, 1, error) != -1)
- {
- *buf = onebyte_buf[0];
- return 0;
- }
- return -1;
-}
-
-
-bool
-AssemblyParse_x86::instruction_length (Address addr, int &length)
-{
- const char *triple;
-
- if (!addr.IsValid())
- return false;
-
- // FIXME should probably pass down the ArchSpec and work from that to make a portable triple
- if (m_cpu == k_i386)
- triple = "i386-unknown-unknown";
- else
- triple = "x86_64-unknown-unknown";
-
- EDDisassemblerRef disasm;
- EDInstRef cur_insn;
-
- if (EDGetDisassembler (&disasm, triple, kEDAssemblySyntaxX86ATT) != 0)
- {
- return false;
- }
-
- uint64_t addr_offset = addr.GetOffset();
- struct edis_byte_read_token arg;
- arg.address = &addr;
- arg.target = &m_target;
- if (EDCreateInsts (&cur_insn, 1, disasm, read_byte_for_edis, addr_offset, &arg) != 1)
- {
- return false;
- }
- length = EDInstByteSize (cur_insn);
- EDReleaseInst (cur_insn);
- return true;
-}
-
-
-bool
-AssemblyParse_x86::get_non_call_site_unwind_plan (UnwindPlan &unwind_plan)
-{
- UnwindPlan::Row row;
- int non_prologue_insn_count = 0;
- m_cur_insn = m_func_bounds.GetBaseAddress ();
- int current_func_text_offset = 0;
- int current_sp_bytes_offset_from_cfa = 0;
- UnwindPlan::Row::RegisterLocation initial_regloc;
- Error error;
-
- if (!m_cur_insn.IsValid())
- {
- return false;
- }
-
- unwind_plan.SetPlanValidAddressRange (m_func_bounds);
- unwind_plan.SetRegisterKind (eRegisterKindLLDB);
-
- // At the start of the function, find the CFA by adding wordsize to the SP register
- row.SetOffset (current_func_text_offset);
- row.SetCFARegister (m_lldb_sp_regnum);
- row.SetCFAOffset (m_wordsize);
-
- // caller's stack pointer value before the call insn is the CFA address
- initial_regloc.SetIsCFAPlusOffset (0);
- row.SetRegisterInfo (m_lldb_sp_regnum, initial_regloc);
-
- // saved instruction pointer can be found at CFA - wordsize.
- current_sp_bytes_offset_from_cfa = m_wordsize;
- initial_regloc.SetAtCFAPlusOffset (-current_sp_bytes_offset_from_cfa);
- row.SetRegisterInfo (m_lldb_ip_regnum, initial_regloc);
-
- unwind_plan.AppendRow (row);
- const bool prefer_file_cache = true;
-
- while (m_func_bounds.ContainsFileAddress (m_cur_insn) && non_prologue_insn_count < 10)
- {
- int stack_offset, insn_len;
- int machine_regno; // register numbers masked directly out of instructions
- uint32_t lldb_regno; // register numbers in lldb's eRegisterKindLLDB numbering scheme
-
- if (!instruction_length (m_cur_insn, insn_len) || insn_len == 0 || insn_len > kMaxInstructionByteSize)
- {
- // An unrecognized/junk instruction
- break;
- }
- if (m_target.ReadMemory (m_cur_insn, prefer_file_cache, m_cur_insn_bytes, insn_len, error) == -1)
- {
- // Error reading the instruction out of the file, stop scanning
- break;
- }
-
- if (push_rbp_pattern_p ())
- {
- row.SetOffset (current_func_text_offset + insn_len);
- current_sp_bytes_offset_from_cfa += m_wordsize;
- row.SetCFAOffset (current_sp_bytes_offset_from_cfa);
- UnwindPlan::Row::RegisterLocation regloc;
- regloc.SetAtCFAPlusOffset (-row.GetCFAOffset());
- row.SetRegisterInfo (m_lldb_fp_regnum, regloc);
- unwind_plan.AppendRow (row);
- goto loopnext;
- }
-
- if (mov_rsp_rbp_pattern_p ())
- {
- row.SetOffset (current_func_text_offset + insn_len);
- row.SetCFARegister (m_lldb_fp_regnum);
- unwind_plan.AppendRow (row);
- goto loopnext;
- }
-
- // This is the start() function (or a pthread equivalent), it starts with a pushl $0x0 which puts the
- // saved pc value of 0 on the stack. In this case we want to pretend we didn't see a stack movement at all --
- // normally the saved pc value is already on the stack by the time the function starts executing.
- if (push_0_pattern_p ())
- {
- goto loopnext;
- }
-
- if (push_reg_p (machine_regno))
- {
- current_sp_bytes_offset_from_cfa += m_wordsize;
- if (nonvolatile_reg_p (machine_regno) && machine_regno_to_lldb_regno (machine_regno, lldb_regno))
- {
- row.SetOffset (current_func_text_offset + insn_len);
- if (row.GetCFARegister() == m_lldb_sp_regnum)
- {
- row.SetCFAOffset (current_sp_bytes_offset_from_cfa);
- }
- UnwindPlan::Row::RegisterLocation regloc;
- regloc.SetAtCFAPlusOffset (-current_sp_bytes_offset_from_cfa);
- row.SetRegisterInfo (lldb_regno, regloc);
- unwind_plan.AppendRow (row);
- }
- goto loopnext;
- }
-
- if (mov_reg_to_local_stack_frame_p (machine_regno, stack_offset) && nonvolatile_reg_p (machine_regno))
- {
- if (machine_regno_to_lldb_regno (machine_regno, lldb_regno))
- {
- row.SetOffset (current_func_text_offset + insn_len);
- UnwindPlan::Row::RegisterLocation regloc;
- regloc.SetAtCFAPlusOffset (-row.GetCFAOffset());
- row.SetRegisterInfo (lldb_regno, regloc);
- unwind_plan.AppendRow (row);
- goto loopnext;
- }
- }
-
- if (sub_rsp_pattern_p (stack_offset))
- {
- current_sp_bytes_offset_from_cfa += stack_offset;
- if (row.GetCFARegister() == m_lldb_sp_regnum)
- {
- row.SetOffset (current_func_text_offset + insn_len);
- row.SetCFAOffset (current_sp_bytes_offset_from_cfa);
- unwind_plan.AppendRow (row);
- }
- goto loopnext;
- }
-
- if (ret_pattern_p ())
- {
- // we know where the end of the function is; set the limit on the PlanValidAddressRange
- // in case our initial "high pc" value was overly large
- // int original_size = m_func_bounds.GetByteSize();
- // int calculated_size = m_cur_insn.GetOffset() - m_func_bounds.GetBaseAddress().GetOffset() + insn_len + 1;
- // m_func_bounds.SetByteSize (calculated_size);
- // unwind_plan.SetPlanValidAddressRange (m_func_bounds);
- break;
- }
-
- // FIXME recognize the i386 picbase setup instruction sequence,
- // 0x1f16: call 0x1f1b ; main + 11 at /private/tmp/a.c:3
- // 0x1f1b: popl %eax
- // and record the temporary stack movements if the CFA is not expressed in terms of ebp.
-
- non_prologue_insn_count++;
-loopnext:
- m_cur_insn.SetOffset (m_cur_insn.GetOffset() + insn_len);
- current_func_text_offset += insn_len;
- }
-
- // Now look at the byte at the end of the AddressRange for a limited attempt at describing the
- // epilogue. If this function is built -fomit-frame-pointer (so the CFA is defined in terms of the
- // stack pointer) we'd need to profile every instruction which causes rsp to change to backtrace
- // all the time. But assuming the CFA is in terms of rbp most of the time, this one additional Row
- // will be sufficient.
-
- if (m_func_bounds.GetByteSize() > 2)
- {
- Address last_insn (m_func_bounds.GetBaseAddress());
- last_insn.SetOffset (last_insn.GetOffset() + m_func_bounds.GetByteSize() - 1);
- uint8_t bytebuf[1];
- if (m_target.ReadMemory (last_insn, prefer_file_cache, bytebuf, 1, error) != -1)
- {
- if (bytebuf[0] == 0xc3) // ret aka retq
- {
- // Create a fresh, empty Row and RegisterLocation - don't mention any other registers
- UnwindPlan::Row epi_row;
- UnwindPlan::Row::RegisterLocation epi_regloc;
-
- // When the ret instruction is about to be executed, here's our state
- epi_row.SetOffset (m_func_bounds.GetByteSize() - 1);
- epi_row.SetCFARegister (m_lldb_sp_regnum);
- epi_row.SetCFAOffset (m_wordsize);
-
- // caller's stack pointer value before the call insn is the CFA address
- epi_regloc.SetIsCFAPlusOffset (0);
- epi_row.SetRegisterInfo (m_lldb_sp_regnum, epi_regloc);
-
- // saved instruction pointer can be found at CFA - wordsize
- epi_regloc.SetAtCFAPlusOffset (-m_wordsize);
- epi_row.SetRegisterInfo (m_lldb_ip_regnum, epi_regloc);
-
- unwind_plan.AppendRow (epi_row);
- }
- }
- }
-
- unwind_plan.SetSourceName ("assembly insn profiling");
-
- return true;
-}
-
-/* The "fast unwind plan" is valid for functions that follow the usual convention of
- using the frame pointer register (ebp, rbp), i.e. the function prologue looks like
- push %rbp [0x55]
- mov %rsp,%rbp [0x48 0x89 0xe5] (this is a 2-byte insn seq on i386)
-*/
-
-bool
-AssemblyParse_x86::get_fast_unwind_plan (AddressRange& func, UnwindPlan &unwind_plan)
-{
- UnwindPlan::Row row;
- UnwindPlan::Row::RegisterLocation pc_reginfo;
- UnwindPlan::Row::RegisterLocation sp_reginfo;
- UnwindPlan::Row::RegisterLocation fp_reginfo;
- unwind_plan.SetRegisterKind (eRegisterKindLLDB);
-
- if (!func.GetBaseAddress().IsValid())
- return false;
-
- uint8_t bytebuf[4];
- Error error;
- const bool prefer_file_cache = true;
- if (m_target.ReadMemory (func.GetBaseAddress(), prefer_file_cache, bytebuf, sizeof (bytebuf), error) == -1)
- return false;
-
- uint8_t i386_prologue[] = {0x55, 0x89, 0xe5};
- uint8_t x86_64_prologue[] = {0x55, 0x48, 0x89, 0xe5};
- int prologue_size;
-
- if (memcmp (bytebuf, i386_prologue, sizeof (i386_prologue)) == 0)
- {
- prologue_size = sizeof (i386_prologue);
- }
- else if (memcmp (bytebuf, x86_64_prologue, sizeof (x86_64_prologue)) == 0)
- {
- prologue_size = sizeof (x86_64_prologue);
- }
- else
- {
- return false;
- }
-
- pc_reginfo.SetAtCFAPlusOffset (-m_wordsize);
- row.SetRegisterInfo (m_lldb_ip_regnum, pc_reginfo);
-
- sp_reginfo.SetIsCFAPlusOffset (0);
- row.SetRegisterInfo (m_lldb_sp_regnum, sp_reginfo);
-
- // Zero instructions into the function
- row.SetCFARegister (m_lldb_sp_regnum);
- row.SetCFAOffset (m_wordsize);
- row.SetOffset (0);
- unwind_plan.AppendRow (row);
-
- // push %rbp has executed - stack moved, rbp now saved
- row.SetCFAOffset (2 * m_wordsize);
- fp_reginfo.SetAtCFAPlusOffset (2 * -m_wordsize);
- row.SetRegisterInfo (m_lldb_fp_regnum, fp_reginfo);
- row.SetOffset (1);
- unwind_plan.AppendRow (row);
-
- // mov %rsp, %rbp has executed
- row.SetCFARegister (m_lldb_fp_regnum);
- row.SetCFAOffset (2 * m_wordsize);
- row.SetOffset (prologue_size); /// 3 or 4 bytes depending on arch
- unwind_plan.AppendRow (row);
-
- unwind_plan.SetPlanValidAddressRange (func);
- return true;
-}
-
-bool
-AssemblyParse_x86::find_first_non_prologue_insn (Address &address)
-{
- m_cur_insn = m_func_bounds.GetBaseAddress ();
- if (!m_cur_insn.IsValid())
- {
- return false;
- }
-
- const bool prefer_file_cache = true;
- while (m_func_bounds.ContainsFileAddress (m_cur_insn))
- {
- Error error;
- int insn_len, offset, regno;
- if (!instruction_length (m_cur_insn, insn_len) || insn_len > kMaxInstructionByteSize || insn_len == 0)
- {
- // An error parsing the instruction, i.e. probably data/garbage - stop scanning
- break;
- }
- if (m_target.ReadMemory (m_cur_insn, prefer_file_cache, m_cur_insn_bytes, insn_len, error) == -1)
- {
- // Error reading the instruction out of the file, stop scanning
- break;
- }
-
- if (push_rbp_pattern_p () || mov_rsp_rbp_pattern_p () || sub_rsp_pattern_p (offset)
- || push_reg_p (regno) || mov_reg_to_local_stack_frame_p (regno, offset))
- {
- m_cur_insn.SetOffset (m_cur_insn.GetOffset() + insn_len);
- continue;
- }
-
- // Unknown non-prologue instruction - stop scanning
- break;
- }
-
- address = m_cur_insn;
- return true;
-}
-
-
-
-
-
-
-//-----------------------------------------------------------------------------------------------
-// UnwindAssemblyParser_x86 method definitions
-//-----------------------------------------------------------------------------------------------
-
-bool
-UnwindAssemblyProfiler_x86::GetNonCallSiteUnwindPlanFromAssembly (AddressRange& func, Thread& thread, UnwindPlan& unwind_plan)
-{
- AssemblyParse_x86 asm_parse(thread.GetProcess().GetTarget(), &thread, m_cpu, func);
- return asm_parse.get_non_call_site_unwind_plan (unwind_plan);
-}
-
-bool
-UnwindAssemblyProfiler_x86::GetFastUnwindPlan (AddressRange& func, Thread& thread, UnwindPlan &unwind_plan)
-{
- AssemblyParse_x86 asm_parse(thread.GetProcess().GetTarget(), &thread, m_cpu, func);
- return asm_parse.get_fast_unwind_plan (func, unwind_plan);
-}
-
-bool
-UnwindAssemblyProfiler_x86::FirstNonPrologueInsn (AddressRange& func, Target& target, Thread* thread, Address& first_non_prologue_insn)
-{
- AssemblyParse_x86 asm_parse(target, thread, m_cpu, func);
- return asm_parse.find_first_non_prologue_insn (first_non_prologue_insn);
-}
-
-UnwindAssemblyProfiler *
-UnwindAssemblyProfiler_x86::CreateInstance (const ArchSpec &arch)
-{
- const llvm::Triple::ArchType cpu = arch.GetMachine ();
- if (cpu == llvm::Triple::x86)
- return new UnwindAssemblyProfiler_x86 (k_i386);
- else if (cpu == llvm::Triple::x86_64)
- return new UnwindAssemblyProfiler_x86 (k_x86_64);
- return NULL;
-}
-
-
-//------------------------------------------------------------------
-// PluginInterface protocol in UnwindAssemblyParser_x86
-//------------------------------------------------------------------
-
-const char *
-UnwindAssemblyProfiler_x86::GetPluginName()
-{
- return "UnwindAssemblyProfiler_x86";
-}
-
-const char *
-UnwindAssemblyProfiler_x86::GetShortPluginName()
-{
- return "unwindassemblyprofiler.x86";
-}
-
-
-uint32_t
-UnwindAssemblyProfiler_x86::GetPluginVersion()
-{
- return 1;
-}
-
-void
-UnwindAssemblyProfiler_x86::Initialize()
-{
- PluginManager::RegisterPlugin (GetPluginNameStatic(),
- GetPluginDescriptionStatic(),
- CreateInstance);
-}
-
-void
-UnwindAssemblyProfiler_x86::Terminate()
-{
- PluginManager::UnregisterPlugin (CreateInstance);
-}
-
-
-const char *
-UnwindAssemblyProfiler_x86::GetPluginNameStatic()
-{
- return "UnwindAssemblyProfiler_x86";
-}
-
-const char *
-UnwindAssemblyProfiler_x86::GetPluginDescriptionStatic()
-{
- return "i386 and x86_64 assembly language profiler plugin.";
-}
Removed: lldb/trunk/source/Plugins/Process/Utility/UnwindAssemblyProfiler-x86.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Utility/UnwindAssemblyProfiler-x86.h?rev=130134&view=auto
==============================================================================
--- lldb/trunk/source/Plugins/Process/Utility/UnwindAssemblyProfiler-x86.h (original)
+++ lldb/trunk/source/Plugins/Process/Utility/UnwindAssemblyProfiler-x86.h (removed)
@@ -1,73 +0,0 @@
-//===-- UnwindAssemblyProfiler-x86.h ----------------------------*- C++ -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef liblldb_UnwindAssemblyProfiler_x86_h_
-#define liblldb_UnwindAssemblyProfiler_x86_h_
-
-#include "lldb/lldb-private.h"
-#include "lldb/Utility/UnwindAssemblyProfiler.h"
-#include "lldb/Target/Thread.h"
-
-namespace lldb_private {
-
-class UnwindAssemblyProfiler_x86 : public lldb_private::UnwindAssemblyProfiler
-{
-public:
-
- ~UnwindAssemblyProfiler_x86 () { }
-
- virtual bool
- GetNonCallSiteUnwindPlanFromAssembly (AddressRange& func, lldb_private::Thread& thread, UnwindPlan& unwind_plan);
-
- virtual bool
- GetFastUnwindPlan (AddressRange& func, lldb_private::Thread& thread, UnwindPlan &unwind_plan);
-
- // thread may be NULL in which case we only use the Target (e.g. if this is called pre-process-launch).
- virtual bool
- FirstNonPrologueInsn (AddressRange& func, lldb_private::Target& target, lldb_private::Thread* thread, Address& first_non_prologue_insn);
-
- static lldb_private::UnwindAssemblyProfiler *
- CreateInstance (const lldb_private::ArchSpec &arch);
-
-
- //------------------------------------------------------------------
- // PluginInterface protocol
- //------------------------------------------------------------------
- static void
- Initialize();
-
- static void
- Terminate();
-
- static const char *
- GetPluginNameStatic();
-
- static const char *
- GetPluginDescriptionStatic();
-
- virtual const char *
- GetPluginName();
-
- virtual const char *
- GetShortPluginName();
-
- virtual uint32_t
- GetPluginVersion();
-
-private:
- UnwindAssemblyProfiler_x86(int cpu) :
- lldb_private::UnwindAssemblyProfiler(), m_cpu(cpu) { } // Call CreateInstance instead.
-
- int m_cpu;
-};
-
-
-} // namespace lldb_private
-
-#endif // liblldb_UnwindAssemblyProfiler_x86_h_
Modified: lldb/trunk/source/Plugins/Process/Utility/UnwindLLDB.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Utility/UnwindLLDB.cpp?rev=130135&r1=130134&r2=130135&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/Utility/UnwindLLDB.cpp (original)
+++ lldb/trunk/source/Plugins/Process/Utility/UnwindLLDB.cpp Mon Apr 25 13:36:36 2011
@@ -7,16 +7,16 @@
//
//===----------------------------------------------------------------------===//
-#include "lldb/Target/Thread.h"
-#include "lldb/Target/Target.h"
-#include "lldb/Target/Process.h"
-#include "lldb/Target/RegisterContext.h"
#include "lldb/Core/Module.h"
+#include "lldb/Core/Log.h"
#include "lldb/Symbol/FuncUnwinders.h"
#include "lldb/Symbol/Function.h"
-#include "lldb/Utility/ArchDefaultUnwindPlan.h"
#include "lldb/Symbol/UnwindPlan.h"
-#include "lldb/Core/Log.h"
+#include "lldb/Target/ArchDefaultUnwindPlan.h"
+#include "lldb/Target/Thread.h"
+#include "lldb/Target/Target.h"
+#include "lldb/Target/Process.h"
+#include "lldb/Target/RegisterContext.h"
#include "UnwindLLDB.h"
#include "RegisterContextLLDB.h"
Copied: lldb/trunk/source/Plugins/UnwindAssembly/UnwindAssemblyProfiler-x86.cpp (from r130129, lldb/trunk/source/Plugins/Process/Utility/UnwindAssemblyProfiler-x86.cpp)
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/UnwindAssembly/UnwindAssemblyProfiler-x86.cpp?p2=lldb/trunk/source/Plugins/UnwindAssembly/UnwindAssemblyProfiler-x86.cpp&p1=lldb/trunk/source/Plugins/Process/Utility/UnwindAssemblyProfiler-x86.cpp&r1=130129&r2=130135&rev=130135&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/Utility/UnwindAssemblyProfiler-x86.cpp (original)
+++ lldb/trunk/source/Plugins/UnwindAssembly/UnwindAssemblyProfiler-x86.cpp Mon Apr 25 13:36:36 2011
@@ -9,24 +9,19 @@
#include "UnwindAssemblyProfiler-x86.h"
-#include "lldb/lldb-private.h"
-#include "lldb/Utility/UnwindAssemblyProfiler.h"
+#include "llvm-c/EnhancedDisassembly.h"
+
#include "lldb/Core/Address.h"
#include "lldb/Core/Error.h"
#include "lldb/Core/ArchSpec.h"
#include "lldb/Core/PluginManager.h"
+#include "lldb/Symbol/UnwindPlan.h"
#include "lldb/Target/ExecutionContext.h"
#include "lldb/Target/Process.h"
#include "lldb/Target/RegisterContext.h"
#include "lldb/Target/Thread.h"
#include "lldb/Target/Target.h"
-#include "lldb/Symbol/UnwindPlan.h"
-
-#include "lldb/lldb-enumerations.h"
-#include "llvm-c/EnhancedDisassembly.h"
-
-#include "UnwindAssemblyProfiler-x86.h"
-
+#include "lldb/Target/UnwindAssemblyProfiler.h"
using namespace lldb;
using namespace lldb_private;
Copied: lldb/trunk/source/Plugins/UnwindAssembly/UnwindAssemblyProfiler-x86.h (from r130129, lldb/trunk/source/Plugins/Process/Utility/UnwindAssemblyProfiler-x86.h)
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/UnwindAssembly/UnwindAssemblyProfiler-x86.h?p2=lldb/trunk/source/Plugins/UnwindAssembly/UnwindAssemblyProfiler-x86.h&p1=lldb/trunk/source/Plugins/Process/Utility/UnwindAssemblyProfiler-x86.h&r1=130129&r2=130135&rev=130135&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/Utility/UnwindAssemblyProfiler-x86.h (original)
+++ lldb/trunk/source/Plugins/UnwindAssembly/UnwindAssemblyProfiler-x86.h Mon Apr 25 13:36:36 2011
@@ -11,7 +11,7 @@
#define liblldb_UnwindAssemblyProfiler_x86_h_
#include "lldb/lldb-private.h"
-#include "lldb/Utility/UnwindAssemblyProfiler.h"
+#include "lldb/Target/UnwindAssemblyProfiler.h"
#include "lldb/Target/Thread.h"
namespace lldb_private {
Modified: lldb/trunk/source/Symbol/FuncUnwinders.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/FuncUnwinders.cpp?rev=130135&r1=130134&r2=130135&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/FuncUnwinders.cpp (original)
+++ lldb/trunk/source/Symbol/FuncUnwinders.cpp Mon Apr 25 13:36:36 2011
@@ -7,18 +7,17 @@
//
//===----------------------------------------------------------------------===//
-#include "lldb/lldb-private.h"
+#include "lldb/Core/AddressRange.h"
+#include "lldb/Core/Address.h"
#include "lldb/Symbol/FuncUnwinders.h"
+#include "lldb/Symbol/DWARFCallFrameInfo.h"
#include "lldb/Symbol/ObjectFile.h"
#include "lldb/Symbol/UnwindPlan.h"
-#include "lldb/Core/AddressRange.h"
-#include "lldb/Core/Address.h"
#include "lldb/Symbol/UnwindTable.h"
-#include "lldb/Utility/UnwindAssemblyProfiler.h"
-#include "lldb/Utility/ArchDefaultUnwindPlan.h"
-#include "lldb/Symbol/DWARFCallFrameInfo.h"
+#include "lldb/Target/ArchDefaultUnwindPlan.h"
#include "lldb/Target/Thread.h"
#include "lldb/Target/Target.h"
+#include "lldb/Target/UnwindAssemblyProfiler.h"
using namespace lldb;
using namespace lldb_private;
Modified: lldb/trunk/source/Symbol/UnwindTable.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/UnwindTable.cpp?rev=130135&r1=130134&r2=130135&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/UnwindTable.cpp (original)
+++ lldb/trunk/source/Symbol/UnwindTable.cpp Mon Apr 25 13:36:36 2011
@@ -1,4 +1,4 @@
-//===-- UnwindTable.cpp ----------------------------------*- C++ -*-===//
+//===-- UnwindTable.cpp -----------------------------------------*- C++ -*-===//
//
// The LLVM Compiler Infrastructure
//
@@ -11,16 +11,13 @@
#include <stdio.h>
-#include "lldb/lldb-forward.h"
-
#include "lldb/Core/Module.h"
#include "lldb/Core/Section.h"
-//#include "lldb/Core/StreamFile.h"
#include "lldb/Symbol/ObjectFile.h"
#include "lldb/Symbol/FuncUnwinders.h"
#include "lldb/Symbol/SymbolContext.h"
#include "lldb/Symbol/DWARFCallFrameInfo.h"
-#include "lldb/Utility/UnwindAssemblyProfiler.h"
+#include "lldb/Target/UnwindAssemblyProfiler.h"
// There is one UnwindTable object per ObjectFile.
// It contains a list of Unwind objects -- one per function, populated lazily -- for the ObjectFile.
Copied: lldb/trunk/source/Target/ArchDefaultUnwindPlan.cpp (from r130129, lldb/trunk/source/Utility/ArchDefaultUnwindPlan.cpp)
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/ArchDefaultUnwindPlan.cpp?p2=lldb/trunk/source/Target/ArchDefaultUnwindPlan.cpp&p1=lldb/trunk/source/Utility/ArchDefaultUnwindPlan.cpp&r1=130129&r2=130135&rev=130135&view=diff
==============================================================================
--- lldb/trunk/source/Utility/ArchDefaultUnwindPlan.cpp (original)
+++ lldb/trunk/source/Target/ArchDefaultUnwindPlan.cpp Mon Apr 25 13:36:36 2011
@@ -14,7 +14,7 @@
#include "lldb/Core/ArchSpec.h"
#include "lldb/Core/PluginInterface.h"
#include "lldb/Host/Mutex.h"
-#include "lldb/Utility/ArchDefaultUnwindPlan.h"
+#include "lldb/Target/ArchDefaultUnwindPlan.h"
using namespace lldb;
using namespace lldb_private;
Copied: lldb/trunk/source/Target/ArchVolatileRegs.cpp (from r130129, lldb/trunk/source/Utility/ArchVolatileRegs.cpp)
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/ArchVolatileRegs.cpp?p2=lldb/trunk/source/Target/ArchVolatileRegs.cpp&p1=lldb/trunk/source/Utility/ArchVolatileRegs.cpp&r1=130129&r2=130135&rev=130135&view=diff
==============================================================================
--- lldb/trunk/source/Utility/ArchVolatileRegs.cpp (original)
+++ lldb/trunk/source/Target/ArchVolatileRegs.cpp Mon Apr 25 13:36:36 2011
@@ -10,7 +10,7 @@
#include "lldb/lldb-private.h"
#include "lldb/Core/PluginManager.h"
#include "lldb/Core/PluginInterface.h"
-#include "lldb/Utility/ArchVolatileRegs.h"
+#include "lldb/Target/ArchVolatileRegs.h"
using namespace lldb;
using namespace lldb_private;
Copied: lldb/trunk/source/Target/UnwindAssemblyProfiler.cpp (from r130129, lldb/trunk/source/Utility/UnwindAssemblyProfiler.cpp)
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/UnwindAssemblyProfiler.cpp?p2=lldb/trunk/source/Target/UnwindAssemblyProfiler.cpp&p1=lldb/trunk/source/Utility/UnwindAssemblyProfiler.cpp&r1=130129&r2=130135&rev=130135&view=diff
==============================================================================
--- lldb/trunk/source/Utility/UnwindAssemblyProfiler.cpp (original)
+++ lldb/trunk/source/Target/UnwindAssemblyProfiler.cpp Mon Apr 25 13:36:36 2011
@@ -10,7 +10,7 @@
#include "lldb/lldb-private.h"
#include "lldb/Core/PluginManager.h"
#include "lldb/Core/PluginInterface.h"
-#include "lldb/Utility/UnwindAssemblyProfiler.h"
+#include "lldb/Target/UnwindAssemblyProfiler.h"
using namespace lldb;
using namespace lldb_private;
Removed: lldb/trunk/source/Utility/ArchDefaultUnwindPlan.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/ArchDefaultUnwindPlan.cpp?rev=130134&view=auto
==============================================================================
--- lldb/trunk/source/Utility/ArchDefaultUnwindPlan.cpp (original)
+++ lldb/trunk/source/Utility/ArchDefaultUnwindPlan.cpp (removed)
@@ -1,54 +0,0 @@
-//===-- ArchDefaultUnwindPlan.cpp -------------------------------*- C++ -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "lldb/Core/PluginManager.h"
-
-#include <map>
-
-#include "lldb/Core/ArchSpec.h"
-#include "lldb/Core/PluginInterface.h"
-#include "lldb/Host/Mutex.h"
-#include "lldb/Utility/ArchDefaultUnwindPlan.h"
-
-using namespace lldb;
-using namespace lldb_private;
-
-ArchDefaultUnwindPlanSP
-ArchDefaultUnwindPlan::FindPlugin (const ArchSpec &arch)
-{
- ArchDefaultUnwindPlanCreateInstance create_callback;
- typedef std::map <const ArchSpec, ArchDefaultUnwindPlanSP> ArchDefaultUnwindPlanMap;
- static ArchDefaultUnwindPlanMap g_plugin_map;
- static Mutex g_plugin_map_mutex (Mutex::eMutexTypeRecursive);
- Mutex::Locker locker (g_plugin_map_mutex);
- ArchDefaultUnwindPlanMap::iterator pos = g_plugin_map.find (arch);
- if (pos != g_plugin_map.end())
- return pos->second;
-
- for (uint32_t idx = 0;
- (create_callback = PluginManager::GetArchDefaultUnwindPlanCreateCallbackAtIndex(idx)) != NULL;
- ++idx)
- {
- ArchDefaultUnwindPlanSP default_unwind_plan_sp (create_callback (arch));
- if (default_unwind_plan_sp)
- {
- g_plugin_map[arch] = default_unwind_plan_sp;
- return default_unwind_plan_sp;
- }
- }
- return ArchDefaultUnwindPlanSP();
-}
-
-ArchDefaultUnwindPlan::ArchDefaultUnwindPlan ()
-{
-}
-
-ArchDefaultUnwindPlan::~ArchDefaultUnwindPlan ()
-{
-}
Removed: lldb/trunk/source/Utility/ArchVolatileRegs.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/ArchVolatileRegs.cpp?rev=130134&view=auto
==============================================================================
--- lldb/trunk/source/Utility/ArchVolatileRegs.cpp (original)
+++ lldb/trunk/source/Utility/ArchVolatileRegs.cpp (removed)
@@ -1,40 +0,0 @@
-//===-- ArchVolatileRegs.cpp ------------------------------------*- C++ -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "lldb/lldb-private.h"
-#include "lldb/Core/PluginManager.h"
-#include "lldb/Core/PluginInterface.h"
-#include "lldb/Utility/ArchVolatileRegs.h"
-
-using namespace lldb;
-using namespace lldb_private;
-
-ArchVolatileRegs*
-ArchVolatileRegs::FindPlugin (const ArchSpec &arch)
-{
- ArchVolatileRegsCreateInstance create_callback;
-
- for (uint32_t idx = 0;
- (create_callback = PluginManager::GetArchVolatileRegsCreateCallbackAtIndex(idx)) != NULL;
- ++idx)
- {
- std::auto_ptr<ArchVolatileRegs> default_volatile_regs_ap (create_callback (arch));
- if (default_volatile_regs_ap.get ())
- return default_volatile_regs_ap.release ();
- }
- return NULL;
-}
-
-ArchVolatileRegs::ArchVolatileRegs ()
-{
-}
-
-ArchVolatileRegs::~ArchVolatileRegs ()
-{
-}
Removed: lldb/trunk/source/Utility/UnwindAssemblyProfiler.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/UnwindAssemblyProfiler.cpp?rev=130134&view=auto
==============================================================================
--- lldb/trunk/source/Utility/UnwindAssemblyProfiler.cpp (original)
+++ lldb/trunk/source/Utility/UnwindAssemblyProfiler.cpp (removed)
@@ -1,40 +0,0 @@
-//===-- UnwindAssemblyProfiler.cpp ------------------------------*- C++ -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "lldb/lldb-private.h"
-#include "lldb/Core/PluginManager.h"
-#include "lldb/Core/PluginInterface.h"
-#include "lldb/Utility/UnwindAssemblyProfiler.h"
-
-using namespace lldb;
-using namespace lldb_private;
-
-UnwindAssemblyProfiler*
-UnwindAssemblyProfiler::FindPlugin (const ArchSpec &arch)
-{
- UnwindAssemblyProfilerCreateInstance create_callback;
-
- for (uint32_t idx = 0;
- (create_callback = PluginManager::GetUnwindAssemblyProfilerCreateCallbackAtIndex(idx)) != NULL;
- ++idx)
- {
- std::auto_ptr<UnwindAssemblyProfiler> assembly_profiler_ap (create_callback (arch));
- if (assembly_profiler_ap.get ())
- return assembly_profiler_ap.release ();
- }
- return NULL;
-}
-
-UnwindAssemblyProfiler::UnwindAssemblyProfiler ()
-{
-}
-
-UnwindAssemblyProfiler::~UnwindAssemblyProfiler ()
-{
-}
Modified: lldb/trunk/source/lldb.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/lldb.cpp?rev=130135&r1=130134&r2=130135&view=diff
==============================================================================
--- lldb/trunk/source/lldb.cpp (original)
+++ lldb/trunk/source/lldb.cpp Mon Apr 25 13:36:36 2011
@@ -30,9 +30,9 @@
#include "Plugins/SymbolFile/DWARF/SymbolFileDWARF.h"
#include "Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h"
#include "Plugins/SymbolFile/Symtab/SymbolFileSymtab.h"
-#include "Plugins/Process/Utility/UnwindAssemblyProfiler-x86.h"
-#include "Plugins/Process/Utility/ArchDefaultUnwindPlan-x86.h"
-#include "Plugins/Process/Utility/ArchVolatileRegs-x86.h"
+#include "Plugins/UnwindAssembly/UnwindAssemblyProfiler-x86.h"
+#include "Plugins/ArchDefaultUnwindPlan/ArchDefaultUnwindPlan-x86.h"
+#include "Plugins/ArchVolatileRegs/ArchVolatileRegs-x86.h"
#if defined (__APPLE__)
#include "Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h"
Modified: lldb/trunk/tools/debugserver/debugserver.xcodeproj/project.pbxproj
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/debugserver.xcodeproj/project.pbxproj?rev=130135&r1=130134&r2=130135&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/debugserver.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/tools/debugserver/debugserver.xcodeproj/project.pbxproj Mon Apr 25 13:36:36 2011
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 45;
+ objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
@@ -374,8 +374,11 @@
/* Begin PBXProject section */
08FB7793FE84155DC02AAC07 /* Project object */ = {
isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0420;
+ };
buildConfigurationList = 1DEB914E08733D8E0010E9CD /* Build configuration list for PBXProject "debugserver" */;
- compatibilityVersion = "Xcode 3.1";
+ compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
More information about the lldb-commits
mailing list