From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40305) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1by3Tw-00052C-N9 for qemu-devel@nongnu.org; Sat, 22 Oct 2016 17:05:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1by3Tt-0001nJ-CE for qemu-devel@nongnu.org; Sat, 22 Oct 2016 17:05:32 -0400 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:33138) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1by3Tt-0001n2-57 for qemu-devel@nongnu.org; Sat, 22 Oct 2016 17:05:29 -0400 Received: by mail-pf0-x243.google.com with SMTP id i85so12088967pfa.0 for ; Sat, 22 Oct 2016 14:05:29 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Sat, 22 Oct 2016 14:04:52 -0700 Message-Id: <1477170324-17783-4-git-send-email-rth@twiddle.net> In-Reply-To: <1477170324-17783-1-git-send-email-rth@twiddle.net> References: <1477170324-17783-1-git-send-email-rth@twiddle.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PULL 03/35] exec: Avoid direct references to Int128 parts List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org Reviewed-by: Emilio G. Cota Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- exec.c | 4 ++-- include/qemu/int128.h | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/exec.c b/exec.c index e63c5a1..0096a54 100644 --- a/exec.c +++ b/exec.c @@ -318,9 +318,9 @@ static inline bool section_covers_addr(const MemoryRegionSection *section, /* Memory topology clips a memory region to [0, 2^64); size.hi > 0 means * the section must cover the entire address space. */ - return section->size.hi || + return int128_gethi(section->size) || range_covers_byte(section->offset_within_address_space, - section->size.lo, addr); + int128_getlo(section->size), addr); } static MemoryRegionSection *phys_page_find(PhysPageEntry lp, hwaddr addr, diff --git a/include/qemu/int128.h b/include/qemu/int128.h index c598881..52aaf99 100644 --- a/include/qemu/int128.h +++ b/include/qemu/int128.h @@ -20,6 +20,16 @@ static inline uint64_t int128_get64(Int128 a) return a.lo; } +static inline uint64_t int128_getlo(Int128 a) +{ + return a.lo; +} + +static inline int64_t int128_gethi(Int128 a) +{ + return a.hi; +} + static inline Int128 int128_zero(void) { return int128_make64(0); -- 2.7.4