diff options
| author | bunnei <bunneidev@gmail.com> | 2015-02-26 15:27:16 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-02-26 15:27:16 -0500 |
| commit | 2dac2ea3894677a6241faf8ba85d8c80e2fe73cb (patch) | |
| tree | 68f847d3df6dbccdfcbdd91d8c4d1b2f54b42819 | |
| parent | c7dac73b0c4f3552882f8e7a04ffff8ead435d7b (diff) | |
| parent | 8812d2fbdb64ebeed7868bb73f470e30e50d27e0 (diff) | |
Merge pull request #614 from lioncash/mcr
arm: The CP15 Main ID register is not writeable
| -rw-r--r-- | src/core/arm/dyncom/arm_dyncom_interpreter.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp index 3b508f617..d8a708b9e 100644 --- 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; |