diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-08-03 21:52:08 -0700 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-08-03 21:52:08 -0700 |
| commit | 6befa34b609797b4c48dd45b0f0a7adeba8d8a40 (patch) | |
| tree | 869ff351cb9a9b4115518da6be8837b9846d9e67 /Source/Core/DolphinWX/Debugger/RegisterView.cpp | |
| parent | 05a9f5b07abfbb41954b977652e7d11000ea9fae (diff) | |
| parent | 0718937237db22d26e1b764b4733645c2b9f1562 (diff) | |
Merge pull request #647 from lioncash/disasm
Common: Introduce the new Gekko disassembler to Common.
Diffstat (limited to 'Source/Core/DolphinWX/Debugger/RegisterView.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Debugger/RegisterView.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Source/Core/DolphinWX/Debugger/RegisterView.cpp b/Source/Core/DolphinWX/Debugger/RegisterView.cpp index a2338d5bd7..25635db528 100644 --- a/Source/Core/DolphinWX/Debugger/RegisterView.cpp +++ b/Source/Core/DolphinWX/Debugger/RegisterView.cpp @@ -10,6 +10,7 @@ #include <wx/windowid.h> #include "Common/CommonTypes.h" +#include "Common/GekkoDisassembler.h" #include "Common/StringUtil.h" #include "Core/HW/ProcessorInterface.h" #include "Core/PowerPC/Gekko.h" @@ -22,9 +23,6 @@ class wxWindow; // F-zero 80005e60 wtf?? -extern const char* GetGPRName(unsigned int index); -extern const char* GetFPRName(unsigned int index); - static const char *special_reg_names[] = { "PC", "LR", "CTR", "CR", "FPSCR", "MSR", "SRR0", "SRR1", "Exceptions", "Int Mask", "Int Cause", }; @@ -54,9 +52,9 @@ wxString CRegTable::GetValue(int row, int col) { switch (col) { - case 0: return StrToWxStr(GetGPRName(row)); + case 0: return StrToWxStr(GekkoDisassembler::GetGPRName(row)); case 1: return wxString::Format("%08x", GPR(row)); - case 2: return StrToWxStr(GetFPRName(row)); + case 2: return StrToWxStr(GekkoDisassembler::GetFPRName(row)); case 3: return wxString::Format("%016llx", riPS0(row)); case 4: return wxString::Format("%016llx", riPS1(row)); default: return wxEmptyString; |