Merge pull request #4766 from lioncash/dspemitter

DSPCore: Move CompileCurrent to the DSPEmitter

Source/Core/Core/DSP/DSPCore.cpp

@@ -314,28 +314,6 @@ void DSPCore_Step()
     step_event.Set();
 }
 
-void CompileCurrent()
-{
-  g_dsp_jit->Compile(g_dsp.pc);
-
-  bool retry = true;
-
-  while (retry)
-  {
-    retry = false;
-    for (u16 i = 0x0000; i < 0xffff; ++i)
-    {
-      if (!g_dsp_jit->m_unresolved_jumps[i].empty())
-      {
-        u16 addrToCompile = g_dsp_jit->m_unresolved_jumps[i].front();
-        g_dsp_jit->Compile(addrToCompile);
-        if (!g_dsp_jit->m_unresolved_jumps[i].empty())
-          retry = true;
-      }
-    }
-  }
-}
-
 u16 DSPCore_ReadRegister(size_t reg)
 {
   switch (reg)

Source/Core/Core/DSP/DSPCore.h

@@ -354,8 +354,6 @@ void DSPCore_SetExternalInterrupt(bool val);
 // sets a flag in the pending exception register.
 void DSPCore_SetException(u8 level);
 
-void CompileCurrent();
-
 enum DSPCoreState
 {
   DSPCORE_STOP = 0,

Source/Core/Core/DSP/Jit/DSPEmitter.cpp

@@ -352,6 +352,28 @@ void DSPEmitter::Compile(u16 start_addr)
   JMP(m_return_dispatcher, true);
 }
 
+static void CompileCurrent()
+{
+  g_dsp_jit->Compile(g_dsp.pc);
+
+  bool retry = true;
+
+  while (retry)
+  {
+    retry = false;
+    for (u16 i = 0x0000; i < 0xffff; ++i)
+    {
+      if (!g_dsp_jit->m_unresolved_jumps[i].empty())
+      {
+        const u16 address_to_compile = g_dsp_jit->m_unresolved_jumps[i].front();
+        g_dsp_jit->Compile(address_to_compile);
+        if (!g_dsp_jit->m_unresolved_jumps[i].empty())
+          retry = true;
+      }
+    }
+  }
+}
+
 const u8* DSPEmitter::CompileStub()
 {
   const u8* entryPoint = AlignCode16();