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

Some more warnings enabled by default in devel builds. 

It'll be good to know which games trigger these.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2290 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
ramapcsx2 2009-12-03 12:06:39 +00:00
parent ecabd7ff4d
commit 8d5caa300d
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pcsx2/HwWrite.cpp
View File

@ -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 //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) 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. // 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 //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) 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. // 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 //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) 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. :( // Returning here breaks every single Gust game written. :(
// Not returning here breaks Fatal Frame. Gamefix time. // 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. // Upper 16bits of QWC should not be written since QWC is 16bits in size.
if ((psHu32(qwcRegister) >> 16) != 0) 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, qwcRegister,
psHu32(qwcRegister) >> 16); psHu32(qwcRegister) >> 16);
psHu32(qwcRegister) = 0; psHu32(qwcRegister) = 0;

4
pcsx2/R5900.cpp
View File

@ -588,6 +588,10 @@ void cpuExecuteBios()
__forceinline void CPU_INT( u32 n, s32 ecycle) __forceinline void CPU_INT( u32 n, s32 ecycle)
{ {
if( n != 2 && cpuRegs.interrupt & (1<<n) ){ //2 is Gif, and every path 3 masking game triggers this :/
DevCon.Warning( "***** EE > Twice-thrown int on IRQ %d", n );
}
cpuRegs.interrupt|= 1 << n; cpuRegs.interrupt|= 1 << n;
cpuRegs.sCycle[n] = cpuRegs.cycle; cpuRegs.sCycle[n] = cpuRegs.cycle;
cpuRegs.eCycle[n] = ecycle; cpuRegs.eCycle[n] = ecycle;

4
pcsx2/gui/AppCoreThread.cpp
View File

@ -192,8 +192,8 @@ void AppCoreThread::StateCheckInThread()
case WXK_MENU: m_kevt.m_altDown = isDown; return; case WXK_MENU: m_kevt.m_altDown = isDown; return;
} }
if( vkey != WXK_ALT ) /*if( vkey != WXK_ALT )
Console.Warning( "It's not Alt!" ); Console.Warning( "It's not Alt!" );*/
m_kevt.m_keyCode = vkey; m_kevt.m_keyCode = vkey;
wxGetApp().PostPadKey( m_kevt ); wxGetApp().PostPadKey( m_kevt );