aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cpu/ChangeLog7
-rw-r--r--cpu/frv.cpu18
2 files changed, 21 insertions, 4 deletions
diff --git a/cpu/ChangeLog b/cpu/ChangeLog
index 8f46cf2..3fbbd89 100644
--- a/cpu/ChangeLog
+++ b/cpu/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-07 Hans-Peter Nilsson <hp@axis.com>
+
+ * frv.cpu (mabshs): Explicitly sign-extend arguments of abs to DI.
+ (DI-ext-HI, DI-ext-UHI, DI-ext-DI): New pmacros.
+ (media-arith-sat-semantics): Explicitly sign- or zero-extend
+ arguments of "operation" to DI using "mode" and the new pmacros.
+
2009-01-03 Hans-Peter Nilsson <hp@axis.com>
* cris.cpu (cris-implemented-writable-specregs-v32): Correct size
diff --git a/cpu/frv.cpu b/cpu/frv.cpu
index 78d031f..8935924 100644
--- a/cpu/frv.cpu
+++ b/cpu/frv.cpu
@@ -1,6 +1,6 @@
; Fujitsu FRV opcode support, for GNU Binutils. -*- Scheme -*-
;
-; Copyright 2000, 2001, 2003, 2004, 2007 Free Software Foundation, Inc.
+; Copyright 2000, 2001, 2003, 2004, 2007, 2009 Free Software Foundation, Inc.
;
; Contributed by Red Hat Inc; developed under contract from Fujitsu.
;
@@ -8229,18 +8229,28 @@
(set FRintk (c-raw-call SI "frv_ref_SI" FRintk))
(set arghi (halfword hi FRintj 0))
(set arglo (halfword lo FRintj 0))
- (saturate-v (abs arghi) 32767 -32768 (msr-sie-fri-hi)
+ ; We extend the argument before the abs operation so we can
+ ; notice -32768 overflowing as 32768.
+ (saturate-v (abs (ext DI arghi)) 32767 -32768 (msr-sie-fri-hi)
(halfword hi FRintk 0))
- (saturate-v (abs arglo) 32767 -32768 (msr-sie-fri-lo)
+ (saturate-v (abs (ext DI arglo)) 32767 -32768 (msr-sie-fri-lo)
(halfword lo FRintk 0)))
((fr400 (unit u-media-1)) (fr450 (unit u-media-1))
(fr550 (unit u-media)))
)
+; How to extend from a mode to get the intended signedness.
+(define-pmacro (DI-ext-HI x) (ext DI x))
+(define-pmacro (DI-ext-UHI x) (zext DI x))
+(define-pmacro (DI-ext-DI x) x)
+
(define-pmacro (media-arith-sat-semantics
operation arg1 arg2 res mode max min sie)
(sequence ((DI tmp))
- (set tmp (operation arg1 arg2))
+ ; Make sure we saturate at max/min against a value that is
+ ; sign- or zero-extended appropriately from "mode".
+ (set tmp (operation DI
+ ((.sym DI-ext- mode) arg1) ((.sym DI-ext- mode) arg2)))
(saturate-v tmp max min sie res))
)