diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2011-06-18 20:10:57 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-06-18 20:10:57 +0000 |
| commit | a0a71a7f8b85f3d25403d140b7fb14b54b3e7f4a (patch) | |
| tree | 82501167712b1235f722213e1e7ab8e728560b7c /sim/bfin | |
| parent | 388aa9fe20b5692d76ca36c61619bdb887d174b0 (diff) | |
| download | binutils-a0a71a7f8b85f3d25403d140b7fb14b54b3e7f4a.tar.gz binutils-a0a71a7f8b85f3d25403d140b7fb14b54b3e7f4a.tar.bz2 binutils-a0a71a7f8b85f3d25403d140b7fb14b54b3e7f4a.zip | |
sim: bfin: fix M_IH saturation size
This reverts the previous commit and does it right. This change got
lost in the shuffle of patches I have pending.
Basically the logic is to change the 32bit saturation (and then masked
to 16bits) to a proper 16bit saturation.
Signed-off-by: Robin Getz <robin.getz@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'sim/bfin')
| -rw-r--r-- | sim/bfin/ChangeLog | 10 | ||||
| -rw-r--r-- | sim/bfin/bfin-sim.c | 13 |
2 files changed, 6 insertions, 17 deletions
diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog index 27d38a79930..ffd9ff2252d 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): Call saturate_s16 directly when + mmod is M_IH rather than computing the result by hand. + +2011-06-18 Robin Getz <robin.getz@analog.com> + * bfin-sim.c (decode_macfunc): Add nosat_acc to track acc value before saturation, set sat when more cases saturate, and set the overflow bit based on these results. For M_TFU, M_IU, M_FU, and @@ -23,11 +28,6 @@ 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 d0ad051c59d..38e5fe1ebdb 100644 --- a/sim/bfin/bfin-sim.c +++ b/sim/bfin/bfin-sim.c @@ -1534,19 +1534,8 @@ extract_mult (SIM_CPU *cpu, bu64 res, int mmod, int MM, { case 0: case M_W32: - return saturate_s16 (rnd16 (res), overflow); case M_IH: - { - 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; - } + return saturate_s16 (rnd16 (res), overflow); case M_IS: return saturate_s16 (res, overflow); case M_FU: |