diff --git a/pcsx2/HwWrite.cpp b/pcsx2/HwWrite.cpp index 2b57570b71..027346d7b7 100644 --- a/pcsx2/HwWrite.cpp +++ b/pcsx2/HwWrite.cpp @@ -32,7 +32,7 @@ static __forceinline void DmaExec8( void (*func)(), u32 mem, u8 value ) //It's invalid for the hardware to write a DMA while it is active, not without Suspending the DMAC if ((value & 0x1) && ((psHu8(mem) & 0x1) == 0x1) && dmacRegs->ctrl.DMAE) { - DMA_LOG( "DMAExec8 Attempt to run DMA while one is already active mem = %x", mem ); + DevCon.Warning( "DMAExec8 Attempt to run DMA while one is already active mem = %x", mem ); } // Upper 16bits of QWC should not be written since QWC is 16bits in size. @@ -57,7 +57,7 @@ static __forceinline void DmaExec16( void (*func)(), u32 mem, u16 value ) //It's invalid for the hardware to write a DMA while it is active, not without Suspending the DMAC if ((value & 0x100) && ((psHu32(mem) & 0x100) == 0x100) && dmacRegs->ctrl.DMAE) { - DMA_LOG( "DMAExec16 Attempt to run DMA while one is already active mem = %x", mem); + DevCon.Warning( "DMAExec16 Attempt to run DMA while one is already active mem = %x", mem); } // Upper 16bits of QWC should not be written since QWC is 16bits in size. @@ -84,7 +84,7 @@ static void DmaExec( void (*func)(), u32 mem, u32 value ) //It's invalid for the hardware to write a DMA while it is active, not without Suspending the DMAC if ((value & 0x100) && ((psHu32(mem) & 0x100) == 0x100) && dmacRegs->ctrl.DMAE) { - DMA_LOG( "DMAExec32 Attempt to run DMA while one is already active mem = %x", mem ); + DevCon.Warning( "DMAExec32 Attempt to run DMA while one is already active mem = %x", mem ); // Returning here breaks every single Gust game written. :( // Not returning here breaks Fatal Frame. Gamefix time. @@ -94,7 +94,7 @@ static void DmaExec( void (*func)(), u32 mem, u32 value ) // Upper 16bits of QWC should not be written since QWC is 16bits in size. if ((psHu32(qwcRegister) >> 16) != 0) { - DMA_LOG("DMA QWC (%x) upper 16bits set to %x\n", + DevCon.Warning("DMA QWC (%x) upper 16bits set to %x\n", qwcRegister, psHu32(qwcRegister) >> 16); psHu32(qwcRegister) = 0; diff --git a/pcsx2/R5900.cpp b/pcsx2/R5900.cpp index 9a7a283d11..78b3afdeac 100644 --- a/pcsx2/R5900.cpp +++ b/pcsx2/R5900.cpp @@ -588,6 +588,10 @@ void cpuExecuteBios() __forceinline void CPU_INT( u32 n, s32 ecycle) { + if( n != 2 && cpuRegs.interrupt & (1< Twice-thrown int on IRQ %d", n ); + } + cpuRegs.interrupt|= 1 << n; cpuRegs.sCycle[n] = cpuRegs.cycle; cpuRegs.eCycle[n] = ecycle; diff --git a/pcsx2/gui/AppCoreThread.cpp b/pcsx2/gui/AppCoreThread.cpp index 0590e67dd9..b70089c980 100644 --- a/pcsx2/gui/AppCoreThread.cpp +++ b/pcsx2/gui/AppCoreThread.cpp @@ -192,8 +192,8 @@ void AppCoreThread::StateCheckInThread() case WXK_MENU: m_kevt.m_altDown = isDown; return; } - if( vkey != WXK_ALT ) - Console.Warning( "It's not Alt!" ); + /*if( vkey != WXK_ALT ) + Console.Warning( "It's not Alt!" );*/ m_kevt.m_keyCode = vkey; wxGetApp().PostPadKey( m_kevt );