[Lldb-commits] [lldb] r130154 - in /lldb/trunk: lldb.xcodeproj/ source/ source/Plugins/ArchDefaultUnwindPlan/ source/Plugins/ArchDefaultUnwindPlan/x86/ source/Plugins/ArchVolatileRegs/ source/Plugins/ArchVolatileRegs/x86/ source/Plugins/UnwindAssembly/ source/Plugins/UnwindAssembly/InstEmulation/ source/Plugins/UnwindAssembly/x86/

Greg Clayton gclayton at apple.com
Mon Apr 25 14:05:07 PDT 2011


Author: gclayton
Date: Mon Apr 25 16:05:07 2011
New Revision: 130154

URL: http://llvm.org/viewvc/llvm-project?rev=130154&view=rev
Log:
More moving things around for the unwind plan and assembly unwind plug-ins.


Added:
    lldb/trunk/source/Plugins/ArchDefaultUnwindPlan/x86/
    lldb/trunk/source/Plugins/ArchDefaultUnwindPlan/x86/ArchDefaultUnwindPlan-x86.cpp
      - copied unchanged from r130146, lldb/trunk/source/Plugins/ArchDefaultUnwindPlan/ArchDefaultUnwindPlan-x86.cpp
    lldb/trunk/source/Plugins/ArchDefaultUnwindPlan/x86/ArchDefaultUnwindPlan-x86.h
      - copied unchanged from r130146, lldb/trunk/source/Plugins/ArchDefaultUnwindPlan/ArchDefaultUnwindPlan-x86.h
    lldb/trunk/source/Plugins/ArchVolatileRegs/x86/
    lldb/trunk/source/Plugins/ArchVolatileRegs/x86/ArchVolatileRegs-x86.cpp
      - copied unchanged from r130146, lldb/trunk/source/Plugins/ArchVolatileRegs/ArchVolatileRegs-x86.cpp
    lldb/trunk/source/Plugins/ArchVolatileRegs/x86/ArchVolatileRegs-x86.h
      - copied unchanged from r130146, lldb/trunk/source/Plugins/ArchVolatileRegs/ArchVolatileRegs-x86.h
    lldb/trunk/source/Plugins/UnwindAssembly/InstEmulation/
    lldb/trunk/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp
    lldb/trunk/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.h
    lldb/trunk/source/Plugins/UnwindAssembly/x86/
    lldb/trunk/source/Plugins/UnwindAssembly/x86/UnwindAssemblyx86.cpp
      - copied, changed from r130146, lldb/trunk/source/Plugins/UnwindAssembly/UnwindAssemblyProfiler-x86.cpp
    lldb/trunk/source/Plugins/UnwindAssembly/x86/UnwindAssemblyx86.h
      - copied, changed from r130146, lldb/trunk/source/Plugins/UnwindAssembly/UnwindAssemblyProfiler-x86.h
Removed:
    lldb/trunk/source/Plugins/ArchDefaultUnwindPlan/ArchDefaultUnwindPlan-x86.cpp
    lldb/trunk/source/Plugins/ArchDefaultUnwindPlan/ArchDefaultUnwindPlan-x86.h
    lldb/trunk/source/Plugins/ArchVolatileRegs/ArchVolatileRegs-x86.cpp
    lldb/trunk/source/Plugins/ArchVolatileRegs/ArchVolatileRegs-x86.h
    lldb/trunk/source/Plugins/UnwindAssembly/UnwindAssemblyProfiler-x86.cpp
    lldb/trunk/source/Plugins/UnwindAssembly/UnwindAssemblyProfiler-x86.h
Modified:
    lldb/trunk/lldb.xcodeproj/project.pbxproj
    lldb/trunk/source/lldb.cpp

Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=130154&r1=130153&r2=130154&view=diff
==============================================================================
--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Mon Apr 25 16:05:07 2011
@@ -362,12 +362,15 @@
 		2689FFFF13353DB600698AC0 /* BreakpointResolver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26BC7E1210F1B83100F91463 /* BreakpointResolver.cpp */; };
 		268F9D53123AA15200B91E9B /* SBSymbolContextList.h in Headers */ = {isa = PBXBuildFile; fileRef = 268F9D52123AA15200B91E9B /* SBSymbolContextList.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		268F9D55123AA16600B91E9B /* SBSymbolContextList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 268F9D54123AA16600B91E9B /* SBSymbolContextList.cpp */; };
+		2692BA15136610C100F9E14D /* UnwindAssemblyInstEmulation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2692BA13136610C100F9E14D /* UnwindAssemblyInstEmulation.cpp */; };
+		2692BA16136610C100F9E14D /* UnwindAssemblyInstEmulation.h in Headers */ = {isa = PBXBuildFile; fileRef = 2692BA14136610C100F9E14D /* UnwindAssemblyInstEmulation.h */; };
+		2692BA1A136611CD00F9E14D /* UnwindAssemblyx86.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2692BA18136611CD00F9E14D /* UnwindAssemblyx86.cpp */; };
+		2692BA1B136611CD00F9E14D /* UnwindAssemblyx86.h in Headers */ = {isa = PBXBuildFile; fileRef = 2692BA19136611CD00F9E14D /* UnwindAssemblyx86.h */; };
+		2692BA1F136614D800F9E14D /* ArchDefaultUnwindPlan-x86.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2692BA1D136614D000F9E14D /* ArchDefaultUnwindPlan-x86.cpp */; };
+		2692BA231366150100F9E14D /* ArchVolatileRegs-x86.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2692BA21136614FC00F9E14D /* ArchVolatileRegs-x86.cpp */; };
 		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 */; };
@@ -706,6 +709,14 @@
 		268DA873130095ED00C9483A /* Terminal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Terminal.cpp; sourceTree = "<group>"; };
 		268F9D52123AA15200B91E9B /* SBSymbolContextList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBSymbolContextList.h; path = include/lldb/API/SBSymbolContextList.h; sourceTree = "<group>"; };
 		268F9D54123AA16600B91E9B /* SBSymbolContextList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SBSymbolContextList.cpp; path = source/API/SBSymbolContextList.cpp; sourceTree = "<group>"; };
+		2692BA13136610C100F9E14D /* UnwindAssemblyInstEmulation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UnwindAssemblyInstEmulation.cpp; sourceTree = "<group>"; };
+		2692BA14136610C100F9E14D /* UnwindAssemblyInstEmulation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnwindAssemblyInstEmulation.h; sourceTree = "<group>"; };
+		2692BA18136611CD00F9E14D /* UnwindAssemblyx86.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UnwindAssemblyx86.cpp; sourceTree = "<group>"; };
+		2692BA19136611CD00F9E14D /* UnwindAssemblyx86.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnwindAssemblyx86.h; sourceTree = "<group>"; };
+		2692BA1D136614D000F9E14D /* ArchDefaultUnwindPlan-x86.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = "ArchDefaultUnwindPlan-x86.cpp"; sourceTree = "<group>"; };
+		2692BA1E136614D000F9E14D /* ArchDefaultUnwindPlan-x86.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ArchDefaultUnwindPlan-x86.h"; sourceTree = "<group>"; };
+		2692BA21136614FC00F9E14D /* ArchVolatileRegs-x86.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = "ArchVolatileRegs-x86.cpp"; sourceTree = "<group>"; };
+		2692BA22136614FC00F9E14D /* ArchVolatileRegs-x86.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ArchVolatileRegs-x86.h"; sourceTree = "<group>"; };
 		269416AD119A024800FF2715 /* CommandObjectTarget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CommandObjectTarget.cpp; path = source/Commands/CommandObjectTarget.cpp; sourceTree = "<group>"; };
 		269416AE119A024800FF2715 /* CommandObjectTarget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CommandObjectTarget.h; path = source/Commands/CommandObjectTarget.h; sourceTree = "<group>"; };
 		2697A54B133A6305004E4240 /* PlatformDarwin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformDarwin.cpp; sourceTree = "<group>"; };
@@ -720,12 +731,6 @@
 		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>"; };
@@ -1777,6 +1782,42 @@
 			path = Static;
 			sourceTree = "<group>";
 		};
+		2692BA12136610C100F9E14D /* InstEmulation */ = {
+			isa = PBXGroup;
+			children = (
+				2692BA13136610C100F9E14D /* UnwindAssemblyInstEmulation.cpp */,
+				2692BA14136610C100F9E14D /* UnwindAssemblyInstEmulation.h */,
+			);
+			path = InstEmulation;
+			sourceTree = "<group>";
+		};
+		2692BA17136611CD00F9E14D /* x86 */ = {
+			isa = PBXGroup;
+			children = (
+				2692BA18136611CD00F9E14D /* UnwindAssemblyx86.cpp */,
+				2692BA19136611CD00F9E14D /* UnwindAssemblyx86.h */,
+			);
+			path = x86;
+			sourceTree = "<group>";
+		};
+		2692BA1C136614D000F9E14D /* x86 */ = {
+			isa = PBXGroup;
+			children = (
+				2692BA1D136614D000F9E14D /* ArchDefaultUnwindPlan-x86.cpp */,
+				2692BA1E136614D000F9E14D /* ArchDefaultUnwindPlan-x86.h */,
+			);
+			path = x86;
+			sourceTree = "<group>";
+		};
+		2692BA20136614FC00F9E14D /* x86 */ = {
+			isa = PBXGroup;
+			children = (
+				2692BA21136614FC00F9E14D /* ArchVolatileRegs-x86.cpp */,
+				2692BA22136614FC00F9E14D /* ArchVolatileRegs-x86.h */,
+			);
+			path = x86;
+			sourceTree = "<group>";
+		};
 		26A3B4AB1181454800381BC2 /* BSD-Archive */ = {
 			isa = PBXGroup;
 			children = (
@@ -1789,29 +1830,26 @@
 		26AC3F441365F40E0065C7EF /* UnwindAssembly */ = {
 			isa = PBXGroup;
 			children = (
-				26AC3F451365F4390065C7EF /* UnwindAssemblyProfiler-x86.cpp */,
-				26AC3F461365F4390065C7EF /* UnwindAssemblyProfiler-x86.h */,
+				2692BA12136610C100F9E14D /* InstEmulation */,
+				2692BA17136611CD00F9E14D /* x86 */,
 			);
-			name = UnwindAssembly;
-			path = Process;
+			path = UnwindAssembly;
 			sourceTree = "<group>";
 		};
 		26AC3F481365F4620065C7EF /* ArchDefaultUnwindPlan */ = {
 			isa = PBXGroup;
 			children = (
-				26AC3F491365F4E90065C7EF /* ArchDefaultUnwindPlan-x86.cpp */,
-				26AC3F4A1365F4E90065C7EF /* ArchDefaultUnwindPlan-x86.h */,
+				2692BA1C136614D000F9E14D /* x86 */,
 			);
-			name = ArchDefaultUnwindPlan;
+			path = ArchDefaultUnwindPlan;
 			sourceTree = "<group>";
 		};
 		26AC3F4C1365F5260065C7EF /* ArchVolatileRegs */ = {
 			isa = PBXGroup;
 			children = (
-				26AC3F4D1365F5380065C7EF /* ArchVolatileRegs-x86.cpp */,
-				26AC3F4E1365F5380065C7EF /* ArchVolatileRegs-x86.h */,
+				2692BA20136614FC00F9E14D /* x86 */,
 			);
-			name = ArchVolatileRegs;
+			path = ArchVolatileRegs;
 			sourceTree = "<group>";
 		};
 		26B4666E11A2080F00CF6220 /* Utility */ = {
@@ -2619,6 +2657,8 @@
 				4CABA9DD134A8BA800539BDD /* ValueObjectMemory.h in Headers */,
 				4CD0BD0D134BFAB600CB44D4 /* ValueObjectDynamicValue.h in Headers */,
 				4C2FAE2F135E3A70001EDE44 /* SharedCluster.h in Headers */,
+				2692BA16136610C100F9E14D /* UnwindAssemblyInstEmulation.h in Headers */,
+				2692BA1B136611CD00F9E14D /* UnwindAssemblyx86.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3189,9 +3229,10 @@
 				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 */,
+				2692BA15136610C100F9E14D /* UnwindAssemblyInstEmulation.cpp in Sources */,
+				2692BA1A136611CD00F9E14D /* UnwindAssemblyx86.cpp in Sources */,
+				2692BA1F136614D800F9E14D /* ArchDefaultUnwindPlan-x86.cpp in Sources */,
+				2692BA231366150100F9E14D /* ArchVolatileRegs-x86.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Removed: lldb/trunk/source/Plugins/ArchDefaultUnwindPlan/ArchDefaultUnwindPlan-x86.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ArchDefaultUnwindPlan/ArchDefaultUnwindPlan-x86.cpp?rev=130153&view=auto
==============================================================================
--- lldb/trunk/source/Plugins/ArchDefaultUnwindPlan/ArchDefaultUnwindPlan-x86.cpp (original)
+++ lldb/trunk/source/Plugins/ArchDefaultUnwindPlan/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/Target/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/ArchDefaultUnwindPlan/ArchDefaultUnwindPlan-x86.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ArchDefaultUnwindPlan/ArchDefaultUnwindPlan-x86.h?rev=130153&view=auto
==============================================================================
--- lldb/trunk/source/Plugins/ArchDefaultUnwindPlan/ArchDefaultUnwindPlan-x86.h (original)
+++ lldb/trunk/source/Plugins/ArchDefaultUnwindPlan/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/Target/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/ArchVolatileRegs/ArchVolatileRegs-x86.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ArchVolatileRegs/ArchVolatileRegs-x86.cpp?rev=130153&view=auto
==============================================================================
--- lldb/trunk/source/Plugins/ArchVolatileRegs/ArchVolatileRegs-x86.cpp (original)
+++ lldb/trunk/source/Plugins/ArchVolatileRegs/ArchVolatileRegs-x86.cpp (removed)
@@ -1,150 +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 <set>
-
-#include "llvm/Support/MachO.h"
-
-#include "lldb/Core/ArchSpec.h"
-#include "lldb/Core/PluginManager.h"
-#include "lldb/Target/ArchVolatileRegs.h"
-#include "lldb/Target/Thread.h"
-#include "lldb/Target/RegisterContext.h"
-
-
-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/ArchVolatileRegs/ArchVolatileRegs-x86.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ArchVolatileRegs/ArchVolatileRegs-x86.h?rev=130153&view=auto
==============================================================================
--- lldb/trunk/source/Plugins/ArchVolatileRegs/ArchVolatileRegs-x86.h (original)
+++ lldb/trunk/source/Plugins/ArchVolatileRegs/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/Target/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_

Added: lldb/trunk/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp?rev=130154&view=auto
==============================================================================
--- lldb/trunk/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp (added)
+++ lldb/trunk/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp Mon Apr 25 16:05:07 2011
@@ -0,0 +1,108 @@
+//===-- UnwindAssemblyInstEmulation.cpp --------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "UnwindAssemblyInstEmulation.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/Target/UnwindAssemblyProfiler.h"
+
+using namespace lldb;
+using namespace lldb_private;
+
+
+
+//-----------------------------------------------------------------------------------------------
+//  UnwindAssemblyParser_x86 method definitions 
+//-----------------------------------------------------------------------------------------------
+
+bool
+UnwindAssemblyInstEmulation::GetNonCallSiteUnwindPlanFromAssembly (AddressRange& func, Thread& thread, UnwindPlan& unwind_plan)
+{
+    return false;
+}
+
+bool
+UnwindAssemblyInstEmulation::GetFastUnwindPlan (AddressRange& func, Thread& thread, UnwindPlan &unwind_plan)
+{
+    return false;
+}
+
+bool
+UnwindAssemblyInstEmulation::FirstNonPrologueInsn (AddressRange& func, Target& target, Thread* thread, Address& first_non_prologue_insn)
+{
+    return false;
+}
+
+UnwindAssemblyProfiler *
+UnwindAssemblyInstEmulation::CreateInstance (const ArchSpec &arch)
+{
+    return NULL;
+}
+
+
+//------------------------------------------------------------------
+// PluginInterface protocol in UnwindAssemblyParser_x86
+//------------------------------------------------------------------
+
+const char *
+UnwindAssemblyInstEmulation::GetPluginName()
+{
+    return "UnwindAssemblyInstEmulation";
+}
+
+const char *
+UnwindAssemblyInstEmulation::GetShortPluginName()
+{
+    return "unwindassembly.inst-emulation";
+}
+
+
+uint32_t
+UnwindAssemblyInstEmulation::GetPluginVersion()
+{
+    return 1;
+}
+
+void
+UnwindAssemblyInstEmulation::Initialize()
+{
+    PluginManager::RegisterPlugin (GetPluginNameStatic(),
+                                   GetPluginDescriptionStatic(),
+                                   CreateInstance);
+}
+
+void
+UnwindAssemblyInstEmulation::Terminate()
+{
+    PluginManager::UnregisterPlugin (CreateInstance);
+}
+
+
+const char *
+UnwindAssemblyInstEmulation::GetPluginNameStatic()
+{
+    return "UnwindAssemblyInstEmulation";
+}
+
+const char *
+UnwindAssemblyInstEmulation::GetPluginDescriptionStatic()
+{
+    return "Instruction emulation based unwind information.";
+}

Added: lldb/trunk/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.h?rev=130154&view=auto
==============================================================================
--- lldb/trunk/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.h (added)
+++ lldb/trunk/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.h Mon Apr 25 16:05:07 2011
@@ -0,0 +1,82 @@
+//===-- UnwindAssemblyInstEmulation.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_UnwindAssemblyInstEmulation_h_
+#define liblldb_UnwindAssemblyInstEmulation_h_
+
+#include "lldb/lldb-private.h"
+#include "lldb/Target/UnwindAssemblyProfiler.h"
+#include "lldb/Target/Thread.h"
+
+class UnwindAssemblyInstEmulation : public lldb_private::UnwindAssemblyProfiler
+{
+public:
+
+    virtual
+    ~UnwindAssemblyInstEmulation () 
+    {
+    }
+
+    virtual bool
+    GetNonCallSiteUnwindPlanFromAssembly (lldb_private::AddressRange& func, 
+                                          lldb_private::Thread& thread, 
+                                          lldb_private::UnwindPlan& unwind_plan);
+
+    virtual bool
+    GetFastUnwindPlan (lldb_private::AddressRange& func, 
+                       lldb_private::Thread& thread, 
+                       lldb_private::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 (lldb_private::AddressRange& func, 
+                          lldb_private::Target& target, 
+                          lldb_private::Thread* thread, 
+                          lldb_private::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:
+
+    // Call CreateInstance to get an instance of this class
+    UnwindAssemblyInstEmulation(int cpu) : 
+          lldb_private::UnwindAssemblyProfiler(), m_cpu(cpu) 
+    {
+    }
+
+    int m_cpu;
+};
+
+#endif // liblldb_UnwindAssemblyInstEmulation_h_

Removed: lldb/trunk/source/Plugins/UnwindAssembly/UnwindAssemblyProfiler-x86.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/UnwindAssembly/UnwindAssemblyProfiler-x86.cpp?rev=130153&view=auto
==============================================================================
--- lldb/trunk/source/Plugins/UnwindAssembly/UnwindAssemblyProfiler-x86.cpp (original)
+++ lldb/trunk/source/Plugins/UnwindAssembly/UnwindAssemblyProfiler-x86.cpp (removed)
@@ -1,902 +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 "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/Target/UnwindAssemblyProfiler.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/UnwindAssembly/UnwindAssemblyProfiler-x86.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/UnwindAssembly/UnwindAssemblyProfiler-x86.h?rev=130153&view=auto
==============================================================================
--- lldb/trunk/source/Plugins/UnwindAssembly/UnwindAssemblyProfiler-x86.h (original)
+++ lldb/trunk/source/Plugins/UnwindAssembly/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/Target/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_

Copied: lldb/trunk/source/Plugins/UnwindAssembly/x86/UnwindAssemblyx86.cpp (from r130146, lldb/trunk/source/Plugins/UnwindAssembly/UnwindAssemblyProfiler-x86.cpp)
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/UnwindAssembly/x86/UnwindAssemblyx86.cpp?p2=lldb/trunk/source/Plugins/UnwindAssembly/x86/UnwindAssemblyx86.cpp&p1=lldb/trunk/source/Plugins/UnwindAssembly/UnwindAssemblyProfiler-x86.cpp&r1=130146&r2=130154&rev=130154&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/UnwindAssembly/UnwindAssemblyProfiler-x86.cpp (original)
+++ lldb/trunk/source/Plugins/UnwindAssembly/x86/UnwindAssemblyx86.cpp Mon Apr 25 16:05:07 2011
@@ -1,4 +1,4 @@
-//===-- UnwindAssemblyProfiler-x86.cpp --------------------------*- C++ -*-===//
+//===-- UnwindAssemblyx86.cpp -----------------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "UnwindAssemblyProfiler-x86.h"
+#include "UnwindAssemblyx86.h"
 
 #include "llvm-c/EnhancedDisassembly.h"
 
@@ -819,34 +819,34 @@
 //-----------------------------------------------------------------------------------------------
 
 bool
-UnwindAssemblyProfiler_x86::GetNonCallSiteUnwindPlanFromAssembly (AddressRange& func, Thread& thread, UnwindPlan& unwind_plan)
+UnwindAssembly_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)
+UnwindAssembly_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)
+UnwindAssembly_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)
+UnwindAssembly_x86::CreateInstance (const ArchSpec &arch)
 {
     const llvm::Triple::ArchType cpu = arch.GetMachine ();
     if (cpu == llvm::Triple::x86)
-        return new UnwindAssemblyProfiler_x86 (k_i386);
+        return new UnwindAssembly_x86 (k_i386);
     else if (cpu == llvm::Triple::x86_64)
-        return new UnwindAssemblyProfiler_x86 (k_x86_64);
+        return new UnwindAssembly_x86 (k_x86_64);
     return NULL;
 }
 
@@ -856,26 +856,26 @@
 //------------------------------------------------------------------
 
 const char *
-UnwindAssemblyProfiler_x86::GetPluginName()
+UnwindAssembly_x86::GetPluginName()
 {
-    return "UnwindAssemblyProfiler_x86";
+    return "UnwindAssembly_x86";
 }
 
 const char *
-UnwindAssemblyProfiler_x86::GetShortPluginName()
+UnwindAssembly_x86::GetShortPluginName()
 {
-    return "unwindassemblyprofiler.x86";
+    return "unwindassembly.x86";
 }
 
 
 uint32_t
-UnwindAssemblyProfiler_x86::GetPluginVersion()
+UnwindAssembly_x86::GetPluginVersion()
 {
     return 1;
 }
 
 void
-UnwindAssemblyProfiler_x86::Initialize()
+UnwindAssembly_x86::Initialize()
 {
     PluginManager::RegisterPlugin (GetPluginNameStatic(),
                                    GetPluginDescriptionStatic(),
@@ -883,20 +883,20 @@
 }
 
 void
-UnwindAssemblyProfiler_x86::Terminate()
+UnwindAssembly_x86::Terminate()
 {
     PluginManager::UnregisterPlugin (CreateInstance);
 }
 
 
 const char *
-UnwindAssemblyProfiler_x86::GetPluginNameStatic()
+UnwindAssembly_x86::GetPluginNameStatic()
 {
-    return "UnwindAssemblyProfiler_x86";
+    return "UnwindAssembly_x86";
 }
 
 const char *
-UnwindAssemblyProfiler_x86::GetPluginDescriptionStatic()
+UnwindAssembly_x86::GetPluginDescriptionStatic()
 {
     return "i386 and x86_64 assembly language profiler plugin.";
 }

Copied: lldb/trunk/source/Plugins/UnwindAssembly/x86/UnwindAssemblyx86.h (from r130146, lldb/trunk/source/Plugins/UnwindAssembly/UnwindAssemblyProfiler-x86.h)
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/UnwindAssembly/x86/UnwindAssemblyx86.h?p2=lldb/trunk/source/Plugins/UnwindAssembly/x86/UnwindAssemblyx86.h&p1=lldb/trunk/source/Plugins/UnwindAssembly/UnwindAssemblyProfiler-x86.h&r1=130146&r2=130154&rev=130154&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/UnwindAssembly/UnwindAssemblyProfiler-x86.h (original)
+++ lldb/trunk/source/Plugins/UnwindAssembly/x86/UnwindAssemblyx86.h Mon Apr 25 16:05:07 2011
@@ -1,4 +1,4 @@
-//===-- UnwindAssemblyProfiler-x86.h ----------------------------*- C++ -*-===//
+//===-- UnwindAssemblyx86.h -------------------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef liblldb_UnwindAssemblyProfiler_x86_h_
-#define liblldb_UnwindAssemblyProfiler_x86_h_
+#ifndef liblldb_UnwindAssemblyx86_h_
+#define liblldb_UnwindAssemblyx86_h_
 
 #include "lldb/lldb-private.h"
 #include "lldb/Target/UnwindAssemblyProfiler.h"
@@ -16,11 +16,11 @@
 
 namespace lldb_private {
     
-class UnwindAssemblyProfiler_x86 : public lldb_private::UnwindAssemblyProfiler
+class UnwindAssembly_x86 : public lldb_private::UnwindAssemblyProfiler
 {
 public:
 
-    ~UnwindAssemblyProfiler_x86 () { }
+    ~UnwindAssembly_x86 () { }
 
     virtual bool
     GetNonCallSiteUnwindPlanFromAssembly (AddressRange& func, lldb_private::Thread& thread, UnwindPlan& unwind_plan);
@@ -61,7 +61,7 @@
     GetPluginVersion();
     
 private:
-    UnwindAssemblyProfiler_x86(int cpu) : 
+    UnwindAssembly_x86(int cpu) : 
           lldb_private::UnwindAssemblyProfiler(), m_cpu(cpu) { } // Call CreateInstance instead.
 
     int m_cpu;
@@ -70,4 +70,4 @@
 
 } // namespace lldb_private
 
-#endif // liblldb_UnwindAssemblyProfiler_x86_h_
+#endif // liblldb_UnwindAssemblyx86_h_

Modified: lldb/trunk/source/lldb.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/lldb.cpp?rev=130154&r1=130153&r2=130154&view=diff
==============================================================================
--- lldb/trunk/source/lldb.cpp (original)
+++ lldb/trunk/source/lldb.cpp Mon Apr 25 16:05:07 2011
@@ -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();





More information about the lldb-commits mailing list