diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPHost.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPHost.cpp index fa9341159b..75d74028ac 100644 --- a/Source/Core/Core/Src/HW/DSPLLE/DSPHost.cpp +++ b/Source/Core/Core/Src/HW/DSPLLE/DSPHost.cpp @@ -24,15 +24,10 @@ #include "../../ConfigManager.h" #include "../../PowerPC/PowerPC.h" -/* -ECTORTODO #if defined(HAVE_WX) && HAVE_WX - -#include "Debugger/DSPDebugWindow.h" // For the DSPDebuggerLLE class +#include "DSPDebugWindow.h" // For the DSPDebuggerLLE class extern DSPDebuggerLLE* m_DebuggerFrame; - #endif -*/ // The user of the DSPCore library must supply a few functions so that the // emulation core can access the environment it runs in. If the emulation @@ -103,20 +98,19 @@ u32 DSPHost_CodeLoaded(const u8 *ptr, int size) // Always add the ROM. DSPSymbols::AutoDisassembly(0x8000, 0x9000); - /* ECTORTODO + #if defined(HAVE_WX) && HAVE_WX if (m_DebuggerFrame) m_DebuggerFrame->Refresh(); #endif - */ + return ector_crc; } void DSPHost_UpdateDebugger() { - /* ECTORTODO #if defined(HAVE_WX) && HAVE_WX if (m_DebuggerFrame) m_DebuggerFrame->Refresh(); -#endif */ +#endif } diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp index 3b217dea70..c94881c32d 100644 --- a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp +++ b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp @@ -31,6 +31,10 @@ #include "DSP/disassemble.h" #include "DSPSymbols.h" +#if defined HAVE_WX && HAVE_WX +#include "DSPDebugWindow.h" +#endif + #include "AudioCommon.h" #include "Mixer.h" @@ -77,19 +81,6 @@ void DSPLLE::DoState(PointerWrap &p) p.Do(m_cycle_count); } - /* ECTORTODO -void *DllDebugger(void *_hParent, bool Show) -{ -#if defined(HAVE_WX) && HAVE_WX - m_DebuggerFrame = new DSPDebuggerLLE((wxWindow *)_hParent); - return (void *)m_DebuggerFrame; -#else - return NULL; -#endif -} - */ - - // Regular thread void DSPLLE::dsp_thread(DSPLLE *lpParameter) { @@ -109,7 +100,6 @@ void DSPLLE::dsp_thread(DSPLLE *lpParameter) } } -/* ECTORTODO void DSPLLE::DSP_DebugBreak() { #if defined(HAVE_WX) && HAVE_WX @@ -117,7 +107,6 @@ void DSPLLE::DSP_DebugBreak() // m_DebuggerFrame->DebugBreak(); #endif } -*/ void DSPLLE::Initialize(void *hWnd, bool bWii, bool bDSPThread) { @@ -157,17 +146,12 @@ void DSPLLE::Initialize(void *hWnd, bool bWii, bool bDSPThread) InitInstructionTable(); if (m_bDSPThread) - { -// m_hDSPThread = new Common::Thread(dsp_thread, (void *)this); m_hDSPThread = std::thread(dsp_thread, this); - } -/* -ECTORTODO + #if defined(HAVE_WX) && HAVE_WX if (m_DebuggerFrame) m_DebuggerFrame->Refresh(); #endif - */ } void DSPLLE::DSP_StopSoundStream() diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.h b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.h index c41cf951e2..76cd9decb2 100644 --- a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.h +++ b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.h @@ -43,6 +43,7 @@ public: virtual void DSP_Update(int cycles); virtual void DSP_StopSoundStream(); virtual void DSP_ClearAudioBuffer(bool mute); + void DSP_DebugBreak(); private: static void dsp_thread(DSPLLE* lpParameter); diff --git a/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp b/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp index 7a2bade4ad..1cbca44a06 100644 --- a/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp +++ b/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp @@ -516,7 +516,6 @@ void CCodeWindow::ToggleJitWindow(bool bShow) void CCodeWindow::ToggleSoundWindow(bool bShow) { - // TODO: Resurrect DSP debugger window. GetMenuBar()->FindItem(IDM_SOUNDWINDOW)->Check(bShow); if (bShow) {