Merge pull request #11765 from Minty-Meeo/ppc-cache-savestate

Fix PPCCache savestate behavior
dolphin-emu · Apr 25, 2023 · b9a7f57 · b9a7f57
2 parents 6bdfcc6 + 0948f0e
commit b9a7f57
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/Source/Core/Core/PowerPC/PPCCache.cpp b/Source/Core/Core/PowerPC/PPCCache.cpp
@@ -391,11 +391,11 @@ void Cache::DoState(PointerWrap& p)
         if ((valid[set] & (1 << way)) != 0)
         {
           if (addrs[set][way] & CACHE_VMEM_BIT)
-            lookup_table_vmem[(addrs[set][way] & memory.GetFakeVMemMask()) >> 5] = 0xff;
+            lookup_table_vmem[(addrs[set][way] & memory.GetFakeVMemMask()) >> 5] = way;
           else if (addrs[set][way] & CACHE_EXRAM_BIT)
-            lookup_table_ex[(addrs[set][way] & memory.GetExRamMask()) >> 5] = 0xff;
+            lookup_table_ex[(addrs[set][way] & memory.GetExRamMask()) >> 5] = way;
           else
-            lookup_table[(addrs[set][way] & memory.GetRamMask()) >> 5] = 0xff;
+            lookup_table[(addrs[set][way] & memory.GetRamMask()) >> 5] = way;
         }
       }
     }

diff --git a/Source/Core/Core/PowerPC/PowerPC.cpp b/Source/Core/Core/PowerPC/PowerPC.cpp
@@ -134,10 +134,6 @@ void PowerPCManager::DoState(PointerWrap& p)
       INFO_LOG_FMT(POWERPC, "Flushing data cache");
       m_ppc_state.dCache.FlushAll();
     }
-    else
-    {
-      m_ppc_state.dCache.Reset();
-    }
 
     RoundingModeUpdated(m_ppc_state);