diff options
| author |  Lioncash | 2015-02-26 09:26:51 -0500 |
|---|---|---|
| committer | Lioncash | 2015-02-26 09:28:31 -0500 |
| commit | 8812d2fbdb64ebeed7868bb73f470e30e50d27e0 (patch) | |
| tree | 68f847d3df6dbccdfcbdd91d8c4d1b2f54b42819 | |
| parent | Merge pull request #612 from yuriks/fix-A4 (diff) | |
| download | yuzu-8812d2fbdb64ebeed7868bb73f470e30e50d27e0.tar.gz yuzu-8812d2fbdb64ebeed7868bb73f470e30e50d27e0.tar.xz yuzu-8812d2fbdb64ebeed7868bb73f470e30e50d27e0.zip | |
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) { | |||
| 4709 | DEBUG_MSG; | 4709 | DEBUG_MSG; |
| 4710 | } else { | 4710 | } else { |
| 4711 | if (inst_cream->cp_num == 15) { | 4711 | if (inst_cream->cp_num == 15) { |
| 4712 | if(CRn == 0 && OPCODE_2 == 0 && CRm == 0) { | 4712 | if (CRn == 1 && CRm == 0 && OPCODE_2 == 0) { |
| 4713 | CP15_REG(CP15_MAIN_ID) = RD; | ||
| 4714 | } else if(CRn == 1 && CRm == 0 && OPCODE_2 == 0) { | ||
| 4715 | CP15_REG(CP15_CONTROL) = RD; | 4713 | CP15_REG(CP15_CONTROL) = RD; |
| 4716 | } else if (CRn == 1 && CRm == 0 && OPCODE_2 == 1) { | 4714 | } else if (CRn == 1 && CRm == 0 && OPCODE_2 == 1) { |
| 4717 | CP15_REG(CP15_AUXILIARY_CONTROL) = RD; | 4715 | CP15_REG(CP15_AUXILIARY_CONTROL) = RD; |