include/qemu/host-utils: Remove the *_overflow wrappers
RFC PATCH 1/1 include/qemu/host-utils: Remove the *_overflow wrappers
According to commit cec07c0b612975 these wrappers were required for GCC < 5.0 and Clang < 3.8. We don't support such old compilers at all anymore, so we can remove the wrappers now.
---
Not sure whether it's nicer to remove these to get rid of some lines of code, or whether it's nicer to keep them for the more explicit names...
include/qemu/host-utils.h | 235 +---------------------------------- accel/tcg/tcg-runtime-gvec.c | 16 +-- fpu/softfloat.c | 10 +- libdecnumber/decNumber.c | 4 +- target/arm/mve_helper.c | 18 +-- 5 files changed, 29 insertions(+), 254 deletions(-)
include/qemu/host-utils.h +5 -230
@@ -366,231 +366,6 @@ static inline uint64_t uabs64(int64_t v)return v <0 ? -v : v; } -/** -* sadd32_overflow - addition with overflow indication -* @x, @y: addends -* @ret: Output for sum -* -* Computes *@ret = @x + @y, and returns true if and only if that -* value has been truncated. -*/ -static inline bool sadd32_overflow (int32_t x,int32_t y,int32_t *ret) -{ -#if __has_builtin (__builtin_add_overflow) || __GNUC__ >=5 -return __builtin_add_overflow (x, y, ret); -#else - *ret = x + y; -return ((*ret ^ x) & ~(x ^ y)) <0 ; -#endif -} - -/** -* sadd64_overflow - addition with overflow indication -* @x, @y: addends -* @ret: Output for sum -* -* Computes *@ret = @x + @y, and returns true if and only if that -* value has been truncated. -*/ -static inline bool sadd64_overflow (int64_t x,int64_t y,int64_t *ret) -{ -#if __has_builtin (__builtin_add_overflow) || __GNUC__ >=5 -return __builtin_add_overflow (x, y, ret); -#else - *ret = x + y; -return ((*ret ^ x) & ~(x ^ y)) <0 ; -#endif -} - -/** -* uadd32_overflow - addition with overflow indication -* @x, @y: addends -* @ret: Output for sum -* -* Computes *@ret = @x + @y, and returns true if and only if that -* value has been truncated. -*/ -static inline bool uadd32_overflow (uint32_t x,uint32_t y,uint32_t *ret) -{ -#if __has_builtin (__builtin_add_overflow) || __GNUC__ >=5 -return __builtin_add_overflow (x, y, ret); -#else - *ret = x + y; -return *ret < x; -#endif -} - -/** -* uadd64_overflow - addition with overflow indication -* @x, @y: addends -* @ret: Output for sum -* -* Computes *@ret = @x + @y, and returns true if and only if that -* value has been truncated. -*/ -static inline bool uadd64_overflow (uint64_t x,uint64_t y,uint64_t *ret) -{ -#if __has_builtin (__builtin_add_overflow) || __GNUC__ >=5 -return __builtin_add_overflow (x, y, ret); -#else - *ret = x + y; -return *ret < x; -#endif -} - -/** -* ssub32_overflow - subtraction with overflow indication -* @x: Minuend -* @y: Subtrahend -* @ret: Output for difference -* -* Computes *@ret = @x - @y, and returns true if and only if that -* value has been truncated. -*/ -static inline bool ssub32_overflow (int32_t x,int32_t y,int32_t *ret) -{ -#if __has_builtin (__builtin_sub_overflow) || __GNUC__ >=5 -return __builtin_sub_overflow (x, y, ret); -#else - *ret = x - y; -return ((*ret ^ x) & (x ^ y)) <0 ; -#endif -} - -/** -* ssub64_overflow - subtraction with overflow indication -* @x: Minuend -* @y: Subtrahend -* @ret: Output for sum -* -* Computes *@ret = @x - @y, and returns true if and only if that -* value has been truncated. -*/ -static inline bool ssub64_overflow (int64_t x,int64_t y,int64_t *ret) -{ -#if __has_builtin (__builtin_sub_overflow) || __GNUC__ >=5 -return __builtin_sub_overflow (x, y, ret); -#else - *ret = x - y; -return ((*ret ^ x) & (x ^ y)) <0 ; -#endif -} - -/** -* usub32_overflow - subtraction with overflow indication -* @x: Minuend -* @y: Subtrahend -* @ret: Output for sum -* -* Computes *@ret = @x - @y, and returns true if and only if that -* value has been truncated. -*/ -static inline bool usub32_overflow (uint32_t x,uint32_t y,uint32_t *ret) -{ -#if __has_builtin (__builtin_sub_overflow) || __GNUC__ >=5 -return __builtin_sub_overflow (x, y, ret); -#else - *ret = x - y; -return x < y; -#endif -} - -/** -* usub64_overflow - subtraction with overflow indication -* @x: Minuend -* @y: Subtrahend -* @ret: Output for sum -* -* Computes *@ret = @x - @y, and returns true if and only if that -* value has been truncated. -*/ -static inline bool usub64_overflow (uint64_t x,uint64_t y,uint64_t *ret) -{ -#if __has_builtin (__builtin_sub_overflow) || __GNUC__ >=5 -return __builtin_sub_overflow (x, y, ret); -#else - *ret = x - y; -return x < y; -#endif -} - -/** -* smul32_overflow - multiplication with overflow indication -* @x, @y: Input multipliers -* @ret: Output for product -* -* Computes *@ret = @x * @y, and returns true if and only if that -* value has been truncated. -*/ -static inline bool smul32_overflow (int32_t x,int32_t y,int32_t *ret) -{ -#if __has_builtin (__builtin_mul_overflow) || __GNUC__ >=5 -return __builtin_mul_overflow (x, y, ret); -#else -int64_t z = (int64_t )x * y; - *ret = z; -return *ret != z; -#endif -} - -/** -* smul64_overflow - multiplication with overflow indication -* @x, @y: Input multipliers -* @ret: Output for product -* -* Computes *@ret = @x * @y, and returns true if and only if that -* value has been truncated. -*/ -static inline bool smul64_overflow (int64_t x,int64_t y,int64_t *ret) -{ -#if __has_builtin (__builtin_mul_overflow) || __GNUC__ >=5 -return __builtin_mul_overflow (x, y, ret); -#else -uint64_t hi, lo; -muls64 (&lo, &hi, x, y); - *ret = lo; -return hi != ((int64_t )lo >>63 ); -#endif -} - -/** -* umul32_overflow - multiplication with overflow indication -* @x, @y: Input multipliers -* @ret: Output for product -* -* Computes *@ret = @x * @y, and returns true if and only if that -* value has been truncated. -*/ -static inline bool umul32_overflow (uint32_t x,uint32_t y,uint32_t *ret) -{ -#if __has_builtin (__builtin_mul_overflow) || __GNUC__ >=5 -return __builtin_mul_overflow (x, y, ret); -#else -uint64_t z = (uint64_t )x * y; - *ret = z; -return z >UINT32_MAX ; -#endif -} - -/** -* umul64_overflow - multiplication with overflow indication -* @x, @y: Input multipliers -* @ret: Output for product -* -* Computes *@ret = @x * @y, and returns true if and only if that -* value has been truncated. -*/ -static inline bool umul64_overflow (uint64_t x,uint64_t y,uint64_t *ret) -{ -#if __has_builtin (__builtin_mul_overflow) || __GNUC__ >=5 -return __builtin_mul_overflow (x, y, ret); -#else -uint64_t hi; -mulu64 (ret, &hi, x, y); -return hi !=0 ; -#endif -} -/* * Unsigned 128x64 multiplication. * Returns true if the result got truncated to 128 bits.
@@ -623,7 +398,7 @@ static inline bool mulu128(uint64_t *plow, uint64_t *phigh, uint64_t factor)mulu64 (plow, &ahi, dlo, factor);mulu64 (&blo, &bhi, dhi, factor); -return uadd64_overflow (ahi, blo, phigh) || bhi !=0 ; +return __builtin_add_overflow (ahi, blo, phigh) || bhi !=0 ;#endif }
@@ -645,8 +420,8 @@ static inline uint64_t uadd64_carry(uint64_t x, uint64_t y, bool *pcarry)#else bool c = *pcarry;/* This is clang's internal expansion of __builtin_addc. */ - c =uadd64_overflow (x, c, &x); - c |=uadd64_overflow (x, y, &x); + c =__builtin_add_overflow (x, c, &x); + c |=__builtin_add_overflow (x, y, &x); *pcarry = c;return x;#endif
@@ -669,8 +444,8 @@ static inline uint64_t usub64_borrow(uint64_t x, uint64_t y, bool *pborrow)return x;#else bool b = *pborrow; - b =usub64_overflow (x, b, &x); - b |=usub64_overflow (x, y, &x); + b =__builtin_sub_overflow (x, b, &x); + b |=__builtin_sub_overflow (x, y, &x); *pborrow = b;return x;#endif
accel/tcg/tcg-runtime-gvec.c +8 -8
@@ -1074,7 +1074,7 @@ void HELPER(gvec_ssadd32)(void *d, void *a, void *b, uint32_t desc)int32_t ai = *(int32_t *)(a + i);int32_t bi = *(int32_t *)(b + i);int32_t di; -if (sadd32_overflow (ai, bi, &di)) { +if (__builtin_add_overflow (ai, bi, &di)) { di = (di <0 ?INT32_MAX :INT32_MIN ); } *(int32_t *)(d + i) = di;
@@ -1091,7 +1091,7 @@ void HELPER(gvec_ssadd64)(void *d, void *a, void *b, uint32_t desc)int64_t ai = *(int64_t *)(a + i);int64_t bi = *(int64_t *)(b + i);int64_t di; -if (sadd64_overflow (ai, bi, &di)) { +if (__builtin_add_overflow (ai, bi, &di)) { di = (di <0 ?INT64_MAX :INT64_MIN ); } *(int64_t *)(d + i) = di;
@@ -1142,7 +1142,7 @@ void HELPER(gvec_sssub32)(void *d, void *a, void *b, uint32_t desc)int32_t ai = *(int32_t *)(a + i);int32_t bi = *(int32_t *)(b + i);int32_t di; -if (ssub32_overflow (ai, bi, &di)) { +if (__builtin_sub_overflow (ai, bi, &di)) { di = (di <0 ?INT32_MAX :INT32_MIN ); } *(int32_t *)(d + i) = di;
@@ -1159,7 +1159,7 @@ void HELPER(gvec_sssub64)(void *d, void *a, void *b, uint32_t desc)int64_t ai = *(int64_t *)(a + i);int64_t bi = *(int64_t *)(b + i);int64_t di; -if (ssub64_overflow (ai, bi, &di)) { +if (__builtin_sub_overflow (ai, bi, &di)) { di = (di <0 ?INT64_MAX :INT64_MIN ); } *(int64_t *)(d + i) = di;
@@ -1206,7 +1206,7 @@ void HELPER(gvec_usadd32)(void *d, void *a, void *b, uint32_t desc)uint32_t ai = *(uint32_t *)(a + i);uint32_t bi = *(uint32_t *)(b + i);uint32_t di; -if (uadd32_overflow (ai, bi, &di)) { +if (__builtin_add_overflow (ai, bi, &di)) { di =UINT32_MAX ; } *(uint32_t *)(d + i) = di;
@@ -1223,7 +1223,7 @@ void HELPER(gvec_usadd64)(void *d, void *a, void *b, uint32_t desc)uint64_t ai = *(uint64_t *)(a + i);uint64_t bi = *(uint64_t *)(b + i);uint64_t di; -if (uadd64_overflow (ai, bi, &di)) { +if (__builtin_add_overflow (ai, bi, &di)) { di =UINT64_MAX ; } *(uint64_t *)(d + i) = di;
@@ -1270,7 +1270,7 @@ void HELPER(gvec_ussub32)(void *d, void *a, void *b, uint32_t desc)uint32_t ai = *(uint32_t *)(a + i);uint32_t bi = *(uint32_t *)(b + i);uint32_t di; -if (usub32_overflow (ai, bi, &di)) { +if (__builtin_sub_overflow (ai, bi, &di)) { di =0 ; } *(uint32_t *)(d + i) = di;
@@ -1287,7 +1287,7 @@ void HELPER(gvec_ussub64)(void *d, void *a, void *b, uint32_t desc)uint64_t ai = *(uint64_t *)(a + i);uint64_t bi = *(uint64_t *)(b + i);uint64_t di; -if (usub64_overflow (ai, bi, &di)) { +if (__builtin_sub_overflow (ai, bi, &di)) { di =0 ; } *(uint64_t *)(d + i) = di;
fpu/softfloat.c +5 -5
@@ -909,7 +909,7 @@ static void parts128_log2(FloatParts128 *a, float_status *s, const FloatFmt *f);static bool frac64_add (FloatParts64 *r,FloatParts64 *a,FloatParts64 *b) { -return uadd64_overflow (a->frac, b->frac, &r->frac); +return __builtin_add_overflow (a->frac, b->frac, &r->frac); }static bool frac128_add (FloatParts128 *r,FloatParts128 *a,FloatParts128 *b)
@@ -934,13 +934,13 @@ static bool frac256_add(FloatParts256 *r, FloatParts256 *a, FloatParts256 *b)static bool frac64_addi (FloatParts64 *r,FloatParts64 *a,uint64_t c) { -return uadd64_overflow (a->frac, c, &r->frac); +return __builtin_add_overflow (a->frac, c, &r->frac); }static bool frac128_addi (FloatParts128 *r,FloatParts128 *a,uint64_t c) { - c =uadd64_overflow (a->frac_lo, c, &r->frac_lo); -return uadd64_overflow (a->frac_hi, c, &r->frac_hi); + c =__builtin_add_overflow (a->frac_lo, c, &r->frac_lo); +return __builtin_add_overflow (a->frac_hi, c, &r->frac_hi); }#define frac_addi (R ,A ,C ) FRAC_GENERIC_64_128(addi, R)(R, A, C)
@@ -1516,7 +1516,7 @@ static void frac256_shrjam(FloatParts256 *a, int c)static bool frac64_sub (FloatParts64 *r,FloatParts64 *a,FloatParts64 *b) { -return usub64_overflow (a->frac, b->frac, &r->frac); +return __builtin_sub_overflow (a->frac, b->frac, &r->frac); }static bool frac128_sub (FloatParts128 *r,FloatParts128 *a,FloatParts128 *b)
libdecnumber/decNumber.c +2 -2
@@ -574,8 +574,8 @@ void decNumberIntegralToInt128(const decNumber *dn, decContext *set,/* overflow */ goto Invalid; } -if (uadd64_overflow (lo, up[d], &lo)) { -if (uadd64_overflow (hi,1 , &hi)) { +if (__builtin_add_overflow (lo, up[d], &lo)) { +if (__builtin_add_overflow (hi,1 , &hi)) {/* overflow */ goto Invalid; }
target/arm/mve_helper.c +9 -9
@@ -1345,9 +1345,9 @@ static int32_t do_vqdmladh_w(int32_t a, int32_t b, int32_t c, int32_t d,* So we add half the rounding constant before doubling rather * than adding the rounding constant after the doubling. */ -if (sadd64_overflow (m1, m2, &r) || -sadd64_overflow (r, (round <<30 ), &r) || -sadd64_overflow (r, r, &r)) { +if (__builtin_add_overflow (m1, m2, &r) || +__builtin_add_overflow (r, (round <<30 ), &r) || +__builtin_add_overflow (r, r, &r)) { *sat = true;return r <0 ?INT32_MAX :INT32_MIN ; }
@@ -1375,9 +1375,9 @@ static int32_t do_vqdmlsdh_w(int32_t a, int32_t b, int32_t c, int32_t d,int64_t m2 = (int64_t )c * d;int64_t r;/* The same ordering issue as in do_vqdmladh_w applies here too */ -if (ssub64_overflow (m1, m2, &r) || -sadd64_overflow (r, (round <<30 ), &r) || -sadd64_overflow (r, r, &r)) { +if (__builtin_sub_overflow (m1, m2, &r) || +__builtin_add_overflow (r, (round <<30 ), &r) || +__builtin_add_overflow (r, r, &r)) { *sat = true;return r <0 ?INT32_MAX :INT32_MIN ; }
@@ -1561,9 +1561,9 @@ static int32_t do_vqdmlah_w(int32_t a, int32_t b, int32_t c,int64_t m1 = (int64_t )a * b;int64_t m2 = (int64_t )c <<31 ;int64_t r; -if (sadd64_overflow (m1, m2, &r) || -sadd64_overflow (r, (round <<30 ), &r) || -sadd64_overflow (r, r, &r)) { +if (__builtin_add_overflow (m1, m2, &r) || +__builtin_add_overflow (r, (round <<30 ), &r) || +__builtin_add_overflow (r, r, &r)) { *sat = true;return r <0 ?INT32_MAX :INT32_MIN ; }
Signature · 1 line
2.31.1
Quoted 32 lines · Thomas Huth
According to commit
cec07c0b612975these wrappers were required for GCC < 5.0 and Clang < 3.8. We don't support such old compilers at all anymore, so we can remove the wrappers now.Signed-off-by Thomas Huth <[email protected]>---
Not sure whether it's nicer to remove these to get rid of some lines of code, or whether it's nicer to keep them for the more explicit names...include/qemu/host-utils.h | 235 +---------------------------------- accel/tcg/tcg-runtime-gvec.c | 16 +-- fpu/softfloat.c | 10 +- libdecnumber/decNumber.c | 4 +- target/arm/mve_helper.c | 18 +-- 5 files changed, 29 insertions(+), 254 deletions(-)include/qemu/host-utils.h +0
-7@@ -366,231 +366,6 @@ static inline uint64_t uabs64(int64_t v)return v <0 ? -v : v; } -/** -* sadd32_overflow - addition with overflow indication -* @x, @y: addends -* @ret: Output for sum -* -* Computes *@ret = @x + @y, and returns true if and only if that -* value has been truncated.
include/qemu/host-utils.h static inline uint64_t uabs64(int64_t v) · line 385
Quoted 10 lines
include/qemu/host-utils.h +0
-10-*/ -static inline bool sadd32_overflow (int32_t x,int32_t y,int32_t *ret) -{ -#if __has_builtin (__builtin_add_overflow) || __GNUC__ >=5 -return __builtin_add_overflow (x, y, ret); -#else - *ret = x + y; -return ((*ret ^ x) & ~(x ^ y)) <0 ; -#endif -}
I think I'd prefer to keep the wrapper functions and just delete the fallback ifdeffery, but I guess I don't feel really strongly about it. Richard, do you have an opinion?
-- PMM
Quoted 5 lines · Peter Maydell
Quoted 5 lines
include/qemu/host-utils.h +0
-5-static inline bool sadd32_overflow (int32_t x,int32_t y,int32_t *ret) -{ -#if __has_builtin (__builtin_add_overflow) || __GNUC__ >=5 -return __builtin_add_overflow (x, y, ret); -#else
Quoted 8 lines
include/qemu/host-utils.h static inline uint64_t uabs64(int64_t v) · line 385
Quoted 4 lines
include/qemu/host-utils.h +0
-4- *ret = x + y; -return ((*ret ^ x) & ~(x ^ y)) <0 ; -#endif -}I think I'd prefer to keep the wrapper functions and just delete the fallback ifdeffery, but I guess I don't feel really strongly about it. Richard, do you have an opinion?
Likewise I don't feel strongly, but lean toward keeping the names. I will point out that without these names, one has to track down the type of each argument to figure out what is, or is not, overflowing.
r~
Quoted 15 lines · Richard Henderson
Quoted 5 lines · Peter Maydell
Quoted 5 lines
include/qemu/host-utils.h +0
-5-static inline bool sadd32_overflow (int32_t x,int32_t y,int32_t *ret) -{ -#if __has_builtin (__builtin_add_overflow) || __GNUC__ >=5 - return __builtin_add_overflow(x, y, ret); -#else Quoted 8 lines
Review
Quoted 4 lines
- *ret = x + y;
- return ((*ret ^ x) & ~(x ^ y)) < 0;(quoted diff) +0
-2-#endif -}I think I'd prefer to keep the wrapper functions and just delete the fallback ifdeffery, but I guess I don't feel really strongly about it. Richard, do you have an opinion?
Quoted 1 line
Likewise I don't feel strongly, but lean toward keeping the names. I will point out that without these names, one has to track down the type of each argument to figure out what is, or is not, overflowing.
Yes, I checked the calling sites, and some do use different types indeed, but as far as I understood the __builtin_add_overflow(), it should be ok in our cases. Anyway, it's maybe less error prone to keep the wrapper with the fixed parameter types, so I'll send a v2 that just removes the #ifs instead.
Thomas