From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>
Subject: [PATCH v5 17/23] tcg/tci: Add special tci_movi_{i32,i64} opcodes
Date: Thu, 17 Dec 2020 08:52:09 -0600 [thread overview]
Message-ID: <20201217145215.534637-18-richard.henderson@linaro.org> (raw)
In-Reply-To: <20201217145215.534637-1-richard.henderson@linaro.org>
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 67092e82c6..314455b386 100644
--- a/include/tcg/tcg-opc.h
+++ b/include/tcg/tcg-opc.h
@@ -273,6 +273,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 82039fd163..52b34bd70f 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.c.inc b/tcg/tci/tcg-target.c.inc
index 231b9b1775..c8c8386a72 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
next prev parent reply other threads:[~2020-12-17 14:58 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-17 14:51 [PATCH v5 00/23] tcg: Better handling of constants Richard Henderson
2020-12-17 14:51 ` [PATCH v5 01/23] tcg: Use tcg_out_dupi_vec from temp_load Richard Henderson
2020-12-17 14:51 ` [PATCH v5 02/23] tcg: Increase tcg_out_dupi_vec immediate to int64_t Richard Henderson
2020-12-17 14:51 ` [PATCH v5 03/23] tcg: Consolidate 3 bits into enum TCGTempKind Richard Henderson
2020-12-17 14:51 ` [PATCH v5 04/23] tcg: Add temp_readonly Richard Henderson
2020-12-17 14:51 ` [PATCH v5 05/23] tcg: Expand TCGTemp.val to 64-bits Richard Henderson
2020-12-17 14:51 ` [PATCH v5 06/23] tcg: Rename struct tcg_temp_info to TempOptInfo Richard Henderson
2020-12-17 14:51 ` [PATCH v5 07/23] tcg: Expand TempOptInfo to 64-bits Richard Henderson
2020-12-17 14:52 ` [PATCH v5 08/23] tcg: Introduce TYPE_CONST temporaries Richard Henderson
2020-12-17 14:52 ` [PATCH v5 09/23] tcg/optimize: Improve find_better_copy Richard Henderson
2020-12-17 14:52 ` [PATCH v5 10/23] tcg/optimize: Adjust TempOptInfo allocation Richard Henderson
2020-12-17 14:52 ` [PATCH v5 11/23] tcg/optimize: Use tcg_constant_internal with constant folding Richard Henderson
2020-12-17 14:52 ` [PATCH v5 12/23] tcg: Convert tcg_gen_dupi_vec to TCG_CONST Richard Henderson
2020-12-17 14:52 ` [PATCH v5 13/23] tcg: Use tcg_constant_i32 with icount expander Richard Henderson
2020-12-17 14:52 ` [PATCH v5 14/23] tcg: Use tcg_constant_{i32, i64} with tcg int expanders Richard Henderson
2020-12-17 14:52 ` [PATCH v5 15/23] tcg: Use tcg_constant_{i32,i64} with tcg plugins Richard Henderson
2020-12-17 14:52 ` [PATCH v5 16/23] tcg: Use tcg_constant_{i32, i64, vec} with gvec expanders Richard Henderson
2020-12-17 14:52 ` Richard Henderson [this message]
2020-12-17 14:52 ` [PATCH v5 18/23] tcg: Remove movi and dupi opcodes Richard Henderson
2020-12-17 14:52 ` [PATCH v5 19/23] tcg: Add tcg_reg_alloc_dup2 Richard Henderson
2020-12-17 14:52 ` [PATCH v5 20/23] tcg/i386: Use tcg_constant_vec with tcg vec expanders Richard Henderson
2020-12-17 14:52 ` [PATCH v5 21/23] tcg: Remove tcg_gen_dup{8,16,32,64}i_vec Richard Henderson
2020-12-17 14:52 ` [PATCH v5 22/23] tcg/ppc: Use tcg_constant_vec with tcg vec expanders Richard Henderson
2020-12-17 14:52 ` [PATCH v5 23/23] tcg/aarch64: " Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201217145215.534637-18-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).