mirrors-yuzu-emu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn synced 2024-11-25 21:37:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

tcg/optimize: remove opc argument from tcg_opt_gen_movi

Browse source 
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.

Backports commit ebd27391b00cdafc81e0541a940686137b3b48df from qemu
This commit is contained in:
Aurelien Jarno 2018-02-10 21:20:34 -05:00 committed by Lioncash
parent dafc44c0a5
commit 0fd0afad13
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
qemu/tcg/optimize.c
View file

@ -221,10 +221,10 @@ static void tcg_opt_gen_mov(TCGContext *s, TCGOp *op, TCGArg *args,
} }
static void tcg_opt_gen_movi(TCGContext *s, TCGOp *op, TCGArg *args, static void tcg_opt_gen_movi(TCGContext *s, TCGOp *op, TCGArg *args,
TCGOpcode old_op, TCGArg dst, TCGArg val) TCGArg dst, TCGArg val)
{ {
struct tcg_temp_info *temps = s->temps2; struct tcg_temp_info *temps = s->temps2;
TCGOpcode new_op = op_to_movi(s, old_op); TCGOpcode new_op = op_to_movi(s, op->opc);
tcg_target_ulong mask; tcg_target_ulong mask;
op->opc = new_op; op->opc = new_op;
@ -672,7 +672,7 @@ static void tcg_constant_folding(TCGContext *s)
CASE_OP_32_64(rotr): CASE_OP_32_64(rotr):
if (temps[args[1]].state == TCG_TEMP_CONST if (temps[args[1]].state == TCG_TEMP_CONST
&& temps[args[1]].val == 0) { && temps[args[1]].val == 0) {
tcg_opt_gen_movi(s, op, args, opc, args[0], 0); tcg_opt_gen_movi(s, op, args, args[0], 0);
continue; continue;
} }
break; break;
@ -944,7 +944,7 @@ static void tcg_constant_folding(TCGContext *s)
if (partmask == 0) { if (partmask == 0) {
assert(nb_oargs == 1); assert(nb_oargs == 1);
tcg_opt_gen_movi(s, op, args, opc, args[0], 0); tcg_opt_gen_movi(s, op, args, args[0], 0);
continue; continue;
} }
if (affected == 0) { if (affected == 0) {
@ -954,7 +954,7 @@ static void tcg_constant_folding(TCGContext *s)
} else if (temps[args[1]].state != TCG_TEMP_CONST) { } 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, opc, args[0], args[1]);
} else { } else {
tcg_opt_gen_movi(s, op, args, opc, tcg_opt_gen_movi(s, op, args,
args[0], temps[args[1]].val); args[0], temps[args[1]].val);
} }
continue; continue;
@ -968,7 +968,7 @@ static void tcg_constant_folding(TCGContext *s)
CASE_OP_32_64(mulsh): CASE_OP_32_64(mulsh):
if ((temps[args[2]].state == TCG_TEMP_CONST if ((temps[args[2]].state == TCG_TEMP_CONST
&& temps[args[2]].val == 0)) { && temps[args[2]].val == 0)) {
tcg_opt_gen_movi(s, op, args, opc, args[0], 0); tcg_opt_gen_movi(s, op, args, args[0], 0);
continue; continue;
} }
break; break;
@ -986,7 +986,7 @@ static void tcg_constant_folding(TCGContext *s)
} else if (temps[args[1]].state != TCG_TEMP_CONST) { } 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, opc, args[0], args[1]);
} else { } else {
tcg_opt_gen_movi(s, op, args, opc, tcg_opt_gen_movi(s, op, args,
args[0], temps[args[1]].val); args[0], temps[args[1]].val);
} }
continue; continue;
@ -1002,7 +1002,7 @@ static void tcg_constant_folding(TCGContext *s)
CASE_OP_32_64(sub): CASE_OP_32_64(sub):
CASE_OP_32_64(xor): CASE_OP_32_64(xor):
if (temps_are_copies(s, args[1], args[2])) { if (temps_are_copies(s, args[1], args[2])) {
tcg_opt_gen_movi(s, op, args, opc, args[0], 0); tcg_opt_gen_movi(s, op, args, args[0], 0);
continue; continue;
} }
break; break;
@ -1028,7 +1028,7 @@ static void tcg_constant_folding(TCGContext *s)
args[1] = temps[args[1]].val; args[1] = temps[args[1]].val;
/* fallthrough */ /* fallthrough */
CASE_OP_32_64(movi): CASE_OP_32_64(movi):
tcg_opt_gen_movi(s, op, args, opc, args[0], args[1]); tcg_opt_gen_movi(s, op, args, args[0], args[1]);
break; break;
CASE_OP_32_64(not): CASE_OP_32_64(not):
@ -1041,7 +1041,7 @@ static void tcg_constant_folding(TCGContext *s)
case INDEX_op_ext32u_i64: case INDEX_op_ext32u_i64:
if (temps[args[1]].state == TCG_TEMP_CONST) { if (temps[args[1]].state == TCG_TEMP_CONST) {
tmp = do_constant_folding(s, opc, temps[args[1]].val, 0); tmp = do_constant_folding(s, opc, temps[args[1]].val, 0);
tcg_opt_gen_movi(s, op, args, opc, args[0], tmp); tcg_opt_gen_movi(s, op, args, args[0], tmp);
break; break;
} }
goto do_default; goto do_default;
@ -1049,7 +1049,7 @@ static void tcg_constant_folding(TCGContext *s)
case INDEX_op_trunc_shr_i32: case INDEX_op_trunc_shr_i32:
if (temps[args[1]].state == TCG_TEMP_CONST) { if (temps[args[1]].state == TCG_TEMP_CONST) {
tmp = do_constant_folding(s, opc, temps[args[1]].val, args[2]); tmp = do_constant_folding(s, opc, temps[args[1]].val, args[2]);
tcg_opt_gen_movi(s, op, args, opc, args[0], tmp); tcg_opt_gen_movi(s, op, args, args[0], tmp);
break; break;
} }
goto do_default; goto do_default;
@ -1080,7 +1080,7 @@ static void tcg_constant_folding(TCGContext *s)
&& temps[args[2]].state == TCG_TEMP_CONST) { && temps[args[2]].state == TCG_TEMP_CONST) {
tmp = do_constant_folding(s, opc, temps[args[1]].val, tmp = do_constant_folding(s, opc, temps[args[1]].val,
temps[args[2]].val); temps[args[2]].val);
tcg_opt_gen_movi(s, op, args, opc, args[0], tmp); tcg_opt_gen_movi(s, op, args, args[0], tmp);
break; break;
} }
goto do_default; goto do_default;
@ -1090,7 +1090,7 @@ static void tcg_constant_folding(TCGContext *s)
&& temps[args[2]].state == TCG_TEMP_CONST) { && temps[args[2]].state == TCG_TEMP_CONST) {
tmp = (TCGArg)deposit64(temps[args[1]].val, args[3], args[4], tmp = (TCGArg)deposit64(temps[args[1]].val, args[3], args[4],
temps[args[2]].val); temps[args[2]].val);
tcg_opt_gen_movi(s, op, args, opc, args[0], tmp); tcg_opt_gen_movi(s, op, args, args[0], tmp);
break; break;
} }
goto do_default; goto do_default;
@ -1098,7 +1098,7 @@ static void tcg_constant_folding(TCGContext *s)
CASE_OP_32_64(setcond): CASE_OP_32_64(setcond):
tmp = do_constant_folding_cond(s, opc, args[1], args[2], args[3]); tmp = do_constant_folding_cond(s, opc, args[1], args[2], args[3]);
if (tmp != 2) { if (tmp != 2) {
tcg_opt_gen_movi(s, op, args, opc, args[0], tmp); tcg_opt_gen_movi(s, op, args, args[0], tmp);
break; break;
} }
goto do_default; goto do_default;
@ -1123,7 +1123,7 @@ static void tcg_constant_folding(TCGContext *s)
if (temps_are_copies(s, args[0], args[4-tmp])) { if (temps_are_copies(s, args[0], args[4-tmp])) {
tcg_op_remove(s, op); tcg_op_remove(s, op);
} else if (temps[args[4-tmp]].state == TCG_TEMP_CONST) { } else if (temps[args[4-tmp]].state == TCG_TEMP_CONST) {
tcg_opt_gen_movi(s, op, args, opc, tcg_opt_gen_movi(s, op, args,
args[0], temps[args[4-tmp]].val); args[0], temps[args[4-tmp]].val);
} else { } else {
tcg_opt_gen_mov(s, op, args, opc, args[0], args[4-tmp]); tcg_opt_gen_mov(s, op, args, opc, args[0], args[4-tmp]);
@ -1156,8 +1156,8 @@ static void tcg_constant_folding(TCGContext *s)
rl = args[0]; rl = args[0];
rh = args[1]; rh = args[1];
tcg_opt_gen_movi(s, op, args, opc, rl, (uint32_t)a); tcg_opt_gen_movi(s, op, args, rl, (uint32_t)a);
tcg_opt_gen_movi(s, op2, args2, opc, rh, (uint32_t)(a >> 32)); tcg_opt_gen_movi(s, op2, args2, rh, (uint32_t)(a >> 32));
/* We've done all we need to do with the movi. Skip it. */ /* We've done all we need to do with the movi. Skip it. */
oi_next = op2->next; oi_next = op2->next;
@ -1177,8 +1177,8 @@ static void tcg_constant_folding(TCGContext *s)
rl = args[0]; rl = args[0];
rh = args[1]; rh = args[1];
tcg_opt_gen_movi(s, op, args, opc, rl, (uint32_t)r); tcg_opt_gen_movi(s, op, args, rl, (uint32_t)r);
tcg_opt_gen_movi(s, op2, args2, opc, rh, (uint32_t)(r >> 32)); tcg_opt_gen_movi(s, op2, args2, rh, (uint32_t)(r >> 32));
/* We've done all we need to do with the movi. Skip it. */ /* We've done all we need to do with the movi. Skip it. */
oi_next = op2->next; oi_next = op2->next;
@ -1262,7 +1262,7 @@ static void tcg_constant_folding(TCGContext *s)
tmp = do_constant_folding_cond2(s, &args[1], &args[3], args[5]); tmp = do_constant_folding_cond2(s, &args[1], &args[3], args[5]);
if (tmp != 2) { if (tmp != 2) {
do_setcond_const: do_setcond_const:
tcg_opt_gen_movi(s, op, args, opc, args[0], tmp); tcg_opt_gen_movi(s, op, args, args[0], tmp);
} else if ((args[5] == TCG_COND_LT || args[5] == TCG_COND_GE) } else if ((args[5] == TCG_COND_LT || args[5] == TCG_COND_GE)
&& temps[args[3]].state == TCG_TEMP_CONST && temps[args[3]].state == TCG_TEMP_CONST
&& temps[args[4]].state == TCG_TEMP_CONST && temps[args[4]].state == TCG_TEMP_CONST