JitRegCache: Count locks/unlocks

dolphin-emu · Oct 28, 2018 · 448fc89 · 448fc89
1 parent 2dce7e6
commit 448fc89
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/Source/Core/Core/PowerPC/Jit64/JitRegCache.cpp b/Source/Core/Core/PowerPC/Jit64/JitRegCache.cpp
@@ -212,13 +212,13 @@ X64Reg RegCache::RX(preg_t preg) const
 void RegCache::UnlockAll()
 {
   for (auto& reg : m_regs)
-    reg.Unlock();
+    reg.UnlockAll();
 }
 
 void RegCache::UnlockAllX()
 {
   for (auto& xreg : m_xregs)
-    xreg.Unlock();
+    xreg.UnlockAll();
 }
 
 bool RegCache::IsFreeX(size_t xreg) const

diff --git a/Source/Core/Core/PowerPC/Jit64/JitRegCache.h b/Source/Core/Core/PowerPC/Jit64/JitRegCache.h
@@ -75,15 +75,20 @@ class PPCCachedReg
     location = Gen::Imm32(imm32);
   }
 
-  bool IsLocked() const { return locked; }
+  bool IsLocked() const { return locked > 0; }
-  void Lock() { locked = true; }
+  void Lock() { locked++; }
-  void Unlock() { locked = false; }
+  void Unlock()
+  {
+    ASSERT(IsLocked());
+    locked--;
+  }
+  void UnlockAll() { locked = 0; }  // TODO: Remove from final version
 
 private:
   Gen::OpArg default_location{};
   Gen::OpArg location{};
   bool away = false;  // value not in source register
-  bool locked = false;
+  size_t locked = 0;
 };
 
 class X64CachedReg
@@ -110,15 +115,20 @@ class X64CachedReg
   bool IsDirty() const { return dirty; }
   void MakeDirty() { dirty = true; }
 
-  bool IsLocked() const { return locked; }
+  bool IsLocked() const { return locked > 0; }
-  void Lock() { locked = true; }
+  void Lock() { locked++; }
-  void Unlock() { locked = false; }
+  void Unlock()
+  {
+    ASSERT(IsLocked());
+    locked--;
+  }
+  void UnlockAll() { locked = 0; }  // TODO: Remove from final version
 
 private:
   preg_t ppcReg = static_cast<preg_t>(Gen::INVALID_REG);
   bool free = true;
   bool dirty = false;
-  bool locked = false;
+  size_t locked = 0;
 };
 
 class RegCache