OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target/arm: Restructure has_vfp_d32 test 

One cannot test for feature aa32_simd_r32 without first
testing if AArch32 mode is supported at all.  This leads to

qemu-system-aarch64: ARM CPUs must have both VFP-D32 and Neon or neither

for Apple M1 cpus.

We already have a check for ARMv8-A never setting vfp-d32 true,
so restructure the code so that AArch64 avoids the test entirely.

Reported-by: Mads Ynddal <mads@ynddal.dk>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Mads Ynddal <m.ynddal@samsung.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Mads Ynddal <m.ynddal@samsung.com>
Message-id: 20230619140216.402530-1-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2023-06-19 16:02:16 +02:00 committed by Peter Maydell
parent b0438861ef
commit 4315f7c614
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
target/arm/cpu.c
View File

@ -1402,25 +1402,27 @@ void arm_cpu_post_init(Object *obj)
* KVM does not currently allow us to lie to the guest about its * KVM does not currently allow us to lie to the guest about its
* ID/feature registers, so the guest always sees what the host has. * ID/feature registers, so the guest always sees what the host has.
*/ */
if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64) if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64)) {
? cpu_isar_feature(aa64_fp_simd, cpu) if (cpu_isar_feature(aa64_fp_simd, cpu)) {
: cpu_isar_feature(aa32_vfp, cpu)) { cpu->has_vfp = true;
cpu->has_vfp = true; cpu->has_vfp_d32 = true;
if (!kvm_enabled()) { if (tcg_enabled() || qtest_enabled()) {
qdev_property_add_static(DEVICE(obj), &arm_cpu_has_vfp_property); qdev_property_add_static(DEVICE(obj),
&arm_cpu_has_vfp_property);
}
} }
} } else if (cpu_isar_feature(aa32_vfp, cpu)) {
cpu->has_vfp = true;
if (cpu->has_vfp && cpu_isar_feature(aa32_simd_r32, cpu)) { if (cpu_isar_feature(aa32_simd_r32, cpu)) {
cpu->has_vfp_d32 = true; cpu->has_vfp_d32 = true;
if (!kvm_enabled()) {
/* /*
* The permitted values of the SIMDReg bits [3:0] on * The permitted values of the SIMDReg bits [3:0] on
* Armv8-A are either 0b0000 and 0b0010. On such CPUs, * Armv8-A are either 0b0000 and 0b0010. On such CPUs,
* make sure that has_vfp_d32 can not be set to false. * make sure that has_vfp_d32 can not be set to false.
*/ */
if (!(arm_feature(&cpu->env, ARM_FEATURE_V8) && if ((tcg_enabled() || qtest_enabled())
!arm_feature(&cpu->env, ARM_FEATURE_M))) { && !(arm_feature(&cpu->env, ARM_FEATURE_V8)
&& !arm_feature(&cpu->env, ARM_FEATURE_M))) {
qdev_property_add_static(DEVICE(obj), qdev_property_add_static(DEVICE(obj),
&arm_cpu_has_vfp_d32_property); &arm_cpu_has_vfp_d32_property);
} }