From patchwork Mon Apr 15 18:40:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 236668 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 46B472C00C7 for ; Tue, 16 Apr 2013 04:43:06 +1000 (EST) Received: from localhost ([::1]:49027 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URoMq-0004tx-F0 for incoming@patchwork.ozlabs.org; Mon, 15 Apr 2013 14:43:04 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42265) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URoMH-0004m8-IJ for qemu-devel@nongnu.org; Mon, 15 Apr 2013 14:42:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1URoME-0002Ey-OU for qemu-devel@nongnu.org; Mon, 15 Apr 2013 14:42:29 -0400 Received: from mail-qe0-f46.google.com ([209.85.128.46]:50210) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URoME-0002Em-KL for qemu-devel@nongnu.org; Mon, 15 Apr 2013 14:42:26 -0400 Received: by mail-qe0-f46.google.com with SMTP id nd7so2863308qeb.19 for ; Mon, 15 Apr 2013 11:42:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=YLD1DrUOBbIgoyDr+TmKTrIxQ2XMYBxoJ0bnJBnSIGQ=; b=NYDi6PgFqVMqRIw8lTc5Yu5BYXONjCTFQNw9T4wWuBwGajgM1fSrBpbfwme6Rzp1Nt Hubtq7s9DV4VbmtczIJImqtpa0dHJ8w590cJIlhqc19yalVUSO1IPkxW90y8ZdRQCkhq UHttBgq02c9zVkX+2lQDuI6Xs/OStJxBNR/CmmCsFQf0IN3MxWsjO3xQr6AJesCad2/B USD0573KhaeZBaogJjR/A9C+8UdCgRDEjMBpgm1fKJ3vd8l7+oRZPRuuq5Ko2xpr64zc Lss5mKdar7SDiq3Tnqz6tXeGUI795DcRRMUokfp4pF0i+Ksim7WNdVANkQSqEiFNpAU+ NCrQ== X-Received: by 10.224.192.196 with SMTP id dr4mr6514232qab.80.1366051346213; Mon, 15 Apr 2013 11:42:26 -0700 (PDT) Received: from pebble.com (214.Red-217-126-56.staticIP.rima-tde.net. [217.126.56.214]) by mx.google.com with ESMTPS id g6sm33990707qav.6.2013.04.15.11.42.21 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 15 Apr 2013 11:42:25 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 15 Apr 2013 20:40:41 +0200 Message-Id: <1366051272-12979-3-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1366051272-12979-1-git-send-email-rth@twiddle.net> References: <1366051272-12979-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.128.46 Cc: av1474@comtv.ru, aurelien@aurel32.net Subject: [Qemu-devel] [PATCH v5 02/33] tcg-ppc64: Use TCGReg everywhere 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/ppc64/tcg-target.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/tcg/ppc64/tcg-target.c b/tcg/ppc64/tcg-target.c index 833fe0c..762ca1b 100644 --- a/tcg/ppc64/tcg-target.c +++ b/tcg/ppc64/tcg-target.c @@ -431,19 +431,21 @@ static const uint32_t tcg_to_bc[] = { [TCG_COND_GTU] = BC | BI (7, CR_GT) | BO_COND_TRUE, }; -static void tcg_out_mov (TCGContext *s, TCGType type, TCGReg ret, TCGReg arg) +static inline void tcg_out_mov(TCGContext *s, TCGType type, + TCGReg ret, TCGReg arg) { tcg_out32 (s, OR | SAB (arg, ret, arg)); } -static void tcg_out_rld (TCGContext *s, int op, int ra, int rs, int sh, int mb) +static inline void tcg_out_rld(TCGContext *s, int op, TCGReg ra, TCGReg rs, + int sh, int mb) { sh = SH (sh & 0x1f) | (((sh >> 5) & 1) << 1); mb = MB64 ((mb >> 5) | ((mb << 1) & 0x3f)); tcg_out32 (s, op | RA (ra) | RS (rs) | sh | mb); } -static void tcg_out_movi32 (TCGContext *s, int ret, int32_t arg) +static void tcg_out_movi32(TCGContext *s, TCGReg ret, int32_t arg) { if (arg == (int16_t) arg) tcg_out32 (s, ADDI | RT (ret) | RA (0) | (arg & 0xffff)); @@ -522,8 +524,8 @@ static void tcg_out_call (TCGContext *s, tcg_target_long arg, int const_arg) #endif } -static void tcg_out_ldst (TCGContext *s, int ret, int addr, - int offset, int op1, int op2) +static void tcg_out_ldst(TCGContext *s, TCGReg ret, TCGReg addr, + int offset, int op1, int op2) { if (offset == (int16_t) offset) tcg_out32 (s, op1 | RT (ret) | RA (addr) | (offset & 0xffff)); @@ -533,8 +535,8 @@ static void tcg_out_ldst (TCGContext *s, int ret, int addr, } } -static void tcg_out_ldsta (TCGContext *s, int ret, int addr, - int offset, int op1, int op2) +static void tcg_out_ldsta(TCGContext *s, TCGReg ret, TCGReg addr, + int offset, int op1, int op2) { if (offset == (int16_t) (offset & ~3)) tcg_out32 (s, op1 | RT (ret) | RA (addr) | (offset & 0xffff)); @@ -566,8 +568,8 @@ static const void * const qemu_st_helpers[4] = { helper_stq_mmu, }; -static void tcg_out_tlb_read (TCGContext *s, int r0, int r1, int r2, - int addr_reg, int s_bits, int offset) +static void tcg_out_tlb_read(TCGContext *s, TCGReg r0, TCGReg r1, TCGReg r2, + TCGReg addr_reg, int s_bits, int offset) { #if TARGET_LONG_BITS == 32 tcg_out_rld (s, RLDICL, addr_reg, addr_reg, 0, 32); @@ -616,9 +618,11 @@ static void tcg_out_tlb_read (TCGContext *s, int r0, int r1, int r2, static void tcg_out_qemu_ld (TCGContext *s, const TCGArg *args, int opc) { - int addr_reg, data_reg, r0, r1, rbase, bswap; + TCGReg addr_reg, data_reg, r0, r1, rbase; + int bswap; #ifdef CONFIG_SOFTMMU - int r2, mem_index, s_bits, ir; + TCGReg r2, ir; + int mem_index, s_bits; void *label1_ptr, *label2_ptr; #endif @@ -766,9 +770,11 @@ static void tcg_out_qemu_ld (TCGContext *s, const TCGArg *args, int opc) static void tcg_out_qemu_st (TCGContext *s, const TCGArg *args, int opc) { - int addr_reg, r0, r1, rbase, data_reg, bswap; + TCGReg addr_reg, r0, r1, rbase, data_reg; + int bswap; #ifdef CONFIG_SOFTMMU - int r2, mem_index, ir; + TCGReg r2, ir; + int mem_index; void *label1_ptr, *label2_ptr; #endif @@ -954,7 +960,7 @@ static void tcg_out_st (TCGContext *s, TCGType type, TCGReg arg, TCGReg arg1, tcg_out_ldsta (s, arg, arg1, arg2, STD, STDX); } -static void ppc_addi32 (TCGContext *s, int rt, int ra, tcg_target_long si) +static void ppc_addi32(TCGContext *s, TCGReg rt, TCGReg ra, tcg_target_long si) { if (!si && rt == ra) return; @@ -968,7 +974,7 @@ static void ppc_addi32 (TCGContext *s, int rt, int ra, tcg_target_long si) } } -static void ppc_addi64 (TCGContext *s, int rt, int ra, tcg_target_long si) +static void ppc_addi64(TCGContext *s, TCGReg rt, TCGReg ra, tcg_target_long si) { /* XXX: suboptimal */ if (si == (int16_t) si