Fixed the public and internal disassembler API to be named correctly:

const char *
SBInstruction::GetMnemonic()

const char *
SBInstruction::GetOperands()

const char *
SBInstruction::GetComment()

Fixed the symbolicate example script and the internals.



git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@140591 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 10 insertions, 10 deletions

diff --git a/include/lldb/API/SBInstruction.h b/include/lldb/API/SBInstruction.h
index 2893ea667..420e869a9 100644
--- a/include/lldb/API/SBInstruction.h
+++ b/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/include/lldb/Core/Disassembler.h b/include/lldb/Core/Disassembler.h
index fb031d0e7..f84e9b059 100644
--- a/include/lldb/Core/Disassembler.h
+++ b/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
     }