diff --git a/pcsx2/MTGS.cpp b/pcsx2/MTGS.cpp index a61ecc1481..4698cf4295 100644 --- a/pcsx2/MTGS.cpp +++ b/pcsx2/MTGS.cpp @@ -974,14 +974,14 @@ void SysMtgsThread::WaitForOpen() // Two-phase timeout on MTGS opening, so that possible errors are handled // in a timely fashion. We check for errors after 2 seconds, and then give it - // another 4 seconds if no errors occurred (this might seem long, but sometimes a + // another 12 seconds if no errors occurred (this might seem long, but sometimes a // GS plugin can be very stubborned, especially in debug mode builds). if( !m_sem_OpenDone.Wait( wxTimeSpan(0, 0, 2, 0) ) ) { RethrowException(); - if( !m_sem_OpenDone.Wait( wxTimeSpan(0, 0, 4, 0) ) ) + if( !m_sem_OpenDone.Wait( wxTimeSpan(0, 0, 12, 0) ) ) { RethrowException(); diff --git a/pcsx2/R5900OpcodeImpl.cpp b/pcsx2/R5900OpcodeImpl.cpp index 4e5b5307b4..23f6dee41c 100644 --- a/pcsx2/R5900OpcodeImpl.cpp +++ b/pcsx2/R5900OpcodeImpl.cpp @@ -914,12 +914,12 @@ void TLTU() { Console.Warning("TLTU Trap"); if (cpuRegs.GPR.r[_Rs_].UD[0] < cpu void TEQ() { Console.Warning("TEQ Trap"); if (cpuRegs.GPR.r[_Rs_].SD[0] == cpuRegs.GPR.r[_Rt_].SD[0]) throw R5900Exception::Trap(_TrapCode_); } void TNE() { Console.Warning("TNE Trap"); if (cpuRegs.GPR.r[_Rs_].SD[0] != cpuRegs.GPR.r[_Rt_].SD[0]) throw R5900Exception::Trap(_TrapCode_); } #else -void TGE() { Console.Warning("TGE Trap"); } -void TGEU() { Console.Warning("TGEU Trap"); } -void TLT() { Console.Warning("TLT Trap"); } -void TLTU() { Console.Warning("TLTU Trap"); } -void TEQ() { Console.Warning("TEQ Trap"); } -void TNE() { Console.Warning("TNE Trap"); } +void TGE() { } +void TGEU() { } +void TLT() { } +void TLTU() { } +void TEQ() { } +void TNE() { } #endif /********************************************************* @@ -934,12 +934,12 @@ void TNEI() { Console.Warning("TNEI Trap"); if (cpuRegs.GPR.r[_Rs_].SD[0] != _I void TGEIU() { Console.Warning("TGEIU Trap"); if (cpuRegs.GPR.r[_Rs_].UD[0] >= (u64)_Imm_) throw R5900Exception::Trap(); } void TLTIU() { Console.Warning("TLTIU Trap"); if (cpuRegs.GPR.r[_Rs_].UD[0] < (u64)_Imm_) throw R5900Exception::Trap(); } #else -void TGEI() { Console.Warning("TGEI Trap"); } -void TLTI() { Console.Warning("TLTI Trap"); } -void TEQI() { Console.Warning("TEQI Trap"); } -void TNEI() { Console.Warning("TNEI Trap"); } -void TGEIU() { Console.Warning("TGEIU Trap"); } -void TLTIU() { Console.Warning("TLTIU Trap"); } +void TGEI() { } +void TLTI() { } +void TEQI() { } +void TNEI() { } +void TGEIU() { } +void TLTIU() { } #endif /********************************************************* diff --git a/pcsx2/vtlb.cpp b/pcsx2/vtlb.cpp index 51e99a995a..120a8f5b07 100644 --- a/pcsx2/vtlb.cpp +++ b/pcsx2/vtlb.cpp @@ -233,7 +233,7 @@ static const char* _getModeStr( u32 mode ) // Generates a tlbMiss Exception static __forceinline void vtlb_Miss(u32 addr,u32 mode) { - //Console.Error( "vtlb miss : addr 0x%X, mode %d [%s]", addr, mode, _getModeStr(mode) ); + Console.Error( "vtlb miss : addr 0x%X, mode %d [%s]", addr, mode, _getModeStr(mode) ); //verify(false); throw R5900Exception::TLBMiss( addr, !!mode ); } @@ -242,7 +242,7 @@ static __forceinline void vtlb_Miss(u32 addr,u32 mode) // Eventually should generate a BusError exception. static __forceinline void vtlb_BusError(u32 addr,u32 mode) { - //Console.Error( "vtlb bus error : addr 0x%X, mode %d\n", addr, _getModeStr(mode) ); + Console.Error( "vtlb bus error : addr 0x%X, mode %d\n", addr, _getModeStr(mode) ); //verify(false); throw R5900Exception::BusError( addr, !!mode ); }