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

More Fixes 

The possibility of the RSP instruction at address 0xFFC being JR was
never accounted for. This fixes Wave Race and Star Wars - Shadow of the
Empire.

The accumulator analysis was wrong, which broke games like Mario No
Photopie.
This commit is contained in:
LegendOfDragoon 2015-01-11 19:49:04 -08:00
parent 43c6017ddb
commit 02fe2e7241
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/RSP/Recompiler Analysis.c
View File

@ -247,20 +247,25 @@ DWORD WriteToAccum2 (int Location, int PC, BOOL RecursiveCall) {
case RSP_VECTOR_VMADL: case RSP_VECTOR_VMADL:
case RSP_VECTOR_VMADM: case RSP_VECTOR_VMADM:
case RSP_VECTOR_VMADN: case RSP_VECTOR_VMADN:
case RSP_VECTOR_VMADH:
return TRUE; return TRUE;
case RSP_VECTOR_VMADH:
if (Location == Low16BitAccum) { break; }
return TRUE;
case RSP_VECTOR_VABS: case RSP_VECTOR_VABS:
case RSP_VECTOR_VADD: case RSP_VECTOR_VADD:
case RSP_VECTOR_VADDC: case RSP_VECTOR_VADDC:
case RSP_VECTOR_VSUB: case RSP_VECTOR_VSUB:
case RSP_VECTOR_VSUBC: case RSP_VECTOR_VSUBC:
case RSP_VECTOR_VAND: case RSP_VECTOR_VAND:
case RSP_VECTOR_VNAND:
case RSP_VECTOR_VOR: case RSP_VECTOR_VOR:
case RSP_VECTOR_VNOR:
case RSP_VECTOR_VXOR: case RSP_VECTOR_VXOR:
case RSP_VECTOR_VNXOR: case RSP_VECTOR_VNXOR:
/* since these modify the accumulator lower-16 bits we can */ /* since these modify the accumulator lower-16 bits we can */
/* safely assume these 'reset' the accumulator no matter what */ /* safely assume these 'reset' the accumulator no matter what */
return FALSE; // return FALSE;
case RSP_VECTOR_VCR: case RSP_VECTOR_VCR:
case RSP_VECTOR_VCH: case RSP_VECTOR_VCH:
case RSP_VECTOR_VCL: case RSP_VECTOR_VCL:
@ -272,11 +277,11 @@ DWORD WriteToAccum2 (int Location, int PC, BOOL RecursiveCall) {
case RSP_VECTOR_VLT: case RSP_VECTOR_VLT:
case RSP_VECTOR_VEQ: case RSP_VECTOR_VEQ:
case RSP_VECTOR_VGE: case RSP_VECTOR_VGE:
case RSP_VECTOR_VMRG:
if (Location == Low16BitAccum) { return FALSE; } if (Location == Low16BitAccum) { return FALSE; }
break; break;
case RSP_VECTOR_VMOV: case RSP_VECTOR_VMOV:
case RSP_VECTOR_VMRG:
break; break;
case RSP_VECTOR_VSAW: case RSP_VECTOR_VSAW:
return TRUE; return TRUE;

2
Source/RSP/Recompiler CPU.c
View File

@ -878,7 +878,7 @@ void CompilerRSPBlock ( void ) {
CompilePC += 4; CompilePC += 4;
break; break;
} }
} while ( NextInstruction != FINISH_BLOCK && CompilePC < 0x1000); } while (NextInstruction != FINISH_BLOCK && (CompilePC < 0x1000 || NextInstruction == DELAY_SLOT));
CPU_Message("==== end of recompiled code ===="); CPU_Message("==== end of recompiled code ====");
if (Compiler.bReOrdering == TRUE) { if (Compiler.bReOrdering == TRUE) {