From 075a845a9281b4bdef459b6494a7db3bf666b911 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 18 Jun 2011 19:24:57 +0000 Subject: [PATCH] sim: bfin: fix dsp insns IH saturation/rounding behavior When using the IH modifier, we need to first saturate the value before rounding it, and then further saturate it a bit more. This makes the sim match the hardware behavior with these insns. Signed-off-by: Robin Getz Signed-off-by: Mike Frysinger --- sim/bfin/ChangeLog | 5 +++++ sim/bfin/bfin-sim.c | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog index aaea1e5a0c7..72bd3584461 100644 --- a/sim/bfin/ChangeLog +++ b/sim/bfin/ChangeLog @@ -1,3 +1,8 @@ +2011-06-18 Robin Getz + + * 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 * bfin-sim.c (saturate_s40_astat): Change ">=" to ">". diff --git a/sim/bfin/bfin-sim.c b/sim/bfin/bfin-sim.c index 31136a0660b..5b8d601d7d6 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: -- 2.30.2