[Lldb-commits] [lldb] r164160 - in /lldb/branches/windows: source/Plugins/UnwindAssembly/CMakeLists.txt source/Plugins/UnwindAssembly/InstEmulation/CMakeLists.txt source/Plugins/UnwindAssembly/x86/CMakeLists.txt source/Target/Thread.cpp source/lldb.cpp tools/driver/CMakeLists.txt

[Carlo Kok]

Author: carlokok
Date: Tue Sep 18 14:38:51 2012
New Revision: 164160

URL: http://llvm.org/viewvc/llvm-project?rev=164160&view=rev
Log:
Windows support: Unwinding plugins (compile & run) and removed the ifdef so it actually loads it.

Added:
    lldb/branches/windows/source/Plugins/UnwindAssembly/InstEmulation/CMakeLists.txt
    lldb/branches/windows/source/Plugins/UnwindAssembly/x86/CMakeLists.txt
Modified:
    lldb/branches/windows/source/Plugins/UnwindAssembly/CMakeLists.txt
    lldb/branches/windows/source/Target/Thread.cpp
    lldb/branches/windows/source/lldb.cpp
    lldb/branches/windows/tools/driver/CMakeLists.txt

Modified: lldb/branches/windows/source/Plugins/UnwindAssembly/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/windows/source/Plugins/UnwindAssembly/CMakeLists.txt?rev=164160&r1=164159&r2=164160&view=diff
==============================================================================
--- lldb/branches/windows/source/Plugins/UnwindAssembly/CMakeLists.txt (original)
+++ lldb/branches/windows/source/Plugins/UnwindAssembly/CMakeLists.txt Tue Sep 18 14:38:51 2012
@@ -1,2 +1,2 @@
-#add_subdirectory(InstEmulation)
-#add_subdirectory(x86)
+add_subdirectory(InstEmulation)
+add_subdirectory(x86)

Added: lldb/branches/windows/source/Plugins/UnwindAssembly/InstEmulation/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/windows/source/Plugins/UnwindAssembly/InstEmulation/CMakeLists.txt?rev=164160&view=auto
==============================================================================
--- lldb/branches/windows/source/Plugins/UnwindAssembly/InstEmulation/CMakeLists.txt (added)
+++ lldb/branches/windows/source/Plugins/UnwindAssembly/InstEmulation/CMakeLists.txt Tue Sep 18 14:38:51 2012
@@ -0,0 +1,5 @@
+set(LLVM_NO_RTTI 1)
+
+add_lldb_library(lldbPluginUnwindAssemblyInstEmulation
+  UnwindAssemblyInstEmulation.cpp
+  )

Added: lldb/branches/windows/source/Plugins/UnwindAssembly/x86/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/windows/source/Plugins/UnwindAssembly/x86/CMakeLists.txt?rev=164160&view=auto
==============================================================================
--- lldb/branches/windows/source/Plugins/UnwindAssembly/x86/CMakeLists.txt (added)
+++ lldb/branches/windows/source/Plugins/UnwindAssembly/x86/CMakeLists.txt Tue Sep 18 14:38:51 2012
@@ -0,0 +1,5 @@
+set(LLVM_NO_RTTI 1)
+
+add_lldb_library(lldbPluginUnwindAssemblyX86
+  UnwindAssembly-x86.cpp
+  )

Modified: lldb/branches/windows/source/Target/Thread.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/windows/source/Target/Thread.cpp?rev=164160&r1=164159&r2=164160&view=diff
==============================================================================
--- lldb/branches/windows/source/Target/Thread.cpp (original)
+++ lldb/branches/windows/source/Target/Thread.cpp Tue Sep 18 14:38:51 2012
@@ -1524,9 +1524,7 @@
             case llvm::Triple::x86:
             case llvm::Triple::arm:
             case llvm::Triple::thumb:
-#ifndef _WIN32
                 m_unwinder_ap.reset (new UnwindLLDB (*this));
-#endif
                 break;
                 
             default:

Modified: lldb/branches/windows/source/lldb.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/windows/source/lldb.cpp?rev=164160&r1=164159&r2=164160&view=diff
==============================================================================
--- lldb/branches/windows/source/lldb.cpp (original)
+++ lldb/branches/windows/source/lldb.cpp Tue Sep 18 14:38:51 2012
@@ -113,11 +113,11 @@
         ObjectFileELF::Initialize();
         SymbolFileDWARF::Initialize();
         SymbolFileSymtab::Initialize();
-        UnwindAssemblyInstEmulation::Initialize();
-        UnwindAssembly_x86::Initialize();
         EmulateInstructionARM::Initialize ();
         ObjectFilePECOFF::Initialize ();
 #endif
+        UnwindAssemblyInstEmulation::Initialize();
+        UnwindAssembly_x86::Initialize();
         DynamicLoaderPOSIXDYLD::Initialize ();
         DynamicLoaderMacOSXDYLD::Initialize();
 #ifndef LLDB_DISABLE_PYTHON

Modified: lldb/branches/windows/tools/driver/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/windows/tools/driver/CMakeLists.txt?rev=164160&r1=164159&r2=164160&view=diff
==============================================================================
--- lldb/branches/windows/tools/driver/CMakeLists.txt (original)
+++ lldb/branches/windows/tools/driver/CMakeLists.txt Tue Sep 18 14:38:51 2012
@@ -32,6 +32,8 @@
   lldbPluginPlatformMacOSX
   lldbPluginDynamicLoaderMacOSXDYLD
   lldbPluginDynamicLoaderPosixDYLD
+  lldbPluginUnwindAssemblyInstEmulation
+  lldbPluginUnwindAssemblyX86
   
   # Windows
   lldbHostWindows
@@ -79,6 +81,7 @@
   bitreader
   mc
   core
+  mcdisassembler
   )
 
 add_lldb_executable(lldb