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

newVif: fixed a problem with the dynarec. fixes .hack gu rebirth. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2435 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
cottonvibes 2010-01-16 04:59:23 +00:00
parent 9914e05788
commit 1aa3f77dad
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pcsx2/x86/VifUnpackSSE_Dynarec.cpp
View File

@ -106,7 +106,7 @@ _f void VifUnpackSSE_Dynarec::SetMasks(int cS) const {
if ((cS>=4) && (m3&0xff000000)) xPSHUF.D(xmmCol3, xmmCol0, _v3); if ((cS>=4) && (m3&0xff000000)) xPSHUF.D(xmmCol3, xmmCol0, _v3);
if ((cS>=1) && (m3&0x000000ff)) xPSHUF.D(xmmCol0, xmmCol0, _v0); if ((cS>=1) && (m3&0x000000ff)) xPSHUF.D(xmmCol0, xmmCol0, _v0);
} }
//if (mask||mode) loadRowCol(v); //if (doMask||doMode) loadRowCol((nVifStruct&)v);
} }
void VifUnpackSSE_Dynarec::doMaskWrite(const xRegisterSSE& regX) const { void VifUnpackSSE_Dynarec::doMaskWrite(const xRegisterSSE& regX) const {
@ -173,14 +173,14 @@ static bool UsesTwoRegs[] =
}; };
void VifUnpackSSE_Dynarec::CompileRoutine() { void VifUnpackSSE_Dynarec::CompileRoutine() {
const int upkNum = v.vif->cmd & 0xf; const int upkNum = v.vif->cmd & 0xf;
const u8& vift = nVifT[upkNum]; const u8& vift = nVifT[upkNum];
const int cycleSize = isFill ? vB.cl : vB.wl; const int cycleSize = isFill ? vB.cl : vB.wl;
const int blockSize = isFill ? vB.wl : vB.cl; const int blockSize = isFill ? vB.wl : vB.cl;
const int skipSize = blockSize - cycleSize; const int skipSize = blockSize - cycleSize;
int vNum = v.vifRegs->num; int vNum = v.vifRegs->num;
vCL = v.vif->cl; vCL = v.vif->cl;
SetMasks(cycleSize); SetMasks(cycleSize);
@ -256,6 +256,7 @@ _f void dVifUnpack(int idx, u8 *data, u32 size, bool isFill) {
const nVifStruct& v = nVif[idx]; const nVifStruct& v = nVif[idx];
const u8 upkType = v.vif->cmd & 0x1f | ((!!v.vif->usn) << 5); const u8 upkType = v.vif->cmd & 0x1f | ((!!v.vif->usn) << 5);
const int doMask = v.vif->cmd & 0x10; const int doMask = v.vif->cmd & 0x10;
const int doMode = (doMask) ? 0 : (u8&)v.vifRegs->mode;
const int cycle_cl = v.vifRegs->cycle.cl; const int cycle_cl = v.vifRegs->cycle.cl;
const int cycle_wl = v.vifRegs->cycle.wl; const int cycle_wl = v.vifRegs->cycle.wl;
@ -265,8 +266,8 @@ _f void dVifUnpack(int idx, u8 *data, u32 size, bool isFill) {
if (v.vif->cl >= blockSize) v.vif->cl = 0; if (v.vif->cl >= blockSize) v.vif->cl = 0;
_vBlock.upkType = upkType; _vBlock.upkType = upkType;
_vBlock.num = *(u8*)&v.vifRegs->num; _vBlock.num = (u8&)v.vifRegs->num;
_vBlock.mode = *(u8*)&v.vifRegs->mode; _vBlock.mode = doMode;
_vBlock.scl = v.vif->cl; _vBlock.scl = v.vif->cl;
_vBlock.cl = cycle_cl; _vBlock.cl = cycle_cl;
_vBlock.wl = cycle_wl; _vBlock.wl = cycle_wl;