From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60100) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brLLs-000334-Tl for qemu-devel@nongnu.org; Tue, 04 Oct 2016 04:45:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1brLLr-0003N1-LX for qemu-devel@nongnu.org; Tue, 04 Oct 2016 04:45:28 -0400 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]:35275) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brLLr-0003Mf-Bf for qemu-devel@nongnu.org; Tue, 04 Oct 2016 04:45:27 -0400 Received: by mail-wm0-x231.google.com with SMTP id f193so153694197wmg.0 for ; Tue, 04 Oct 2016 01:45:27 -0700 (PDT) References: <1474048017-26696-1-git-send-email-rth@twiddle.net> <1474048017-26696-5-git-send-email-rth@twiddle.net> From: Alex =?utf-8?Q?Benn=C3=A9e?= In-reply-to: <1474048017-26696-5-git-send-email-rth@twiddle.net> Date: Tue, 04 Oct 2016 09:45:24 +0100 Message-ID: <87zimksdsr.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v4 04/35] int128: Use __int128 if available List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Richard Henderson Cc: qemu-devel@nongnu.org Richard Henderson writes: > Signed-off-by: Richard Henderson Reviewed-by: Alex Bennée > --- > include/qemu/int128.h | 135 +++++++++++++++++++++++++++++++++++++++++++++++++- > tests/test-int128.c | 22 ++++---- > 2 files changed, 145 insertions(+), 12 deletions(-) > > diff --git a/include/qemu/int128.h b/include/qemu/int128.h > index 52aaf99..08f1db1 100644 > --- a/include/qemu/int128.h > +++ b/include/qemu/int128.h > @@ -1,6 +1,138 @@ > #ifndef INT128_H > #define INT128_H > > +#ifdef CONFIG_INT128 > + > +typedef __int128 Int128; > + > +static inline Int128 int128_make64(uint64_t a) > +{ > + return a; > +} > + > +static inline uint64_t int128_get64(Int128 a) > +{ > + uint64_t r = a; > + assert(r == a); > + return r; > +} > + > +static inline uint64_t int128_getlo(Int128 a) > +{ > + return a; > +} > + > +static inline int64_t int128_gethi(Int128 a) > +{ > + return a >> 64; > +} > + > +static inline Int128 int128_zero(void) > +{ > + return 0; > +} > + > +static inline Int128 int128_one(void) > +{ > + return 1; > +} > + > +static inline Int128 int128_2_64(void) > +{ > + return (Int128)1 << 64; > +} > + > +static inline Int128 int128_exts64(int64_t a) > +{ > + return a; > +} > + > +static inline Int128 int128_and(Int128 a, Int128 b) > +{ > + return a & b; > +} > + > +static inline Int128 int128_rshift(Int128 a, int n) > +{ > + return a >> n; > +} > + > +static inline Int128 int128_add(Int128 a, Int128 b) > +{ > + return a + b; > +} > + > +static inline Int128 int128_neg(Int128 a) > +{ > + return -a; > +} > + > +static inline Int128 int128_sub(Int128 a, Int128 b) > +{ > + return a - b; > +} > + > +static inline bool int128_nonneg(Int128 a) > +{ > + return a >= 0; > +} > + > +static inline bool int128_eq(Int128 a, Int128 b) > +{ > + return a == b; > +} > + > +static inline bool int128_ne(Int128 a, Int128 b) > +{ > + return a != b; > +} > + > +static inline bool int128_ge(Int128 a, Int128 b) > +{ > + return a >= b; > +} > + > +static inline bool int128_lt(Int128 a, Int128 b) > +{ > + return a < b; > +} > + > +static inline bool int128_le(Int128 a, Int128 b) > +{ > + return a <= b; > +} > + > +static inline bool int128_gt(Int128 a, Int128 b) > +{ > + return a > b; > +} > + > +static inline bool int128_nz(Int128 a) > +{ > + return a != 0; > +} > + > +static inline Int128 int128_min(Int128 a, Int128 b) > +{ > + return a < b ? a : b; > +} > + > +static inline Int128 int128_max(Int128 a, Int128 b) > +{ > + return a > b ? a : b; > +} > + > +static inline void int128_addto(Int128 *a, Int128 b) > +{ > + *a += b; > +} > + > +static inline void int128_subfrom(Int128 *a, Int128 b) > +{ > + *a -= b; > +} > + > +#else /* !CONFIG_INT128 */ > > typedef struct Int128 Int128; > > @@ -153,4 +285,5 @@ static inline void int128_subfrom(Int128 *a, Int128 b) > *a = int128_sub(*a, b); > } > > -#endif > +#endif /* CONFIG_INT128 */ > +#endif /* INT128_H */ > diff --git a/tests/test-int128.c b/tests/test-int128.c > index 4390123..b86a3c7 100644 > --- a/tests/test-int128.c > +++ b/tests/test-int128.c > @@ -41,7 +41,7 @@ static Int128 expand(uint32_t x) > uint64_t l, h; > l = expand16(x & 65535); > h = expand16(x >> 16); > - return (Int128) {l, h}; > + return (Int128) int128_make128(l, h); > }; > > static void test_and(void) > @@ -54,8 +54,8 @@ static void test_and(void) > Int128 b = expand(tests[j]); > Int128 r = expand(tests[i] & tests[j]); > Int128 s = int128_and(a, b); > - g_assert_cmpuint(r.lo, ==, s.lo); > - g_assert_cmpuint(r.hi, ==, s.hi); > + g_assert_cmpuint(int128_getlo(r), ==, int128_getlo(s)); > + g_assert_cmpuint(int128_gethi(r), ==, int128_gethi(s)); > } > } > } > @@ -70,8 +70,8 @@ static void test_add(void) > Int128 b = expand(tests[j]); > Int128 r = expand(tests[i] + tests[j]); > Int128 s = int128_add(a, b); > - g_assert_cmpuint(r.lo, ==, s.lo); > - g_assert_cmpuint(r.hi, ==, s.hi); > + g_assert_cmpuint(int128_getlo(r), ==, int128_getlo(s)); > + g_assert_cmpuint(int128_gethi(r), ==, int128_gethi(s)); > } > } > } > @@ -86,8 +86,8 @@ static void test_sub(void) > Int128 b = expand(tests[j]); > Int128 r = expand(tests[i] - tests[j]); > Int128 s = int128_sub(a, b); > - g_assert_cmpuint(r.lo, ==, s.lo); > - g_assert_cmpuint(r.hi, ==, s.hi); > + g_assert_cmpuint(int128_getlo(r), ==, int128_getlo(s)); > + g_assert_cmpuint(int128_gethi(r), ==, int128_gethi(s)); > } > } > } > @@ -100,8 +100,8 @@ static void test_neg(void) > Int128 a = expand(tests[i]); > Int128 r = expand(-tests[i]); > Int128 s = int128_neg(a); > - g_assert_cmpuint(r.lo, ==, s.lo); > - g_assert_cmpuint(r.hi, ==, s.hi); > + g_assert_cmpuint(int128_getlo(r), ==, int128_getlo(s)); > + g_assert_cmpuint(int128_gethi(r), ==, int128_gethi(s)); > } > } > > @@ -180,8 +180,8 @@ test_rshift_one(uint32_t x, int n, uint64_t h, uint64_t l) > { > Int128 a = expand(x); > Int128 r = int128_rshift(a, n); > - g_assert_cmpuint(r.lo, ==, l); > - g_assert_cmpuint(r.hi, ==, h); > + g_assert_cmpuint(int128_getlo(r), ==, l); > + g_assert_cmpuint(int128_gethi(r), ==, h); > } > > static void test_rshift(void) -- Alex Bennée