summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2021-07-04 20:47:04 +0200
committerJosJuice <josjuice@gmail.com>2021-08-04 23:04:02 +0200
commitc56526d5f8ddfb8e4895133bc013c216efe86d60 (patch)
treebb26327315023f78b95214bcb7214b7002891e84 /Source
parent234859e2f321d20704a637f9bef7ceee0346f319 (diff)
PowerPC: Keep track of write-through/cache-inhibited
One of the following commits will add emulation of a quirk that only happens when writing to memory which is mapped as write-through or cache-inhibited, so let's keep track of which memory is mapped in this way.
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/Core/PowerPC/MMU.cpp85
-rw-r--r--Source/Core/Core/PowerPC/MMU.h6
2 files changed, 62 insertions, 29 deletions
diff --git a/Source/Core/Core/PowerPC/MMU.cpp b/Source/Core/Core/PowerPC/MMU.cpp
index 3b49381d76..5a8d5e8051 100644
--- a/Source/Core/Core/PowerPC/MMU.cpp
+++ b/Source/Core/Core/PowerPC/MMU.cpp
@@ -106,6 +106,7 @@ struct TranslateAddressResult
PAGE_FAULT
} result;
u32 address;
+ bool wi; // Set to true if the view of memory is either write-through or cache-inhibited
bool Success() const { return result <= PAGE_TABLE_TRANSLATED; }
};
template <const XCheckTLBFlag flag>
@@ -1015,7 +1016,8 @@ u32 IsOptimizableMMIOAccess(u32 address, u32 access_size)
// Translate address
// If we also optimize for TLB mappings, we'd have to clear the
// JitCache on each TLB invalidation.
- if (!TranslateBatAddess(dbat_table, &address))
+ bool wi = false;
+ if (!TranslateBatAddess(dbat_table, &address, &wi))
return 0;
// Check whether the address is an aligned address of an MMIO register.
@@ -1037,7 +1039,8 @@ bool IsOptimizableGatherPipeWrite(u32 address)
// Translate address, only check BAT mapping.
// If we also optimize for TLB mappings, we'd have to clear the
// JitCache on each TLB invalidation.
- if (!TranslateBatAddess(dbat_table, &address))
+ bool wi = false;
+ if (!TranslateBatAddess(dbat_table, &address, &wi))
return false;
// Check whether the translated address equals the address in WPAR.
@@ -1206,18 +1209,20 @@ enum class TLBLookupResult
UpdateC
};
-static TLBLookupResult LookupTLBPageAddress(const XCheckTLBFlag flag, const u32 vpa, u32* paddr)
+static TLBLookupResult LookupTLBPageAddress(const XCheckTLBFlag flag, const u32 vpa, u32* paddr,
+ bool* wi)
{
const u32 tag = vpa >> HW_PAGE_INDEX_SHIFT;
TLBEntry& tlbe = ppcState.tlb[IsOpcodeFlag(flag)][tag & HW_PAGE_INDEX_MASK];
if (tlbe.tag[0] == tag)
{
+ UPTE2 PTE2;
+ PTE2.Hex = tlbe.pte[0];
+
// Check if C bit requires updating
if (flag == XCheckTLBFlag::Write)
{
- UPTE2 PTE2;
- PTE2.Hex = tlbe.pte[0];
if (PTE2.C == 0)
{
PTE2.C = 1;
@@ -1230,16 +1235,18 @@ static TLBLookupResult LookupTLBPageAddress(const XCheckTLBFlag flag, const u32
tlbe.recent = 0;
*paddr = tlbe.paddr[0] | (vpa & 0xfff);
+ *wi = (PTE2.WIMG & 0b1100) != 0;
return TLBLookupResult::Found;
}
if (tlbe.tag[1] == tag)
{
+ UPTE2 PTE2;
+ PTE2.Hex = tlbe.pte[0];
+
// Check if C bit requires updating
if (flag == XCheckTLBFlag::Write)
{
- UPTE2 PTE2;
- PTE2.Hex = tlbe.pte[1];
if (PTE2.C == 0)
{
PTE2.C = 1;
@@ -1252,6 +1259,7 @@ static TLBLookupResult LookupTLBPageAddress(const XCheckTLBFlag flag, const u32
tlbe.recent = 1;
*paddr = tlbe.paddr[1] | (vpa & 0xfff);
+ *wi = (PTE2.WIMG & 0b1100) != 0;
return TLBLookupResult::Found;
}
@@ -1286,14 +1294,14 @@ void InvalidateTLBEntry(u32 address)
}
// Page Address Translation
-static TranslateAddressResult TranslatePageAddress(const u32 address, const XCheckTLBFlag flag)
+static TranslateAddressResult TranslatePageAddress(const u32 address, const XCheckTLBFlag flag,
+ bool* wi)
{
// TLB cache
// This catches 99%+ of lookups in practice, so the actual page table entry code below doesn't
- // benefit
- // much from optimization.
+ // benefit much from optimization.
u32 translatedAddress = 0;
- TLBLookupResult res = LookupTLBPageAddress(flag, address, &translatedAddress);
+ TLBLookupResult res = LookupTLBPageAddress(flag, address, &translatedAddress, wi);
if (res == TLBLookupResult::Found)
return TranslateAddressResult{TranslateAddressResult::PAGE_TABLE_TRANSLATED, translatedAddress};
@@ -1368,6 +1376,8 @@ static TranslateAddressResult TranslatePageAddress(const u32 address, const XChe
if (res != TLBLookupResult::UpdateC)
UpdateTLBEntry(flag, PTE2, address);
+ *wi = (PTE2.WIMG & 0b1100) != 0;
+
return TranslateAddressResult{TranslateAddressResult::PAGE_TABLE_TRANSLATED,
(PTE2.RPN << 12) | offset};
}
@@ -1379,7 +1389,7 @@ static TranslateAddressResult TranslatePageAddress(const u32 address, const XChe
static void UpdateBATs(BatTable& bat_table, u32 base_spr)
{
// TODO: Separate BATs for MSR.PR==0 and MSR.PR==1
- // TODO: Handle PP/WIMG settings.
+ // TODO: Handle PP settings.
// TODO: Check how hardware reacts to overlapping BATs (including
// BATs which should cause a DSI).
// TODO: Check how hardware reacts to invalid BATs (bad mask etc).
@@ -1424,19 +1434,38 @@ static void UpdateBATs(BatTable& bat_table, u32 base_spr)
u32 physical_address = (batl.BRPN | j) << BAT_INDEX_SHIFT;
u32 virtual_address = (batu.BEPI | j) << BAT_INDEX_SHIFT;
- // The bottom bit is whether the translation is valid; the second
- // bit from the bottom is whether we can use the fastmem arena.
+ // BAT_MAPPED_BIT is whether the translation is valid
+ // BAT_PHYSICAL_BIT is whether we can use the fastmem arena
+ // BAT_WI_BIT is whether either W or I (of WIMG) is set
u32 valid_bit = BAT_MAPPED_BIT;
- if (Memory::m_pFakeVMEM && (physical_address & 0xFE000000) == 0x7E000000)
- valid_bit |= BAT_PHYSICAL_BIT;
- else if (physical_address < Memory::GetRamSizeReal())
- valid_bit |= BAT_PHYSICAL_BIT;
- else if (Memory::m_pEXRAM && physical_address >> 28 == 0x1 &&
- (physical_address & 0x0FFFFFFF) < Memory::GetExRamSizeReal())
- valid_bit |= BAT_PHYSICAL_BIT;
- else if (physical_address >> 28 == 0xE &&
- physical_address < 0xE0000000 + Memory::GetL1CacheSize())
- valid_bit |= BAT_PHYSICAL_BIT;
+
+ const bool wi = (batl.WIMG & 0b1100) != 0;
+ if (wi)
+ valid_bit |= BAT_WI_BIT;
+
+ // Enable fastmem mappings for cached memory. There are quirks related to uncached memory
+ // that fastmem doesn't emulate properly (though no normal games are known to rely on them).
+ if (!wi)
+ {
+ if (Memory::m_pFakeVMEM && (physical_address & 0xFE000000) == 0x7E000000)
+ {
+ valid_bit |= BAT_PHYSICAL_BIT;
+ }
+ else if (physical_address < Memory::GetRamSizeReal())
+ {
+ valid_bit |= BAT_PHYSICAL_BIT;
+ }
+ else if (Memory::m_pEXRAM && physical_address >> 28 == 0x1 &&
+ (physical_address & 0x0FFFFFFF) < Memory::GetExRamSizeReal())
+ {
+ valid_bit |= BAT_PHYSICAL_BIT;
+ }
+ else if (physical_address >> 28 == 0xE &&
+ physical_address < 0xE0000000 + Memory::GetL1CacheSize())
+ {
+ valid_bit |= BAT_PHYSICAL_BIT;
+ }
+ }
// Fastmem doesn't support memchecks, so disable it for all overlapping virtual pages.
if (PowerPC::memchecks.OverlapsMemcheck(virtual_address, BAT_PAGE_SIZE))
@@ -1511,10 +1540,12 @@ void IBATUpdated()
template <const XCheckTLBFlag flag>
static TranslateAddressResult TranslateAddress(u32 address)
{
- if (TranslateBatAddess(IsOpcodeFlag(flag) ? ibat_table : dbat_table, &address))
- return TranslateAddressResult{TranslateAddressResult::BAT_TRANSLATED, address};
+ bool wi = false;
+
+ if (TranslateBatAddess(IsOpcodeFlag(flag) ? ibat_table : dbat_table, &address, &wi))
+ return TranslateAddressResult{TranslateAddressResult::BAT_TRANSLATED, address, wi};
- return TranslatePageAddress(address, flag);
+ return TranslatePageAddress(address, flag, &wi);
}
std::optional<u32> GetTranslatedAddress(u32 address)
diff --git a/Source/Core/Core/PowerPC/MMU.h b/Source/Core/Core/PowerPC/MMU.h
index 9191cea2ab..484daa5b1b 100644
--- a/Source/Core/Core/PowerPC/MMU.h
+++ b/Source/Core/Core/PowerPC/MMU.h
@@ -199,16 +199,18 @@ constexpr int BAT_INDEX_SHIFT = 17;
constexpr u32 BAT_PAGE_SIZE = 1 << BAT_INDEX_SHIFT;
constexpr u32 BAT_MAPPED_BIT = 0x1;
constexpr u32 BAT_PHYSICAL_BIT = 0x2;
-constexpr u32 BAT_RESULT_MASK = UINT32_C(~0x3);
+constexpr u32 BAT_WI_BIT = 0x4;
+constexpr u32 BAT_RESULT_MASK = UINT32_C(~0x7);
using BatTable = std::array<u32, 1 << (32 - BAT_INDEX_SHIFT)>; // 128 KB
extern BatTable ibat_table;
extern BatTable dbat_table;
-inline bool TranslateBatAddess(const BatTable& bat_table, u32* address)
+inline bool TranslateBatAddess(const BatTable& bat_table, u32* address, bool* wi)
{
u32 bat_result = bat_table[*address >> BAT_INDEX_SHIFT];
if ((bat_result & BAT_MAPPED_BIT) == 0)
return false;
*address = (bat_result & BAT_RESULT_MASK) | (*address & (BAT_PAGE_SIZE - 1));
+ *wi = (bat_result & BAT_WI_BIT) != 0;
return true;
}