ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re-add windows specific stuff, properly ifdefing it? (should fix #360)

This commit is contained in:
zeromus 2020-08-19 17:11:27 -04:00
parent 79c6ab430a
commit f6064006d2
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
desmume/src/NDSSystem.cpp
View File

@ -59,7 +59,11 @@
#include "wifi.h" #include "wifi.h"
#include "Database.h" #include "Database.h"
#include "frontend/modules/Disassembler.h" #include "frontend/modules/Disassembler.h"
#ifdef HOST_WINDOWS
#include "display.h" #include "display.h"
extern HWND DisViewWnd[2];
#endif
#ifdef GDB_STUB #ifdef GDB_STUB
#include "gdbstub.h" #include "gdbstub.h"
@ -1916,14 +1920,15 @@ static /*donotinline*/ std::pair<s32,s32> armInnerLoop(
while(timer < s32next && !sequencer.reschedule && execute) while(timer < s32next && !sequencer.reschedule && execute)
{ {
// breakpoint handling // breakpoint handling
#ifdef HOST_WINDOWS
for (int i = 0; i < NDS_ARM9.breakPoints.size(); ++i) { for (int i = 0; i < NDS_ARM9.breakPoints.size(); ++i) {
if (NDS_ARM9.instruct_adr == NDS_ARM9.breakPoints[i] && !NDS_ARM9.debugStep) { if (NDS_ARM9.instruct_adr == NDS_ARM9.breakPoints[i] && !NDS_ARM9.debugStep) {
emu_paused = true; emu_paused = true;
paused = true; paused = true;
execute = false; execute = false;
// update debug display // update debug display
//PostMessageA(DisViewWnd[0], WM_COMMAND, IDC_DISASMSEEK, NDS_ARM9.instruct_adr); PostMessageA(DisViewWnd[0], WM_COMMAND, IDC_DISASMSEEK, NDS_ARM9.instruct_adr);
//InvalidateRect(DisViewWnd[0], NULL, FALSE); InvalidateRect(DisViewWnd[0], NULL, FALSE);
return std::make_pair(arm9, arm7); return std::make_pair(arm9, arm7);
} }
} }
@ -1933,11 +1938,13 @@ static /*donotinline*/ std::pair<s32,s32> armInnerLoop(
paused = true; paused = true;
execute = false; execute = false;
// update debug display // update debug display
//PostMessageA(DisViewWnd[1], WM_COMMAND, IDC_DISASMSEEK, NDS_ARM7.instruct_adr); PostMessageA(DisViewWnd[1], WM_COMMAND, IDC_DISASMSEEK, NDS_ARM7.instruct_adr);
//InvalidateRect(DisViewWnd[1], NULL, FALSE); InvalidateRect(DisViewWnd[1], NULL, FALSE);
return std::make_pair(arm9, arm7); return std::make_pair(arm9, arm7);
} }
} }
#endif //HOST_WINDOWS
if(doarm9 && (!doarm7 || arm9 <= timer)) if(doarm9 && (!doarm7 || arm9 <= timer))
{ {
if(!(NDS_ARM9.freeze & CPU_FREEZE_WAIT_IRQ) && !nds.freezeBus) if(!(NDS_ARM9.freeze & CPU_FREEZE_WAIT_IRQ) && !nds.freezeBus)