From patchwork Thu Aug 29 21:09:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 270955 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 61D3F2C00A9 for ; Fri, 30 Aug 2013 07:14:37 +1000 (EST) Received: from localhost ([::1]:45852 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VF9Y3-0000HT-Cl for incoming@patchwork.ozlabs.org; Thu, 29 Aug 2013 17:14:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42381) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VF9UI-0003TO-40 for qemu-devel@nongnu.org; Thu, 29 Aug 2013 17:10:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VF9UD-0001sp-3y for qemu-devel@nongnu.org; Thu, 29 Aug 2013 17:10:42 -0400 Received: from mail-qc0-x22e.google.com ([2607:f8b0:400d:c01::22e]:55517) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VF9UC-0001rc-Cw for qemu-devel@nongnu.org; Thu, 29 Aug 2013 17:10:36 -0400 Received: by mail-qc0-f174.google.com with SMTP id e10so556347qcy.5 for ; Thu, 29 Aug 2013 14:10: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=gQ1hf8zmjjPVL+dfUrVRLOyu5uyuVMLlEibXUBdGbdY=; b=JIvv33DLYoVW9HJ7yzQg7iyafgg+jR5txWlX+P3goDkMasmaEqfgIAiDh4uibiZd32 QaT5ZwDCnNy5XPizamJtB1vqZkbIpOBvdSkBUusFMZ8+m7MQVE2jQESu5xmmrByZpoW8 cbo9LQdtAA1FO39paJZeo8y8pqGoN/pEdfuU9UbR8kYxEJ6nNAkjILA8eOVd6AC2Vq9n vcsl1W8pUFTwS1f1/oohtUVSJIuQhWc+fOit0tUHmu9O8TJK/0cOgBRSa1pPHOCItbkd EDrCv1em5S7xoukHYbX2igUf+eukYjc/jCYvE36Lp2NPLJGtTZMI7uZzk6GfCiXlcynm ZN2Q== X-Received: by 10.229.71.132 with SMTP id h4mr6628819qcj.14.1377810636061; Thu, 29 Aug 2013 14:10:36 -0700 (PDT) Received: from anchor.com (50-194-63-110-static.hfc.comcastbusiness.net. [50.194.63.110]) by mx.google.com with ESMTPSA id j11sm46864113qaa.7.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 29 Aug 2013 14:10:35 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 29 Aug 2013 14:09:37 -0700 Message-Id: <1377810586-19931-10-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1377810586-19931-1-git-send-email-rth@twiddle.net> References: <1377810586-19931-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:400d:c01::22e Cc: aurelien@aurel32.net Subject: [Qemu-devel] [PATCH v2 09/18] tcg: Change memory 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 | 16 +++++----------- tcg/tcg.h | 8 +++----- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/tcg/tcg.c b/tcg/tcg.c index f6fa226..5970185 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -389,7 +389,7 @@ TCGv_i64 tcg_global_reg_new_i64(int reg, const char *name) } static inline int tcg_global_mem_new_internal(TCGType type, int reg, - tcg_target_long offset, + intptr_t offset, const char *name) { TCGContext *s = &tcg_ctx; @@ -449,21 +449,15 @@ static inline int tcg_global_mem_new_internal(TCGType type, int reg, return idx; } -TCGv_i32 tcg_global_mem_new_i32(int reg, tcg_target_long offset, - const char *name) +TCGv_i32 tcg_global_mem_new_i32(int reg, intptr_t offset, const char *name) { - int idx; - - idx = tcg_global_mem_new_internal(TCG_TYPE_I32, reg, offset, name); + int idx = tcg_global_mem_new_internal(TCG_TYPE_I32, reg, offset, name); return MAKE_TCGV_I32(idx); } -TCGv_i64 tcg_global_mem_new_i64(int reg, tcg_target_long offset, - const char *name) +TCGv_i64 tcg_global_mem_new_i64(int reg, intptr_t offset, const char *name) { - int idx; - - idx = tcg_global_mem_new_internal(TCG_TYPE_I64, reg, offset, name); + int idx = tcg_global_mem_new_internal(TCG_TYPE_I64, reg, offset, name); return MAKE_TCGV_I64(idx); } diff --git a/tcg/tcg.h b/tcg/tcg.h index 9a267ca..c49b3fd 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -386,7 +386,7 @@ typedef struct TCGTemp { int reg; tcg_target_long val; int mem_reg; - tcg_target_long mem_offset; + intptr_t mem_offset; unsigned int fixed_reg:1; unsigned int mem_coherent:1; unsigned int mem_allocated:1; @@ -531,8 +531,7 @@ int tcg_gen_code_search_pc(TCGContext *s, uint8_t *gen_code_buf, long offset); 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, - const char *name); +TCGv_i32 tcg_global_mem_new_i32(int reg, intptr_t offset, const char *name); TCGv_i32 tcg_temp_new_internal_i32(int temp_local); static inline TCGv_i32 tcg_temp_new_i32(void) { @@ -546,8 +545,7 @@ void tcg_temp_free_i32(TCGv_i32 arg); char *tcg_get_arg_str_i32(TCGContext *s, char *buf, int buf_size, TCGv_i32 arg); TCGv_i64 tcg_global_reg_new_i64(int reg, const char *name); -TCGv_i64 tcg_global_mem_new_i64(int reg, tcg_target_long offset, - const char *name); +TCGv_i64 tcg_global_mem_new_i64(int reg, intptr_t offset, const char *name); TCGv_i64 tcg_temp_new_internal_i64(int temp_local); static inline TCGv_i64 tcg_temp_new_i64(void) {