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

vif: move back the cache seach in the unpack function 

Avoid the various move to return the value (actually due to the pointer)
This commit is contained in:
Gregory Hainaut 2016-12-18 13:43:40 +01:00
parent e4c2c53b19
commit ef75b36013
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pcsx2/x86/newVif_Dynarec.cpp
View File

@ -272,16 +272,8 @@ static u16 dVifComputeLength(uint cl, uint wl, u8 num, bool isFill) {
return std::min(length, 0xFFFFu);
}
_vifT __fi void dVifCompile(nVifBlock& block, bool isFill) {
_vifT __fi nVifBlock* dVifCompile(nVifBlock& block, bool isFill) {
nVifStruct& v = nVif[idx];
nVifBlock* b = v.vifBlocks.find(block);
// Cache hit
if (likely(b != nullptr)) {
block.startPtr = b->startPtr;
block.length = b->length;
return;
}
// Check size before the compilation
if (v.recWritePtr > (v.recReserve->GetPtrEnd() - _256kb)) {
@ -303,7 +295,7 @@ _vifT __fi void dVifCompile(nVifBlock& block, bool isFill) {
Perf::vif.map((uptr)v.recWritePtr, xGetPtr() - v.recWritePtr, block.upkType /* FIXME ideally a key*/);
v.recWritePtr = xGetPtr();
return;
return █
}
_vifT __fi void dVifUnpack(const u8* data, bool isFill) {
@ -337,7 +329,11 @@ _vifT __fi void dVifUnpack(const u8* data, bool isFill) {
// doMask >> 4, doMask ? wxsFormat( L"0x%08x", block.mask ).c_str() : L"ignored"
//);
dVifCompile<idx>(block, isFill);
// Seach in cache before trying to compile the block
nVifBlock* b = v.vifBlocks.find(block);
if (unlikely(b == nullptr)) {
b = dVifCompile<idx>(block, isFill);
}
{ // Execute the block
const VURegs& VU = vuRegs[idx];
@ -346,9 +342,9 @@ _vifT __fi void dVifUnpack(const u8* data, bool isFill) {
u8* startmem = VU.Mem + (vif.tag.addr & (vuMemLimit-0x10));
u8* endmem = VU.Mem + vuMemLimit;
if (likely((startmem + block.length) <= endmem)) {
if (likely((startmem + b->length) <= endmem)) {
// No wrapping, you can run the fast dynarec
((nVifrecCall)block.startPtr)((uptr)startmem, (uptr)data);
((nVifrecCall)b->startPtr)((uptr)startmem, (uptr)data);
} else {
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);