From patchwork Fri Mar 2 22:30:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 144374 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B690FB6EF1 for ; Sat, 3 Mar 2012 09:31:06 +1100 (EST) Received: from localhost ([::1]:40408 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S3b0C-0001ff-H6 for incoming@patchwork.ozlabs.org; Fri, 02 Mar 2012 17:31:04 -0500 Received: from eggs.gnu.org ([208.118.235.92]:41241) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S3azi-0000sx-IB for qemu-devel@nongnu.org; Fri, 02 Mar 2012 17:30:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S3azO-0000AI-Cx for qemu-devel@nongnu.org; Fri, 02 Mar 2012 17:30:34 -0500 Received: from v220110690675601.yourvserver.net ([78.47.199.172]:41016) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S3azO-00009V-6b for qemu-devel@nongnu.org; Fri, 02 Mar 2012 17:30:14 -0500 Received: from localhost (v220110690675601.yourvserver.net.local [127.0.0.1]) by v220110690675601.yourvserver.net (Postfix) with ESMTP id 135C172800A0; Fri, 2 Mar 2012 23:30:12 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at weilnetz.de Received: from v220110690675601.yourvserver.net ([127.0.0.1]) by localhost (v220110690675601.yourvserver.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pl0iQUa2KedM; Fri, 2 Mar 2012 23:30:11 +0100 (CET) Received: by v220110690675601.yourvserver.net (Postfix, from userid 1000) id 8FA79728009F; Fri, 2 Mar 2012 23:30:11 +0100 (CET) From: Stefan Weil To: qemu-devel@nongnu.org Date: Fri, 2 Mar 2012 23:30:02 +0100 Message-Id: <1330727407-24014-2-git-send-email-sw@weilnetz.de> X-Mailer: git-send-email 1.7.9 In-Reply-To: <1330727407-24014-1-git-send-email-sw@weilnetz.de> References: <1330727407-24014-1-git-send-email-sw@weilnetz.de> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 78.47.199.172 Cc: Stefan Weil Subject: [Qemu-devel] [PATCH 1/6] w64: Fix size of ram_addr_t X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org ram_addr_t must be large enough to address any address of the host. For hosts with sizeof(unsigned long) == sizeof(void *), this patch changes nothing. All currently supported hosts fall into this category. For w64 hosts, sizeof(unsigned long) is 4 while sizeof(void *) is 8, so the use of uintptr_t is needed. Signed-off-by: Stefan Weil --- cpu-common.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cpu-common.h b/cpu-common.h index a40c57d..dca5175 100644 --- a/cpu-common.h +++ b/cpu-common.h @@ -28,9 +28,9 @@ typedef uint64_t ram_addr_t; # define RAM_ADDR_MAX UINT64_MAX # define RAM_ADDR_FMT "%" PRIx64 #else -typedef unsigned long ram_addr_t; -# define RAM_ADDR_MAX ULONG_MAX -# define RAM_ADDR_FMT "%lx" +typedef uintptr_t ram_addr_t; +# define RAM_ADDR_MAX UINTPTR_MAX +# define RAM_ADDR_FMT "%" PRIxPTR #endif /* memory API */