[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC v12 53/65] target/arm: restrict rebuild_hflags_a64 to TARGET_AARCH6
From: |
Claudio Fontana |
Subject: |
[RFC v12 53/65] target/arm: restrict rebuild_hflags_a64 to TARGET_AARCH64 |
Date: |
Fri, 26 Mar 2021 20:36:49 +0100 |
Signed-off-by: Claudio Fontana <cfontana@suse.de>
---
target/arm/helper-a64.h | 2 ++
target/arm/helper.h | 1 -
target/arm/tcg/helper.c | 14 ++++++++++++++
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/target/arm/helper-a64.h b/target/arm/helper-a64.h
index c139fa81f9..342f55d577 100644
--- a/target/arm/helper-a64.h
+++ b/target/arm/helper-a64.h
@@ -119,3 +119,5 @@ DEF_HELPER_FLAGS_2(st2g_stub, TCG_CALL_NO_WG, void, env,
i64)
DEF_HELPER_FLAGS_2(ldgm, TCG_CALL_NO_WG, i64, env, i64)
DEF_HELPER_FLAGS_3(stgm, TCG_CALL_NO_WG, void, env, i64, i64)
DEF_HELPER_FLAGS_3(stzgm_tags, TCG_CALL_NO_WG, void, env, i64, i64)
+
+DEF_HELPER_FLAGS_2(rebuild_hflags_a64, TCG_CALL_NO_RWG, void, env, int)
diff --git a/target/arm/helper.h b/target/arm/helper.h
index ff8148ddc6..37dd9797a1 100644
--- a/target/arm/helper.h
+++ b/target/arm/helper.h
@@ -94,7 +94,6 @@ DEF_HELPER_FLAGS_1(rebuild_hflags_m32_newel, TCG_CALL_NO_RWG,
void, env)
DEF_HELPER_FLAGS_2(rebuild_hflags_m32, TCG_CALL_NO_RWG, void, env, int)
DEF_HELPER_FLAGS_1(rebuild_hflags_a32_newel, TCG_CALL_NO_RWG, void, env)
DEF_HELPER_FLAGS_2(rebuild_hflags_a32, TCG_CALL_NO_RWG, void, env, int)
-DEF_HELPER_FLAGS_2(rebuild_hflags_a64, TCG_CALL_NO_RWG, void, env, int)
DEF_HELPER_FLAGS_5(probe_access, TCG_CALL_NO_WG, void, env, tl, i32, i32, i32)
diff --git a/target/arm/tcg/helper.c b/target/arm/tcg/helper.c
index 1320185140..470b2894e3 100644
--- a/target/arm/tcg/helper.c
+++ b/target/arm/tcg/helper.c
@@ -1084,6 +1084,8 @@ static uint32_t rebuild_hflags_a32(CPUARMState *env, int
fp_el,
return rebuild_hflags_common_32(env, fp_el, mmu_idx, flags);
}
+#ifdef TARGET_AARCH64
+
static uint32_t rebuild_hflags_a64(CPUARMState *env, int el, int fp_el,
ARMMMUIdx mmu_idx)
{
@@ -1204,6 +1206,16 @@ static uint32_t rebuild_hflags_a64(CPUARMState *env, int
el, int fp_el,
return rebuild_hflags_common(env, fp_el, mmu_idx, flags);
}
+#else
+
+static inline uint32_t rebuild_hflags_a64(CPUARMState *env, int el, int fp_el,
+ ARMMMUIdx mmu_idx)
+{
+ return 0;
+}
+
+#endif /* TARGET_AARCH64 */
+
static uint32_t rebuild_hflags_internal(CPUARMState *env)
{
int el = arm_current_el(env);
@@ -1264,6 +1276,7 @@ void HELPER(rebuild_hflags_a32)(CPUARMState *env, int el)
env->hflags = rebuild_hflags_a32(env, fp_el, mmu_idx);
}
+#ifdef TARGET_AARCH64
void HELPER(rebuild_hflags_a64)(CPUARMState *env, int el)
{
int fp_el = fp_exception_el(env, el);
@@ -1271,6 +1284,7 @@ void HELPER(rebuild_hflags_a64)(CPUARMState *env, int el)
env->hflags = rebuild_hflags_a64(env, el, fp_el, mmu_idx);
}
+#endif /* TARGET_AARCH64 */
static inline void assert_hflags_rebuild_correctly(CPUARMState *env)
{
--
2.26.2
- [RFC v12 49/65] target/arm: move TCG gt timer creation code in tcg/, (continued)
- [RFC v12 49/65] target/arm: move TCG gt timer creation code in tcg/, Claudio Fontana, 2021/03/26
- [RFC v12 50/65] target/arm: cpu-sve: new module, Claudio Fontana, 2021/03/26
- [RFC v12 46/65] target/arm: create kvm cpu accel class, Claudio Fontana, 2021/03/26
- [RFC v12 52/65] target/arm: make is_aa64 and arm_el_is_aa64 a macro for !TARGET_AARCH64, Claudio Fontana, 2021/03/26
- [RFC v12 51/65] target/arm: cpu-sve: split TCG and KVM functionality, Claudio Fontana, 2021/03/26
- [RFC v12 53/65] target/arm: restrict rebuild_hflags_a64 to TARGET_AARCH64,
Claudio Fontana <=
- [RFC v12 56/65] target/arm: tcg: restrict ZCR cpregs to TARGET_AARCH64, Claudio Fontana, 2021/03/26
- [RFC v12 54/65] target/arm: arch_dump: restrict ELFCLASS64 to AArch64, Claudio Fontana, 2021/03/26
- [RFC v12 55/65] target/arm: cpu-exceptions: new module, Claudio Fontana, 2021/03/26
- [RFC v12 57/65] target/arm: tcg-sve: import narrow_vq and change_el functions, Claudio Fontana, 2021/03/26