58 lines
2.4 KiB
Diff
58 lines
2.4 KiB
Diff
|
From 98dc31743b94d5719c02c589e7cd652e95570b25 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aurelien Jarno <aurelien@aurel32.net>
|
||
|
|
Date: Thu, 6 Sep 2012 16:47:14 +0200
|
||
|
|
Subject: [PATCH] tcg/optimize: add constant folding for brcond
|
||
|
|
|
||
|
|
Reviewed-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 | 27 ++++++++++++++++++++++++++-
|
||
|
|
1 file changed, 26 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/tcg/optimize.c b/tcg/optimize.c
|
||
|
|
index 1cb1f36..156e8d9 100644
|
||
|
|
--- a/tcg/optimize.c
|
||
|
|
+++ b/tcg/optimize.c
|
||
|
|
@@ -603,6 +603,32 @@ static TCGArg *tcg_constant_folding(TCGContext *s, uint16_t *tcg_opc_ptr,
|
||
|
|
args += 4;
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
+ CASE_OP_32_64(brcond):
|
||
|
|
+ if (temps[args[0]].state == TCG_TEMP_CONST
|
||
|
|
+ && temps[args[1]].state == TCG_TEMP_CONST) {
|
||
|
|
+ if (do_constant_folding_cond(op, temps[args[0]].val,
|
||
|
|
+ temps[args[1]].val, args[2])) {
|
||
|
|
+ memset(temps, 0, nb_temps * sizeof(struct tcg_temp_info));
|
||
|
|
+ gen_opc_buf[op_index] = INDEX_op_br;
|
||
|
|
+ gen_args[0] = args[3];
|
||
|
|
+ gen_args += 1;
|
||
|
|
+ args += 4;
|
||
|
|
+ } else {
|
||
|
|
+ gen_opc_buf[op_index] = INDEX_op_nop;
|
||
|
|
+ args += 4;
|
||
|
|
+ }
|
||
|
|
+ break;
|
||
|
|
+ } else {
|
||
|
|
+ memset(temps, 0, nb_temps * sizeof(struct tcg_temp_info));
|
||
|
|
+ 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;
|
||
|
|
+ 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))) {
|
||
|
|
@@ -624,7 +650,6 @@ static TCGArg *tcg_constant_folding(TCGContext *s, uint16_t *tcg_opc_ptr,
|
||
|
|
case INDEX_op_set_label:
|
||
|
|
case INDEX_op_jmp:
|
||
|
|
case INDEX_op_br:
|
||
|
|
- CASE_OP_32_64(brcond):
|
||
|
|
memset(temps, 0, nb_temps * sizeof(struct tcg_temp_info));
|
||
|
|
for (i = 0; i < def->nb_args; i++) {
|
||
|
|
*gen_args = *args;
|