From feb961b86a260009a241a2c4ff742fe8c8384bcb Mon Sep 17 00:00:00 2001 From: Johnny Chen Date: Mon, 23 May 2011 18:00:40 +0000 Subject: Fix the Align() utility which tries to align the raw disassembly with the edis'ed disassembly so that both the opcode and the operands are aligned with the rest of output. Comment out the code related to force_raw mode when disassembling arm or thumb for now. It testing goes ok, we will remove the section of code related to force_raw. llvm-svn: 131910 --- lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp') diff --git a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp index ea31a82798c..4b5d1dca975 100644 --- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp +++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp @@ -109,11 +109,15 @@ StripSpaces(llvm::StringRef &Str) Str = Str.substr(0, Str.size()-1); } static void -Align(Stream *s, const char *str) +Align(Stream *s, const char *str, size_t opcodeColWidth, size_t operandColWidth) { llvm::StringRef raw_disasm(str); StripSpaces(raw_disasm); - s->PutCString(raw_disasm.str().c_str()); + // Split the raw disassembly into opcode and operands. + std::pair p = raw_disasm.split('\t'); + PadString(s, p.first, opcodeColWidth); + if (!p.second.empty()) + PadString(s, p.second, operandColWidth); } void @@ -173,10 +177,12 @@ InstructionLLVM::Dump // FIXME!!! /* Remove the following section of code related to force_raw .... */ + /* bool force_raw = m_arch_type == llvm::Triple::arm || m_arch_type == llvm::Triple::thumb; if (!raw) raw = force_raw; + */ /* .... when we fix the edis for arm/thumb. */ if (!raw) @@ -349,7 +355,7 @@ InstructionLLVM::Dump if (EDGetInstString(&str, m_inst)) return; - Align(s, str); + Align(s, str, opcodeColumnWidth, operandColumnWidth); } else { @@ -380,7 +386,7 @@ InstructionLLVM::Dump { // EDis fails to parse the tokens of this inst. Need to align this // raw disassembly's opcode with the rest of output. - Align(s, str); + Align(s, str, opcodeColumnWidth, operandColumnWidth); } } } -- cgit v1.2.3