diff --git a/Source/Core/Core/PowerPC/MMU.cpp b/Source/Core/Core/PowerPC/MMU.cpp index aa305fe0ab..fdd370acc4 100644 --- a/Source/Core/Core/PowerPC/MMU.cpp +++ b/Source/Core/Core/PowerPC/MMU.cpp @@ -85,12 +85,12 @@ MMU::~MMU() = default; return Common::swap64(val); } -static bool IsOpcodeFlag(XCheckTLBFlag flag) +static constexpr bool IsOpcodeFlag(XCheckTLBFlag flag) { return flag == XCheckTLBFlag::Opcode || flag == XCheckTLBFlag::OpcodeNoException; } -static bool IsNoExceptionFlag(XCheckTLBFlag flag) +static constexpr bool IsNoExceptionFlag(XCheckTLBFlag flag) { return flag == XCheckTLBFlag::NoException || flag == XCheckTLBFlag::OpcodeNoException; } @@ -148,6 +148,12 @@ static void EFB_Write(u32 data, u32 addr) template T MMU::ReadFromHardware(u32 em_address) { + // ReadFromHardware is currently used with XCheckTLBFlag::OpcodeNoException by host instruction + // functions. Actual instruction decoding (which can raise exceptions and uses icache) is handled + // by TryReadInstruction. + static_assert(flag == XCheckTLBFlag::NoException || flag == XCheckTLBFlag::Read || + flag == XCheckTLBFlag::OpcodeNoException); + const u32 em_address_start_page = em_address & ~HW_PAGE_MASK; const u32 em_address_end_page = (em_address + sizeof(T) - 1) & ~HW_PAGE_MASK; if (em_address_start_page != em_address_end_page) @@ -166,7 +172,8 @@ T MMU::ReadFromHardware(u32 em_address) bool wi = false; - if (!never_translate && m_ppc_state.msr.DR) + if (!never_translate && + (IsOpcodeFlag(flag) ? m_ppc_state.msr.IR.Value() : m_ppc_state.msr.DR.Value())) { auto translated_addr = TranslateAddress(em_address); if (!translated_addr.Success()) @@ -258,6 +265,8 @@ T MMU::ReadFromHardware(u32 em_address) template void MMU::WriteToHardware(u32 em_address, const u32 data, const u32 size) { + static_assert(flag == XCheckTLBFlag::NoException || flag == XCheckTLBFlag::Write); + DEBUG_ASSERT(size <= 4); const u32 em_address_start_page = em_address & ~HW_PAGE_MASK; @@ -508,7 +517,7 @@ std::optional> MMU::HostTryReadInstruction(const Core::CPUThread case RequestedAddressSpace::Effective: { const u32 value = mmu.ReadFromHardware(address); - return ReadResult(!!mmu.m_ppc_state.msr.DR, value); + return ReadResult(!!mmu.m_ppc_state.msr.IR, value); } case RequestedAddressSpace::Physical: { @@ -517,7 +526,7 @@ std::optional> MMU::HostTryReadInstruction(const Core::CPUThread } case RequestedAddressSpace::Virtual: { - if (!mmu.m_ppc_state.msr.DR) + if (!mmu.m_ppc_state.msr.IR) return std::nullopt; const u32 value = mmu.ReadFromHardware(address); return ReadResult(true, value); @@ -1464,11 +1473,13 @@ MMU::TranslateAddressResult MMU::TranslatePageAddress(const EffectiveAddress add for (int i = 0; i < 8; i++, pteg_addr += 8) { - const u32 pteg = ReadFromHardware(pteg_addr); + constexpr XCheckTLBFlag pte_read_flag = + IsNoExceptionFlag(flag) ? XCheckTLBFlag::NoException : XCheckTLBFlag::Read; + const u32 pteg = ReadFromHardware(pteg_addr); if (pte1.Hex == pteg) { - UPTE_Hi pte2(ReadFromHardware(pteg_addr + 4)); + UPTE_Hi pte2(ReadFromHardware(pteg_addr + 4)); // set the access bits switch (flag)