[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 10/16] tcg/tci: Add special tci_movi_{i32,i64} opcodes
From: |
Richard Henderson |
Subject: |
[PATCH 10/16] tcg/tci: Add special tci_movi_{i32,i64} opcodes |
Date: |
Sat, 18 Apr 2020 09:19:08 -0700 |
The normal movi opcodes are going away. We need something
for TCI to use internally.
Signed-off-by: Richard Henderson <address@hidden>
---
include/tcg/tcg-opc.h | 8 ++++++++
tcg/tci.c | 4 ++--
tcg/tci/tcg-target.inc.c | 4 ++--
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/include/tcg/tcg-opc.h b/include/tcg/tcg-opc.h
index 9288a04946..7dee9b38f7 100644
--- a/include/tcg/tcg-opc.h
+++ b/include/tcg/tcg-opc.h
@@ -268,6 +268,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 46fe9ce63f..a6c1aaf5af 100644
--- a/tcg/tci.c
+++ b/tcg/tci.c
@@ -576,7 +576,7 @@ uintptr_t tcg_qemu_tb_exec(CPUArchState *env, uint8_t
*tb_ptr)
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);
@@ -847,7 +847,7 @@ uintptr_t tcg_qemu_tb_exec(CPUArchState *env, uint8_t
*tb_ptr)
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.inc.c b/tcg/tci/tcg-target.inc.c
index 992d50cb1e..1f1639df0d 100644
--- a/tcg/tci/tcg-target.inc.c
+++ b/tcg/tci/tcg-target.inc.c
@@ -530,13 +530,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.20.1
- [PATCH 01/16] tcg: Add temp_readonly, (continued)
- [PATCH 01/16] tcg: Add temp_readonly, Richard Henderson, 2020/04/18
- [PATCH 05/16] tcg: Use tcg_constant_{i32,vec} with tcg vec expanders, Richard Henderson, 2020/04/18
- [PATCH 02/16] tcg: Introduce TYPE_CONST temporaries, Richard Henderson, 2020/04/18
- [PATCH 03/16] tcg: Use tcg_constant_i32 with icount expander, Richard Henderson, 2020/04/18
- [PATCH 06/16] tcg: Use tcg_constant_{i32,i64} with tcg plugins, Richard Henderson, 2020/04/18
- [PATCH 07/16] tcg: Rename struct tcg_temp_info to TempOptInfo, Richard Henderson, 2020/04/18
- [PATCH 08/16] tcg/optimize: Adjust TempOptInfo allocation, Richard Henderson, 2020/04/18
- [PATCH 04/16] tcg: Use tcg_constant_{i32,i64} with tcg int expanders, Richard Henderson, 2020/04/18
- [PATCH 10/16] tcg/tci: Add special tci_movi_{i32,i64} opcodes,
Richard Henderson <=
- [PATCH 09/16] tcg/optimize: Use tcg_constant_internal with constant folding, Richard Henderson, 2020/04/18
- [PATCH 12/16] tcg: Use tcg_out_dupi_vec from temp_load, Richard Henderson, 2020/04/18
- [PATCH 14/16] tcg: Add tcg_reg_alloc_dup2, Richard Henderson, 2020/04/18
- [PATCH 13/16] tcg: Increase tcg_out_dupi_vec immediate to int64_t, Richard Henderson, 2020/04/18
- [PATCH 11/16] tcg: Remove movi and dupi opcodes, Richard Henderson, 2020/04/18
- [PATCH 16/16] tcg: Remove tcg_gen_dup{8,16,32,64}i_vec, Richard Henderson, 2020/04/18
- [PATCH 15/16] tcg/i386: Use tcg_constant_vec with tcg vec expanders, Richard Henderson, 2020/04/18
- Re: [PATCH 00/16] tcg: Better handling of constants, Alex Bennée, 2020/04/20