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

Magna Carta fix is now a toggable gamefix, since it broke Crash Bandicoot. 

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@184 a6443dda-0b58-4228-96e9-037be469359c
This commit is contained in:
cottonvibes 2008-10-09 23:29:02 +00:00 committed by Gregory Hainaut
parent 800a634dc2
commit dcec162818
6 changed files with 40 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/Misc.h
View File

@ -70,6 +70,8 @@
#define CHECK_SLOWDVD (Config.GameFixes & 0x1) // Slow DVD access times, for games that are strict about them (Tales of the Abyss) #define CHECK_SLOWDVD (Config.GameFixes & 0x1) // Slow DVD access times, for games that are strict about them (Tales of the Abyss)
#define CHECK_FPUCLAMPHACK (Config.GameFixes & 0x4) // Special Fix for Tekken 5, different clamping for FPU (sets NaN to zero; doesn't clamp infinities) #define CHECK_FPUCLAMPHACK (Config.GameFixes & 0x4) // Special Fix for Tekken 5, different clamping for FPU (sets NaN to zero; doesn't clamp infinities)
#define CHECK_VUCLIPHACK (Config.GameFixes & 0x2) // Special Fix for GoW, updates the clipflag differently in recVUMI_CLIP() (note: turning this hack on, breaks Rockstar games) #define CHECK_VUCLIPHACK (Config.GameFixes & 0x2) // Special Fix for GoW, updates the clipflag differently in recVUMI_CLIP() (note: turning this hack on, breaks Rockstar games)
#define CHECK_VUBRANCHHACK (Config.GameFixes & 0x8) // Special Fix for Magna Carta (note: Breaks Crash Bandicoot)
//------------ DEFAULT sseMXCSR VALUES!!! --------------- //------------ DEFAULT sseMXCSR VALUES!!! ---------------
#define DEFAULT_sseMXCSR 0x9fc0 //disable all exception, round to 0, flush to 0 #define DEFAULT_sseMXCSR 0x9fc0 //disable all exception, round to 0, flush to 0
#define DEFAULT_sseVUMXCSR 0x7f80 //disable all exception #define DEFAULT_sseVUMXCSR 0x7f80 //disable all exception

2
pcsx2/windows/WinMain.c
View File

@ -728,6 +728,7 @@ BOOL APIENTRY GameFixes(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
if(Config.GameFixes & 0x1) CheckDlgButton(hDlg, IDC_GAMEFIX1, TRUE); if(Config.GameFixes & 0x1) CheckDlgButton(hDlg, IDC_GAMEFIX1, TRUE);
if(Config.GameFixes & 0x2) CheckDlgButton(hDlg, IDC_GAMEFIX2, TRUE); if(Config.GameFixes & 0x2) CheckDlgButton(hDlg, IDC_GAMEFIX2, TRUE);
if(Config.GameFixes & 0x4) CheckDlgButton(hDlg, IDC_GAMEFIX3, TRUE); if(Config.GameFixes & 0x4) CheckDlgButton(hDlg, IDC_GAMEFIX3, TRUE);
if(Config.GameFixes & 0x8) CheckDlgButton(hDlg, IDC_GAMEFIX4, TRUE);
return TRUE; return TRUE;
case WM_COMMAND: case WM_COMMAND:
@ -737,6 +738,7 @@ BOOL APIENTRY GameFixes(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
Config.GameFixes |= IsDlgButtonChecked(hDlg, IDC_GAMEFIX1) ? 0x1 : 0; Config.GameFixes |= IsDlgButtonChecked(hDlg, IDC_GAMEFIX1) ? 0x1 : 0;
Config.GameFixes |= IsDlgButtonChecked(hDlg, IDC_GAMEFIX2) ? 0x2 : 0; Config.GameFixes |= IsDlgButtonChecked(hDlg, IDC_GAMEFIX2) ? 0x2 : 0;
Config.GameFixes |= IsDlgButtonChecked(hDlg, IDC_GAMEFIX3) ? 0x4 : 0; Config.GameFixes |= IsDlgButtonChecked(hDlg, IDC_GAMEFIX3) ? 0x4 : 0;
Config.GameFixes |= IsDlgButtonChecked(hDlg, IDC_GAMEFIX4) ? 0x8 : 0;
SaveConfig(); SaveConfig();

2
pcsx2/windows/pcsx2.rc
View File

@ -90,6 +90,8 @@ BEGIN
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,58,253,10 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,58,253,10
CONTROL "Slow DVD access (fixes Tales of the Abyss)",IDC_GAMEFIX1, CONTROL "Slow DVD access (fixes Tales of the Abyss)",IDC_GAMEFIX1,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,44,252,10 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,44,252,10
CONTROL "VU Branch Hack - Special fix for Magna Carta; Breaks Crash Bandicoot!",IDC_GAMEFIX4,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,84,252,10
END END

1
pcsx2/windows/resource.h
View File

@ -626,6 +626,7 @@
#define IDC_FPUCLAMPHACK 1303 #define IDC_FPUCLAMPHACK 1303
#define IDC_VU_CHECK2 1303 #define IDC_VU_CHECK2 1303
#define IDC_FPU_FLAGS 1303 #define IDC_FPU_FLAGS 1303
#define IDC_GAMEFIX4 1303
#define IDC_ROUNDMODE 1304 #define IDC_ROUNDMODE 1304
#define IDC_SOUNDHACK2 1304 #define IDC_SOUNDHACK2 1304
#define IDC_ESCHACK 1304 #define IDC_ESCHACK 1304

38
pcsx2/x86/iVUzerorec.cpp
View File

@ -93,10 +93,6 @@ using namespace std;
#define SUPERVU_VIBRANCHDELAY // when integers are modified right before a branch that uses the integer, #define SUPERVU_VIBRANCHDELAY // when integers are modified right before a branch that uses the integer,
// the old integer value is used in the branch // the old integer value is used in the branch
// fixes kh2 // fixes kh2
#ifdef SUPERVU_VIBRANCHDELAY
//#define SUPERVU_VIBRANCHDELAY2 // stores the old integer value for SUPERVU_VIBRANCHDELAY into s_VIBranchDelay; when this is not-defined, we just return (uptr)&VU->VI[reg] instead.
// Note: this method breaks Magna Carta.
#endif
#define SUPERVU_PROPAGATEFLAGS // the correct behavior of VUs, for some reason superman breaks gfx with it on... #define SUPERVU_PROPAGATEFLAGS // the correct behavior of VUs, for some reason superman breaks gfx with it on...
@ -468,12 +464,8 @@ static u32 s_StatusRead = 0, s_MACRead = 0, s_ClipRead = 0; // read addrs
static u32 s_PrevStatusWrite = 0, s_PrevMACWrite = 0, s_PrevClipWrite = 0, s_PrevIWrite = 0; static u32 s_PrevStatusWrite = 0, s_PrevMACWrite = 0, s_PrevClipWrite = 0, s_PrevIWrite = 0;
static u32 s_WriteToReadQ = 0; static u32 s_WriteToReadQ = 0;
#ifdef SUPERVU_VIBRANCHDELAY2 static u32 s_VIBranchDelay = 0; //Value of register to use in a vi branch delayed situation
static u32 s_VIBranchDelay = 0;
//Value of register to use in a vi branch delayed situation
//If SUPERVU_VIBRANCHDELAY2 is not defined, we just return (uptr)&VU->VI[reg]
//Test this with Kingdom Hearts II and Magna Carta
#endif
extern "C" { extern "C" {
u32 s_TotalVUCycles; // total cycles since start of program execution u32 s_TotalVUCycles; // total cycles since start of program execution
@ -515,14 +507,12 @@ u32 SuperVUGetVIAddr(int reg, int read)
} }
#ifdef SUPERVU_VIBRANCHDELAY #ifdef SUPERVU_VIBRANCHDELAY
if( read != 0 && (s_pCurInst->regs[0].pipe == VUPIPE_BRANCH) && s_pCurInst->vicached >= 0 && s_pCurInst->vicached == reg ) { if( (read != 0) && (s_pCurInst->regs[0].pipe == VUPIPE_BRANCH) && (s_pCurInst->vicached >= 0) && (s_pCurInst->vicached == reg) ) {
// test for branch delays if (!CHECK_VUBRANCHHACK) {
#ifdef SUPERVU_VIBRANCHDELAY2 return (uptr)&s_VIBranchDelay; // test for branch delays
return (uptr)&s_VIBranchDelay; }
#else else SysPrintf("VIBRANCHDELAY hack! Please report if this breaks anything (rama)\n");
SysPrintf("VIBRANCHDELAY! Report if this breaks anything (rama)\n"); }
#endif
}
#endif #endif
return (uptr)&VU->VI[reg]; return (uptr)&VU->VI[reg];
@ -3674,12 +3664,12 @@ void VuInstruction::Recompile(list<VuInstruction>::iterator& itinst, u32 vuxyz)
if( s_JumpX86 > 0 ) x86regs[s_JumpX86].needed = 1; if( s_JumpX86 > 0 ) x86regs[s_JumpX86].needed = 1;
if( s_ScheduleXGKICK && s_XGKICKReg > 0 ) x86regs[s_XGKICKReg].needed = 1; if( s_ScheduleXGKICK && s_XGKICKReg > 0 ) x86regs[s_XGKICKReg].needed = 1;
#ifdef SUPERVU_VIBRANCHDELAY2 #ifdef SUPERVU_VIBRANCHDELAY
if( type & INST_CACHE_VI ) { if ( (!CHECK_VUBRANCHHACK) && (type & INST_CACHE_VI) ) {
assert( vicached >= 0 ); assert( vicached >= 0 );
int cachedreg = _allocX86reg(-1, X86TYPE_VI|(s_vu?X86TYPE_VU1:0), vicached, MODE_READ); int cachedreg = _allocX86reg(-1, X86TYPE_VI|(s_vu?X86TYPE_VU1:0), vicached, MODE_READ);
MOV32RtoM((uptr)&s_VIBranchDelay, cachedreg); MOV32RtoM((uptr)&s_VIBranchDelay, cachedreg);
} }
#endif #endif
// check if inst before branch and the write is the same as the read in the branch (wipeout) // check if inst before branch and the write is the same as the read in the branch (wipeout)

45
pcsx2/x86/ix86-32/iR5900AritImm.c
View File

@ -65,39 +65,34 @@ void recADDI_(int info)
EEINST_SETSIGNEXT(_Rt_); EEINST_SETSIGNEXT(_Rt_);
EEINST_SETSIGNEXT(_Rs_); EEINST_SETSIGNEXT(_Rs_);
if( info & PROCESS_EE_MMX ) { if ( info & PROCESS_EE_MMX ) {
if( _Imm_ != 0 ) { if ( _Imm_ != 0 ) {
u32* ptempmem = recAllocStackMem(8, 8); u32* ptempmem = recAllocStackMem(8, 8);
ptempmem[0] = (s32)_Imm_; ptempmem[0] = (s32)_Imm_;
ptempmem[1] = 0; ptempmem[1] = 0;
if( EEREC_T != EEREC_S ) MOVQRtoR(EEREC_T, EEREC_S); if ( EEREC_T != EEREC_S ) MOVQRtoR(EEREC_T, EEREC_S);
PADDDMtoR(EEREC_T, (u32)ptempmem); PADDDMtoR(EEREC_T, (u32)ptempmem);
if( EEINST_ISLIVE1(_Rt_) ) _signExtendGPRtoMMX(EEREC_T, _Rt_, 0); if ( EEINST_ISLIVE1(_Rt_) ) _signExtendGPRtoMMX(EEREC_T, _Rt_, 0);
else EEINST_RESETHASLIVE1(_Rt_); else EEINST_RESETHASLIVE1(_Rt_);
} }
else { else {
// just move and sign extend // just move and sign extend
if( !EEINST_HASLIVE1(_Rs_) ) { if ( !EEINST_HASLIVE1(_Rs_) ) {
if ( EEINST_ISLIVE1(_Rt_) ) _signExtendGPRMMXtoMMX(EEREC_T, _Rt_, EEREC_S, _Rs_);
if( EEINST_ISLIVE1(_Rt_) ) else EEINST_RESETHASLIVE1(_Rt_);
_signExtendGPRMMXtoMMX(EEREC_T, _Rt_, EEREC_S, _Rs_);
else
EEINST_RESETHASLIVE1(_Rt_);
}
else {
if( EEREC_T != EEREC_S ) MOVQRtoR(EEREC_T, EEREC_S);
} }
else if ( EEREC_T != EEREC_S ) MOVQRtoR(EEREC_T, EEREC_S);
} }
return; return;
} }
if( (g_pCurInstInfo->regs[_Rt_]&EEINST_MMX) && (_Rt_ != _Rs_) ) { if ( (g_pCurInstInfo->regs[_Rt_]&EEINST_MMX) && (_Rt_ != _Rs_) ) {
int rtreg = _allocMMXreg(-1, MMX_GPR+_Rt_, MODE_WRITE); int rtreg = _allocMMXreg(-1, MMX_GPR+_Rt_, MODE_WRITE);
SetMMXstate(); SetMMXstate();
if( _Imm_ != 0 ) { if ( _Imm_ != 0 ) {
u32* ptempmem = recAllocStackMem(8, 8); u32* ptempmem = recAllocStackMem(8, 8);
ptempmem[0] = (s32)_Imm_; ptempmem[0] = (s32)_Imm_;
ptempmem[1] = 0; ptempmem[1] = 0;
@ -105,33 +100,31 @@ void recADDI_(int info)
MOVDMtoMMX(rtreg, (int)&cpuRegs.GPR.r[ _Rs_ ].UL[ 0 ]); MOVDMtoMMX(rtreg, (int)&cpuRegs.GPR.r[ _Rs_ ].UL[ 0 ]);
PADDDMtoR(rtreg, (u32)ptempmem); PADDDMtoR(rtreg, (u32)ptempmem);
if( EEINST_ISLIVE1(_Rt_) ) _signExtendGPRtoMMX(rtreg, _Rt_, 0); if ( EEINST_ISLIVE1(_Rt_) ) _signExtendGPRtoMMX(rtreg, _Rt_, 0);
else EEINST_RESETHASLIVE1(_Rt_); else EEINST_RESETHASLIVE1(_Rt_);
} }
else { else {
// just move and sign extend // just move and sign extend
if( !EEINST_HASLIVE1(_Rs_) ) { if ( !EEINST_HASLIVE1(_Rs_) ) {
MOVDMtoMMX(rtreg, (int)&cpuRegs.GPR.r[ _Rs_ ].UL[ 0 ]); MOVDMtoMMX(rtreg, (int)&cpuRegs.GPR.r[ _Rs_ ].UL[ 0 ]);
if( EEINST_ISLIVE1(_Rt_) ) _signExtendGPRtoMMX(rtreg, _Rt_, 0); if ( EEINST_ISLIVE1(_Rt_) ) _signExtendGPRtoMMX(rtreg, _Rt_, 0);
else EEINST_RESETHASLIVE1(_Rt_); else EEINST_RESETHASLIVE1(_Rt_);
} }
else { else MOVQMtoR(rtreg, (int)&cpuRegs.GPR.r[ _Rs_ ].UL[ 0 ]);
MOVQMtoR(rtreg, (int)&cpuRegs.GPR.r[ _Rs_ ].UL[ 0 ]);
}
} }
} }
else { else {
if( _Rt_ == _Rs_ ) { if ( _Rt_ == _Rs_ ) {
ADD32ItoM((int)&cpuRegs.GPR.r[ _Rt_ ].UL[ 0 ], _Imm_); ADD32ItoM((int)&cpuRegs.GPR.r[ _Rt_ ].UL[ 0 ], _Imm_);
if( EEINST_ISLIVE1(_Rt_) ) _signExtendSFtoM( (int)&cpuRegs.GPR.r[ _Rt_ ].UL[ 1 ]); if ( EEINST_ISLIVE1(_Rt_) ) _signExtendSFtoM( (int)&cpuRegs.GPR.r[ _Rt_ ].UL[ 1 ]);
else EEINST_RESETHASLIVE1(_Rt_); else EEINST_RESETHASLIVE1(_Rt_);
} }
else { else {
MOV32MtoR( EAX, (int)&cpuRegs.GPR.r[ _Rs_ ].UL[ 0 ] ); MOV32MtoR( EAX, (int)&cpuRegs.GPR.r[ _Rs_ ].UL[ 0 ] );
if ( _Imm_ != 0 )
ADD32ItoR( EAX, _Imm_ );
if( EEINST_ISLIVE1(_Rt_) ) { if ( _Imm_ != 0 ) ADD32ItoR( EAX, _Imm_ );
if ( EEINST_ISLIVE1(_Rt_) ) {
CDQ( ); CDQ( );
MOV32RtoM( (int)&cpuRegs.GPR.r[ _Rt_ ].UL[ 0 ], EAX ); MOV32RtoM( (int)&cpuRegs.GPR.r[ _Rt_ ].UL[ 0 ], EAX );
MOV32RtoM( (int)&cpuRegs.GPR.r[ _Rt_ ].UL[ 1 ], EDX ); MOV32RtoM( (int)&cpuRegs.GPR.r[ _Rt_ ].UL[ 1 ], EDX );