diff options
| author | Anthony Liguori | 2013-07-15 21:02:32 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2013-07-15 21:02:32 +0200 |
| commit | ab4e1589f072c7a5d1238c7f0d289c163c7736b2 (patch) | |
| tree | 1aa4517122ee4e83ede4adfd4109c865a53fc9fe /target-arm/cpu.c | |
| parent | Merge remote-tracking branch 'pmaydell/tags/pull-arm-devs-20130715' into staging (diff) | |
| parent | target-arm: Avoid g_hash_table_get_keys() (diff) | |
| download | qemu-ab4e1589f072c7a5d1238c7f0d289c163c7736b2.tar.gz qemu-ab4e1589f072c7a5d1238c7f0d289c163c7736b2.tar.xz qemu-ab4e1589f072c7a5d1238c7f0d289c163c7736b2.zip | |
Merge remote-tracking branch 'pmaydell/tags/pull-target-arm-20130715-1' into staging
target-arm queue
# gpg: Signature made Mon 15 Jul 2013 11:15:13 AM CDT using RSA key ID 14360CDE
# gpg: Can't check signature: public key not found
# By Mans Rullgard (3) and others
# Via Peter Maydell
* pmaydell/tags/pull-target-arm-20130715-1:
target-arm: Avoid g_hash_table_get_keys()
target-arm: avoid undefined behaviour when writing TTBCR
target-arm/helper.c: Allow const opaques in arm CP
target-arm/helper.c: Implement MIDR aliases
target-arm/helper.c: OMAP/StrongARM cp15 crn=0 cleanup
target-arm: explicitly decode SEVL instruction
target-arm: implement LDA/STL instructions
target-arm: add feature flag for ARMv8
Message-id: 1373905022-27735-1-git-send-email-peter.maydell@linaro.org
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'target-arm/cpu.c')
| -rw-r--r-- | target-arm/cpu.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/target-arm/cpu.c b/target-arm/cpu.c index be26acc38d..9f1696f933 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -157,6 +157,11 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) CPUARMState *env = &cpu->env; /* Some features automatically imply others: */ + if (arm_feature(env, ARM_FEATURE_V8)) { + set_feature(env, ARM_FEATURE_V7); + set_feature(env, ARM_FEATURE_ARM_DIV); + set_feature(env, ARM_FEATURE_LPAE); + } if (arm_feature(env, ARM_FEATURE_V7)) { set_feature(env, ARM_FEATURE_VAPA); set_feature(env, ARM_FEATURE_THUMB2); @@ -744,7 +749,7 @@ static void pxa270c5_initfn(Object *obj) static void arm_any_initfn(Object *obj) { ARMCPU *cpu = ARM_CPU(obj); - set_feature(&cpu->env, ARM_FEATURE_V7); + set_feature(&cpu->env, ARM_FEATURE_V8); set_feature(&cpu->env, ARM_FEATURE_VFP4); set_feature(&cpu->env, ARM_FEATURE_VFP_FP16); set_feature(&cpu->env, ARM_FEATURE_NEON); |