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

Core: Fix clang compile issues

This commit is contained in:
zilmar 2023-10-05 15:01:09 +10:30
parent f73c3708a5
commit befa57924d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Project64-core/N64System/Mips/TLB.cpp
View File

@ -98,7 +98,7 @@ void CTLB::Probe()
uint64_t TlbValueMasked = TlbEntryHiValue.Value & Mask;
uint64_t EntryHiMasked = m_Reg.ENTRYHI_REGISTER.Value & Mask;
if (TlbValueMasked != EntryHiMasked ||
if (TlbValueMasked != EntryHiMasked ||
TlbEntryHiValue.R != m_Reg.ENTRYHI_REGISTER.R ||
(m_tlb[i].EntryLo0.GLOBAL == 0 || m_tlb[i].EntryLo1.GLOBAL == 0) && TlbEntryHiValue.ASID != m_Reg.ENTRYHI_REGISTER.ASID)
{
@ -414,7 +414,7 @@ MemorySegment CTLB::VAddrMemorySegment(uint64_t VAddr)
}
if (VAddr <= 0x88000000ffffffffull)
{
return MemorySegment_Cached32; //xkphys*
return MemorySegment_Cached32; //xkphys*
}
if (VAddr <= 0x8fffffffffffffffull)
{
@ -505,7 +505,7 @@ MemorySegment CTLB::VAddrMemorySegment(uint64_t VAddr)
}
if (VAddr <= 0x400000ffffffffffull) //xsseg
{
return MemorySegment_Mapped;
return MemorySegment_Mapped;
}
if (VAddr <= 0xffffffffbfffffffull)
{
@ -513,7 +513,7 @@ MemorySegment CTLB::VAddrMemorySegment(uint64_t VAddr)
}
if (VAddr <= 0xffffffffdfffffffull) //csseg
{
return MemorySegment_Mapped;
return MemorySegment_Mapped;
}
if (VAddr <= 0xffffffffffffffffull)
{
@ -524,7 +524,7 @@ MemorySegment CTLB::VAddrMemorySegment(uint64_t VAddr)
{
if (VAddr <= 0x000000ffffffffffull)
{
return MemorySegment_Mapped; //xuseg
return MemorySegment_Mapped; //xuseg
}
}
return MemorySegment_Unused;

2
Source/Project64-core/N64System/Mips/TLB.h
View File

@ -58,7 +58,7 @@ public:
void ReadEntry();
void WriteEntry(uint32_t Index, bool Random);
void COP0StatusChanged(void);
bool AddressDefined(uint64_t VAddr, bool & Dirty);
bool AddressDefined(uint64_t VAddr, bool & Dirty);
TLB_ENTRY & TlbEntry(int32_t Entry);
bool VAddrToPAddr(uint64_t VAddr, uint32_t & PAddr, bool & MemoryUnused);