From f8712de58cb966291018a55717ea500924879b23 Mon Sep 17 00:00:00 2001 From: Greg Clayton Date: Thu, 22 Mar 2012 00:49:15 +0000 Subject: 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. llvm-svn: 153231 --- lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp | 4 ++-- lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lldb/source/Plugins/Disassembler/llvm') diff --git a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp index 9df0d9437d0..47e6ddb208c 100644 --- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp +++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp @@ -767,13 +767,13 @@ DisassemblerLLVM::Terminate() 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."; } //------------------------------------------------------------------ diff --git a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp index 2667ff0d456..cd8a1352d19 100644 --- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp +++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp @@ -541,13 +541,13 @@ DisassemblerLLVMC::Terminate() 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, -- cgit v1.2.3