diff --git a/desmume/src/GPU_osd.cpp b/desmume/src/GPU_osd.cpp index 80195c172..6ca742656 100644 --- a/desmume/src/GPU_osd.cpp +++ b/desmume/src/GPU_osd.cpp @@ -505,7 +505,6 @@ void DrawHUD() 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+20, "[%07d]", Hud.cpuloopIterationCount); } if (CommonSettings.hud.FrameCounterDisplay) @@ -531,7 +530,7 @@ void DrawHUD() #ifdef WIN32 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 diff --git a/desmume/src/arm_instructions.cpp b/desmume/src/arm_instructions.cpp index db842ad26..ef33862c5 100644 --- a/desmume/src/arm_instructions.cpp +++ b/desmume/src/arm_instructions.cpp @@ -7230,6 +7230,7 @@ TEMPLATE static u32 FASTCALL OP_SWI(const u32 i) if(cpu->swi_tab) { swinum &= 0x1F; + //printf("%d ARM SWI %d\n",PROCNUM,swinum); return cpu->swi_tab[swinum]() + 3; } else { /* TODO (#1#): translocated SWI vectors */ diff --git a/desmume/src/thumb_instructions.cpp b/desmume/src/thumb_instructions.cpp index f36213ae8..c64507f99 100644 --- a/desmume/src/thumb_instructions.cpp +++ b/desmume/src/thumb_instructions.cpp @@ -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... //u32 swinum = cpu->instruction & 0xFF; swinum &= 0x1F; + //printf("%d ARM SWI %d\n",PROCNUM,swinum); return cpu->swi_tab[swinum]() + 3; } else {