ARM: Fix build
Vicki Pfau vi@endrift.com
Sat, 28 Jan 2017 11:15:30 -0800
1 files changed,
6 insertions(+),
2 deletions(-)
jump to
M
src/arm/isa-arm.c
→
src/arm/isa-arm.c
@@ -236,8 +236,12 @@ cpu->cpsr = cpu->cpsr & (0x1FFFFFFF) | cpsr; \
} #define ARM_NEUTRAL_HI_S(DLO, DHI) \ - cpu->cpsr.n = ARM_SIGN(DHI); \ - cpu->cpsr.z = !((DHI) | (DLO)); + { \ + ARMPSR cpsr = 0; \ + cpsr = ARMPSROrUnsafeN(cpsr, ARM_SIGN(DHI)); \ + cpsr = ARMPSROrUnsafeZ(cpsr, !(DHI) | (DLO)); \ + cpu->cpsr = cpu->cpsr & (0x3FFFFFFF) | cpsr; \ + } #define ADDR_MODE_2_I_TEST (opcode & 0x00000F80) #define ADDR_MODE_2_I ((opcode & 0x00000F80) >> 7)