[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/10] target-arm: Infer ARMv5 feature from ARMv6
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 03/10] target-arm: Infer ARMv5 feature from ARMv6 |
Date: |
Tue, 13 Dec 2011 18:30:10 +0000 |
From: Andreas Färber <address@hidden>
V6 => V5
Signed-off-by: Andreas Färber <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
target-arm/helper.c | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/target-arm/helper.c b/target-arm/helper.c
index eff2ac1..6a78dd0 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -82,7 +82,6 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t id)
* older core than plain "arm1136". In particular this does not
* have the v6K features.
*/
- set_feature(env, ARM_FEATURE_V5);
set_feature(env, ARM_FEATURE_V6);
set_feature(env, ARM_FEATURE_VFP);
set_feature(env, ARM_FEATURE_AUXCR);
@@ -99,7 +98,6 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t id)
env->cp15.c1_sys = 0x00050078;
break;
case ARM_CPUID_ARM1176:
- set_feature(env, ARM_FEATURE_V5);
set_feature(env, ARM_FEATURE_V6);
set_feature(env, ARM_FEATURE_V6K);
set_feature(env, ARM_FEATURE_VFP);
@@ -114,7 +112,6 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t
id)
env->cp15.c1_sys = 0x00050078;
break;
case ARM_CPUID_ARM11MPCORE:
- set_feature(env, ARM_FEATURE_V5);
set_feature(env, ARM_FEATURE_V6);
set_feature(env, ARM_FEATURE_V6K);
set_feature(env, ARM_FEATURE_VFP);
@@ -128,7 +125,6 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t
id)
env->cp15.c0_cachetype = 0x1dd20d2;
break;
case ARM_CPUID_CORTEXA8:
- set_feature(env, ARM_FEATURE_V5);
set_feature(env, ARM_FEATURE_V6);
set_feature(env, ARM_FEATURE_V6K);
set_feature(env, ARM_FEATURE_V7);
@@ -151,7 +147,6 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t
id)
env->cp15.c1_sys = 0x00c50078;
break;
case ARM_CPUID_CORTEXA9:
- set_feature(env, ARM_FEATURE_V5);
set_feature(env, ARM_FEATURE_V6);
set_feature(env, ARM_FEATURE_V6K);
set_feature(env, ARM_FEATURE_V7);
@@ -179,7 +174,6 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t
id)
env->cp15.c1_sys = 0x00c50078;
break;
case ARM_CPUID_CORTEXM3:
- set_feature(env, ARM_FEATURE_V5);
set_feature(env, ARM_FEATURE_V6);
set_feature(env, ARM_FEATURE_THUMB2);
set_feature(env, ARM_FEATURE_V7);
@@ -187,7 +181,6 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t
id)
set_feature(env, ARM_FEATURE_THUMB_DIV);
break;
case ARM_CPUID_ANY: /* For userspace emulation. */
- set_feature(env, ARM_FEATURE_V5);
set_feature(env, ARM_FEATURE_V6);
set_feature(env, ARM_FEATURE_V6K);
set_feature(env, ARM_FEATURE_V7);
@@ -250,6 +243,9 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t
id)
if (arm_feature(env, ARM_FEATURE_V7)) {
set_feature(env, ARM_FEATURE_VAPA);
}
+ if (arm_feature(env, ARM_FEATURE_V6)) {
+ set_feature(env, ARM_FEATURE_V5);
+ }
if (arm_feature(env, ARM_FEATURE_V5)) {
set_feature(env, ARM_FEATURE_V4T);
}
--
1.7.1
- [Qemu-devel] [PULL 00/10] target-arm queue, Peter Maydell, 2011/12/13
- [Qemu-devel] [PATCH 10/10] target-arm: Infer VFPv3 feature from VFPv4, Peter Maydell, 2011/12/13
- [Qemu-devel] [PATCH 07/10] target-arm: Infer Thumb2 feature from ARMv7, Peter Maydell, 2011/12/13
- [Qemu-devel] [PATCH 04/10] target-arm: Infer ARMv6 feature from v6K, Peter Maydell, 2011/12/13
- [Qemu-devel] [PATCH 02/10] target-arm: Infer ARMv4T feature from ARMv5, Peter Maydell, 2011/12/13
- [Qemu-devel] [PATCH 05/10] target-arm: Infer ARMv6(K) feature from ARMv7, Peter Maydell, 2011/12/13
- [Qemu-devel] [PATCH 06/10] target-arm: Infer AUXCR feature from ARMv6, Peter Maydell, 2011/12/13
- [Qemu-devel] [PATCH 09/10] target-arm: Infer VFP feature from VFPv3, Peter Maydell, 2011/12/13
- [Qemu-devel] [PATCH 08/10] target-arm: Infer Thumb division feature from M profile, Peter Maydell, 2011/12/13
- [Qemu-devel] [PATCH 03/10] target-arm: Infer ARMv5 feature from ARMv6,
Peter Maydell <=
- [Qemu-devel] [PATCH 01/10] arm: Fix CP15 FSR (C5) domain setting, Peter Maydell, 2011/12/13
- Re: [Qemu-devel] [PULL 00/10] target-arm queue, andrzej zaborowski, 2011/12/14