commit fb0655ef59f52c81c8998e51477157e7794d7c05
author Greg Clayton <gclayton@apple.com> Tue Sep 27 00:58:45 2011 +0000
committer Greg Clayton <gclayton@apple.com> Tue Sep 27 00:58:45 2011 +0000
tree c3cc61410a497f3d93b329d5856c4ae47992db04
parent 581243919d9e2b06c65cb4c55834819dc75cb6d3

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.

llvm-svn: 140591

lldb/source/API/SBInstruction.cpp

diff --git a/lldb/source/API/SBInstruction.cpp b/lldb/source/API/SBInstruction.cpp
index d708aa0..26f8d1a 100644
--- a/lldb/source/API/SBInstruction.cpp
+++ b/lldb/source/API/SBInstruction.cpp
@@ -69,7 +69,7 @@
 }
 
 const char *
-SBInstruction::GetOpcodeName(SBTarget target)
+SBInstruction::GetMnemonic(SBTarget target)
 {
     if (m_opaque_sp)
     {        
@@ -81,13 +81,13 @@
             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 @@
             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;
 }

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 610271d..97831ea 100644
--- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp
+++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp
@@ -430,7 +430,7 @@
 }
 
 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 @@
 }
 
 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

lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h

diff --git a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h
index b9ab490..73a117d 100644
--- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h
+++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h
@@ -44,10 +44,10 @@
             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);