From patchwork Mon Sep 2 16:29:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 272004 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 51B8B2C00A4 for ; Tue, 3 Sep 2013 02:38:40 +1000 (EST) Received: from localhost ([::1]:41029 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGX9C-0006dZ-9N for incoming@patchwork.ozlabs.org; Mon, 02 Sep 2013 12:38:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39979) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGX0i-0002vY-KK for qemu-devel@nongnu.org; Mon, 02 Sep 2013 12:29:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VGX0d-0005mx-Pe for qemu-devel@nongnu.org; Mon, 02 Sep 2013 12:29:52 -0400 Received: from mail-pd0-x231.google.com ([2607:f8b0:400e:c02::231]:55726) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGX0d-0005mj-IT for qemu-devel@nongnu.org; Mon, 02 Sep 2013 12:29:47 -0400 Received: by mail-pd0-f177.google.com with SMTP id y10so4915960pdj.36 for ; Mon, 02 Sep 2013 09:29:46 -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=zhTXoALfgm3jCGKoqfFvyOQbOKKQ7urhaqtBJTHcjx8=; b=dCdtu8hF2xIXJd1uKvNs5j/u+uFDXdQ+feEnr+awVpMsAaA0U5JkHYT78Da/jTohJC x8yXGzQaafYvvrzUqfHkNYFRVatkYkXYPZ38c82lG8b6CUh9sJmEtYZ9gEuADqQHdUae MhM91D2X21bssk72fMNYzD5UIIDTLwa9P0+mUVvot+vnU+KKKhdq8y3O2FKe9BjhcSdH xqXwySvFdZeuBSEcODaBbK4CDXzC4RSMeq2HS9Vgudb9PaZeffda/L0e0HceM2t0itw5 5qu49xpQle5IQaaF+7sMeAWVPRkf+/vz6p7J/oSSglZxuGg52uIe+W3KNfbgMExRC1Fy 58IA== X-Received: by 10.68.237.3 with SMTP id uy3mr3939701pbc.155.1378139386691; Mon, 02 Sep 2013 09:29:46 -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:45 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 2 Sep 2013 09:29:04 -0700 Message-Id: <1378139354-28602-20-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::231 Cc: aurelien@aurel32.net, anthony@codemonkey.ws Subject: [Qemu-devel] [PULL 19/29] tcg: Fix jit debug for x32 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.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tcg/tcg.c b/tcg/tcg.c index 99f3b2c..fd7fb6b 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -49,10 +49,10 @@ #include "tcg-op.h" -#if TCG_TARGET_REG_BITS == 64 -# define ELF_CLASS ELFCLASS64 -#else +#if UINTPTR_MAX == UINT32_MAX # define ELF_CLASS ELFCLASS32 +#else +# define ELF_CLASS ELFCLASS64 #endif #ifdef HOST_WORDS_BIGENDIAN # define ELF_DATA ELFDATA2MSB @@ -82,8 +82,8 @@ typedef struct { typedef struct QEMU_PACKED { uint32_t len __attribute__((aligned((sizeof(void *))))); uint32_t cie_offset; - tcg_target_long func_start; - tcg_target_long func_len; + uintptr_t func_start; + uintptr_t func_len; } DebugFrameFDEHeader; static void tcg_register_jit_int(void *buf, size_t size,