diff options
Diffstat (limited to 'lldb')
| -rwxr-xr-x | lldb/examples/python/symbolicate-crash.py | 10 | ||||
| -rw-r--r-- | lldb/include/lldb/API/SBInstruction.h | 4 | ||||
| -rw-r--r-- | lldb/include/lldb/Core/Disassembler.h | 16 | ||||
| -rw-r--r-- | lldb/scripts/Python/interface/SBInstruction.i | 4 | ||||
| -rw-r--r-- | lldb/source/API/SBInstruction.cpp | 8 | ||||
| -rw-r--r-- | lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp | 12 | ||||
| -rw-r--r-- | lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h | 4 |
7 files changed, 29 insertions, 29 deletions
diff --git a/lldb/examples/python/symbolicate-crash.py b/lldb/examples/python/symbolicate-crash.py index 9e614def6ee..6afd9e1eb9a 100755 --- a/lldb/examples/python/symbolicate-crash.py +++ b/lldb/examples/python/symbolicate-crash.py @@ -236,11 +236,11 @@ def disassemble_instructions (target, instructions, pc, insts_before_pc, insts_a inst_pc = inst.GetAddress().GetLoadAddress(target); if pc == inst_pc: pc_index = inst_idx - opcode_name = inst.GetOpcodeName(target) - mnemonics = inst.GetMnemonics(target) - comment = inst.GetComment(target) - #data = inst.GetData(target) - lines.append ("%#16.16x: %8s %s" % (inst_pc, opcode_name, mnemonics)) + mnemonic = inst.GetMnemonic (target) + operands = inst.GetOperands (target) + comment = inst.GetComment (target) + #data = inst.GetData (target) + lines.append ("%#16.16x: %8s %s" % (inst_pc, mnemonic, operands)) if comment: line_len = len(lines[-1]) if line_len < comment_column: diff --git a/lldb/include/lldb/API/SBInstruction.h b/lldb/include/lldb/API/SBInstruction.h index 2893ea667a3..420e869a959 100644 --- a/lldb/include/lldb/API/SBInstruction.h +++ b/lldb/include/lldb/API/SBInstruction.h @@ -42,10 +42,10 @@ public: GetAddress(); const char * - GetOpcodeName (lldb::SBTarget target); + GetMnemonic (lldb::SBTarget target); const char * - GetMnemonics (lldb::SBTarget target); + GetOperands (lldb::SBTarget target); const char * GetComment (lldb::SBTarget target); diff --git a/lldb/include/lldb/Core/Disassembler.h b/lldb/include/lldb/Core/Disassembler.h index fb031d0e7dc..f84e9b059d0 100644 --- a/lldb/include/lldb/Core/Disassembler.h +++ b/lldb/include/lldb/Core/Disassembler.h @@ -42,17 +42,17 @@ public: } const char * - GetOpcodeName (ExecutionContextScope *exe_scope) + GetMnemonic (ExecutionContextScope *exe_scope) { if (m_opcode_name.empty()) - CalculateOpcodeName(exe_scope); + CalculateMnemonic(exe_scope); return m_opcode_name.c_str(); } const char * - GetMnemonics (ExecutionContextScope *exe_scope) + GetOperands (ExecutionContextScope *exe_scope) { if (m_mnemocics.empty()) - CalculateMnemonics(exe_scope); + CalculateOperands(exe_scope); return m_mnemocics.c_str(); } @@ -65,10 +65,10 @@ public: } virtual void - CalculateOpcodeName (ExecutionContextScope *exe_scope) = 0; + CalculateMnemonic (ExecutionContextScope *exe_scope) = 0; virtual void - CalculateMnemonics (ExecutionContextScope *exe_scope) = 0; + CalculateOperands (ExecutionContextScope *exe_scope) = 0; virtual void CalculateComment (ExecutionContextScope *exe_scope) = 0; @@ -199,13 +199,13 @@ public: DoesBranch () const; virtual void - CalculateOpcodeName(ExecutionContextScope *exe_scope) + CalculateMnemonic(ExecutionContextScope *exe_scope) { // TODO: fill this in and put opcode name into Instruction::m_opcode_name } virtual void - CalculateMnemonics(ExecutionContextScope *exe_scope) + CalculateOperands(ExecutionContextScope *exe_scope) { // TODO: fill this in and put opcode name into Instruction::m_mnemonics } diff --git a/lldb/scripts/Python/interface/SBInstruction.i b/lldb/scripts/Python/interface/SBInstruction.i index cf82ad9e4d6..7be6e911ed0 100644 --- a/lldb/scripts/Python/interface/SBInstruction.i +++ b/lldb/scripts/Python/interface/SBInstruction.i @@ -31,10 +31,10 @@ public: GetAddress(); const char * - GetOpcodeName (lldb::SBTarget target); + GetMnemonic (lldb::SBTarget target); const char * - GetMnemonics (lldb::SBTarget target); + GetOperands (lldb::SBTarget target); const char * GetComment (lldb::SBTarget target); diff --git a/lldb/source/API/SBInstruction.cpp b/lldb/source/API/SBInstruction.cpp index d708aa035d9..26f8d1aa005 100644 --- a/lldb/source/API/SBInstruction.cpp +++ b/lldb/source/API/SBInstruction.cpp @@ -69,7 +69,7 @@ SBInstruction::GetAddress() } const char * -SBInstruction::GetOpcodeName(SBTarget target) +SBInstruction::GetMnemonic(SBTarget target) { if (m_opaque_sp) { @@ -81,13 +81,13 @@ SBInstruction::GetOpcodeName(SBTarget target) target->CalculateExecutionContext (exe_ctx); exe_ctx.SetProcessSP(target->GetProcessSP()); } - return m_opaque_sp->GetOpcodeName(exe_ctx.GetBestExecutionContextScope()); + return m_opaque_sp->GetMnemonic(exe_ctx.GetBestExecutionContextScope()); } return NULL; } const char * -SBInstruction::GetMnemonics(SBTarget target) +SBInstruction::GetOperands(SBTarget target) { if (m_opaque_sp) { @@ -99,7 +99,7 @@ SBInstruction::GetMnemonics(SBTarget target) target->CalculateExecutionContext (exe_ctx); exe_ctx.SetProcessSP(target->GetProcessSP()); } - return m_opaque_sp->GetMnemonics(exe_ctx.GetBestExecutionContextScope()); + return m_opaque_sp->GetOperands(exe_ctx.GetBestExecutionContextScope()); } return NULL; } diff --git a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp index 610271deb98..97831eaffa6 100644 --- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp +++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp @@ -430,7 +430,7 @@ InstructionLLVM::Dump } void -InstructionLLVM::CalculateOpcodeName (ExecutionContextScope *exe_scope) +InstructionLLVM::CalculateMnemonic (ExecutionContextScope *exe_scope) { const int num_tokens = EDNumTokens(m_inst); if (num_tokens > 0) @@ -554,17 +554,17 @@ InstructionLLVM::CalculateOpcodeName (ExecutionContextScope *exe_scope) } void -InstructionLLVM::CalculateMnemonics(ExecutionContextScope *exe_scope) +InstructionLLVM::CalculateOperands(ExecutionContextScope *exe_scope) { - // Do all of the work in CalculateOpcodeName() - CalculateOpcodeName (exe_scope); + // Do all of the work in CalculateMnemonic() + CalculateMnemonic (exe_scope); } void InstructionLLVM::CalculateComment(ExecutionContextScope *exe_scope) { - // Do all of the work in CalculateOpcodeName() - CalculateOpcodeName (exe_scope); + // Do all of the work in CalculateMnemonic() + CalculateMnemonic (exe_scope); } bool diff --git a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h index b9ab49005a3..73a117d4f40 100644 --- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h +++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h @@ -44,10 +44,10 @@ public: uint32_t data_offset); virtual void - CalculateOpcodeName (lldb_private::ExecutionContextScope *exe_scope); + CalculateMnemonic (lldb_private::ExecutionContextScope *exe_scope); virtual void - CalculateMnemonics (lldb_private::ExecutionContextScope *exe_scope); + CalculateOperands (lldb_private::ExecutionContextScope *exe_scope); virtual void CalculateComment (lldb_private::ExecutionContextScope *exe_scope); |
