[Lldb-commits] [lldb] r167531 - in /lldb/branches/windows: source/Plugins/Instruction/ARM/CMakeLists.txt source/Plugins/Instruction/ARM/EmulationStateARM.h source/Plugins/Instruction/CMakeLists.txt source/Plugins/Platform/Windows/PlatformWindows.cpp source/lldb.cpp tools/driver/CMakeLists.txt

[Carlo Kok]

Author: carlokok
Date: Wed Nov  7 09:09:29 2012
New Revision: 167531

URL: http://llvm.org/viewvc/llvm-project?rev=167531&view=rev
Log:
Windows support: Also compile & link plugin/instruction/arm.

Added:
    lldb/branches/windows/source/Plugins/Instruction/ARM/CMakeLists.txt
Modified:
    lldb/branches/windows/source/Plugins/Instruction/ARM/EmulationStateARM.h
    lldb/branches/windows/source/Plugins/Instruction/CMakeLists.txt
    lldb/branches/windows/source/Plugins/Platform/Windows/PlatformWindows.cpp
    lldb/branches/windows/source/lldb.cpp
    lldb/branches/windows/tools/driver/CMakeLists.txt

Added: lldb/branches/windows/source/Plugins/Instruction/ARM/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/windows/source/Plugins/Instruction/ARM/CMakeLists.txt?rev=167531&view=auto
==============================================================================
--- lldb/branches/windows/source/Plugins/Instruction/ARM/CMakeLists.txt (added)
+++ lldb/branches/windows/source/Plugins/Instruction/ARM/CMakeLists.txt Wed Nov  7 09:09:29 2012
@@ -0,0 +1,6 @@
+set(LLVM_NO_RTTI 1)
+
+add_lldb_library(lldbPluginInstructionARM
+  EmulateInstructionARM.cpp
+  EmulationStateARM.cpp
+  )

Modified: lldb/branches/windows/source/Plugins/Instruction/ARM/EmulationStateARM.h
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/windows/source/Plugins/Instruction/ARM/EmulationStateARM.h?rev=167531&r1=167530&r2=167531&view=diff
==============================================================================
--- lldb/branches/windows/source/Plugins/Instruction/ARM/EmulationStateARM.h (original)
+++ lldb/branches/windows/source/Plugins/Instruction/ARM/EmulationStateARM.h Wed Nov  7 09:09:29 2012
@@ -80,7 +80,7 @@
                          const lldb_private::RegisterValue &reg_value);
 private:
     uint32_t m_gpr[17];
-    struct sd_regs
+    struct _sd_regs
     {
         union 
         {

Modified: lldb/branches/windows/source/Plugins/Instruction/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/windows/source/Plugins/Instruction/CMakeLists.txt?rev=167531&r1=167530&r2=167531&view=diff
==============================================================================
--- lldb/branches/windows/source/Plugins/Instruction/CMakeLists.txt (original)
+++ lldb/branches/windows/source/Plugins/Instruction/CMakeLists.txt Wed Nov  7 09:09:29 2012
@@ -1 +1 @@
-#add_subdirectory(ARM)
+add_subdirectory(ARM)

Modified: lldb/branches/windows/source/Plugins/Platform/Windows/PlatformWindows.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/windows/source/Plugins/Platform/Windows/PlatformWindows.cpp?rev=167531&r1=167530&r2=167531&view=diff
==============================================================================
--- lldb/branches/windows/source/Plugins/Platform/Windows/PlatformWindows.cpp (original)
+++ lldb/branches/windows/source/Plugins/Platform/Windows/PlatformWindows.cpp Wed Nov  7 09:09:29 2012
@@ -221,7 +221,7 @@
                                                  NULL,
                                                  NULL);
 
-            if (exe_module_sp->GetObjectFile() == NULL)
+            if (exe_module_sp == NULL && exe_module_sp->GetObjectFile() == NULL)
             {
                 exe_module_sp.reset();
                 error.SetErrorStringWithFormat ("'%s%s%s' doesn't contain the architecture %s",

Modified: lldb/branches/windows/source/lldb.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/windows/source/lldb.cpp?rev=167531&r1=167530&r2=167531&view=diff
==============================================================================
--- lldb/branches/windows/source/lldb.cpp (original)
+++ lldb/branches/windows/source/lldb.cpp Wed Nov  7 09:09:29 2012
@@ -106,12 +106,10 @@
         ABIMacOSX_i386::Initialize();
         ABIMacOSX_arm::Initialize();
         ABISysV_x86_64::Initialize();
-#ifndef _WIN32
         DisassemblerLLVMC::Initialize();
         DisassemblerLLVM::Initialize();
         ObjectContainerBSDArchive::Initialize();
         EmulateInstructionARM::Initialize ();
-#endif
         ObjectFilePECOFF::Initialize ();
         ObjectFileELF::Initialize();
         SymbolFileDWARF::Initialize();
@@ -191,7 +189,6 @@
     ABIMacOSX_i386::Terminate();
     ABIMacOSX_arm::Terminate();
     ABISysV_x86_64::Terminate();
-#ifndef _WIN32
     DisassemblerLLVMC::Terminate();
     DisassemblerLLVM::Terminate();
     ObjectContainerBSDArchive::Terminate();
@@ -199,7 +196,6 @@
     UnwindAssembly_x86::Terminate();
     UnwindAssemblyInstEmulation::Terminate();
     EmulateInstructionARM::Terminate ();
-#endif
     SymbolFileDWARF::Terminate();
     SymbolFileSymtab::Terminate();
     ObjectFilePECOFF::Terminate ();

Modified: lldb/branches/windows/tools/driver/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/windows/tools/driver/CMakeLists.txt?rev=167531&r1=167530&r2=167531&view=diff
==============================================================================
--- lldb/branches/windows/tools/driver/CMakeLists.txt (original)
+++ lldb/branches/windows/tools/driver/CMakeLists.txt Wed Nov  7 09:09:29 2012
@@ -40,6 +40,7 @@
   lldbPluginABIMacOSX_arm
   lldbPluginABIMacOSX_i386
   lldbPluginABISysV_x86_64
+  lldbPluginInstructionARM
 
   
   # Windows