From e42ae8497f1863087e32f3325f46d02960f9b5c2 Mon Sep 17 00:00:00 2001 From: Greg Clayton Date: Thu, 19 Jan 2012 03:24:53 +0000 Subject: Fixed an issue with the Instruction subclasses where the strings might be fetched too many times and the DisassemblerLLVM was appending to strings when the opcode, mnemonic and comment accessors were called multiple times and if any of the strings were empty. Also fixed the test suite failures from recent Objective C modifications. llvm-svn: 148460 --- .../Plugins/Disassembler/llvm/DisassemblerLLVM.cpp | 16 +--------------- 1 file changed, 1 insertion(+), 15 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 8544be7c9f8..e395cccfad8 100644 --- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp +++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp @@ -437,7 +437,7 @@ InstructionLLVM::Dump } void -InstructionLLVM::CalculateMnemonic (ExecutionContextScope *exe_scope) +InstructionLLVM::CalculateMnemonicOperandsAndComment (ExecutionContextScope *exe_scope) { const int num_tokens = EDNumTokens(m_inst); if (num_tokens > 0) @@ -560,20 +560,6 @@ InstructionLLVM::CalculateMnemonic (ExecutionContextScope *exe_scope) } } -void -InstructionLLVM::CalculateOperands(ExecutionContextScope *exe_scope) -{ - // Do all of the work in CalculateMnemonic() - CalculateMnemonic (exe_scope); -} - -void -InstructionLLVM::CalculateComment(ExecutionContextScope *exe_scope) -{ - // Do all of the work in CalculateMnemonic() - CalculateMnemonic (exe_scope); -} - bool InstructionLLVM::DoesBranch() const { -- cgit v1.2.3