piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-26 23:59:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

MMU: Use references to TLBEntry instances instead of pointers

Browse Source 
Same behavior, less verbosity.
This commit is contained in:
Lioncash
2017-02-04 19:03:19 -05:00
parent 52b45a3933
commit 4b091f5872
1 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
Source/Core/Core/PowerPC/MMU.cpp
View File

@ -971,49 +971,50 @@ enum TLBLookupResult
static TLBLookupResult LookupTLBPageAddress(const XCheckTLBFlag flag, const u32 vpa, u32* paddr) static TLBLookupResult LookupTLBPageAddress(const XCheckTLBFlag flag, const u32 vpa, u32* paddr)
{ {
u32 tag = vpa >> HW_PAGE_INDEX_SHIFT; const u32 tag = vpa >> HW_PAGE_INDEX_SHIFT;
TLBEntry* tlbe = &ppcState.tlb[IsOpcodeFlag(flag)][tag & HW_PAGE_INDEX_MASK]; TLBEntry& tlbe = ppcState.tlb[IsOpcodeFlag(flag)][tag & HW_PAGE_INDEX_MASK];
if (tlbe->tag[0] == tag)
if (tlbe.tag[0] == tag)
{ {
// Check if C bit requires updating // Check if C bit requires updating
if (flag == FLAG_WRITE) if (flag == FLAG_WRITE)
{ {
UPTE2 PTE2; UPTE2 PTE2;
PTE2.Hex = tlbe->pte[0]; PTE2.Hex = tlbe.pte[0];
if (PTE2.C == 0) if (PTE2.C == 0)
{ {
PTE2.C = 1; PTE2.C = 1;
tlbe->pte[0] = PTE2.Hex; tlbe.pte[0] = PTE2.Hex;
return TLB_UPDATE_C; return TLB_UPDATE_C;
} }
} }
if (!IsNoExceptionFlag(flag)) if (!IsNoExceptionFlag(flag))
tlbe->recent = 0; tlbe.recent = 0;
*paddr = tlbe->paddr[0] | (vpa & 0xfff); *paddr = tlbe.paddr[0] | (vpa & 0xfff);
return TLB_FOUND; return TLB_FOUND;
} }
if (tlbe->tag[1] == tag) if (tlbe.tag[1] == tag)
{ {
// Check if C bit requires updating // Check if C bit requires updating
if (flag == FLAG_WRITE) if (flag == FLAG_WRITE)
{ {
UPTE2 PTE2; UPTE2 PTE2;
PTE2.Hex = tlbe->pte[1]; PTE2.Hex = tlbe.pte[1];
if (PTE2.C == 0) if (PTE2.C == 0)
{ {
PTE2.C = 1; PTE2.C = 1;
tlbe->pte[1] = PTE2.Hex; tlbe.pte[1] = PTE2.Hex;
return TLB_UPDATE_C; return TLB_UPDATE_C;
} }
} }
if (!IsNoExceptionFlag(flag)) if (!IsNoExceptionFlag(flag))
tlbe->recent = 1; tlbe.recent = 1;
*paddr = tlbe->paddr[1] | (vpa & 0xfff); *paddr = tlbe.paddr[1] | (vpa & 0xfff);
return TLB_FOUND; return TLB_FOUND;
} }
@ -1025,24 +1026,26 @@ static void UpdateTLBEntry(const XCheckTLBFlag flag, UPTE2 PTE2, const u32 addre
if (IsNoExceptionFlag(flag)) if (IsNoExceptionFlag(flag))
return; return;
int tag = address >> HW_PAGE_INDEX_SHIFT; const int tag = address >> HW_PAGE_INDEX_SHIFT;
TLBEntry* tlbe = &ppcState.tlb[IsOpcodeFlag(flag)][tag & HW_PAGE_INDEX_MASK]; TLBEntry& tlbe = ppcState.tlb[IsOpcodeFlag(flag)][tag & HW_PAGE_INDEX_MASK];
int index = tlbe->recent == 0 && tlbe->tag[0] != TLB_TAG_INVALID; const int index = tlbe.recent == 0 && tlbe.tag[0] != TLB_TAG_INVALID;
tlbe->recent = index; tlbe.recent = index;
tlbe->paddr[index] = PTE2.RPN << HW_PAGE_INDEX_SHIFT; tlbe.paddr[index] = PTE2.RPN << HW_PAGE_INDEX_SHIFT;
tlbe->pte[index] = PTE2.Hex; tlbe.pte[index] = PTE2.Hex;
tlbe->tag[index] = tag; tlbe.tag[index] = tag;
} }
void InvalidateTLBEntry(u32 address) void InvalidateTLBEntry(u32 address)
{ {
TLBEntry* tlbe = &ppcState.tlb[0][(address >> HW_PAGE_INDEX_SHIFT) & HW_PAGE_INDEX_MASK]; const u32 entry_index = (address >> HW_PAGE_INDEX_SHIFT) & HW_PAGE_INDEX_MASK;
tlbe->tag[0] = TLB_TAG_INVALID;
tlbe->tag[1] = TLB_TAG_INVALID;
TLBEntry* tlbe_i = &ppcState.tlb[1][(address >> HW_PAGE_INDEX_SHIFT) & HW_PAGE_INDEX_MASK]; TLBEntry& tlbe = ppcState.tlb[0][entry_index];
tlbe_i->tag[0] = TLB_TAG_INVALID; tlbe.tag[0] = TLB_TAG_INVALID;
tlbe_i->tag[1] = TLB_TAG_INVALID; tlbe.tag[1] = TLB_TAG_INVALID;
TLBEntry& tlbe_i = ppcState.tlb[1][entry_index];
tlbe_i.tag[0] = TLB_TAG_INVALID;
tlbe_i.tag[1] = TLB_TAG_INVALID;
} }
// Page Address Translation // Page Address Translation