diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2010-09-18 05:53:15 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2010-09-18 05:53:15 +0000 |
| commit | d62d28630dde50b436ca19afc9279ce449170121 (patch) | |
| tree | 693d309cef436a0a2a564f99d50511f6268fecdf | |
| parent | 95ee3914bfd551aeec49932a400530141865acad (diff) | |
PPC: Suppress gcc warnings with -Wtype-limits
The hack added by c5b76b381081680633e2e0a91216507430409fb2 was not
enough to avoid warnings with gcc flag -Wtype-limits. Add a new macro
to fix both problems.
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
| -rw-r--r-- | target-ppc/op_helper.c | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/target-ppc/op_helper.c b/target-ppc/op_helper.c index 8cf34d45a9..3e6db85f14 100644 --- a/target-ppc/op_helper.c +++ b/target-ppc/op_helper.c @@ -1955,14 +1955,14 @@ target_ulong helper_dlmzb (target_ulong high, target_ulong low, uint32_t update_ DO_HANDLE_NAN(result, x) DO_HANDLE_NAN(result, y) DO_HANDLE_NAN(result, z) /* Saturating arithmetic helpers. */ -#define SATCVT(from, to, from_type, to_type, min, max, use_min, use_max) \ +#define SATCVT(from, to, from_type, to_type, min, max) \ static inline to_type cvt##from##to(from_type x, int *sat) \ { \ to_type r; \ - if (use_min && x < min) { \ + if (x < (from_type)min) { \ r = min; \ *sat = 1; \ - } else if (use_max && x > max) { \ + } else if (x > (from_type)max) { \ r = max; \ *sat = 1; \ } else { \ @@ -1970,30 +1970,30 @@ target_ulong helper_dlmzb (target_ulong high, target_ulong low, uint32_t update_ } \ return r; \ } -SATCVT(sh, sb, int16_t, int8_t, INT8_MIN, INT8_MAX, 1, 1) -SATCVT(sw, sh, int32_t, int16_t, INT16_MIN, INT16_MAX, 1, 1) -SATCVT(sd, sw, int64_t, int32_t, INT32_MIN, INT32_MAX, 1, 1) - -/* Work around gcc problems with the macro version */ -static inline uint8_t cvtuhub(uint16_t x, int *sat) -{ - uint8_t r; - - if (x > UINT8_MAX) { - r = UINT8_MAX; - *sat = 1; - } else { - r = x; +#define SATCVTU(from, to, from_type, to_type, min, max) \ + static inline to_type cvt##from##to(from_type x, int *sat) \ + { \ + to_type r; \ + if (x > (from_type)max) { \ + r = max; \ + *sat = 1; \ + } else { \ + r = x; \ + } \ + return r; \ } - return r; -} -//SATCVT(uh, ub, uint16_t, uint8_t, 0, UINT8_MAX, 0, 1) -SATCVT(uw, uh, uint32_t, uint16_t, 0, UINT16_MAX, 0, 1) -SATCVT(ud, uw, uint64_t, uint32_t, 0, UINT32_MAX, 0, 1) -SATCVT(sh, ub, int16_t, uint8_t, 0, UINT8_MAX, 1, 1) -SATCVT(sw, uh, int32_t, uint16_t, 0, UINT16_MAX, 1, 1) -SATCVT(sd, uw, int64_t, uint32_t, 0, UINT32_MAX, 1, 1) +SATCVT(sh, sb, int16_t, int8_t, INT8_MIN, INT8_MAX) +SATCVT(sw, sh, int32_t, int16_t, INT16_MIN, INT16_MAX) +SATCVT(sd, sw, int64_t, int32_t, INT32_MIN, INT32_MAX) + +SATCVTU(uh, ub, uint16_t, uint8_t, 0, UINT8_MAX) +SATCVTU(uw, uh, uint32_t, uint16_t, 0, UINT16_MAX) +SATCVTU(ud, uw, uint64_t, uint32_t, 0, UINT32_MAX) +SATCVT(sh, ub, int16_t, uint8_t, 0, UINT8_MAX) +SATCVT(sw, uh, int32_t, uint16_t, 0, UINT16_MAX) +SATCVT(sd, uw, int64_t, uint32_t, 0, UINT32_MAX) #undef SATCVT +#undef SATCVTU #define LVE(name, access, swap, element) \ void helper_##name (ppc_avr_t *r, target_ulong addr) \ |