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

VI regs needed padding to make them 128bit VU0 maps VU1's VI regs as 128bits to addr 0x4xx0 in VU0 mem, with only lower 16 bits valid, and the upper 112bits are hardwired to 0. 

i changed the 2 functions that deal with VU mem addresses to reflect the changes (GET_VU_MEM() and recVUTransformAddr())
they also had a bug where they weren't mapping VU1's VF regs to 0x4000.

i think i got all the VU mem functions that needed to be modified, if games break with this revision then we know i missed one ><

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@576 a6443dda-0b58-4228-96e9-037be469359c
This commit is contained in:
cottonvibes 2009-01-12 04:19:18 +00:00 committed by Gregory Hainaut
parent 2821b483bf
commit d6383a4a04
2 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pcsx2/VU.h
View File

@ -66,14 +66,18 @@ typedef union {
s8 SC[16]; s8 SC[16];
} VECTOR; } VECTOR;
typedef union { typedef struct {
float F; union {
s32 SL; float F;
u32 UL; s32 SL;
s16 SS[2]; u32 UL;
u16 US[2]; s16 SS[2];
s8 SC[4]; u16 US[2];
u8 UC[4]; s8 SC[4];
u8 UC[4];
};
u32 padding[3]; // needs padding to make them 128bit; VU0 maps VU1's VI regs as 128bits to addr 0x4xx0 in
// VU0 mem, with only lower 16 bits valid, and the upper 112bits are hardwired to 0 (cottonvibes)
} REG_VI; } REG_VI;
#define VUFLAG_BREAKONMFLAG 0x00000001 #define VUFLAG_BREAKONMFLAG 0x00000001
@ -106,8 +110,8 @@ struct fmacPipe {
}; };
struct VURegs { struct VURegs {
VECTOR VF[32]; VECTOR VF[32]; // VF and VI need to be first in this struct for proper mapping
REG_VI VI[32]; REG_VI VI[32]; // needs to be 128bit x 32 (cottonvibes)
VECTOR ACC; VECTOR ACC;
REG_VI q; REG_VI q;
REG_VI p; REG_VI p;
@ -182,9 +186,9 @@ static __forceinline u32* GET_VU_MEM(VURegs* VU, u32 addr)
{ {
if( VU == g_pVU1 ) return (u32*)(VU1.Mem+(addr&0x3fff)); if( VU == g_pVU1 ) return (u32*)(VU1.Mem+(addr&0x3fff));
if( addr >= 0x4200 ) return &VU1.VI[(addr>>2)&0x1f].UL; if( addr >= 0x4000 ) return (u32*)(VU0.Mem+(addr&0x43f0)); // get VF and VI regs (they're mapped to 0x4xx0 in VU0 mem!)
return (u32*)(VU0.Mem+(addr&0x0fff)); return (u32*)(VU0.Mem+(addr&0x0fff)); // for addr 0x0000 to 0x4000 just wrap around
} }

19
pcsx2/x86/iVUmicroLower.cpp
View File

@ -683,19 +683,15 @@ int recVUTransformAddr(int x86reg, VURegs* VU, int vireg, int imm)
AND32ItoR(EAX, 0x3fff); AND32ItoR(EAX, 0x3fff);
} }
else { else {
// if addr >= 4200, reads integers CMP32ItoR(EAX, 0x400);
CMP32ItoR(EAX, 0x420); pjmp[0] = JL8(0); // if addr >= 0x4000, reads VU1's VF regs and VI regs
pjmp[0] = JL8(0); AND32ItoR(EAX, 0x43f);
AND32ItoR(EAX, 0x1f); pjmp[1] = JMP8(0);
SHL32ItoR(EAX, 2);
OR32ItoR(EAX, 0x4200);
pjmp[1] = JMP8(0);
x86SetJ8(pjmp[0]); x86SetJ8(pjmp[0]);
SHL32ItoR(EAX, 4); AND32ItoR(EAX, 0xfff); // if addr < 0x4000, wrap around every 0xfff
AND32ItoR(EAX, 0xfff); // can be removed
x86SetJ8(pjmp[1]); x86SetJ8(pjmp[1]);
SHL32ItoR(EAX, 4); // multiply by 16 (shift left by 4)
} }
return EAX; return EAX;
@ -1029,7 +1025,6 @@ void recVUMI_SQI(VURegs *VU, int info)
else { else {
int ftreg = ALLOCVI(_Ft_, MODE_READ|MODE_WRITE); int ftreg = ALLOCVI(_Ft_, MODE_READ|MODE_WRITE);
_saveEAX(VU, recVUTransformAddr(ftreg, VU, _Ft_, 0), (uptr)VU->Mem, info); _saveEAX(VU, recVUTransformAddr(ftreg, VU, _Ft_, 0), (uptr)VU->Mem, info);
ADD16ItoR( ftreg, 1 ); ADD16ItoR( ftreg, 1 );
} }
} }