From de366db6c102438e928910ea4832f92b4fdf74e2 Mon Sep 17 00:00:00 2001 From: zilmar Date: Tue, 3 May 2022 22:46:12 +0930 Subject: [PATCH] [Core] Clean up some warnings --- Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp | 4 ++-- .../N64System/Recompiler/Arm/ArmRecompilerOps.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp b/Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp index c45855287..0f1f38d76 100755 --- a/Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp +++ b/Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp @@ -875,8 +875,8 @@ void CMipsMemoryVM::TLB_Unmaped(uint32_t Vaddr, uint32_t Len) size_t Index = Address >> 12; m_MemoryReadMap[Index] = (size_t)-1; m_MemoryWriteMap[Index] = (size_t)-1; - m_TLB_ReadMap[Index] = -1; - m_TLB_WriteMap[Index] = -1; + m_TLB_ReadMap[Index] = (uint32_t)-1; + m_TLB_WriteMap[Index] = (uint32_t)-1; } } diff --git a/Source/Project64-core/N64System/Recompiler/Arm/ArmRecompilerOps.cpp b/Source/Project64-core/N64System/Recompiler/Arm/ArmRecompilerOps.cpp index 53676a5dc..5f4ca0098 100644 --- a/Source/Project64-core/N64System/Recompiler/Arm/ArmRecompilerOps.cpp +++ b/Source/Project64-core/N64System/Recompiler/Arm/ArmRecompilerOps.cpp @@ -211,7 +211,7 @@ void CArmRecompilerOps::Compile_Branch(BRANCH_COMPARE CompareType, BRANCH_TYPE B case BranchTypeRsRt: EffectDelaySlot = DelaySlotEffectsCompare(m_CompilePC, m_Opcode.rs, m_Opcode.rt); break; case BranchTypeCop1: - if (!g_MMU->LW_VAddr(m_CompilePC + 4, Command.Hex)) + if (!g_MMU->MemoryValue32(m_CompilePC + 4, Command.Hex)) { g_Notify->FatalError(GS(MSG_FAIL_LOAD_WORD)); } @@ -5847,7 +5847,7 @@ void CArmRecompilerOps::SetCurrentPC(uint32_t ProgramCounter) m_CompilePC = ProgramCounter; __except_try() { - if (!g_MMU->LW_VAddr(m_CompilePC, m_Opcode.Hex)) + if (!g_MMU->MemoryValue32(m_CompilePC, m_Opcode.Hex)) { g_Notify->FatalError(GS(MSG_FAIL_LOAD_WORD)); }