diff options
| -rw-r--r-- | src/ARM.cpp | 2 | ||||
| -rw-r--r-- | src/DMA.cpp | 2 | ||||
| -rw-r--r-- | src/NDS.cpp | 15 | ||||
| -rw-r--r-- | src/frontend/qt_sdl/main.cpp | 9 |
4 files changed, 9 insertions, 19 deletions
diff --git a/src/ARM.cpp b/src/ARM.cpp index c6c51ed..29110e5 100644 --- a/src/ARM.cpp +++ b/src/ARM.cpp @@ -570,8 +570,6 @@ void ARMv5::Execute() // actually execute u32 icode = (CurInstr >> 6) & 0x3FF; ARMInterpreter::THUMBInstrTable[icode](this); - - if (R[15]==0x0219A6B0) printf("CAM THREAD MSG: %02X %08X -> %08X\n", R[1], R[0], 0x0219A6B6+R[0]); } else { diff --git a/src/DMA.cpp b/src/DMA.cpp index 8ad3918..cd3465f 100644 --- a/src/DMA.cpp +++ b/src/DMA.cpp @@ -427,4 +427,4 @@ void DMA::Run() } template void DMA::Run<0>(); -template void DMA::Run<1>();
\ No newline at end of file +template void DMA::Run<1>(); diff --git a/src/NDS.cpp b/src/NDS.cpp index b313db0..b8b83f7 100644 --- a/src/NDS.cpp +++ b/src/NDS.cpp @@ -1811,15 +1811,6 @@ void StartSqrt() void debug(u32 param) { - if (param==1312) - { - u32 timer = 0x10000 - (Timers[3].Counter >> 16); - timer *= 16; - timer += (0x10000 - (Timers[2].Counter >> 16)); - printf("TIMER=%d (%04X/%04X)\n", timer, (Timers[2].Counter >> 16), (Timers[3].Counter >> 16)); - return; - } - printf("ARM9 PC=%08X LR=%08X %08X\n", ARM9->R[15], ARM9->R[14], ARM9->R_IRQ[1]); printf("ARM7 PC=%08X LR=%08X %08X\n", ARM7->R[15], ARM7->R[14], ARM7->R_IRQ[1]); @@ -1845,14 +1836,14 @@ void debug(u32 param) fclose(shit);*/ FILE* - shit = fopen("debug/cam9.bin", "wb"); + shit = fopen("debug/power9.bin", "wb"); for (u32 i = 0x02000000; i < 0x04000000; i+=4) { u32 val = DSi::ARM9Read32(i); fwrite(&val, 4, 1, shit); } fclose(shit); - shit = fopen("debug/cam7.bin", "wb"); + shit = fopen("debug/power7.bin", "wb"); for (u32 i = 0x02000000; i < 0x04000000; i+=4) { u32 val = DSi::ARM7Read32(i); @@ -3258,7 +3249,7 @@ void ARM9IOWrite16(u32 addr, u16 val) return; case 0x04000188: - ARM9IOWrite32(addr, val | (val << 16)); + ARM9IOWrite32(addr, val | (val << 16)); return; case 0x040001A0: diff --git a/src/frontend/qt_sdl/main.cpp b/src/frontend/qt_sdl/main.cpp index 6e27d61..0228446 100644 --- a/src/frontend/qt_sdl/main.cpp +++ b/src/frontend/qt_sdl/main.cpp @@ -371,7 +371,7 @@ void EmuThread::run() if (Input::HotkeyPressed(HK_Pause)) emit windowEmuPause(); if (Input::HotkeyPressed(HK_Reset)) emit windowEmuReset(); - + if (Input::HotkeyPressed(HK_FullscreenToggle)) emit windowFullscreenToggle(); if (GBACart::CartInserted && GBACart::HasSolarSensor) @@ -507,7 +507,7 @@ void EmuThread::run() frameLimitError = -practicalFramelimit; if (frameLimitError > practicalFramelimit) frameLimitError = practicalFramelimit; - + if (round(frameLimitError * 1000.0) > 0.0) { SDL_Delay(round(frameLimitError * 1000.0)); @@ -1324,6 +1324,7 @@ void MainWindow::keyPressEvent(QKeyEvent* event) { if (event->isAutoRepeat()) return; + // TODO!! REMOVE ME IN RELEASE BUILDS!! if (event->key() == Qt::Key_F11) NDS::debug(0); Input::KeyPress(event); @@ -1926,9 +1927,9 @@ void MainWindow::onTitleUpdate(QString title) void MainWindow::onFullscreenToggled() { - if (!mainWindow->isFullScreen()) + if (!mainWindow->isFullScreen()) { - mainWindow->showFullScreen(); + mainWindow->showFullScreen(); mainWindow->menuBar()->hide(); } else |