From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56416) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WMWKT-0004lE-R4 for qemu-devel@nongnu.org; Sun, 09 Mar 2014 00:31:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WMWKP-0007s1-4M for qemu-devel@nongnu.org; Sun, 09 Mar 2014 00:31:17 -0500 Received: from mail-qc0-x234.google.com ([2607:f8b0:400d:c01::234]:57328) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WMWKP-0007rl-0z for qemu-devel@nongnu.org; Sun, 09 Mar 2014 00:31:13 -0500 Received: by mail-qc0-f180.google.com with SMTP id x3so6400161qcv.25 for ; Sat, 08 Mar 2014 21:31:12 -0800 (PST) Sender: Richard Henderson From: Richard Henderson Date: Sat, 8 Mar 2014 21:30:40 -0800 Message-Id: <1394343043-1473-8-git-send-email-rth@twiddle.net> In-Reply-To: <1394343043-1473-1-git-send-email-rth@twiddle.net> References: <1394343043-1473-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PULL 07/10] tcg-aarch64: Remove the shift_imm parameter from tcg_out_cmp List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, aliguori@amazon.com It was unused. Let's not overcomplicate things before we need them. Reviewed-by: Claudio Fontana Signed-off-by: Richard Henderson --- tcg/aarch64/tcg-target.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tcg/aarch64/tcg-target.c b/tcg/aarch64/tcg-target.c index dca7632..2b55393 100644 --- a/tcg/aarch64/tcg-target.c +++ b/tcg/aarch64/tcg-target.c @@ -541,11 +541,10 @@ static inline void tcg_out_rotl(TCGContext *s, TCGType ext, tcg_out_extr(s, ext, rd, rn, rn, bits - (m & max)); } -static inline void tcg_out_cmp(TCGContext *s, TCGType ext, TCGReg rn, - TCGReg rm, int shift_imm) +static void tcg_out_cmp(TCGContext *s, TCGType ext, TCGReg rn, TCGReg rm) { /* Using CMP alias SUBS wzr, Wn, Wm */ - tcg_out_arith(s, ARITH_SUBS, ext, TCG_REG_XZR, rn, rm, shift_imm); + tcg_out_arith(s, ARITH_SUBS, ext, TCG_REG_XZR, rn, rm, 0); } static inline void tcg_out_cset(TCGContext *s, TCGType ext, @@ -903,7 +902,7 @@ static void tcg_out_tlb_read(TCGContext *s, TCGReg addr_reg, (is_read ? offsetof(CPUTLBEntry, addr_read) : offsetof(CPUTLBEntry, addr_write))); /* Perform the address comparison. */ - tcg_out_cmp(s, (TARGET_LONG_BITS == 64), TCG_REG_X0, TCG_REG_X3, 0); + tcg_out_cmp(s, (TARGET_LONG_BITS == 64), TCG_REG_X0, TCG_REG_X3); *label_ptr = s->code_ptr; /* If not equal, we jump to the slow path. */ tcg_out_goto_cond_noaddr(s, TCG_COND_NE); @@ -1242,13 +1241,13 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, case INDEX_op_brcond_i64: case INDEX_op_brcond_i32: - tcg_out_cmp(s, ext, a0, a1, 0); + tcg_out_cmp(s, ext, a0, a1); tcg_out_goto_label_cond(s, a2, args[3]); break; case INDEX_op_setcond_i64: case INDEX_op_setcond_i32: - tcg_out_cmp(s, ext, a1, a2, 0); + tcg_out_cmp(s, ext, a1, a2); tcg_out_cset(s, 0, a0, args[3]); break; -- 1.8.5.3