From 7452dd44db895f80729c49130fc57b8e20dd3914 Mon Sep 17 00:00:00 2001
From: zilmar <zilmar@pj64-emu.com>
Date: Mon, 10 Jan 2022 19:28:38 +1030
Subject: [PATCH] Core: Removed CRecompiler::RecompilerMain_Lookup_validate
 when I should not have, putting it back in

---
 .../N64System/Recompiler/Recompiler.cpp       | 113 ++++++++++++++++++
 1 file changed, 113 insertions(+)

diff --git a/Source/Project64-core/N64System/Recompiler/Recompiler.cpp b/Source/Project64-core/N64System/Recompiler/Recompiler.cpp
index b6eaa6d1d..54a0a6328 100644
--- a/Source/Project64-core/N64System/Recompiler/Recompiler.cpp
+++ b/Source/Project64-core/N64System/Recompiler/Recompiler.cpp
@@ -195,6 +195,119 @@ void CRecompiler::RecompilerMain_Lookup()
     }
 }
 
+void CRecompiler::RecompilerMain_Lookup_validate()
+{
+    WriteTrace(TraceRecompiler, TraceInfo, "Start");
+    bool & Done = m_EndEmulation;
+    uint32_t & PC = PROGRAM_COUNTER;
+
+    uint32_t PhysicalAddr;
+
+    while (!Done)
+    {
+        if (!m_MMU.TranslateVaddr(PC, PhysicalAddr))
+        {
+            m_Registers.DoTLBReadMiss(false, PC);
+            if (!m_MMU.TranslateVaddr(PC, PhysicalAddr))
+            {
+                g_Notify->DisplayError(stdstr_f("Failed to translate PC to a PAddr: %X\n\nEmulation stopped", PC).c_str());
+                Done = true;
+            }
+            continue;
+        }
+        if (PhysicalAddr < g_System->RdramSize())
+        {
+            CCompiledFunc * info = JumpTable()[PhysicalAddr >> 2];
+
+            if (info == nullptr)
+            {
+                info = CompileCode();
+                if (info == nullptr || m_EndEmulation)
+                {
+                    break;
+                }
+                if (g_System->bSMM_Protect())
+                {
+                    m_MMU.ProtectMemory(PC & ~0xFFF, PC | 0xFFF);
+                }
+                JumpTable()[PhysicalAddr >> 2] = info;
+            }
+            else
+            {
+                if (*(info->MemLocation(0)) != info->MemContents(0) ||
+                    *(info->MemLocation(1)) != info->MemContents(1))
+                {
+                    if (PhysicalAddr > 0x1000)
+                    {
+                        ClearRecompCode_Phys((PhysicalAddr - 0x1000) & ~0xFFF, 0x3000, Remove_ValidateFunc);
+                    }
+                    else
+                    {
+                        ClearRecompCode_Phys(0, 0x2000, Remove_ValidateFunc);
+                    }
+                    info = JumpTable()[PhysicalAddr >> 2];
+                    if (info != nullptr)
+                    {
+                        g_Notify->BreakPoint(__FILE__, __LINE__);
+                        info = nullptr;
+                    }
+                    continue;
+                }
+            }
+
+            if (bRecordExecutionTimes())
+            {
+                uint64_t PreNonCPUTime = g_System->m_CPU_Usage.NonCPUTime();
+                HighResTimeStamp StartTime, EndTime;
+                StartTime.SetToNow();
+                (info->Function())();
+                EndTime.SetToNow();
+                uint64_t PostNonCPUTime = g_System->m_CPU_Usage.NonCPUTime();
+                uint64_t TimeTaken = EndTime.GetMicroSeconds() - StartTime.GetMicroSeconds();
+                if (PostNonCPUTime >= PreNonCPUTime)
+                {
+                    TimeTaken -= PostNonCPUTime - PreNonCPUTime;
+                }
+                else
+                {
+                    TimeTaken -= PostNonCPUTime;
+                }
+                FUNCTION_PROFILE::iterator itr = m_BlockProfile.find(info->Function());
+                if (itr == m_BlockProfile.end())
+                {
+                    FUNCTION_PROFILE_DATA data = { 0 };
+                    data.Address = info->EnterPC();
+                    std::pair<FUNCTION_PROFILE::iterator, bool> res = m_BlockProfile.insert(FUNCTION_PROFILE::value_type(info->Function(), data));
+                    itr = res.first;
+                }
+                WriteTrace(TraceN64System, TraceNotice, "EndTime: %X StartTime: %X TimeTaken: %X", (uint32_t)(EndTime.GetMicroSeconds() & 0xFFFFFFFF), (uint32_t)(StartTime.GetMicroSeconds() & 0xFFFFFFFF), (uint32_t)TimeTaken);
+                itr->second.TimeTaken += TimeTaken;
+            }
+            else
+            {
+                (info->Function())();
+            }
+        }
+        else
+        {
+            uint32_t opsExecuted = 0;
+
+            while (m_MMU.TranslateVaddr(PC, PhysicalAddr) && PhysicalAddr >= g_System->RdramSize())
+            {
+                CInterpreterCPU::ExecuteOps(g_System->CountPerOp());
+                opsExecuted += g_System->CountPerOp();
+            }
+
+            if (g_SyncSystem)
+            {
+                g_System->UpdateSyncCPU(g_SyncSystem, opsExecuted);
+                g_System->SyncCPU(g_SyncSystem);
+            }
+        }
+    }
+    WriteTrace(TraceRecompiler, TraceDebug, "Done");
+}
+
 void CRecompiler::Reset()
 {
     WriteTrace(TraceRecompiler, TraceDebug, "Start");