From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Date: Thu, 27 Sep 2018 00:24:14 +0000 (+0200)
Subject: memory: Use MAKE_64BIT_MASK()
X-Git-Tag: v3.1.0-rc0~71^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=36960b4d66d2dd59174f230766d1f4eaffec60a3;p=thirdparty%2Fqemu.git

memory: Use MAKE_64BIT_MASK()

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180927002416.1781-2-f4bug@amsat.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/memory.c b/memory.c
index f797d82dd13..b3051d99f51 100644
--- a/memory.c
+++ b/memory.c
@@ -582,7 +582,7 @@ static MemTxResult access_with_adjusted_size(hwaddr addr,
 
     /* FIXME: support unaligned access? */
     access_size = MAX(MIN(size, access_size_max), access_size_min);
-    access_mask = -1ULL >> (64 - access_size * 8);
+    access_mask = MAKE_64BIT_MASK(0, access_size * 8);
     if (memory_region_big_endian(mr)) {
         for (i = 0; i < size; i += access_size) {
             r |= access_fn(mr, addr + i, value, access_size,