Merge pull request #7958 from Craftyawesome/cpu-emulation-order

Re-order cpu emulation options from fastest to slowest
dolphin-emu · May 1, 2019 · f4d7b53 · f4d7b53
2 parents bec85a0 + 20cc450
commit f4d7b53
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/Source/Android/app/src/main/res/values/arrays.xml b/Source/Android/app/src/main/res/values/arrays.xml
@@ -5,32 +5,32 @@
 
     <!-- New UI CPU Core selection - Default -->
     <string-array name="emuCoresEntriesX86_64" translatable="false">
-        <item>Interpreter</item>
-        <item>Cached Interpreter</item>
         <item>JIT Recompiler</item>
+        <item>Cached Interpreter</item>
+        <item>Interpreter</item>
     </string-array>
     <integer-array name="emuCoresValuesX86_64" translatable="false">
-        <item>0</item>
-        <item>5</item>
         <item>1</item>
+        <item>5</item>
+        <item>0</item>
     </integer-array>
     <string-array name="emuCoresEntriesARM64" translatable="false">
-        <item>Interpreter</item>
-        <item>Cached Interpreter</item>
         <item>JIT ARM64 Recompiler</item>
+        <item>Cached Interpreter</item>
+        <item>Interpreter</item>
     </string-array>
     <integer-array name="emuCoresValuesARM64" translatable="false">
-        <item>0</item>
-        <item>5</item>
         <item>4</item>
+        <item>5</item>
+        <item>0</item>
     </integer-array>
     <string-array name="emuCoresEntriesGeneric" translatable="false">
-        <item>Interpreter</item>
         <item>Cached Interpreter</item>
+        <item>Interpreter</item>
     </string-array>
     <integer-array name="emuCoresValuesGeneric" translatable="false">
-        <item>0</item>
         <item>5</item>
+        <item>0</item>
     </integer-array>
 
     <!-- GameCube System Languages -->

diff --git a/Source/Core/Core/PowerPC/PowerPC.cpp b/Source/Core/Core/PowerPC/PowerPC.cpp
@@ -213,13 +213,13 @@ static void InitializeCPUCore(CPUCore cpu_core)
 const std::vector<CPUCore>& AvailableCPUCores()
 {
   static const std::vector<CPUCore> cpu_cores = {
-      CPUCore::Interpreter,
-      CPUCore::CachedInterpreter,
 #ifdef _M_X86_64
       CPUCore::JIT64,
 #elif defined(_M_ARM_64)
       CPUCore::JITARM64,
 #endif
+      CPUCore::CachedInterpreter,
+      CPUCore::Interpreter,
   };
 
   return cpu_cores;