commit f6e287a873007543f3b419a71546ab8f007be90b
author Greg Clayton <gclayton@apple.com> Mon Apr 25 21:05:07 2011 +0000
committer Greg Clayton <gclayton@apple.com> Mon Apr 25 21:05:07 2011 +0000
tree 34363275789a4a828ff02c1caa90d48889250ca8
parent bdc36bd05d156143d9f2e568a1aa1b5253bbe1f1

More moving things around for the unwind plan and assembly unwind plug-ins.



git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@130154 91177308-0d34-0410-b5e6-96231b3b80d8

source/lldb.cpp

diff --git a/source/lldb.cpp b/source/lldb.cpp
index 8d3b1eb..0fa46d3 100644
--- a/source/lldb.cpp
+++ b/source/lldb.cpp
@@ -30,9 +30,10 @@
 #include "Plugins/SymbolFile/DWARF/SymbolFileDWARF.h"
 #include "Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h"
 #include "Plugins/SymbolFile/Symtab/SymbolFileSymtab.h"
-#include "Plugins/UnwindAssembly/UnwindAssemblyProfiler-x86.h"
-#include "Plugins/ArchDefaultUnwindPlan/ArchDefaultUnwindPlan-x86.h"
-#include "Plugins/ArchVolatileRegs/ArchVolatileRegs-x86.h"
+#include "Plugins/UnwindAssembly/x86/UnwindAssemblyx86.h"
+#include "Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.h"
+#include "Plugins/ArchDefaultUnwindPlan/x86/ArchDefaultUnwindPlan-x86.h"
+#include "Plugins/ArchVolatileRegs/x86/ArchVolatileRegs-x86.h"
 
 #if defined (__APPLE__)
 #include "Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h"
@@ -82,7 +83,8 @@
         ObjectFileELF::Initialize();
         SymbolFileDWARF::Initialize();
         SymbolFileSymtab::Initialize();
-        UnwindAssemblyProfiler_x86::Initialize();
+        UnwindAssembly_x86::Initialize();
+        UnwindAssemblyInstEmulation::Initialize();
         ArchDefaultUnwindPlan_x86_64::Initialize();
         ArchDefaultUnwindPlan_i386::Initialize();
         ArchVolatileRegs_x86::Initialize();
@@ -150,7 +152,8 @@
     ObjectFileELF::Terminate();
     SymbolFileDWARF::Terminate();
     SymbolFileSymtab::Terminate();
-    UnwindAssemblyProfiler_x86::Terminate();
+    UnwindAssembly_x86::Terminate();
+    UnwindAssemblyInstEmulation::Terminate();
     ArchDefaultUnwindPlan_i386::Terminate();
     ArchDefaultUnwindPlan_x86_64::Terminate();
     ArchVolatileRegs_x86::Terminate();