From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41002) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkxFC-0005wm-5C for qemu-devel@nongnu.org; Fri, 16 Sep 2016 13:48:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bkxF7-0007NO-UU for qemu-devel@nongnu.org; Fri, 16 Sep 2016 13:48:09 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:33092) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkxF7-0007N5-PG for qemu-devel@nongnu.org; Fri, 16 Sep 2016 13:48:05 -0400 Received: by mail-pf0-f193.google.com with SMTP id q2so1220834pfj.0 for ; Fri, 16 Sep 2016 10:48:05 -0700 (PDT) Received: from anchor.twiddle.net (174-24-157-40.tukw.qwest.net. [174.24.157.40]) by smtp.gmail.com with ESMTPSA id e71sm27910078pfc.75.2016.09.16.10.47.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Sep 2016 10:47:04 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Fri, 16 Sep 2016 10:46:27 -0700 Message-Id: <1474048017-26696-6-git-send-email-rth@twiddle.net> In-Reply-To: <1474048017-26696-1-git-send-email-rth@twiddle.net> References: <1474048017-26696-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH v4 05/35] int128: Add int128_make128 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Allows Int128 to be used more generally, rather than having to begin with 64-bit inputs and accumulate. Signed-off-by: Richard Henderson --- include/qemu/int128.h | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/include/qemu/int128.h b/include/qemu/int128.h index 08f1db1..67440fa 100644 --- a/include/qemu/int128.h +++ b/include/qemu/int128.h @@ -10,6 +10,11 @@ static inline Int128 int128_make64(uint64_t a) return a; } +static inline Int128 int128_make128(uint64_t lo, uint64_t hi) +{ + return (unsigned __int128)hi << 64 | lo; +} + static inline uint64_t int128_get64(Int128 a) { uint64_t r = a; @@ -146,6 +151,11 @@ static inline Int128 int128_make64(uint64_t a) return (Int128) { a, 0 }; } +static inline Int128 int128_make128(uint64_t lo, uint64_t hi) +{ + return (Int128) { lo, hi }; +} + static inline uint64_t int128_get64(Int128 a) { assert(!a.hi); @@ -195,9 +205,9 @@ static inline Int128 int128_rshift(Int128 a, int n) } h = a.hi >> (n & 63); if (n >= 64) { - return (Int128) { h, h >> 63 }; + return int128_make128(h, h >> 63); } else { - return (Int128) { (a.lo >> n) | ((uint64_t)a.hi << (64 - n)), h }; + return int128_make128((a.lo >> n) | ((uint64_t)a.hi << (64 - n)), h); } } @@ -211,18 +221,18 @@ static inline Int128 int128_add(Int128 a, Int128 b) * * So the carry is lo < a.lo. */ - return (Int128) { lo, (uint64_t)a.hi + b.hi + (lo < a.lo) }; + return int128_make128(lo, (uint64_t)a.hi + b.hi + (lo < a.lo)); } static inline Int128 int128_neg(Int128 a) { uint64_t lo = -a.lo; - return (Int128) { lo, ~(uint64_t)a.hi + !lo }; + return int128_make128(lo, ~(uint64_t)a.hi + !lo); } static inline Int128 int128_sub(Int128 a, Int128 b) { - return (Int128){ a.lo - b.lo, (uint64_t)a.hi - b.hi - (a.lo < b.lo) }; + return int128_make128(a.lo - b.lo, (uint64_t)a.hi - b.hi - (a.lo < b.lo)); } static inline bool int128_nonneg(Int128 a) -- 2.5.5