From patchwork Mon Sep 2 16:28:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 271998 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 572FC2C009F for ; Tue, 3 Sep 2013 02:33:48 +1000 (EST) Received: from localhost ([::1]:40978 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGX4U-00007p-29 for incoming@patchwork.ozlabs.org; Mon, 02 Sep 2013 12:33:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39871) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGX0X-0002aZ-JL for qemu-devel@nongnu.org; Mon, 02 Sep 2013 12:29:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VGX0S-0005kK-J9 for qemu-devel@nongnu.org; Mon, 02 Sep 2013 12:29:41 -0400 Received: from mail-pd0-x22a.google.com ([2607:f8b0:400e:c02::22a]:45306) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGX0S-0005k8-7a for qemu-devel@nongnu.org; Mon, 02 Sep 2013 12:29:36 -0400 Received: by mail-pd0-f170.google.com with SMTP id x10so4951843pdj.15 for ; Mon, 02 Sep 2013 09:29:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=lUL/JzVj3FRNjo1T3SOqCZztfb6WGhLEyCwUdExvVbI=; b=Px9bLQ6LOVUNtVugHjIVWC9Vw3hMsiiWIh+ODvEwZltKLaUIONrLKt0C+CDwGuyy7M TCnZbEhj1g9tiibvWAIwXCN0PyBVS6Mo+k39GLWANGrG30nmCCLl1mIKuUHJV69bkB2J o3/FprqZ9AyYEcFHduzOWKV6TWAZb+jfjNrRAT/yMlp5h2S84lkoyy5k7vqdINHNNMg+ wFBMw0kMhdfoXJvF/leMBWERFV7LE1Z4TCOVyyG5KkIJEFL6OsDymwOrEZt8DhJKvEmT yXktYAkWLRKsRg4sH6MaVFA/H07DMYfjx/fj5AaK+VEhy42OoywB+gkSnMR1+DXHyaEz XEyQ== X-Received: by 10.66.141.144 with SMTP id ro16mr3142602pab.173.1378139375252; Mon, 02 Sep 2013 09:29:35 -0700 (PDT) Received: from anchor.twiddle.net (50-194-63-110-static.hfc.comcastbusiness.net. [50.194.63.110]) by mx.google.com with ESMTPSA id ia5sm16821148pbc.42.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 02 Sep 2013 09:29:34 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 2 Sep 2013 09:28:56 -0700 Message-Id: <1378139354-28602-12-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1378139354-28602-1-git-send-email-rth@twiddle.net> References: <1378139354-28602-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c02::22a Cc: aurelien@aurel32.net, anthony@codemonkey.ws Subject: [Qemu-devel] [PULL 11/29] tcg: Define TCG_ptr properly 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 Reviewed-by: Aurelien Jarno Signed-off-by: Richard Henderson --- tcg/tcg.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tcg/tcg.h b/tcg/tcg.h index 7a6f2e5..bb215a7 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -645,11 +645,11 @@ do {\ void tcg_add_target_add_op_defs(const TCGTargetOpDef *tdefs); -#if TCG_TARGET_REG_BITS == 32 +#if UINTPTR_MAX == UINT32_MAX #define TCGV_NAT_TO_PTR(n) MAKE_TCGV_PTR(GET_TCGV_I32(n)) #define TCGV_PTR_TO_NAT(n) MAKE_TCGV_I32(GET_TCGV_PTR(n)) -#define tcg_const_ptr(V) TCGV_NAT_TO_PTR(tcg_const_i32((tcg_target_long)(V))) +#define tcg_const_ptr(V) TCGV_NAT_TO_PTR(tcg_const_i32((intptr_t)(V))) #define tcg_global_reg_new_ptr(R, N) \ TCGV_NAT_TO_PTR(tcg_global_reg_new_i32((R), (N))) #define tcg_global_mem_new_ptr(R, O, N) \ @@ -660,7 +660,7 @@ void tcg_add_target_add_op_defs(const TCGTargetOpDef *tdefs); #define TCGV_NAT_TO_PTR(n) MAKE_TCGV_PTR(GET_TCGV_I64(n)) #define TCGV_PTR_TO_NAT(n) MAKE_TCGV_I64(GET_TCGV_PTR(n)) -#define tcg_const_ptr(V) TCGV_NAT_TO_PTR(tcg_const_i64((tcg_target_long)(V))) +#define tcg_const_ptr(V) TCGV_NAT_TO_PTR(tcg_const_i64((intptr_t)(V))) #define tcg_global_reg_new_ptr(R, N) \ TCGV_NAT_TO_PTR(tcg_global_reg_new_i64((R), (N))) #define tcg_global_mem_new_ptr(R, O, N) \