From 8d6a91602ea824ef4435ea38fd475387eecc098c Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Thu, 4 Jun 2015 21:53:24 +0200 Subject: [PATCH] tcg/optimize: remove opc argument from tcg_opt_gen_mov 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 Message-Id: <1433447607-31184-3-git-send-email-aurelien@aurel32.net> Signed-off-by: Richard Henderson --- tcg/optimize.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tcg/optimize.c b/tcg/optimize.c index 0bfc9a5a8c..db159769ec 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; }