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

Some various things. 

Fixed Console spam in MGS3, made the MTGS startup timeout longer (as per request), re-added the vtlb miss warnings.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2682 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
ramapcsx2 2010-03-08 02:55:52 +00:00
parent a7aac122d6
commit b2078a0243
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2/MTGS.cpp
View File

@ -974,14 +974,14 @@ void SysMtgsThread::WaitForOpen()
// Two-phase timeout on MTGS opening, so that possible errors are handled // 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 // 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). // GS plugin can be very stubborned, especially in debug mode builds).
if( !m_sem_OpenDone.Wait( wxTimeSpan(0, 0, 2, 0) ) ) if( !m_sem_OpenDone.Wait( wxTimeSpan(0, 0, 2, 0) ) )
{ {
RethrowException(); RethrowException();
if( !m_sem_OpenDone.Wait( wxTimeSpan(0, 0, 4, 0) ) ) if( !m_sem_OpenDone.Wait( wxTimeSpan(0, 0, 12, 0) ) )
{ {
RethrowException(); RethrowException();

24
pcsx2/R5900OpcodeImpl.cpp
View File

@ -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 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_); } void TNE() { Console.Warning("TNE Trap"); if (cpuRegs.GPR.r[_Rs_].SD[0] != cpuRegs.GPR.r[_Rt_].SD[0]) throw R5900Exception::Trap(_TrapCode_); }
#else #else
void TGE() { Console.Warning("TGE Trap"); } void TGE() { }
void TGEU() { Console.Warning("TGEU Trap"); } void TGEU() { }
void TLT() { Console.Warning("TLT Trap"); } void TLT() { }
void TLTU() { Console.Warning("TLTU Trap"); } void TLTU() { }
void TEQ() { Console.Warning("TEQ Trap"); } void TEQ() { }
void TNE() { Console.Warning("TNE Trap"); } void TNE() { }
#endif #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 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(); } void TLTIU() { Console.Warning("TLTIU Trap"); if (cpuRegs.GPR.r[_Rs_].UD[0] < (u64)_Imm_) throw R5900Exception::Trap(); }
#else #else
void TGEI() { Console.Warning("TGEI Trap"); } void TGEI() { }
void TLTI() { Console.Warning("TLTI Trap"); } void TLTI() { }
void TEQI() { Console.Warning("TEQI Trap"); } void TEQI() { }
void TNEI() { Console.Warning("TNEI Trap"); } void TNEI() { }
void TGEIU() { Console.Warning("TGEIU Trap"); } void TGEIU() { }
void TLTIU() { Console.Warning("TLTIU Trap"); } void TLTIU() { }
#endif #endif
/********************************************************* /*********************************************************

4
pcsx2/vtlb.cpp
View File

@ -233,7 +233,7 @@ static const char* _getModeStr( u32 mode )
// Generates a tlbMiss Exception // Generates a tlbMiss Exception
static __forceinline void vtlb_Miss(u32 addr,u32 mode) 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); //verify(false);
throw R5900Exception::TLBMiss( addr, !!mode ); throw R5900Exception::TLBMiss( addr, !!mode );
} }
@ -242,7 +242,7 @@ static __forceinline void vtlb_Miss(u32 addr,u32 mode)
// Eventually should generate a BusError exception. // Eventually should generate a BusError exception.
static __forceinline void vtlb_BusError(u32 addr,u32 mode) 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); //verify(false);
throw R5900Exception::BusError( addr, !!mode ); throw R5900Exception::BusError( addr, !!mode );
} }