From patchwork Mon Sep 2 16:28:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 272016 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 AADA82C0089 for ; Tue, 3 Sep 2013 03:11:54 +1000 (EST) Received: from localhost ([::1]:41014 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGX7l-0004ag-4b for incoming@patchwork.ozlabs.org; Mon, 02 Sep 2013 12:37:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39887) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGX0Y-0002cW-QJ for qemu-devel@nongnu.org; Mon, 02 Sep 2013 12:29:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VGX0T-0005ke-VT for qemu-devel@nongnu.org; Mon, 02 Sep 2013 12:29:42 -0400 Received: from mail-pd0-x236.google.com ([2607:f8b0:400e:c02::236]:61178) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGX0T-0005kU-O3 for qemu-devel@nongnu.org; Mon, 02 Sep 2013 12:29:37 -0400 Received: by mail-pd0-f182.google.com with SMTP id r10so4947442pdi.13 for ; Mon, 02 Sep 2013 09:29:36 -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=lomdDAIpW4CZjMh0PsYA+BHi4eIhHWnWqDEvUUIr9fE=; b=JyqKBacZbY+t7E+3KT7qrT6QGxKCRLJKxr7+wwAIcJL2SkHfsFHzVVwvlQxNu6ERzf YeFSyQE8jSwXZozV7V+nq7r7EPZeJXbChs4OaY75oZGaW9q+UWKHiNXVkqojn/gB/8W3 pvLJOwK2KUkBfXo6vEaktEuPPSO2JSijf3HcWUOMgXzMxFv8EdP/YOCHLVFAIyKkoRqL c1BhF/Yx8oBkoZ1AFoBiHNSj82nlRufUV5kwSgl0mADxl7GS2gCaD7yEx0aMOEPgvfAW QZl/Hr2tn8jL7q6vJXzy+ucoqUtsF3UcYZ65/hamyMZi5O+rHsn2GR8Cxck6xm6aBFsV 4YgQ== X-Received: by 10.67.30.100 with SMTP id kd4mr27673055pad.24.1378139376860; Mon, 02 Sep 2013 09:29:36 -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:36 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 2 Sep 2013 09:28:57 -0700 Message-Id: <1378139354-28602-13-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::236 Cc: aurelien@aurel32.net, anthony@codemonkey.ws Subject: [Qemu-devel] [PULL 12/29] tcg: Change frame pointer offsets to intptr_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 Reviewed-by: Aurelien Jarno Signed-off-by: Richard Henderson --- tcg/tcg.c | 5 ++--- tcg/tcg.h | 9 ++++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tcg/tcg.c b/tcg/tcg.c index 65cffca..240e6f4 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -306,8 +306,7 @@ void tcg_prologue_init(TCGContext *s) #endif } -void tcg_set_frame(TCGContext *s, int reg, - tcg_target_long start, tcg_target_long size) +void tcg_set_frame(TCGContext *s, int reg, intptr_t start, intptr_t size) { s->frame_start = start; s->frame_end = start + size; @@ -1613,7 +1612,7 @@ static void temp_allocate_frame(TCGContext *s, int temp) ts->mem_offset = s->current_frame_offset; ts->mem_reg = s->frame_reg; ts->mem_allocated = 1; - s->current_frame_offset += (tcg_target_long)sizeof(tcg_target_long); + s->current_frame_offset += sizeof(tcg_target_long); } /* sync register 'reg' by saving it to the corresponding temporary */ diff --git a/tcg/tcg.h b/tcg/tcg.h index bb215a7..b7e112e 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -435,9 +435,9 @@ struct TCGContext { into account fixed registers */ int reg_to_temp[TCG_TARGET_NB_REGS]; TCGRegSet reserved_regs; - tcg_target_long current_frame_offset; - tcg_target_long frame_start; - tcg_target_long frame_end; + intptr_t current_frame_offset; + intptr_t frame_start; + intptr_t frame_end; int frame_reg; uint8_t *code_ptr; @@ -530,8 +530,7 @@ void tcg_func_start(TCGContext *s); int tcg_gen_code(TCGContext *s, uint8_t *gen_code_buf); int tcg_gen_code_search_pc(TCGContext *s, uint8_t *gen_code_buf, long offset); -void tcg_set_frame(TCGContext *s, int reg, - tcg_target_long start, tcg_target_long size); +void tcg_set_frame(TCGContext *s, int reg, intptr_t start, intptr_t size); TCGv_i32 tcg_global_reg_new_i32(int reg, const char *name); TCGv_i32 tcg_global_mem_new_i32(int reg, tcg_target_long offset,