mirror of
https://github.com/yuzu-mirror/yuzu.git
synced 2024-09-09 16:19:09 +01:00
dyncom: Fix conditional execution of MSR
This commit is contained in:
parent
542b0b0057
commit
eabfa5cf43
1 changed files with 31 additions and 29 deletions
|
@ -4964,6 +4964,7 @@ unsigned InterpreterMainLoop(ARMul_State* state) {
|
||||||
}
|
}
|
||||||
MSR_INST:
|
MSR_INST:
|
||||||
{
|
{
|
||||||
|
if (inst_base->cond == 0xE || CondPassed(cpu, inst_base->cond)) {
|
||||||
msr_inst *inst_cream = (msr_inst *)inst_base->component;
|
msr_inst *inst_cream = (msr_inst *)inst_base->component;
|
||||||
const uint32_t UnallocMask = 0x06f0fc00, UserMask = 0xf80f0200, PrivMask = 0x000001df, StateMask = 0x01000020;
|
const uint32_t UnallocMask = 0x06f0fc00, UserMask = 0xf80f0200, PrivMask = 0x000001df, StateMask = 0x01000020;
|
||||||
unsigned int inst = inst_cream->inst;
|
unsigned int inst = inst_cream->inst;
|
||||||
|
@ -4999,6 +5000,7 @@ unsigned InterpreterMainLoop(ARMul_State* state) {
|
||||||
cpu->Spsr_copy = (cpu->Spsr_copy & ~mask) | (operand & mask);
|
cpu->Spsr_copy = (cpu->Spsr_copy & ~mask) | (operand & mask);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
cpu->Reg[15] += GET_INST_SIZE(cpu);
|
cpu->Reg[15] += GET_INST_SIZE(cpu);
|
||||||
INC_PC(sizeof(msr_inst));
|
INC_PC(sizeof(msr_inst));
|
||||||
FETCH_INST;
|
FETCH_INST;
|
||||||
|
|
Loading…
Reference in a new issue