citra-emu
/
citra
Archived
1
0
Fork 0
Code

dyncom: Handle some MSR variants individually 

This is necessary, as hint instructions will be recognized as MSR, which is pretty bad.
This commit is contained in:
Lioncash 2015-05-14 15:14:02 -04:00
parent be0119be08
commit 699b67d7cf
2 changed files with 41 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/arm/dyncom/arm_dyncom_dec.cpp
View File

@ -181,7 +181,11 @@ const ISEITEM arm_instruction[] = {
{ "ldrt", 3, 0, 26, 27, 0x00000001, 24, 24, 0x00000000, 20, 22, 0x00000003 }, { "ldrt", 3, 0, 26, 27, 0x00000001, 24, 24, 0x00000000, 20, 22, 0x00000003 },
{ "mrc", 3, 6, 24, 27, 0x0000000e, 20, 20, 0x00000001, 4, 4, 0x00000001 }, { "mrc", 3, 6, 24, 27, 0x0000000e, 20, 20, 0x00000001, 4, 4, 0x00000001 },
{ "mcr", 3, 0, 24, 27, 0x0000000e, 20, 20, 0x00000000, 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 }, { "ldrb", 3, 0, 26, 27, 0x00000001, 22, 22, 0x00000001, 20, 20, 0x00000001 },
{ "strb", 3, 0, 26, 27, 0x00000001, 22, 22, 0x00000001, 20, 20, 0x00000000 }, { "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 }, { "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 }, { "mrc", 0, 6, 0 },
{ "mcr", 0, 0, 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 },
{ "msr", 0, 0, 0 },
{ "ldrb", 0, 0, 0 }, { "ldrb", 0, 0, 0 },
{ "strb", 0, 0, 0 }, { "strb", 0, 0, 0 },
{ "ldr", 0, 0, 0 }, { "ldr", 0, 0, 0 },

55
src/core/arm/dyncom/arm_dyncom_interpreter.cpp
View File

@ -3536,6 +3536,10 @@ const transop_fp_t arm_instruction_trans[] = {
INTERPRETER_TRANSLATE(mrc), INTERPRETER_TRANSLATE(mrc),
INTERPRETER_TRANSLATE(mcr), INTERPRETER_TRANSLATE(mcr),
INTERPRETER_TRANSLATE(msr), INTERPRETER_TRANSLATE(msr),
INTERPRETER_TRANSLATE(msr),
INTERPRETER_TRANSLATE(msr),
INTERPRETER_TRANSLATE(msr),
INTERPRETER_TRANSLATE(msr),
INTERPRETER_TRANSLATE(ldrb), INTERPRETER_TRANSLATE(ldrb),
INTERPRETER_TRANSLATE(strb), INTERPRETER_TRANSLATE(strb),
INTERPRETER_TRANSLATE(ldr), INTERPRETER_TRANSLATE(ldr),
@ -3912,28 +3916,32 @@ unsigned InterpreterMainLoop(ARMul_State* cpu) {
case 172: goto MRC_INST; \ case 172: goto MRC_INST; \
case 173: goto MCR_INST; \ case 173: goto MCR_INST; \
case 174: goto MSR_INST; \ case 174: goto MSR_INST; \
case 175: goto LDRB_INST; \ case 175: goto MSR_INST; \
case 176: goto STRB_INST; \ case 176: goto MSR_INST; \
case 177: goto LDR_INST; \ case 177: goto MSR_INST; \
case 178: goto LDRCOND_INST ; \ case 178: goto MSR_INST; \
case 179: goto STR_INST; \ case 179: goto LDRB_INST; \
case 180: goto CDP_INST; \ case 180: goto STRB_INST; \
case 181: goto STC_INST; \ case 181: goto LDR_INST; \
case 182: goto LDC_INST; \ case 182: goto LDRCOND_INST ; \
case 183: goto LDREXD_INST; \ case 183: goto STR_INST; \
case 184: goto STREXD_INST; \ case 184: goto CDP_INST; \
case 185: goto LDREXH_INST; \ case 185: goto STC_INST; \
case 186: goto STREXH_INST; \ case 186: goto LDC_INST; \
case 187: goto SWI_INST; \ case 187: goto LDREXD_INST; \
case 188: goto BBL_INST; \ case 188: goto STREXD_INST; \
case 189: goto B_2_THUMB ; \ case 189: goto LDREXH_INST; \
case 190: goto B_COND_THUMB ; \ case 190: goto STREXH_INST; \
case 191: goto BL_1_THUMB ; \ case 191: goto SWI_INST; \
case 192: goto BL_2_THUMB ; \ case 192: goto BBL_INST; \
case 193: goto BLX_1_THUMB ; \ case 193: goto B_2_THUMB ; \
case 194: goto DISPATCH; \ case 194: goto B_COND_THUMB ; \
case 195: goto INIT_INST_LENGTH; \ case 195: goto BL_1_THUMB ; \
case 196: goto END; \ case 196: goto BL_2_THUMB ; \
case 197: goto BLX_1_THUMB ; \
case 198: goto DISPATCH; \
case 199: goto INIT_INST_LENGTH; \
case 200: goto END; \
} }
#endif #endif
@ -3979,7 +3987,8 @@ unsigned InterpreterMainLoop(ARMul_State* cpu) {
&&MCRR_INST,&&MRRC_INST,&&CMP_INST,&&TST_INST,&&TEQ_INST,&&CMN_INST,&&SMULL_INST,&&UMULL_INST,&&UMLAL_INST,&&SMLAL_INST,&&MUL_INST, &&MCRR_INST,&&MRRC_INST,&&CMP_INST,&&TST_INST,&&TEQ_INST,&&CMN_INST,&&SMULL_INST,&&UMULL_INST,&&UMLAL_INST,&&SMLAL_INST,&&MUL_INST,
&&MLA_INST,&&SSAT_INST,&&USAT_INST,&&MRS_INST,&&MSR_INST,&&AND_INST,&&BIC_INST,&&LDM_INST,&&EOR_INST,&&ADD_INST,&&RSB_INST,&&RSC_INST, &&MLA_INST,&&SSAT_INST,&&USAT_INST,&&MRS_INST,&&MSR_INST,&&AND_INST,&&BIC_INST,&&LDM_INST,&&EOR_INST,&&ADD_INST,&&RSB_INST,&&RSC_INST,
&&SBC_INST,&&ADC_INST,&&SUB_INST,&&ORR_INST,&&MVN_INST,&&MOV_INST,&&STM_INST,&&LDM_INST,&&LDRSH_INST,&&STM_INST,&&LDM_INST,&&LDRSB_INST, &&SBC_INST,&&ADC_INST,&&SUB_INST,&&ORR_INST,&&MVN_INST,&&MOV_INST,&&STM_INST,&&LDM_INST,&&LDRSH_INST,&&STM_INST,&&LDM_INST,&&LDRSB_INST,
&&STRD_INST,&&LDRH_INST,&&STRH_INST,&&LDRD_INST,&&STRT_INST,&&STRBT_INST,&&LDRBT_INST,&&LDRT_INST,&&MRC_INST,&&MCR_INST,&&MSR_INST, &&STRD_INST,&&LDRH_INST,&&STRH_INST,&&LDRD_INST,&&STRT_INST,&&STRBT_INST,&&LDRBT_INST,&&LDRT_INST,&&MRC_INST,&&MCR_INST,
&&MSR_INST, &&MSR_INST, &&MSR_INST, &&MSR_INST, &&MSR_INST,
&&LDRB_INST,&&STRB_INST,&&LDR_INST,&&LDRCOND_INST, &&STR_INST,&&CDP_INST,&&STC_INST,&&LDC_INST, &&LDREXD_INST, &&LDRB_INST,&&STRB_INST,&&LDR_INST,&&LDRCOND_INST, &&STR_INST,&&CDP_INST,&&STC_INST,&&LDC_INST, &&LDREXD_INST,
&&STREXD_INST,&&LDREXH_INST,&&STREXH_INST, &&SWI_INST,&&BBL_INST, &&STREXD_INST,&&LDREXH_INST,&&STREXH_INST, &&SWI_INST,&&BBL_INST,
&&B_2_THUMB, &&B_COND_THUMB,&&BL_1_THUMB, &&BL_2_THUMB, &&BLX_1_THUMB, &&DISPATCH, &&B_2_THUMB, &&B_COND_THUMB,&&BL_1_THUMB, &&BL_2_THUMB, &&BLX_1_THUMB, &&DISPATCH,