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/JitWindow.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/JitWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Debugger/JitWindow.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/Debugger/JitWindow.cpp b/Source/Core/DolphinWX/Debugger/JitWindow.cpp index dc10d4ac5c..0ef374ddbe 100644 --- a/Source/Core/DolphinWX/Debugger/JitWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/JitWindow.cpp @@ -5,7 +5,6 @@ #include <cstdio> #include <cstring> #include <disasm.h> // Bochs -#include <PowerPCDisasm.h> // Bochs #include <wx/button.h> #include <wx/chartype.h> #include <wx/defs.h> @@ -22,6 +21,7 @@ #include <wx/windowid.h> #include "Common/Common.h" +#include "Common/GekkoDisassembler.h" #include "Common/StringUtil.h" #include "Core/PowerPC/Gekko.h" #include "Core/PowerPC/PPCAnalyst.h" @@ -161,9 +161,8 @@ void CJitWindow::Compare(u32 em_address) for (u32 i = 0; i < code_block.m_num_instructions; i++) { const PPCAnalyst::CodeOp &op = code_buffer.codebuffer[i]; - char temp[256]; - DisassembleGekko(op.inst.hex, op.address, temp, 256); - sptr += sprintf(sptr, "%08x %s\n", op.address, temp); + std::string temp = GekkoDisassembler::Disassemble(op.inst.hex, op.address); + sptr += sprintf(sptr, "%08x %s\n", op.address, temp.c_str()); } // Add stats to the end of the ppc box since it's generally the shortest. |