diff options
| -rw-r--r-- | sim/arm/ChangeLog | 4 | ||||
| -rw-r--r-- | sim/arm/armemu.c | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog index a2329be..4780f0a 100644 --- a/sim/arm/ChangeLog +++ b/sim/arm/ChangeLog @@ -1,3 +1,7 @@ +2000-06-22 Alexandre Oliva <aoliva@cygnus.com> + + * armemu.c (MultiplyAdd64): Fix computation of flag N. + 2000-06-20 Alexandre Oliva <aoliva@cygnus.com> * armemu.h (NEGBRANCH): Do not overwrite the two most significant diff --git a/sim/arm/armemu.c b/sim/arm/armemu.c index acbcb75..426617d 100644 --- a/sim/arm/armemu.c +++ b/sim/arm/armemu.c @@ -3871,10 +3871,9 @@ MultiplyAdd64 (ARMul_State * state, ARMword instr, int msigned, int scc) if (scc) { - if ((RdHi == 0) && (RdLo == 0)) - ARMul_NegZero (state, RdHi); /* zero value */ - else - ARMul_NegZero (state, scc); /* non-zero value */ + /* Ensure that both RdHi and RdLo are used to compute Z, but + don't let RdLo's sign bit make it to N. */ + ARMul_NegZero (state, RdHi | (RdLo >> 16) | (RdLo & 0xFFFF)); } return scount + 1; /* extra cycle for addition */ |