From 9d327f359258a8843c711b96cb8565abb544e4b8 Mon Sep 17 00:00:00 2001 From: Flyinghead Date: Sat, 20 Oct 2018 16:21:22 +0200 Subject: [PATCH] Aica-rec: revert to original ops order (load arm flags first) --- core/hw/arm7/arm7.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/hw/arm7/arm7.cpp b/core/hw/arm7/arm7.cpp index eb6a6127b..9a628f275 100644 --- a/core/hw/arm7/arm7.cpp +++ b/core/hw/arm7/arm7.cpp @@ -1771,18 +1771,18 @@ extern "C" void CompileCode() verify(op_flags&OP_SETS_PC); + if (cc!=CC_AL) + { + LoadFlags(); + armv_imm_to_reg(R15_ARM_NEXT,pc+4); + } + LoadReg(r0,opcd&0xF); #if HOST_CPU==CPU_X86 x86e->Emit(op_and32, &virt_arm_reg(0), 0xfffffffc); #else BIC(r0, r0, 3); #endif - if (cc!=CC_AL) - { - armv_imm_to_reg(R15_ARM_NEXT,pc+4); - LoadFlags(); - } - StoreReg(r0,R15_ARM_NEXT,cc); } break;