summaryrefslogtreecommitdiffstats
path: root/src/core/arm/dyncom/arm_dyncom_dec.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2015-05-14 21:14:02 +0200
committerLioncash <mathew1800@gmail.com>2015-05-14 22:24:51 +0200
commit699b67d7cfacb48c65df3a6f7e5adc55aebd4c2a (patch)
treef26d957672a829890d6dec8a16a255666b1681d1 /src/core/arm/dyncom/arm_dyncom_dec.cpp
parentdyncom: Move exclusive load/stores above bbl and swi in the decoding table (diff)
downloadyuzu-699b67d7cfacb48c65df3a6f7e5adc55aebd4c2a.tar
yuzu-699b67d7cfacb48c65df3a6f7e5adc55aebd4c2a.tar.gz
yuzu-699b67d7cfacb48c65df3a6f7e5adc55aebd4c2a.tar.bz2
yuzu-699b67d7cfacb48c65df3a6f7e5adc55aebd4c2a.tar.lz
yuzu-699b67d7cfacb48c65df3a6f7e5adc55aebd4c2a.tar.xz
yuzu-699b67d7cfacb48c65df3a6f7e5adc55aebd4c2a.tar.zst
yuzu-699b67d7cfacb48c65df3a6f7e5adc55aebd4c2a.zip
Diffstat (limited to 'src/core/arm/dyncom/arm_dyncom_dec.cpp')
-rw-r--r--src/core/arm/dyncom/arm_dyncom_dec.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom_dec.cpp b/src/core/arm/dyncom/arm_dyncom_dec.cpp
index 411850f0f..d0d37bea0 100644
--- a/src/core/arm/dyncom/arm_dyncom_dec.cpp
+++ b/src/core/arm/dyncom/arm_dyncom_dec.cpp
@@ -181,7 +181,11 @@ const ISEITEM arm_instruction[] = {
{ "ldrt", 3, 0, 26, 27, 0x00000001, 24, 24, 0x00000000, 20, 22, 0x00000003 },
{ "mrc", 3, 6, 24, 27, 0x0000000e, 20, 20, 0x00000001, 4, 4, 0x00000001 },
{ "mcr", 3, 0, 24, 27, 0x0000000e, 20, 20, 0x00000000, 4, 4, 0x00000001 },
- { "msr", 2, 0, 23, 27, 0x00000006, 20, 21, 0x00000002 },
+ { "msr", 3, 0, 23, 27, 0x00000006, 20, 21, 0x00000002, 22, 22, 0x00000001 },
+ { "msr", 4, 0, 23, 27, 0x00000006, 20, 21, 0x00000002, 22, 22, 0x00000000, 16, 19, 0x00000004 },
+ { "msr", 5, 0, 23, 27, 0x00000006, 20, 21, 0x00000002, 22, 22, 0x00000000, 19, 19, 0x00000001, 16, 17, 0x00000000 },
+ { "msr", 4, 0, 23, 27, 0x00000006, 20, 21, 0x00000002, 22, 22, 0x00000000, 16, 17, 0x00000001 },
+ { "msr", 4, 0, 23, 27, 0x00000006, 20, 21, 0x00000002, 22, 22, 0x00000000, 17, 17, 0x00000001 },
{ "ldrb", 3, 0, 26, 27, 0x00000001, 22, 22, 0x00000001, 20, 20, 0x00000001 },
{ "strb", 3, 0, 26, 27, 0x00000001, 22, 22, 0x00000001, 20, 20, 0x00000000 },
{ "ldr", 4, 0, 28, 31, 0x0000000e, 26, 27, 0x00000001, 22, 22, 0x00000000, 20, 20, 0x00000001 },
@@ -375,6 +379,10 @@ const ISEITEM arm_exclusion_code[] = {
{ "mrc", 0, 6, 0 },
{ "mcr", 0, 0, 0 },
{ "msr", 0, 0, 0 },
+ { "msr", 0, 0, 0 },
+ { "msr", 0, 0, 0 },
+ { "msr", 0, 0, 0 },
+ { "msr", 0, 0, 0 },
{ "ldrb", 0, 0, 0 },
{ "strb", 0, 0, 0 },
{ "ldr", 0, 0, 0 },