[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 08/22] tcg/mips: Convert to tcg-target-constr.h
From: |
Richard Henderson |
Subject: |
[PATCH 08/22] tcg/mips: Convert to tcg-target-constr.h |
Date: |
Tue, 22 Dec 2020 22:01:50 -0800 |
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tcg/mips/tcg-target-constr.h | 31 ++++++++++++++++++++
tcg/mips/tcg-target.h | 1 +
tcg/mips/tcg-target.c.inc | 56 ------------------------------------
3 files changed, 32 insertions(+), 56 deletions(-)
create mode 100644 tcg/mips/tcg-target-constr.h
diff --git a/tcg/mips/tcg-target-constr.h b/tcg/mips/tcg-target-constr.h
new file mode 100644
index 0000000000..22f6df0806
--- /dev/null
+++ b/tcg/mips/tcg-target-constr.h
@@ -0,0 +1,31 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * MIPS target-specific operand constaints.
+ * Copyright (c) 2020 Linaro
+ */
+
+#define ALL_GENERAL_REGS 0xffffffffu
+#define NOA0_REGS (ALL_GENERAL_REGS & ~(1 << TCG_REG_A0))
+
+#ifdef CONFIG_SOFTMMU
+#define ALL_QLOAD_REGS \
+ (NOA0_REGS & ~((TCG_TARGET_REG_BITS < TARGET_LONG_BITS) << TCG_REG_A2))
+#define ALL_QSTORE_REGS \
+ (NOA0_REGS & ~(TCG_TARGET_REG_BITS < TARGET_LONG_BITS \
+ ? (1 << TCG_REG_A2) | (1 << TCG_REG_A3) \
+ : (1 << TCG_REG_A1)))
+#else
+#define ALL_QLOAD_REGS NOA0_REGS
+#define ALL_QSTORE_REGS NOA0_REGS
+#endif
+
+REGS('r', ALL_GENERAL_REGS)
+REGS('L', ALL_QLOAD_REGS)
+REGS('S', ALL_QSTORE_REGS)
+
+CONST('I', TCG_CT_CONST_U16)
+CONST('J', TCG_CT_CONST_S16)
+CONST('K', TCG_CT_CONST_P2M1)
+CONST('N', TCG_CT_CONST_N16)
+CONST('W', TCG_CT_CONST_WSZ)
+CONST('Z', TCG_CT_CONST_ZERO)
diff --git a/tcg/mips/tcg-target.h b/tcg/mips/tcg-target.h
index c6b091d849..f4a79bcad1 100644
--- a/tcg/mips/tcg-target.h
+++ b/tcg/mips/tcg-target.h
@@ -217,5 +217,6 @@ void tb_target_set_jmp_target(uintptr_t, uintptr_t,
uintptr_t);
#ifdef CONFIG_SOFTMMU
#define TCG_TARGET_NEED_LDST_LABELS
#endif
+#define TCG_TARGET_CONSTR_H
#endif
diff --git a/tcg/mips/tcg-target.c.inc b/tcg/mips/tcg-target.c.inc
index 41be574e89..d0b674582a 100644
--- a/tcg/mips/tcg-target.c.inc
+++ b/tcg/mips/tcg-target.c.inc
@@ -189,62 +189,6 @@ static inline bool is_p2m1(tcg_target_long val)
return val && ((val + 1) & val) == 0;
}
-/* parse target specific constraints */
-static const char *target_parse_constraint(TCGArgConstraint *ct,
- const char *ct_str, TCGType type)
-{
- switch(*ct_str++) {
- case 'r':
- ct->regs = 0xffffffff;
- break;
- case 'L': /* qemu_ld input arg constraint */
- ct->regs = 0xffffffff;
- tcg_regset_reset_reg(ct->regs, TCG_REG_A0);
-#if defined(CONFIG_SOFTMMU)
- if (TCG_TARGET_REG_BITS < TARGET_LONG_BITS) {
- tcg_regset_reset_reg(ct->regs, TCG_REG_A2);
- }
-#endif
- break;
- case 'S': /* qemu_st constraint */
- ct->regs = 0xffffffff;
- tcg_regset_reset_reg(ct->regs, TCG_REG_A0);
-#if defined(CONFIG_SOFTMMU)
- if (TCG_TARGET_REG_BITS < TARGET_LONG_BITS) {
- tcg_regset_reset_reg(ct->regs, TCG_REG_A2);
- tcg_regset_reset_reg(ct->regs, TCG_REG_A3);
- } else {
- tcg_regset_reset_reg(ct->regs, TCG_REG_A1);
- }
-#endif
- break;
- case 'I':
- ct->ct |= TCG_CT_CONST_U16;
- break;
- case 'J':
- ct->ct |= TCG_CT_CONST_S16;
- break;
- case 'K':
- ct->ct |= TCG_CT_CONST_P2M1;
- break;
- case 'N':
- ct->ct |= TCG_CT_CONST_N16;
- break;
- case 'W':
- ct->ct |= TCG_CT_CONST_WSZ;
- break;
- case 'Z':
- /* We are cheating a bit here, using the fact that the register
- ZERO is also the register number 0. Hence there is no need
- to check for const_args in each instruction. */
- ct->ct |= TCG_CT_CONST_ZERO;
- break;
- default:
- return NULL;
- }
- return ct_str;
-}
-
/* test if a constant matches the constraint */
static inline int tcg_target_const_match(tcg_target_long val, TCGType type,
const TCGArgConstraint *arg_ct)
--
2.25.1
- [PATCH 09/22] tcg/riscv: Convert to tcg-target-constr.h, (continued)
- [PATCH 09/22] tcg/riscv: Convert to tcg-target-constr.h, Richard Henderson, 2020/12/23
- [PATCH 10/22] tcg/s390: Convert to tcg-target-constr.h, Richard Henderson, 2020/12/23
- [PATCH 07/22] tcg/tci: Convert to tcg-target-constr.h, Richard Henderson, 2020/12/23
- [PATCH 06/22] tcg/ppc: Convert to tcg-target-constr.h, Richard Henderson, 2020/12/23
- [PATCH 16/22] tcg/mips: Convert to tcg-target-conset.h, Richard Henderson, 2020/12/23
- [PATCH 22/22] tcg: Remove TCG_TARGET_CONSET_H, Richard Henderson, 2020/12/23
- [PATCH 17/22] tcg/ppc: Convert to tcg-target-conset.h, Richard Henderson, 2020/12/23
- [PATCH 11/22] tcg/sparc: Convert to tcg-target-constr.h, Richard Henderson, 2020/12/23
- [PATCH 15/22] tcg/arm: Convert to tcg-target-conset.h, Richard Henderson, 2020/12/23
- [PATCH 18/22] tcg/riscv: Convert to tcg-target-conset.h, Richard Henderson, 2020/12/23
- [PATCH 08/22] tcg/mips: Convert to tcg-target-constr.h,
Richard Henderson <=
- [PATCH 20/22] tcg/sparc: Convert to tcg-target-conset.h, Richard Henderson, 2020/12/23
- [PATCH 21/22] tcg/tci: Convert to tcg-target-conset.h, Richard Henderson, 2020/12/23
- [PATCH 14/22] tcg/aarch64: Convert to tcg-target-conset.h, Richard Henderson, 2020/12/23
- [PATCH 19/22] tcg/s390: Convert to tcg-target-conset.h, Richard Henderson, 2020/12/23
- [PATCH 12/22] tcg: Remove TCG_TARGET_CONSTR_H, Richard Henderson, 2020/12/23
- Re: [PATCH 00/22] tcg: backend constraints cleanup, no-reply, 2020/12/23