[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 05/27] tcg/s390x: Check for long-displacement facility at star
From: |
Richard Henderson |
Subject: |
[PATCH v4 05/27] tcg/s390x: Check for long-displacement facility at startup |
Date: |
Thu, 8 Dec 2022 20:05:08 -0600 |
We are already assuming the existance of long-displacement, but were
not being explicit about it. This has been present since z990.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tcg/s390x/tcg-target.h | 6 ++++--
tcg/s390x/tcg-target.c.inc | 15 +++++++++++++++
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/tcg/s390x/tcg-target.h b/tcg/s390x/tcg-target.h
index 645f522058..7f230ed243 100644
--- a/tcg/s390x/tcg-target.h
+++ b/tcg/s390x/tcg-target.h
@@ -52,11 +52,13 @@ typedef enum TCGReg {
#define TCG_TARGET_NB_REGS 64
-/* A list of relevant facilities used by this translator. Some of these
- are required for proper operation, and these are checked at startup. */
+/* Facilities required for proper operation; checked at startup. */
#define FACILITY_ZARCH_ACTIVE 2
#define FACILITY_LONG_DISP 18
+
+/* Facilities that are checked at runtime. */
+
#define FACILITY_EXT_IMM 21
#define FACILITY_GEN_INST_EXT 34
#define FACILITY_LOAD_ON_COND 45
diff --git a/tcg/s390x/tcg-target.c.inc b/tcg/s390x/tcg-target.c.inc
index dea889ffa1..1fcefba7ba 100644
--- a/tcg/s390x/tcg-target.c.inc
+++ b/tcg/s390x/tcg-target.c.inc
@@ -3211,6 +3211,7 @@ static TCGConstraintSetIndex tcg_target_op_def(TCGOpcode
op)
static void query_s390_facilities(void)
{
unsigned long hwcap = qemu_getauxval(AT_HWCAP);
+ const char *which;
/* Is STORE FACILITY LIST EXTENDED available? Honestly, I believe this
is present on all 64-bit systems, but let's check for it anyway. */
@@ -3232,6 +3233,20 @@ static void query_s390_facilities(void)
if (!(hwcap & HWCAP_S390_VXRS)) {
s390_facilities[2] = 0;
}
+
+ /*
+ * Check for all required facilities.
+ * ZARCH_ACTIVE is done via preprocessor check for 64-bit.
+ */
+ if (!HAVE_FACILITY(LONG_DISP)) {
+ which = "long-displacement";
+ goto fail;
+ }
+ return;
+
+ fail:
+ error_report("%s: missing required facility %s", __func__, which);
+ exit(EXIT_FAILURE);
}
static void tcg_target_init(TCGContext *s)
--
2.34.1
- [PATCH v4 00/27] tcg/s390x: misc patches, Richard Henderson, 2022/12/08
- [PATCH v4 04/27] tcg/s390x: Remove USE_LONG_BRANCHES, Richard Henderson, 2022/12/08
- [PATCH v4 01/27] tcg/s390x: Use register pair allocation for div and mulu2, Richard Henderson, 2022/12/08
- [PATCH v4 03/27] tcg/s390x: Always set TCG_TARGET_HAS_direct_jump, Richard Henderson, 2022/12/08
- [PATCH v4 02/27] tcg/s390x: Remove TCG_REG_TB, Richard Henderson, 2022/12/08
- [PATCH v4 05/27] tcg/s390x: Check for long-displacement facility at startup,
Richard Henderson <=
- [PATCH v4 06/27] tcg/s390x: Check for extended-immediate facility at startup, Richard Henderson, 2022/12/08
- [PATCH v4 08/27] tcg/s390x: Check for load-on-condition facility at startup, Richard Henderson, 2022/12/08
- [PATCH v4 07/27] tcg/s390x: Check for general-instruction-extension facility at startup, Richard Henderson, 2022/12/08
- [PATCH v4 09/27] tcg/s390x: Remove FAST_BCR_SER facility check, Richard Henderson, 2022/12/08
- [PATCH v4 10/27] tcg/s390x: Remove DISTINCT_OPERANDS facility check, Richard Henderson, 2022/12/08