citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

Merge pull request #614 from lioncash/mcr 

arm: The CP15 Main ID register is not writeable
This commit is contained in:
bunnei 2015-02-26 15:27:16 -05:00
parent c7dac73b0c 8812d2fbdb
commit 2dac2ea389
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4709,9 +4709,7 @@ unsigned InterpreterMainLoop(ARMul_State* state) {
DEBUG_MSG; DEBUG_MSG;
} else { } else {
if (inst_cream->cp_num == 15) { if (inst_cream->cp_num == 15) {
if(CRn == 0 && OPCODE_2 == 0 && CRm == 0) { if (CRn == 1 && CRm == 0 && OPCODE_2 == 0) {
CP15_REG(CP15_MAIN_ID) = RD;
} else if(CRn == 1 && CRm == 0 && OPCODE_2 == 0) {
CP15_REG(CP15_CONTROL) = RD; CP15_REG(CP15_CONTROL) = RD;
} else if (CRn == 1 && CRm == 0 && OPCODE_2 == 1) { } else if (CRn == 1 && CRm == 0 && OPCODE_2 == 1) {
CP15_REG(CP15_AUXILIARY_CONTROL) = RD; CP15_REG(CP15_AUXILIARY_CONTROL) = RD;