Merge pull request #614 from lioncash/mcr

arm: The CP15 Main ID register is not writeable
10 years ago · 2dac2ea389
parent c7dac73b0c 8812d2fbdb
commit 2dac2ea389
1 changed files with 1 additions and 3 deletions
--- a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
+++ b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
@ -4709,9 +4709,7 @@ unsigned InterpreterMainLoop(ARMul_State* state) {
                DEBUG_MSG;
            } else {
                if (inst_cream->cp_num == 15) {
-                    if(CRn == 0 && OPCODE_2 == 0 && CRm == 0) {
-                        CP15_REG(CP15_MAIN_ID) = RD;
-                    } else if(CRn == 1 && CRm == 0 && OPCODE_2 == 0) {
+                    if (CRn == 1 && CRm == 0 && OPCODE_2 == 0) {
                        CP15_REG(CP15_CONTROL) = RD;
                    } else if (CRn == 1 && CRm == 0 && OPCODE_2 == 1) {
                        CP15_REG(CP15_AUXILIARY_CONTROL) = RD;