diff options
Diffstat (limited to 'sim/bfin')
| -rw-r--r-- | sim/bfin/ChangeLog | 5 | ||||
| -rw-r--r-- | sim/bfin/bfin-sim.c | 12 |
2 files changed, 16 insertions, 1 deletions
diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog index aaea1e5..72bd358 100644 --- a/sim/bfin/ChangeLog +++ b/sim/bfin/ChangeLog @@ -1,5 +1,10 @@ 2011-06-18 Robin Getz <robin.getz@analog.com> + * bfin-sim.c (extract_mult): When mmod is M_IH, change the order + from round/saturate to saturate/round/saturate. + +2011-06-18 Robin Getz <robin.getz@analog.com> + * bfin-sim.c (saturate_s40_astat): Change ">=" to ">". (decode_macfunc): Likewise when mmod is M_IH. diff --git a/sim/bfin/bfin-sim.c b/sim/bfin/bfin-sim.c index 31136a0..5b8d601 100644 --- a/sim/bfin/bfin-sim.c +++ b/sim/bfin/bfin-sim.c @@ -1534,7 +1534,17 @@ extract_mult (SIM_CPU *cpu, bu64 res, int mmod, int MM, case M_W32: return saturate_s16 (rnd16 (res), overflow); case M_IH: - return saturate_s32 (rnd16 (res), overflow) & 0xFFFF; + { + bu32 sgn = !!(res >> 39); + bu16 val = rnd16 (saturate_s32 (res, overflow)); + bu32 sgn0 = (val >> 15) & 1; + if (sgn == sgn0 || !val) + return val; + if (sgn) + return 0x8000; + *overflow = 1; + return 0x7FFF; + } case M_IS: return saturate_s16 (res, overflow); case M_FU: |