diff --git a/Source/Core/Common/Src/DebugInterface.h b/Source/Core/Common/Src/DebugInterface.h index 3e8a93e8b9..af72daa3ba 100644 --- a/Source/Core/Common/Src/DebugInterface.h +++ b/Source/Core/Common/Src/DebugInterface.h @@ -20,8 +20,8 @@ public: virtual void clearAllBreakpoints() {} virtual void toggleBreakpoint(unsigned int /*address*/){} virtual unsigned int readMemory(unsigned int /*address*/){return 0;} - virtual void writeExtraMemory(int memory, unsigned int value, unsigned int /*address*/) {} - virtual unsigned int readExtraMemory(int memory, unsigned int address){return 0;} + virtual void writeExtraMemory(int /*memory*/, unsigned int /*value*/, unsigned int /*address*/) {} + virtual unsigned int readExtraMemory(int /*memory*/, unsigned int /*address*/){return 0;} virtual unsigned int readInstruction(unsigned int /*address*/){return 0;} virtual unsigned int getPC() {return 0;} virtual void setPC(unsigned int /*address*/) {} @@ -29,6 +29,7 @@ public: virtual void runToBreakpoint() {} virtual void breakNow() {} virtual void insertBLR(unsigned int /*address*/, unsigned int) {} + virtual void showJitResults(unsigned int /*address*/) {}; virtual int getColor(unsigned int /*address*/){return 0xFFFFFFFF;} virtual std::string getDescription(unsigned int /*address*/) = 0; }; diff --git a/Source/Core/Core/Src/Debugger/PPCDebugInterface.cpp b/Source/Core/Core/Src/Debugger/PPCDebugInterface.cpp index 92d88665c6..24f06f938f 100644 --- a/Source/Core/Core/Src/Debugger/PPCDebugInterface.cpp +++ b/Source/Core/Core/Src/Debugger/PPCDebugInterface.cpp @@ -19,6 +19,7 @@ #include "DebugInterface.h" #include "PPCDebugInterface.h" #include "PowerPCDisasm.h" +#include "../Host.h" #include "../Core.h" #include "../HW/CPU.h" #include "../HW/DSP.h" @@ -181,7 +182,12 @@ void PPCDebugInterface::setPC(unsigned int address) PowerPC::ppcState.pc = address; } -void PPCDebugInterface::runToBreakpoint() +void PPCDebugInterface::showJitResults(unsigned int address) +{ + Host_ShowJitResults(address); +} + +void PPCDebugInterface::runToBreakpoint() { } diff --git a/Source/Core/Core/Src/Debugger/PPCDebugInterface.h b/Source/Core/Core/Src/Debugger/PPCDebugInterface.h index f0886a3ce7..9783f60706 100644 --- a/Source/Core/Core/Src/Debugger/PPCDebugInterface.h +++ b/Source/Core/Core/Src/Debugger/PPCDebugInterface.h @@ -35,6 +35,7 @@ public: virtual void insertBLR(unsigned int address, unsigned int); virtual int getColor(unsigned int address); virtual std::string getDescription(unsigned int address); + virtual void showJitResults(u32 address); }; #endif diff --git a/Source/Core/Core/Src/Host.h b/Source/Core/Core/Src/Host.h index 5ee84b4d02..d432cb36ef 100644 --- a/Source/Core/Core/Src/Host.h +++ b/Source/Core/Core/Src/Host.h @@ -42,6 +42,7 @@ void Host_UpdateLogDisplay(); void Host_UpdateMemoryView(); void Host_NotifyMapLoaded(); void Host_UpdateBreakPointView(); +void Host_ShowJitResults(unsigned int address); void Host_SetDebugMode(bool enable); void Host_SetWaitCursor(bool enable); diff --git a/Source/Core/DebuggerUICommon/Src/CodeView.cpp b/Source/Core/DebuggerUICommon/Src/CodeView.cpp index 59c2590321..a675d73a9f 100644 --- a/Source/Core/DebuggerUICommon/Src/CodeView.cpp +++ b/Source/Core/DebuggerUICommon/Src/CodeView.cpp @@ -296,7 +296,7 @@ void CCodeView::OnPopupMenu(wxCommandEvent& event) break; case IDM_JITRESULTS: - // CJitWindow::ViewAddr(selection); + debugger->showJitResults(selection); break; case IDM_FOLLOWBRANCH: diff --git a/Source/Core/DolphinWX/DolphinWX.vcproj b/Source/Core/DolphinWX/DolphinWX.vcproj index e39da3b609..bd2914e005 100644 --- a/Source/Core/DolphinWX/DolphinWX.vcproj +++ b/Source/Core/DolphinWX/DolphinWX.vcproj @@ -55,7 +55,7 @@ Optimization="3" InlineFunctionExpansion="0" FavorSizeOrSpeed="1" - AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include" + AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DebuggerUICommon\src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include" PreprocessorDefinitions="WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE" StringPooling="false" RuntimeLibrary="0" @@ -172,7 +172,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="false" - AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include" + AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DebuggerUICommon\src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include" PreprocessorDefinitions="WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE" StringPooling="true" RuntimeLibrary="0" @@ -281,7 +281,7 @@