citra/citra-nightly
1
0
Fork 0
mirror of https://github.com/citra-emu/citra-nightly.git synced 2024-12-25 04:06:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1301 from lioncash/mrc-apsr

Browse source 
dyncom: Handle modifying the APSR via an MRC instruction
This commit is contained in:
Mathew Maidment 2015-12-28 09:59:39 -05:00
parent 8f39297c53 fddfe946c8
commit 23f5d5a776
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/core/arm/dyncom/arm_dyncom_interpreter.cpp
View file

@ -4696,18 +4696,15 @@ unsigned InterpreterMainLoop(ARMul_State* cpu) {
if (inst_base->cond == ConditionCode::AL || CondPassed(cpu, inst_base->cond)) {
mrc_inst* inst_cream = (mrc_inst*)inst_base->component;
unsigned int inst = inst_cream->inst;
if (inst_cream->Rd == 15) {
DEBUG_MSG;
}
if (inst_cream->inst == 0xeef04a10) {
// Undefined instruction fmrx
RD = 0x20000000;
CITRA_IGNORE_EXIT(-1);
goto END;
} else {
if (inst_cream->cp_num == 15)
RD = cpu->ReadCP15Register(CRn, OPCODE_1, CRm, OPCODE_2);
if (inst_cream->cp_num == 15) {
const uint32_t value = cpu->ReadCP15Register(CRn, OPCODE_1, CRm, OPCODE_2);
if (inst_cream->Rd == 15) {
cpu->Cpsr = (cpu->Cpsr & ~0xF0000000) | (value & 0xF0000000);
LOAD_NZCVT;
} else {
RD = value;
}
}
}
cpu->Reg[15] += cpu->GetInstructionSize();