[Lldb-commits] [lldb] r153231 - in /lldb/trunk/source: Plugins/Disassembler/llvm/DisassemblerLLVM.cpp Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp lldb.cpp

[Greg Clayton]

Author: gclayton
Date: Wed Mar 21 19:49:15 2012
New Revision: 153231

URL: http://llvm.org/viewvc/llvm-project?rev=153231&view=rev
Log:
Since we are having issues with the new LLVM MC disassembler, we can have
them both installed with the LLVM MC version being the default. I renamed the
name of the LLVM MC disassembler plug-in to "llvm-mc" and the LLVM enhanced
disassembly plug-in to "llvm-edis" and they can both be installed for now.

To use the "llvm-edis" disassembler, you can just specify it while disassembling:

(lldb) disassemble --plugin llvm-edis --name main
(lldb) disassemble --plugin llvm-mc --name main

This will allow us to compare the output of the two disassembler and eventually
deprecate the old one when the new one is ready. But it does use the new disassembler
by default so we continue to test it on a daily basis.


Modified:
    lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp
    lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp
    lldb/trunk/source/lldb.cpp

Modified: lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp?rev=153231&r1=153230&r2=153231&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp (original)
+++ lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp Wed Mar 21 19:49:15 2012
@@ -767,13 +767,13 @@
 const char *
 DisassemblerLLVM::GetPluginNameStatic()
 {
-    return "llvm";
+    return "llvm-edis";
 }
 
 const char *
 DisassemblerLLVM::GetPluginDescriptionStatic()
 {
-    return "Disassembler that uses LLVM opcode tables to disassemble i386, x86_64 and ARM.";
+    return "Disassembler that uses the LLVM enhanced disassembler to disassemble i386, x86_64 and ARM.";
 }
 
 //------------------------------------------------------------------

Modified: lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp?rev=153231&r1=153230&r2=153231&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp (original)
+++ lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp Wed Mar 21 19:49:15 2012
@@ -541,13 +541,13 @@
 const char *
 DisassemblerLLVMC::GetPluginNameStatic()
 {
-    return "llvm";
+    return "llvm-mc";
 }
 
 const char *
 DisassemblerLLVMC::GetPluginDescriptionStatic()
 {
-    return "Disassembler that uses LLVM opcode tables to disassemble i386, x86_64 and ARM.";
+    return "Disassembler that uses LLVM MC to disassemble i386, x86_64 and ARM.";
 }
 
 int DisassemblerLLVMC::OpInfoCallback (void *DisInfo,

Modified: lldb/trunk/source/lldb.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/lldb.cpp?rev=153231&r1=153230&r2=153231&view=diff
==============================================================================
--- lldb/trunk/source/lldb.cpp (original)
+++ lldb/trunk/source/lldb.cpp Wed Mar 21 19:49:15 2012
@@ -73,8 +73,6 @@
 using namespace lldb;
 using namespace lldb_private;
 
-#define USE_NEW_DISASSEMBLER
-
 void
 lldb_private::Initialize ()
 {
@@ -93,11 +91,8 @@
         ABIMacOSX_i386::Initialize();
         ABIMacOSX_arm::Initialize();
         ABISysV_x86_64::Initialize();
-#if defined (USE_NEW_DISASSEMBLER)
         DisassemblerLLVMC::Initialize();
-#else
         DisassemblerLLVM::Initialize();
-#endif
         ObjectContainerBSDArchive::Initialize();
         ObjectFileELF::Initialize();
         SymbolFileDWARF::Initialize();
@@ -172,11 +167,8 @@
     ABIMacOSX_i386::Terminate();
     ABIMacOSX_arm::Terminate();
     ABISysV_x86_64::Terminate();
-#if defined (USE_NEW_DISASSEMBLER)
     DisassemblerLLVMC::Terminate();
-#else
     DisassemblerLLVM::Terminate();
-#endif
     ObjectContainerBSDArchive::Terminate();
     ObjectFileELF::Terminate();
     SymbolFileDWARF::Terminate();