f375e62ad9
Fix libvirt + seccomp combo (bz #855162) Fix scsi hotplug crash (bz #879657) Fix QOM refcount crash (bz #881486)
74 lines
2.9 KiB
Diff
74 lines
2.9 KiB
Diff
From c489b380d3f827be91b5f8b80b88585fb4014fbb Mon Sep 17 00:00:00 2001
|
|
From: Richard Henderson <rth@twiddle.net>
|
|
Date: Fri, 21 Sep 2012 10:13:37 -0700
|
|
Subject: [PATCH] tcg: Optimize movcond for constant comparisons
|
|
|
|
Signed-off-by: Richard Henderson <rth@twiddle.net>
|
|
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
|
|
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
---
|
|
tcg/optimize.c | 40 ++++++++++++++++++++++++++++++++++++++++
|
|
1 file changed, 40 insertions(+)
|
|
|
|
diff --git a/tcg/optimize.c b/tcg/optimize.c
|
|
index 9da333c..26038a6 100644
|
|
--- a/tcg/optimize.c
|
|
+++ b/tcg/optimize.c
|
|
@@ -394,6 +394,14 @@ static TCGArg *tcg_constant_folding(TCGContext *s, uint16_t *tcg_opc_ptr,
|
|
args[3] = tcg_swap_cond(args[3]);
|
|
}
|
|
break;
|
|
+ CASE_OP_32_64(movcond):
|
|
+ if (temps[args[1]].state == TCG_TEMP_CONST
|
|
+ && temps[args[2]].state != TCG_TEMP_CONST) {
|
|
+ tmp = args[1];
|
|
+ args[1] = args[2];
|
|
+ args[2] = tmp;
|
|
+ args[5] = tcg_swap_cond(args[5]);
|
|
+ }
|
|
default:
|
|
break;
|
|
}
|
|
@@ -614,6 +622,38 @@ static TCGArg *tcg_constant_folding(TCGContext *s, uint16_t *tcg_opc_ptr,
|
|
}
|
|
args += 4;
|
|
break;
|
|
+ CASE_OP_32_64(movcond):
|
|
+ if (temps[args[1]].state == TCG_TEMP_CONST
|
|
+ && temps[args[2]].state == TCG_TEMP_CONST) {
|
|
+ tmp = do_constant_folding_cond(op, temps[args[1]].val,
|
|
+ temps[args[2]].val, args[5]);
|
|
+ if (args[0] == args[4-tmp]
|
|
+ || (temps[args[4-tmp]].state == TCG_TEMP_COPY
|
|
+ && temps[args[4-tmp]].val == args[0])) {
|
|
+ gen_opc_buf[op_index] = INDEX_op_nop;
|
|
+ } else if (temps[args[4-tmp]].state == TCG_TEMP_CONST) {
|
|
+ gen_opc_buf[op_index] = op_to_movi(op);
|
|
+ tcg_opt_gen_movi(gen_args, args[0], temps[args[4-tmp]].val,
|
|
+ nb_temps, nb_globals);
|
|
+ gen_args += 2;
|
|
+ } else {
|
|
+ gen_opc_buf[op_index] = op_to_mov(op);
|
|
+ tcg_opt_gen_mov(gen_args, args[0], args[4-tmp],
|
|
+ nb_temps, nb_globals);
|
|
+ gen_args += 2;
|
|
+ }
|
|
+ } else {
|
|
+ reset_temp(args[0], nb_temps, nb_globals);
|
|
+ gen_args[0] = args[0];
|
|
+ gen_args[1] = args[1];
|
|
+ gen_args[2] = args[2];
|
|
+ gen_args[3] = args[3];
|
|
+ gen_args[4] = args[4];
|
|
+ gen_args[5] = args[5];
|
|
+ gen_args += 6;
|
|
+ }
|
|
+ args += 6;
|
|
+ break;
|
|
case INDEX_op_call:
|
|
nb_call_args = (args[0] >> 16) + (args[0] & 0xffff);
|
|
if (!(args[nb_call_args + 1] & (TCG_CALL_CONST | TCG_CALL_PURE))) {
|
|
--
|
|
1.8.0.2
|
|
|