From patchwork Thu Jun 4 19:53:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jarno X-Patchwork-Id: 480865 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5AA1114027F for ; Fri, 5 Jun 2015 05:56:49 +1000 (AEST) Received: from localhost ([::1]:43861 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0bFv-0004U9-Ao for incoming@patchwork.ozlabs.org; Thu, 04 Jun 2015 15:56:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39399) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0bCq-00079P-Oo for qemu-devel@nongnu.org; Thu, 04 Jun 2015 15:53:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z0bCp-0006fN-5B for qemu-devel@nongnu.org; Thu, 04 Jun 2015 15:53:36 -0400 Received: from hall.aurel32.net ([2001:bc8:30d7:101::1]:45507) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0bCo-0006et-Rn for qemu-devel@nongnu.org; Thu, 04 Jun 2015 15:53:34 -0400 Received: from weber.rr44.fr ([2001:470:d4ed:0:7e05:7ff:fe0d:f152]) by hall.aurel32.net with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84) (envelope-from ) id 1Z0bCn-0005hm-EF; Thu, 04 Jun 2015 21:53:33 +0200 Received: from aurel32 by weber.rr44.fr with local (Exim 4.85) (envelope-from ) id 1Z0bCm-00087u-Kr; Thu, 04 Jun 2015 21:53:32 +0200 From: Aurelien Jarno To: qemu-devel@nongnu.org Date: Thu, 4 Jun 2015 21:53:24 +0200 Message-Id: <1433447607-31184-3-git-send-email-aurelien@aurel32.net> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1433447607-31184-1-git-send-email-aurelien@aurel32.net> References: <1433447607-31184-1-git-send-email-aurelien@aurel32.net> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:bc8:30d7:101::1 Cc: Aurelien Jarno , Richard Henderson Subject: [Qemu-devel] [PATCH v1 2/5] tcg/optimize: remove opc argument from tcg_opt_gen_mov 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 We can get the opcode using the TCGOp pointer. It needs to be dereferenced, but it's anyway done a few lines below to write the new value. Cc: Richard Henderson Signed-off-by: Aurelien Jarno --- tcg/optimize.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tcg/optimize.c b/tcg/optimize.c index 0bfc9a5..db15976 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -194,9 +194,9 @@ static bool temps_are_copies(TCGArg arg1, TCGArg arg2) } static void tcg_opt_gen_mov(TCGContext *s, TCGOp *op, TCGArg *args, - TCGOpcode old_op, TCGArg dst, TCGArg src) + TCGArg dst, TCGArg src) { - TCGOpcode new_op = op_to_mov(old_op); + TCGOpcode new_op = op_to_mov(op->opc); tcg_target_ulong mask; op->opc = new_op; @@ -791,7 +791,7 @@ static void tcg_constant_folding(TCGContext *s) if (temps_are_copies(args[0], args[1])) { tcg_op_remove(s, op); } else { - tcg_opt_gen_mov(s, op, args, opc, args[0], args[1]); + tcg_opt_gen_mov(s, op, args, args[0], args[1]); } continue; default: @@ -950,7 +950,7 @@ static void tcg_constant_folding(TCGContext *s) if (temps_are_copies(args[0], args[1])) { tcg_op_remove(s, op); } else if (temps[args[1]].state != TCG_TEMP_CONST) { - tcg_opt_gen_mov(s, op, args, opc, args[0], args[1]); + tcg_opt_gen_mov(s, op, args, args[0], args[1]); } else { tcg_opt_gen_movi(s, op, args, args[0], temps[args[1]].val); @@ -982,7 +982,7 @@ static void tcg_constant_folding(TCGContext *s) if (temps_are_copies(args[0], args[1])) { tcg_op_remove(s, op); } else if (temps[args[1]].state != TCG_TEMP_CONST) { - tcg_opt_gen_mov(s, op, args, opc, args[0], args[1]); + tcg_opt_gen_mov(s, op, args, args[0], args[1]); } else { tcg_opt_gen_movi(s, op, args, args[0], temps[args[1]].val); @@ -1018,7 +1018,7 @@ static void tcg_constant_folding(TCGContext *s) break; } if (temps[args[1]].state != TCG_TEMP_CONST) { - tcg_opt_gen_mov(s, op, args, opc, args[0], args[1]); + tcg_opt_gen_mov(s, op, args, args[0], args[1]); break; } /* Source argument is constant. Rewrite the operation and @@ -1124,7 +1124,7 @@ static void tcg_constant_folding(TCGContext *s) tcg_opt_gen_movi(s, op, args, args[0], temps[args[4-tmp]].val); } else { - tcg_opt_gen_mov(s, op, args, opc, args[0], args[4-tmp]); + tcg_opt_gen_mov(s, op, args, args[0], args[4-tmp]); } break; }