ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reapplying the changes, as fixing was just looking 

the changes and adding a cast, as it was in the
past. Avoid reverts when the fix is as simple as this
one and everyone will be happier :)
This commit is contained in:
shashClp 2008-12-31 18:10:43 +00:00
parent 475d0151cc
commit b47d95082d
2 changed files with 7825 additions and 7825 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
desmume/src/arm_instructions.cpp
View File

@ -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.N = BIT31(cpu->R[REG_POS(i,12)]);\
cpu->CPSR.bits.Z = (cpu->R[REG_POS(i,12)]==0);\ cpu->CPSR.bits.Z = (cpu->R[REG_POS(i,12)]==0);\
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.C = !UNSIGNED_UNDERFLOW(tmp, (u32)cpu->CPSR.bits.C, 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)]);\ cpu->CPSR.bits.V = SIGNED_UNDERFLOW(tmp, (u32)cpu->CPSR.bits.C, cpu->R[REG_POS(i,12)]); \
return a; \ return a; \
} }

4
desmume/src/thumb_instructions.cpp
View File

@ -334,8 +334,8 @@ TEMPLATE static u32 FASTCALL OP_ADC_REG()
cpu->CPSR.bits.N = BIT31(res); cpu->CPSR.bits.N = BIT31(res);
cpu->CPSR.bits.Z = res == 0; cpu->CPSR.bits.Z = res == 0;
cpu->CPSR.bits.C = UNSIGNED_OVERFLOW(b, (u32) cpu->CPSR.bits.C, tmp) | UNSIGNED_OVERFLOW(tmp, a, res); cpu->CPSR.bits.C = !UNSIGNED_UNDERFLOW(a, b, res);
cpu->CPSR.bits.V = SIGNED_OVERFLOW(b, (u32) cpu->CPSR.bits.C, tmp) | SIGNED_OVERFLOW(tmp, a, res); cpu->CPSR.bits.V = SIGNED_UNDERFLOW(a, b, res);
return 3; return 3;
} }