[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 17/23] tcg/tci: Add special tci_movi_{i32,i64} opcodes
From: |
Richard Henderson |
Subject: |
[PATCH v6 17/23] tcg/tci: Add special tci_movi_{i32,i64} opcodes |
Date: |
Mon, 11 Jan 2021 07:19:40 -1000 |
The normal movi opcodes are going away. We need something
for TCI to use internally.
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/tcg/tcg-opc.h | 8 ++++++++
tcg/tci.c | 4 ++--
tcg/tci/tcg-target.c.inc | 4 ++--
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/include/tcg/tcg-opc.h b/include/tcg/tcg-opc.h
index 70a76646c4..43711634f6 100644
--- a/include/tcg/tcg-opc.h
+++ b/include/tcg/tcg-opc.h
@@ -278,6 +278,14 @@ DEF(last_generic, 0, 0, 0, TCG_OPF_NOT_PRESENT)
#include "tcg-target.opc.h"
#endif
+#ifdef TCG_TARGET_INTERPRETER
+/* These opcodes are only for use between the tci generator and interpreter. */
+DEF(tci_movi_i32, 1, 0, 1, TCG_OPF_NOT_PRESENT)
+#if TCG_TARGET_REG_BITS == 64
+DEF(tci_movi_i64, 1, 0, 1, TCG_OPF_64BIT | TCG_OPF_NOT_PRESENT)
+#endif
+#endif
+
#undef TLADDR_ARGS
#undef DATA64_ARGS
#undef IMPL
diff --git a/tcg/tci.c b/tcg/tci.c
index 2bcc4409be..2311aa7d3a 100644
--- a/tcg/tci.c
+++ b/tcg/tci.c
@@ -593,7 +593,7 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchState
*env,
t1 = tci_read_r32(regs, &tb_ptr);
tci_write_reg32(regs, t0, t1);
break;
- case INDEX_op_movi_i32:
+ case INDEX_op_tci_movi_i32:
t0 = *tb_ptr++;
t1 = tci_read_i32(&tb_ptr);
tci_write_reg32(regs, t0, t1);
@@ -864,7 +864,7 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchState
*env,
t1 = tci_read_r64(regs, &tb_ptr);
tci_write_reg64(regs, t0, t1);
break;
- case INDEX_op_movi_i64:
+ case INDEX_op_tci_movi_i64:
t0 = *tb_ptr++;
t1 = tci_read_i64(&tb_ptr);
tci_write_reg64(regs, t0, t1);
diff --git a/tcg/tci/tcg-target.c.inc b/tcg/tci/tcg-target.c.inc
index d5a4d9d37c..e9e5f94c04 100644
--- a/tcg/tci/tcg-target.c.inc
+++ b/tcg/tci/tcg-target.c.inc
@@ -529,13 +529,13 @@ static void tcg_out_movi(TCGContext *s, TCGType type,
uint8_t *old_code_ptr = s->code_ptr;
uint32_t arg32 = arg;
if (type == TCG_TYPE_I32 || arg == arg32) {
- tcg_out_op_t(s, INDEX_op_movi_i32);
+ tcg_out_op_t(s, INDEX_op_tci_movi_i32);
tcg_out_r(s, t0);
tcg_out32(s, arg32);
} else {
tcg_debug_assert(type == TCG_TYPE_I64);
#if TCG_TARGET_REG_BITS == 64
- tcg_out_op_t(s, INDEX_op_movi_i64);
+ tcg_out_op_t(s, INDEX_op_tci_movi_i64);
tcg_out_r(s, t0);
tcg_out64(s, arg);
#else
--
2.25.1
- [PATCH v6 05/23] tcg: Expand TCGTemp.val to 64-bits, (continued)
- [PATCH v6 05/23] tcg: Expand TCGTemp.val to 64-bits, Richard Henderson, 2021/01/11
- [PATCH v6 04/23] tcg: Add temp_readonly, Richard Henderson, 2021/01/11
- [PATCH v6 08/23] tcg: Introduce TYPE_CONST temporaries, Richard Henderson, 2021/01/11
- [PATCH v6 03/23] tcg: Consolidate 3 bits into enum TCGTempKind, Richard Henderson, 2021/01/11
- [PATCH v6 09/23] tcg/optimize: Improve find_better_copy, Richard Henderson, 2021/01/11
- [PATCH v6 12/23] tcg: Convert tcg_gen_dupi_vec to TCG_CONST, Richard Henderson, 2021/01/11
- [PATCH v6 15/23] tcg: Use tcg_constant_{i32,i64} with tcg plugins, Richard Henderson, 2021/01/11
- [PATCH v6 16/23] tcg: Use tcg_constant_{i32, i64, vec} with gvec expanders, Richard Henderson, 2021/01/11
- [PATCH v6 19/23] tcg: Add tcg_reg_alloc_dup2, Richard Henderson, 2021/01/11
- [PATCH v6 21/23] tcg: Remove tcg_gen_dup{8,16,32,64}i_vec, Richard Henderson, 2021/01/11
- [PATCH v6 17/23] tcg/tci: Add special tci_movi_{i32,i64} opcodes,
Richard Henderson <=
- [PATCH v6 23/23] tcg/aarch64: Use tcg_constant_vec with tcg vec expanders, Richard Henderson, 2021/01/11
- [PATCH v6 20/23] tcg/i386: Use tcg_constant_vec with tcg vec expanders, Richard Henderson, 2021/01/11
- [PATCH v6 22/23] tcg/ppc: Use tcg_constant_vec with tcg vec expanders, Richard Henderson, 2021/01/11
- [PATCH v6 10/23] tcg/optimize: Adjust TempOptInfo allocation, Richard Henderson, 2021/01/11
- [PATCH v6 07/23] tcg: Expand TempOptInfo to 64-bits, Richard Henderson, 2021/01/11
- [PATCH v6 11/23] tcg/optimize: Use tcg_constant_internal with constant folding, Richard Henderson, 2021/01/11
- [PATCH v6 14/23] tcg: Use tcg_constant_{i32, i64} with tcg int expanders, Richard Henderson, 2021/01/11
- [PATCH v6 18/23] tcg: Remove movi and dupi opcodes, Richard Henderson, 2021/01/11
- [PATCH v6 13/23] tcg: Use tcg_constant_i32 with icount expander, Richard Henderson, 2021/01/11