[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 10/22] tcg/s390: Convert to tcg-target-constr.h
From: |
Richard Henderson |
Subject: |
[PATCH 10/22] tcg/s390: Convert to tcg-target-constr.h |
Date: |
Tue, 22 Dec 2020 22:01:52 -0800 |
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tcg/s390/tcg-target-constr.h | 15 ++++++++++++++
tcg/s390/tcg-target.h | 1 +
tcg/s390/tcg-target.c.inc | 40 ------------------------------------
3 files changed, 16 insertions(+), 40 deletions(-)
create mode 100644 tcg/s390/tcg-target-constr.h
diff --git a/tcg/s390/tcg-target-constr.h b/tcg/s390/tcg-target-constr.h
new file mode 100644
index 0000000000..885e91e19b
--- /dev/null
+++ b/tcg/s390/tcg-target-constr.h
@@ -0,0 +1,15 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * S390 target-specific operand constaints.
+ * Copyright (c) 2020 Linaro
+ */
+
+REGS('r', 0xffff)
+REGS('L', 0xffff & ~((1 << TCG_REG_R2) | (1 << TCG_REG_R3) | (1 <<
TCG_REG_R4)))
+REGS('a', 1u << TCG_REG_R2)
+REGS('b', 1u << TCG_REG_R3)
+
+CONST('A', TCG_CT_CONST_S33)
+CONST('I', TCG_CT_CONST_S16)
+CONST('J', TCG_CT_CONST_S32)
+CONST('Z', TCG_CT_CONST_ZERO)
diff --git a/tcg/s390/tcg-target.h b/tcg/s390/tcg-target.h
index 63c8797bd3..3aff3cc572 100644
--- a/tcg/s390/tcg-target.h
+++ b/tcg/s390/tcg-target.h
@@ -162,5 +162,6 @@ static inline void tb_target_set_jmp_target(uintptr_t
tc_ptr,
#define TCG_TARGET_NEED_LDST_LABELS
#endif
#define TCG_TARGET_NEED_POOL_LABELS
+#define TCG_TARGET_CONSTR_H
#endif
diff --git a/tcg/s390/tcg-target.c.inc b/tcg/s390/tcg-target.c.inc
index c5e096449b..d00d78f0b9 100644
--- a/tcg/s390/tcg-target.c.inc
+++ b/tcg/s390/tcg-target.c.inc
@@ -402,46 +402,6 @@ static bool patch_reloc(tcg_insn_unit *code_ptr, int type,
return false;
}
-/* parse target specific constraints */
-static const char *target_parse_constraint(TCGArgConstraint *ct,
- const char *ct_str, TCGType type)
-{
- switch (*ct_str++) {
- case 'r': /* all registers */
- ct->regs = 0xffff;
- break;
- case 'L': /* qemu_ld/st constraint */
- ct->regs = 0xffff;
- tcg_regset_reset_reg(ct->regs, TCG_REG_R2);
- tcg_regset_reset_reg(ct->regs, TCG_REG_R3);
- tcg_regset_reset_reg(ct->regs, TCG_REG_R4);
- break;
- case 'a': /* force R2 for division */
- ct->regs = 0;
- tcg_regset_set_reg(ct->regs, TCG_REG_R2);
- break;
- case 'b': /* force R3 for division */
- ct->regs = 0;
- tcg_regset_set_reg(ct->regs, TCG_REG_R3);
- break;
- case 'A':
- ct->ct |= TCG_CT_CONST_S33;
- break;
- case 'I':
- ct->ct |= TCG_CT_CONST_S16;
- break;
- case 'J':
- ct->ct |= TCG_CT_CONST_S32;
- break;
- case 'Z':
- ct->ct |= TCG_CT_CONST_ZERO;
- break;
- default:
- return NULL;
- }
- return ct_str;
-}
-
/* Test if a constant matches the constraint. */
static int tcg_target_const_match(tcg_target_long val, TCGType type,
const TCGArgConstraint *arg_ct)
--
2.25.1
- [PATCH 00/22] tcg: backend constraints cleanup, Richard Henderson, 2020/12/23
- [PATCH 01/22] tcg/tci: Drop L and S constraints, Richard Henderson, 2020/12/23
- [PATCH 05/22] tcg/aarch64: Convert to tcg-target-constr.h, Richard Henderson, 2020/12/23
- [PATCH 03/22] tcg: Split out target constraints to tcg-target-constr.h, Richard Henderson, 2020/12/23
- [PATCH 13/22] tcg: Split out constraint sets to tcg-target-conset.h, Richard Henderson, 2020/12/23
- [PATCH 02/22] tcg/i386: Move constraint type check to tcg_target_const_match, Richard Henderson, 2020/12/23
- [PATCH 04/22] tcg/arm: Convert to tcg-target-constr.h, Richard Henderson, 2020/12/23
- [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 <=
- [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, 2020/12/23
- [PATCH 20/22] tcg/sparc: Convert to tcg-target-conset.h, Richard Henderson, 2020/12/23