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

Minor optimizations to newVifUnpack. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2356 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-12-18 17:49:04 +00:00
parent 89b2ecb4fa
commit 79e07edc9f
2 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcsx2/Vif.h
View File

@ -223,8 +223,10 @@ extern "C"
extern u32* _vifCol;
}
#define vif0Regs ((VIFregisters*)&PS2MEM_HW[0x3800])
#define vif1Regs ((VIFregisters*)&PS2MEM_HW[0x3c00])
#define vif0RegsRef ((VIFregisters&)PS2MEM_HW[0x3800])
#define vif1RegsRef ((VIFregisters&)PS2MEM_HW[0x3c00])
#define vif0Regs (&vif0RegsRef)
#define vif1Regs (&vif1RegsRef)
extern void dmaVIF0();
extern void dmaVIF1();

37
pcsx2/x86/newVif_Unpack.inl
View File

@ -35,17 +35,24 @@ int nVifUnpack(int idx, u32 *data) {
return ret;
}
_f u8* setVUptr(int idx, int offset) {
return (u8*)(nVif[idx].VU->Mem + (offset & nVif[idx].vuMemLimit));
_f u8* setVUptr(int vuidx, const u8* vuMemBase, int offset) {
return (u8*)(vuMemBase + ( offset & (vuidx ? 0x3ff0 : 0xff0) ));
}
_f void incVUptr(int idx, u8* &ptr, int amount) {
_f void incVUptr(int vuidx, u8* &ptr, const u8* vuMemBase, int amount) {
pxAssert( ((uptr)ptr & 0xf) == 0 ); // alignment check
ptr += amount;
int diff = ptr - nVif[idx].vuMemEnd;
int diff = ptr - (vuMemBase + (vuidx ? 0x4000 : 0x1000));
if (diff >= 0) {
ptr = nVif[idx].VU->Mem + diff;
ptr = (u8*)(vuMemBase + diff);
}
if ((uptr)ptr & 0xf) DevCon.WriteLn("unaligned wtf :(");
}
_f void incVUptrBy16(int vuidx, u8* &ptr, const u8* vuMemBase) {
pxAssert( ((uptr)ptr & 0xf) == 0 ); // alignment check
ptr += 16;
if( ptr == (vuMemBase + (vuidx ? 0x4000 : 0x1000)) )
ptr -= (vuidx ? 0x4000 : 0x1000);
}
static u32 oldMaskIdx = -1;
@ -130,7 +137,10 @@ __releaseinline void __fastcall _nVifUnpackLoop(u8 *data, u32 size) {
const VIFUnpackFuncTable& ft = VIFfuncTable[upkNum];
UNPACKFUNCTYPE func = usn ? ft.funcU : ft.funcS;
u8* dest = setVUptr(idx, vif->tag.addr);
// Cache vuMemBase to a local var because the VU1's is a dereferenced pointer that
// mucks up compiler optimizations on the internal loops. >_< --air
const u8* vuMemBase = (idx ? VU1 : VU0).Mem;
u8* dest = setVUptr(idx, vuMemBase, vif->tag.addr);
if (vif->cl >= blockSize) vif->cl = 0;
@ -146,26 +156,27 @@ __releaseinline void __fastcall _nVifUnpackLoop(u8 *data, u32 size) {
// Opt note: removing this min check (which isn't needed right now?) is +1%
// or more. Just something to keep in mind. :) --air
fnbase[0/*aMin(vif->cl, 4)*/](dest, data);
fnbase[aMin(vif->cl, 4)](dest, data);
}
data += ft.gsize;
size -= ft.gsize;
if( IsDevBuild ) size -= ft.gsize; // only used below for assertion checking
vifRegs->num--;
incVUptr(idx, dest, 16);
incVUptrBy16(idx, dest, vuMemBase);
if (++vif->cl == blockSize) vif->cl = 0;
}
else if (isFill) {
func((u32*)dest, (u32*)data);
vifRegs->num--;
incVUptr(idx, dest, 16);
incVUptrBy16(idx, dest, vuMemBase);
if (++vif->cl == blockSize) vif->cl = 0;
}
else {
incVUptr(idx, dest, 16 * skipSize);
incVUptr(idx, dest, vuMemBase, 16 * skipSize);
vif->cl = 0;
}
}
//if (size > 0) DevCon.WriteLn("size = %d", size);
pxAssertDev( size == 0, "Mismatched VIFunpack size specified." );
}
typedef void (__fastcall* Fnptr_VifUnpackLoop)(u8 *data, u32 size);