From 04cfc7ae6660167b8995a49c734c2f4be52399d4 Mon Sep 17 00:00:00 2001 From: riccardom Date: Thu, 1 Jan 2009 23:28:54 +0000 Subject: [PATCH] Revert changes from 1344: they break at least audio for me and Luigi__. --- desmume/src/arm_instructions.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/desmume/src/arm_instructions.cpp b/desmume/src/arm_instructions.cpp index 5d0beca53..0fb68f381 100644 --- a/desmume/src/arm_instructions.cpp +++ b/desmume/src/arm_instructions.cpp @@ -1162,8 +1162,8 @@ TEMPLATE static u32 FASTCALL OP_ADC_IMM_VAL() }\ cpu->CPSR.bits.N = BIT31(cpu->R[REG_POS(i,12)]);\ cpu->CPSR.bits.Z = (cpu->R[REG_POS(i,12)]==0);\ - cpu->CPSR.bits.C = !UNSIGNED_UNDERFLOW(tmp, (u32)cpu->CPSR.bits.C, cpu->R[REG_POS(i,12)]); \ - cpu->CPSR.bits.V = SIGNED_UNDERFLOW(tmp, (u32)cpu->CPSR.bits.C, cpu->R[REG_POS(i,12)]); \ + cpu->CPSR.bits.C = UNSIGNED_OVERFLOW(shift_op, (u32) cpu->CPSR.bits.C, tmp) | UNSIGNED_OVERFLOW(v, tmp, cpu->R[REG_POS(i,12)]);\ + cpu->CPSR.bits.V = SIGNED_OVERFLOW(shift_op, (u32) cpu->CPSR.bits.C, tmp) | SIGNED_OVERFLOW(v, tmp, cpu->R[REG_POS(i,12)]);\ return a; \ }