diff options
| author | Léo Lam <leo@innovatetechnologi.es> | 2018-05-26 11:18:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-26 11:18:10 +0200 |
| commit | 41fe7970da8585efe6ecc98463ca810308ac6ced (patch) | |
| tree | a6661a3076f9a9671bced67e4b18e2515c3878a1 /Source/Core/DolphinWX/Debugger | |
| parent | 3c95c175d0c831f6354bb39010d62a798ae47fb5 (diff) | |
| parent | b60ad2425d05dc5134de76d0848a5079ad197500 (diff) | |
Merge pull request #6969 from lioncash/namespace
Common: Namespace GekkoDisassembler.cpp/.h
Diffstat (limited to 'Source/Core/DolphinWX/Debugger')
| -rw-r--r-- | Source/Core/DolphinWX/Debugger/AssemblerEntryDialog.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Debugger/JitWindow.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Debugger/RegisterView.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/Debugger/AssemblerEntryDialog.cpp b/Source/Core/DolphinWX/Debugger/AssemblerEntryDialog.cpp index 079a3ab222..f6939801fb 100644 --- a/Source/Core/DolphinWX/Debugger/AssemblerEntryDialog.cpp +++ b/Source/Core/DolphinWX/Debugger/AssemblerEntryDialog.cpp @@ -85,6 +85,6 @@ void AssemblerEntryDialog::OnTextChanged(wxCommandEvent& evt) unsigned long code; std::string result = "Input text is invalid"; if (evt.GetString().ToULong(&code, 0) && code <= std::numeric_limits<u32>::max()) - result = TabsToSpaces(1, GekkoDisassembler::Disassemble(code, m_address)); + result = TabsToSpaces(1, Common::GekkoDisassembler::Disassemble(code, m_address)); m_preview->SetLabel(wxString::Format(_("Preview: %s"), result.c_str())); } diff --git a/Source/Core/DolphinWX/Debugger/JitWindow.cpp b/Source/Core/DolphinWX/Debugger/JitWindow.cpp index 47a70e3697..a84d859c7a 100644 --- a/Source/Core/DolphinWX/Debugger/JitWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/JitWindow.cpp @@ -99,7 +99,7 @@ void CJitWindow::Compare(u32 em_address) for (u32 i = 0; i < code_block.m_num_instructions; i++) { const PPCAnalyst::CodeOp& op = code_buffer[i]; - std::string opcode = GekkoDisassembler::Disassemble(op.inst.hex, op.address); + const std::string opcode = Common::GekkoDisassembler::Disassemble(op.inst.hex, op.address); ppc_disasm << std::setfill('0') << std::setw(8) << std::hex << op.address; ppc_disasm << " " << opcode << std::endl; } diff --git a/Source/Core/DolphinWX/Debugger/RegisterView.cpp b/Source/Core/DolphinWX/Debugger/RegisterView.cpp index f027224da6..6d62ca6b5e 100644 --- a/Source/Core/DolphinWX/Debugger/RegisterView.cpp +++ b/Source/Core/DolphinWX/Debugger/RegisterView.cpp @@ -284,11 +284,11 @@ wxString CRegTable::GetValue(int row, int col) switch (col) { case 0: - return StrToWxStr(GekkoDisassembler::GetGPRName(row)); + return StrToWxStr(Common::GekkoDisassembler::GetGPRName(row)); case 1: return FormatGPR(row); case 2: - return StrToWxStr(GekkoDisassembler::GetFPRName(row)); + return StrToWxStr(Common::GekkoDisassembler::GetFPRName(row)); case 3: return FormatFPR(row, 0); case 4: |