mirror of
https://github.com/yuzu-emu/unicorn.git
synced 2025-03-24 22:15:07 +00:00
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. Backports commit 8d6a91602ea824ef4435ea38fd475387eecc098c from qemu
This commit is contained in:
parent
0fd0afad13
commit
d21f474c39
|
@ -185,10 +185,10 @@ static bool temps_are_copies(TCGContext *s, TCGArg arg1, TCGArg arg2)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void tcg_opt_gen_mov(TCGContext *s, TCGOp *op, TCGArg *args,
|
static void tcg_opt_gen_mov(TCGContext *s, TCGOp *op, TCGArg *args,
|
||||||
TCGOpcode old_op, TCGArg dst, TCGArg src)
|
TCGArg dst, TCGArg src)
|
||||||
{
|
{
|
||||||
struct tcg_temp_info *temps = s->temps2;
|
struct tcg_temp_info *temps = s->temps2;
|
||||||
TCGOpcode new_op = op_to_mov(s, old_op);
|
TCGOpcode new_op = op_to_mov(s, op->opc);
|
||||||
tcg_target_ulong mask;
|
tcg_target_ulong mask;
|
||||||
|
|
||||||
op->opc = new_op;
|
op->opc = new_op;
|
||||||
|
@ -793,7 +793,7 @@ static void tcg_constant_folding(TCGContext *s)
|
||||||
if (temps_are_copies(s, args[0], args[1])) {
|
if (temps_are_copies(s, args[0], args[1])) {
|
||||||
tcg_op_remove(s, op);
|
tcg_op_remove(s, op);
|
||||||
} else {
|
} 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;
|
continue;
|
||||||
default:
|
default:
|
||||||
|
@ -952,7 +952,7 @@ static void tcg_constant_folding(TCGContext *s)
|
||||||
if (temps_are_copies(s, args[0], args[1])) {
|
if (temps_are_copies(s, args[0], args[1])) {
|
||||||
tcg_op_remove(s, op);
|
tcg_op_remove(s, op);
|
||||||
} 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, args[0], args[1]);
|
||||||
} else {
|
} else {
|
||||||
tcg_opt_gen_movi(s, op, args,
|
tcg_opt_gen_movi(s, op, args,
|
||||||
args[0], temps[args[1]].val);
|
args[0], temps[args[1]].val);
|
||||||
|
@ -984,7 +984,7 @@ static void tcg_constant_folding(TCGContext *s)
|
||||||
if (temps_are_copies(s, args[0], args[1])) {
|
if (temps_are_copies(s, args[0], args[1])) {
|
||||||
tcg_op_remove(s, op);
|
tcg_op_remove(s, op);
|
||||||
} 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, args[0], args[1]);
|
||||||
} else {
|
} else {
|
||||||
tcg_opt_gen_movi(s, op, args,
|
tcg_opt_gen_movi(s, op, args,
|
||||||
args[0], temps[args[1]].val);
|
args[0], temps[args[1]].val);
|
||||||
|
@ -1020,7 +1020,7 @@ static void tcg_constant_folding(TCGContext *s)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (temps[args[1]].state != TCG_TEMP_CONST) {
|
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;
|
break;
|
||||||
}
|
}
|
||||||
/* Source argument is constant. Rewrite the operation and
|
/* Source argument is constant. Rewrite the operation and
|
||||||
|
@ -1126,7 +1126,7 @@ static void tcg_constant_folding(TCGContext *s)
|
||||||
tcg_opt_gen_movi(s, op, args,
|
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, args[0], args[4-tmp]);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue