[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 15/24] tcg: Use tcg_constant_{i32,i64} with tcg plugins
From: |
Richard Henderson |
Subject: |
[PULL 15/24] tcg: Use tcg_constant_{i32,i64} with tcg plugins |
Date: |
Wed, 13 Jan 2021 16:16:45 -1000 |
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
accel/tcg/plugin-gen.c | 49 +++++++++++++++++++-----------------------
1 file changed, 22 insertions(+), 27 deletions(-)
diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c
index 51580d51a0..e5dc9d0ca9 100644
--- a/accel/tcg/plugin-gen.c
+++ b/accel/tcg/plugin-gen.c
@@ -284,8 +284,8 @@ static TCGOp *copy_extu_i32_i64(TCGOp **begin_op, TCGOp *op)
if (TCG_TARGET_REG_BITS == 32) {
/* mov_i32 */
op = copy_op(begin_op, op, INDEX_op_mov_i32);
- /* movi_i32 */
- op = copy_op(begin_op, op, INDEX_op_movi_i32);
+ /* mov_i32 w/ $0 */
+ op = copy_op(begin_op, op, INDEX_op_mov_i32);
} else {
/* extu_i32_i64 */
op = copy_op(begin_op, op, INDEX_op_extu_i32_i64);
@@ -306,39 +306,34 @@ static TCGOp *copy_mov_i64(TCGOp **begin_op, TCGOp *op)
return op;
}
-static TCGOp *copy_movi_i64(TCGOp **begin_op, TCGOp *op, uint64_t v)
-{
- if (TCG_TARGET_REG_BITS == 32) {
- /* 2x movi_i32 */
- op = copy_op(begin_op, op, INDEX_op_movi_i32);
- op->args[1] = v;
-
- op = copy_op(begin_op, op, INDEX_op_movi_i32);
- op->args[1] = v >> 32;
- } else {
- /* movi_i64 */
- op = copy_op(begin_op, op, INDEX_op_movi_i64);
- op->args[1] = v;
- }
- return op;
-}
-
static TCGOp *copy_const_ptr(TCGOp **begin_op, TCGOp *op, void *ptr)
{
if (UINTPTR_MAX == UINT32_MAX) {
- /* movi_i32 */
- op = copy_op(begin_op, op, INDEX_op_movi_i32);
- op->args[1] = (uintptr_t)ptr;
+ /* mov_i32 */
+ op = copy_op(begin_op, op, INDEX_op_mov_i32);
+ op->args[1] = tcgv_i32_arg(tcg_constant_i32((uintptr_t)ptr));
} else {
- /* movi_i64 */
- op = copy_movi_i64(begin_op, op, (uint64_t)(uintptr_t)ptr);
+ /* mov_i64 */
+ op = copy_op(begin_op, op, INDEX_op_mov_i64);
+ op->args[1] = tcgv_i64_arg(tcg_constant_i64((uintptr_t)ptr));
}
return op;
}
static TCGOp *copy_const_i64(TCGOp **begin_op, TCGOp *op, uint64_t v)
{
- return copy_movi_i64(begin_op, op, v);
+ if (TCG_TARGET_REG_BITS == 32) {
+ /* 2x mov_i32 */
+ op = copy_op(begin_op, op, INDEX_op_mov_i32);
+ op->args[1] = tcgv_i32_arg(tcg_constant_i32(v));
+ op = copy_op(begin_op, op, INDEX_op_mov_i32);
+ op->args[1] = tcgv_i32_arg(tcg_constant_i32(v >> 32));
+ } else {
+ /* mov_i64 */
+ op = copy_op(begin_op, op, INDEX_op_mov_i64);
+ op->args[1] = tcgv_i64_arg(tcg_constant_i64(v));
+ }
+ return op;
}
static TCGOp *copy_extu_tl_i64(TCGOp **begin_op, TCGOp *op)
@@ -486,8 +481,8 @@ static TCGOp *append_mem_cb(const struct qemu_plugin_dyn_cb
*cb,
tcg_debug_assert(type == PLUGIN_GEN_CB_MEM);
- /* const_i32 == movi_i32 ("info", so it remains as is) */
- op = copy_op(&begin_op, op, INDEX_op_movi_i32);
+ /* const_i32 == mov_i32 ("info", so it remains as is) */
+ op = copy_op(&begin_op, op, INDEX_op_mov_i32);
/* const_ptr */
op = copy_const_ptr(&begin_op, op, cb->userp);
--
2.25.1
- [PULL 06/24] tcg: Rename struct tcg_temp_info to TempOptInfo, (continued)
- [PULL 06/24] tcg: Rename struct tcg_temp_info to TempOptInfo, Richard Henderson, 2021/01/13
- [PULL 07/24] tcg: Expand TempOptInfo to 64-bits, Richard Henderson, 2021/01/13
- [PULL 08/24] tcg: Introduce TYPE_CONST temporaries, Richard Henderson, 2021/01/13
- [PULL 09/24] tcg/optimize: Improve find_better_copy, Richard Henderson, 2021/01/13
- [PULL 10/24] tcg/optimize: Adjust TempOptInfo allocation, Richard Henderson, 2021/01/13
- [PULL 13/24] tcg: Use tcg_constant_i32 with icount expander, Richard Henderson, 2021/01/13
- [PULL 12/24] tcg: Convert tcg_gen_dupi_vec to TCG_CONST, Richard Henderson, 2021/01/13
- [PULL 19/24] tcg: Add tcg_reg_alloc_dup2, Richard Henderson, 2021/01/13
- [PULL 11/24] tcg/optimize: Use tcg_constant_internal with constant folding, Richard Henderson, 2021/01/13
- [PULL 14/24] tcg: Use tcg_constant_{i32,i64} with tcg int expanders, Richard Henderson, 2021/01/13
- [PULL 15/24] tcg: Use tcg_constant_{i32,i64} with tcg plugins,
Richard Henderson <=
- [PULL 18/24] tcg: Remove movi and dupi opcodes, Richard Henderson, 2021/01/13
- [PULL 16/24] tcg: Use tcg_constant_{i32,i64,vec} with gvec expanders, Richard Henderson, 2021/01/13
- [PULL 22/24] tcg/ppc: Use tcg_constant_vec with tcg vec expanders, Richard Henderson, 2021/01/13
- [PULL 20/24] tcg/i386: Use tcg_constant_vec with tcg vec expanders, Richard Henderson, 2021/01/13
- [PULL 21/24] tcg: Remove tcg_gen_dup{8,16,32,64}i_vec, Richard Henderson, 2021/01/13
- [PULL 17/24] tcg/tci: Add special tci_movi_{i32,i64} opcodes, Richard Henderson, 2021/01/13
- [PULL 23/24] tcg/aarch64: Use tcg_constant_vec with tcg vec expanders, Richard Henderson, 2021/01/13
- [PULL 24/24] decodetree: Open files with encoding='utf-8', Richard Henderson, 2021/01/13
- Re: [PULL 00/24] tcg patch queue, Peter Maydell, 2021/01/14