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

vif: inline dVifsetVUptr function 

It avoid a double cmp/jmp on the dynarec/interpreter mode.
This commit is contained in:
Gregory Hainaut 2016-12-16 11:58:33 +01:00
parent 6ae082dab2
commit e4c2c53b19
1 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pcsx2/x86/newVif_Dynarec.cpp
View File

@ -272,23 +272,6 @@ static u16 dVifComputeLength(uint cl, uint wl, u8 num, bool isFill) {
return std::min(length, 0xFFFFu); return std::min(length, 0xFFFFu);
} }
_vifT static __fi u8* dVifsetVUptr(u16 length) {
vifStruct& vif = MTVU_VifX;
const VURegs& VU = vuRegs[idx];
const uint vuMemLimit = idx ? 0x4000 : 0x1000;
u8* startmem = VU.Mem + (vif.tag.addr & (vuMemLimit-0x10));
u8* endmem = VU.Mem + vuMemLimit;
if (likely((startmem + length) <= endmem)) {
return startmem;
}
//Console.WriteLn("nVif%x - VU Mem Ptr Overflow; falling back to interpreter. Start = %x End = %x num = %x, wl = %x, cl = %x", v.idx, vif.tag.addr, vif.tag.addr + (_vBlock.num * 16), _vBlock.num, wl, cl);
return NULL; // Fall Back to Interpreters which have wrap-around logic
}
_vifT __fi void dVifCompile(nVifBlock& block, bool isFill) { _vifT __fi void dVifCompile(nVifBlock& block, bool isFill) {
nVifStruct& v = nVif[idx]; nVifStruct& v = nVif[idx];
nVifBlock* b = v.vifBlocks.find(block); nVifBlock* b = v.vifBlocks.find(block);
@ -356,14 +339,22 @@ _vifT __fi void dVifUnpack(const u8* data, bool isFill) {
dVifCompile<idx>(block, isFill); dVifCompile<idx>(block, isFill);
// Run either the dynarec or the interpreter (if complex wrapping) { // Execute the block
if (u8* dest = dVifsetVUptr<idx>(block.length)) { const VURegs& VU = vuRegs[idx];
//DevCon.WriteLn("Running Recompiled Block!"); const uint vuMemLimit = idx ? 0x4000 : 0x1000;
((nVifrecCall)block.startPtr)((uptr)dest, (uptr)data);
u8* startmem = VU.Mem + (vif.tag.addr & (vuMemLimit-0x10));
u8* endmem = VU.Mem + vuMemLimit;
if (likely((startmem + block.length) <= endmem)) {
// No wrapping, you can run the fast dynarec
((nVifrecCall)block.startPtr)((uptr)startmem, (uptr)data);
} else { } else {
VIF_LOG("Running Interpreter Block"); VIF_LOG("Running Interpreter Block: nVif%x - VU Mem Ptr Overflow; falling back to interpreter. Start = %x End = %x num = %x, wl = %x, cl = %x",
v.idx, vif.tag.addr, vif.tag.addr + (block.num * 16), block.num, block.wl, block.cl);
_nVifUnpack(idx, data, vifRegs.mode, isFill); _nVifUnpack(idx, data, vifRegs.mode, isFill);
} }
}
} }
template void dVifUnpack<0>(const u8* data, bool isFill); template void dVifUnpack<0>(const u8* data, bool isFill);