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

just a little cleanup to one of my debug OSD, nothing to see here.

This commit is contained in:
zeromus 2009-10-11 18:08:25 +00:00
parent 16e20312dd
commit 53622dc5f0
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
desmume/src/GPU_osd.cpp
View File

@ -505,7 +505,6 @@ void DrawHUD()
if (CommonSettings.hud.FpsDisplay) if (CommonSettings.hud.FpsDisplay)
{ {
osd->addFixed(Hud.FpsDisplay.x, Hud.FpsDisplay.y, "Fps:%02d/%02d (%02d%%)%s", Hud.fps, Hud.fps3d, Hud.arm9load, driver->EMU_IsEmulationPaused() ? " (paused)" : ""); osd->addFixed(Hud.FpsDisplay.x, Hud.FpsDisplay.y, "Fps:%02d/%02d (%02d%%)%s", Hud.fps, Hud.fps3d, Hud.arm9load, driver->EMU_IsEmulationPaused() ? " (paused)" : "");
osd->addFixed(Hud.FpsDisplay.x, Hud.FpsDisplay.y+20, "[%07d]", Hud.cpuloopIterationCount);
} }
if (CommonSettings.hud.FrameCounterDisplay) if (CommonSettings.hud.FrameCounterDisplay)
@ -531,7 +530,7 @@ void DrawHUD()
#ifdef WIN32 #ifdef WIN32
if (CommonSettings.hud.ShowMicrophone) if (CommonSettings.hud.ShowMicrophone)
{ {
osd->addFixed(Hud.Microphone.x, Hud.Microphone.y, "%d",MicDisplay); osd->addFixed(Hud.Microphone.x, Hud.Microphone.y, "%03d [%07d]",MicDisplay, Hud.cpuloopIterationCount);
} }
#endif #endif

1
desmume/src/arm_instructions.cpp
View File

@ -7230,6 +7230,7 @@ TEMPLATE static u32 FASTCALL OP_SWI(const u32 i)
if(cpu->swi_tab) { if(cpu->swi_tab) {
swinum &= 0x1F; swinum &= 0x1F;
//printf("%d ARM SWI %d\n",PROCNUM,swinum);
return cpu->swi_tab[swinum]() + 3; return cpu->swi_tab[swinum]() + 3;
} else { } else {
/* TODO (#1#): translocated SWI vectors */ /* TODO (#1#): translocated SWI vectors */

1
desmume/src/thumb_instructions.cpp
View File

@ -863,6 +863,7 @@ TEMPLATE static u32 FASTCALL OP_SWI_THUMB(const u32 i)
//zero 30-jun-2009 - but they say that the ideas 0xFF should crash the device... //zero 30-jun-2009 - but they say that the ideas 0xFF should crash the device...
//u32 swinum = cpu->instruction & 0xFF; //u32 swinum = cpu->instruction & 0xFF;
swinum &= 0x1F; swinum &= 0x1F;
//printf("%d ARM SWI %d\n",PROCNUM,swinum);
return cpu->swi_tab[swinum]() + 3; return cpu->swi_tab[swinum]() + 3;
} }
else { else {