summaryrefslogtreecommitdiff
path: root/Source/Android
diff options
context:
space:
mode:
authorRyan Houdek <Sonicadvance1@Gmail.com>2013-10-09 23:16:07 +0000
committerRyan Houdek <Sonicadvance1@Gmail.com>2013-10-09 23:16:07 +0000
commit715d5ae8a7eb8a6cbdce2690e82c0e193a9c6714 (patch)
treebfb6aee891821a3784cc0a91815c1ef11c41ca53 /Source/Android
parentcc05f66ba1a0c4641b4dc19b77b252470d346350 (diff)
parent7bc48382431afa57d3fe5a642079f0574cae218b (diff)
Merge branch 'JitArmIL'
This implements a partial JITIL based off of the JIT64IL. It's enough to run most games, albiet at a slow speed. Implementing instructions for this IL is really simple since it basically is just enabling based on what is already in JIT64IL, and then enabling each individual IL instruction.
Diffstat (limited to 'Source/Android')
-rw-r--r--Source/Android/res/values/arrays.xml4
-rw-r--r--Source/Android/res/values/strings.xml1
2 files changed, 4 insertions, 1 deletions
diff --git a/Source/Android/res/values/arrays.xml b/Source/Android/res/values/arrays.xml
index 8e75554384..4aaedd6370 100644
--- a/Source/Android/res/values/arrays.xml
+++ b/Source/Android/res/values/arrays.xml
@@ -19,10 +19,12 @@
<string-array name="emuCoreEntriesARM" translatable="false">
<item>@string/interpreter</item>
<item>@string/jit_arm_recompiler</item>
+ <item>@string/jitil_arm_recompiler</item>
</string-array>
<string-array name="emuCoreValuesARM" translatable="false">
<item>0</item>
<item>3</item>
+ <item>4</item>
</string-array>
<!-- CPU core selection - Other -->
@@ -137,4 +139,4 @@
<item>4</item>
</string-array>
-</resources> \ No newline at end of file
+</resources>
diff --git a/Source/Android/res/values/strings.xml b/Source/Android/res/values/strings.xml
index 4364116167..3f3f7151e0 100644
--- a/Source/Android/res/values/strings.xml
+++ b/Source/Android/res/values/strings.xml
@@ -69,6 +69,7 @@
<string name="jit64_recompiler">JIT64 Recompiler</string>
<string name="jitil_recompiler">JITIL Recompiler</string>
<string name="jit_arm_recompiler">JIT ARM Recompiler</string>
+ <string name="jitil_arm_recompiler">JITIL ARM Recompiler</string>
<string name="cpu_core">CPU Core</string>
<string name="cpu_settings">CPU</string>
<string name="emu_core_to_use">Emulation core to use</string>