Skip to content

Commit

Permalink
Core: Fix clang compile issues
Browse files Browse the repository at this point in the history
  • Loading branch information
project64 committed Oct 5, 2023
1 parent f73c370 commit befa579
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions Source/Project64-core/N64System/Mips/TLB.cpp
Expand Up @@ -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)
{
Expand Down Expand Up @@ -414,7 +414,7 @@ MemorySegment CTLB::VAddrMemorySegment(uint64_t VAddr)
}
if (VAddr <= 0x88000000ffffffffull)
{
return MemorySegment_Cached32; //xkphys*
return MemorySegment_Cached32; //xkphys*
}
if (VAddr <= 0x8fffffffffffffffull)
{
Expand Down Expand Up @@ -505,15 +505,15 @@ MemorySegment CTLB::VAddrMemorySegment(uint64_t VAddr)
}
if (VAddr <= 0x400000ffffffffffull) //xsseg
{
return MemorySegment_Mapped;
return MemorySegment_Mapped;
}
if (VAddr <= 0xffffffffbfffffffull)
{
return MemorySegment_Unused;
}
if (VAddr <= 0xffffffffdfffffffull) //csseg
{
return MemorySegment_Mapped;
return MemorySegment_Mapped;
}
if (VAddr <= 0xffffffffffffffffull)
{
Expand All @@ -524,7 +524,7 @@ MemorySegment CTLB::VAddrMemorySegment(uint64_t VAddr)
{
if (VAddr <= 0x000000ffffffffffull)
{
return MemorySegment_Mapped; //xuseg
return MemorySegment_Mapped; //xuseg
}
}
return MemorySegment_Unused;
Expand Down
2 changes: 1 addition & 1 deletion Source/Project64-core/N64System/Mips/TLB.h
Expand Up @@ -58,7 +58,7 @@ class CTLB :
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);
Expand Down

0 comments on commit befa579

Please sign in to comment.