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

EE Cache: Fix PageMask reg usage when checking TLB entry cache mode

This commit is contained in:
Ty Lamontagne 2024-06-24 11:35:43 -04:00 committed by refractionpcsx2
parent c7e516b743
commit a0b42f069f
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pcsx2/vtlb.cpp
View File

@ -29,6 +29,7 @@
#include "fmt/core.h" #include "fmt/core.h"
#include <bit>
#include <map> #include <map>
#include <unordered_set> #include <unordered_set>
#include <unordered_map> #include <unordered_map>
@ -108,6 +109,15 @@ vtlb_private::VTLBVirtual::VTLBVirtual(VTLBPhysical phys, u32 paddr, u32 vaddr)
} }
} }
__inline int ConvertPageMask(u32 PageMask)
{
const u32 mask = std::popcount(PageMask >> 13);
pxAssertMsg (!((mask & 1) || mask > 12), "Invalid page mask for this TLB entry. EE cache doesn't know what to do here.");
return (1 << (12 + mask)) - 1;
}
__inline int CheckCache(u32 addr) __inline int CheckCache(u32 addr)
{ {
u32 mask; u32 mask;
@ -122,8 +132,7 @@ __inline int CheckCache(u32 addr)
{ {
if (((tlb[i].EntryLo1 & 0x38) >> 3) == 0x3) if (((tlb[i].EntryLo1 & 0x38) >> 3) == 0x3)
{ {
mask = tlb[i].PageMask; mask = ConvertPageMask(tlb[i].PageMask);
if ((addr >= tlb[i].PFN1) && (addr <= tlb[i].PFN1 + mask)) if ((addr >= tlb[i].PFN1) && (addr <= tlb[i].PFN1 + mask))
{ {
//DevCon.Warning("Yay! Cache check cache addr=%x, mask=%x, addr+mask=%x, VPN2=%x PFN0=%x", addr, mask, (addr & mask), tlb[i].VPN2, tlb[i].PFN0); //DevCon.Warning("Yay! Cache check cache addr=%x, mask=%x, addr+mask=%x, VPN2=%x PFN0=%x", addr, mask, (addr & mask), tlb[i].VPN2, tlb[i].PFN0);
@ -132,8 +141,7 @@ __inline int CheckCache(u32 addr)
} }
if (((tlb[i].EntryLo0 & 0x38) >> 3) == 0x3) if (((tlb[i].EntryLo0 & 0x38) >> 3) == 0x3)
{ {
mask = tlb[i].PageMask; mask = ConvertPageMask(tlb[i].PageMask);
if ((addr >= tlb[i].PFN0) && (addr <= tlb[i].PFN0 + mask)) if ((addr >= tlb[i].PFN0) && (addr <= tlb[i].PFN0 + mask))
{ {
//DevCon.Warning("Yay! Cache check cache addr=%x, mask=%x, addr+mask=%x, VPN2=%x PFN0=%x", addr, mask, (addr & mask), tlb[i].VPN2, tlb[i].PFN0); //DevCon.Warning("Yay! Cache check cache addr=%x, mask=%x, addr+mask=%x, VPN2=%x PFN0=%x", addr, mask, (addr & mask), tlb[i].VPN2, tlb[i].PFN0);