From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1O0V58-0001ni-W7
	for qemu-devel@nongnu.org; Sat, 10 Apr 2010 03:26:19 -0400
Received: from [140.186.70.92] (port=35847 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1O0V57-0001nO-4C
	for qemu-devel@nongnu.org; Sat, 10 Apr 2010 03:26:18 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <stefan@weilnetz.de>) id 1O0V54-0008CY-Go
	for qemu-devel@nongnu.org; Sat, 10 Apr 2010 03:26:16 -0400
Received: from moutng.kundenserver.de ([212.227.17.9]:49963)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <stefan@weilnetz.de>) id 1O0V54-0008CH-2k
	for qemu-devel@nongnu.org; Sat, 10 Apr 2010 03:26:14 -0400
From: Stefan Weil <weil@mail.berlios.de>
Date: Sat, 10 Apr 2010 09:26:03 +0200
Message-Id: <1270884363-5186-1-git-send-email-weil@mail.berlios.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [Qemu-devel] [PATCH] Avoid compiler error
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: QEMU Developers <qemu-devel@nongnu.org>
Cc: Juergen Lock <nox@jelal.kn-bremen.de>, Aurelien Jarno <aurelien@aurel32.net>, Richard Henderson <rth@twiddle.net>

A 32 bit cross compilation of x86_64-linux-user raises this error:

  CC    x86_64-linux-user/exec.o
cc1: warnings being treated as errors
exec.c: In function ‘page_init’:
exec.c:350: error: large integer implicitly truncated to unsigned type

L1_MAP_ADDR_SPACE_BITS == 47, HOST_LONG_BITS == 32,
so the shift operation indeed is problematic.

Limit endaddr to ULONG_MAX in this case.

Cc: Richard Henderson <rth@twiddle.net>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Juergen Lock <nox@jelal.kn-bremen.de>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
---
 exec.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/exec.c b/exec.c
index a6d3bad..c80b7f7 100644
--- a/exec.c
+++ b/exec.c
@@ -343,6 +343,8 @@ static void page_init(void)
                     } else {
 #if TARGET_ABI_BITS <= L1_MAP_ADDR_SPACE_BITS
                         endaddr = ~0ul;
+#elif HOST_LONG_BITS <= L1_MAP_ADDR_SPACE_BITS
+                        endaddr = ULONG_MAX;
 #else
                         endaddr = ((abi_ulong)1 << L1_MAP_ADDR_SPACE_BITS) - 1;
 #endif
-- 
1.7.0