From a0b42f069fe4cd8982d7b565f16df269fe9dce32 Mon Sep 17 00:00:00 2001 From: Ty Lamontagne Date: Mon, 24 Jun 2024 11:35:43 -0400 Subject: [PATCH] EE Cache: Fix PageMask reg usage when checking TLB entry cache mode --- pcsx2/vtlb.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pcsx2/vtlb.cpp b/pcsx2/vtlb.cpp index 4fa67cfcb1..c4d21f9164 100644 --- a/pcsx2/vtlb.cpp +++ b/pcsx2/vtlb.cpp @@ -29,6 +29,7 @@ #include "fmt/core.h" +#include #include #include #include @@ -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) { u32 mask; @@ -122,8 +132,7 @@ __inline int CheckCache(u32 addr) { 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)) { //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) { - mask = tlb[i].PageMask; - + mask = ConvertPageMask(tlb[i].PageMask); 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);