[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/38] tcg/tci: Split out tci_args_rrrc
From: |
Richard Henderson |
Subject: |
[PULL 06/38] tcg/tci: Split out tci_args_rrrc |
Date: |
Wed, 17 Mar 2021 09:34:12 -0600 |
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tcg/tci.c | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/tcg/tci.c b/tcg/tci.c
index 1c879a2536..dd9bcd74f3 100644
--- a/tcg/tci.c
+++ b/tcg/tci.c
@@ -180,6 +180,7 @@ static tcg_target_ulong tci_read_label(const uint8_t
**tb_ptr)
* tci_args_<arguments>
* where arguments is a sequence of
*
+ * c = condition (TCGCond)
* r = register
* s = signed ldst offset
*/
@@ -207,6 +208,15 @@ static void tci_args_rrs(const uint8_t **tb_ptr,
*i2 = tci_read_s32(tb_ptr);
}
+static void tci_args_rrrc(const uint8_t **tb_ptr,
+ TCGReg *r0, TCGReg *r1, TCGReg *r2, TCGCond *c3)
+{
+ *r0 = tci_read_r(tb_ptr);
+ *r1 = tci_read_r(tb_ptr);
+ *r2 = tci_read_r(tb_ptr);
+ *c3 = tci_read_b(tb_ptr);
+}
+
static bool tci_compare32(uint32_t u0, uint32_t u1, TCGCond condition)
{
bool result = false;
@@ -413,11 +423,8 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchState
*env,
tb_ptr = (uint8_t *)label;
continue;
case INDEX_op_setcond_i32:
- t0 = *tb_ptr++;
- t1 = tci_read_rval(regs, &tb_ptr);
- t2 = tci_read_rval(regs, &tb_ptr);
- condition = *tb_ptr++;
- tci_write_reg(regs, t0, tci_compare32(t1, t2, condition));
+ tci_args_rrrc(&tb_ptr, &r0, &r1, &r2, &condition);
+ regs[r0] = tci_compare32(regs[r1], regs[r2], condition);
break;
#if TCG_TARGET_REG_BITS == 32
case INDEX_op_setcond2_i32:
@@ -429,11 +436,8 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchState
*env,
break;
#elif TCG_TARGET_REG_BITS == 64
case INDEX_op_setcond_i64:
- t0 = *tb_ptr++;
- t1 = tci_read_rval(regs, &tb_ptr);
- t2 = tci_read_rval(regs, &tb_ptr);
- condition = *tb_ptr++;
- tci_write_reg(regs, t0, tci_compare64(t1, t2, condition));
+ tci_args_rrrc(&tb_ptr, &r0, &r1, &r2, &condition);
+ regs[r0] = tci_compare64(regs[r1], regs[r2], condition);
break;
#endif
CASE_32_64(mov)
--
2.25.1
- [PULL 00/38] tcg patch queue for 6.0, Richard Henderson, 2021/03/17
- [PULL 05/38] tcg/tci: Split out tci_args_rrr, Richard Henderson, 2021/03/17
- [PULL 06/38] tcg/tci: Split out tci_args_rrrc,
Richard Henderson <=
- [PULL 02/38] tcg/tci: Rename tci_read_r to tci_read_rval, Richard Henderson, 2021/03/17
- [PULL 01/38] tcg/tci: Remove ifdefs for TCG_TARGET_HAS_ext32[us]_i64, Richard Henderson, 2021/03/17
- [PULL 03/38] tcg/tci: Split out tci_args_rrs, Richard Henderson, 2021/03/17
- [PULL 11/38] tcg/tci: Reuse tci_args_l for calls., Richard Henderson, 2021/03/17
- [PULL 09/38] tcg/tci: Split out tci_args_rrcl and tci_args_rrrrcl, Richard Henderson, 2021/03/17
- [PULL 07/38] tcg/tci: Split out tci_args_l, Richard Henderson, 2021/03/17
- [PULL 10/38] tcg/tci: Split out tci_args_ri and tci_args_rI, Richard Henderson, 2021/03/17
- [PULL 04/38] tcg/tci: Split out tci_args_rr, Richard Henderson, 2021/03/17
- [PULL 12/38] tcg/tci: Reuse tci_args_l for exit_tb, Richard Henderson, 2021/03/17
- [PULL 08/38] tcg/tci: Split out tci_args_rrrrrc, Richard Henderson, 2021/03/17