yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-03-24 10:55:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/arm: Define and use any_predinv isar_feature test

Browse source 
Instead of open-coding "ARM_FEATURE_AARCH64 ? aa64_predinv: aa32_predinv",
define and use an any_predinv isar_feature test function.

Backports commit 22e570730d15374453baa73ff2a699e01ef4e950 from qemu
This commit is contained in:
Peter Maydell 2020-03-21 18:13:22 -04:00 committed by Lioncash
parent 62178626e4
commit b1c088e2f2
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
qemu/target/arm/cpu.h
View file

@ -3550,6 +3550,11 @@ static inline bool isar_feature_any_fp16(const ARMISARegisters *id)
return isar_feature_aa64_fp16(id) || isar_feature_aa32_fp16_arith(id); return isar_feature_aa64_fp16(id) || isar_feature_aa32_fp16_arith(id);
} }
static inline bool isar_feature_any_predinv(const ARMISARegisters *id)
{
return isar_feature_aa64_predinv(id) || isar_feature_aa32_predinv(id);
}
/* /*
* Forward to the above feature tests given an ARMCPU pointer. * Forward to the above feature tests given an ARMCPU pointer.
*/ */

9
qemu/target/arm/helper.c
View file

@ -7492,14 +7492,7 @@ void register_cp_regs_for_features(ARMCPU *cpu)
#endif /*CONFIG_USER_ONLY*/ #endif /*CONFIG_USER_ONLY*/
#endif #endif
/* if (cpu_isar_feature(any_predinv, cpu)) {
* While all v8.0 cpus support aarch64, QEMU does have configurations
* that do not set ID_AA64ISAR1, e.g. user-only qemu-arm -cpu max,
* which will set ID_ISAR6.
*/
if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64)
? cpu_isar_feature(aa64_predinv, cpu)
: cpu_isar_feature(aa32_predinv, cpu)) {
define_arm_cp_regs(cpu, predinv_reginfo); define_arm_cp_regs(cpu, predinv_reginfo);
} }