[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 4/9] target-arm: Infer ARMv6(K) feature from ARMv
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH v3 4/9] target-arm: Infer ARMv6(K) feature from ARMv7 |
Date: |
Tue, 6 Dec 2011 01:30:41 +0100 |
V7 && M => V6
V7 && !M => V6K
Signed-off-by: Andreas Färber <address@hidden>
Cc: Peter Maydell <address@hidden>
---
target-arm/helper.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/target-arm/helper.c b/target-arm/helper.c
index 109918b..caee25c 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -123,7 +123,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_V6K);
set_feature(env, ARM_FEATURE_V7);
set_feature(env, ARM_FEATURE_AUXCR);
set_feature(env, ARM_FEATURE_THUMB2);
@@ -144,7 +143,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_V6K);
set_feature(env, ARM_FEATURE_V7);
set_feature(env, ARM_FEATURE_AUXCR);
set_feature(env, ARM_FEATURE_THUMB2);
@@ -170,14 +168,12 @@ 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_V6);
set_feature(env, ARM_FEATURE_THUMB2);
set_feature(env, ARM_FEATURE_V7);
set_feature(env, ARM_FEATURE_M);
set_feature(env, ARM_FEATURE_THUMB_DIV);
break;
case ARM_CPUID_ANY: /* For userspace emulation. */
- set_feature(env, ARM_FEATURE_V6K);
set_feature(env, ARM_FEATURE_V7);
set_feature(env, ARM_FEATURE_THUMB2);
set_feature(env, ARM_FEATURE_VFP);
@@ -237,6 +233,11 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t
id)
/* Some features automatically imply others: */
if (arm_feature(env, ARM_FEATURE_V7)) {
set_feature(env, ARM_FEATURE_VAPA);
+ if (!arm_feature(env, ARM_FEATURE_M)) {
+ set_feature(env, ARM_FEATURE_V6K);
+ } else {
+ set_feature(env, ARM_FEATURE_V6);
+ }
}
if (arm_feature(env, ARM_FEATURE_V6K)) {
set_feature(env, ARM_FEATURE_V6);
--
1.7.7
- [Qemu-devel] [PATCH v3 for-1.1 0/9] target-arm: More inference rules for features, Andreas Färber, 2011/12/05
- [Qemu-devel] [PATCH v3 1/9] target-arm: Infer ARMv4T feature from ARMv5, Andreas Färber, 2011/12/05
- [Qemu-devel] [PATCH v3 2/9] target-arm: Infer ARMv5 feature from ARMv6, Andreas Färber, 2011/12/05
- [Qemu-devel] [PATCH v3 3/9] target-arm: Infer ARMv6 feature from v6K, Andreas Färber, 2011/12/05
- [Qemu-devel] [PATCH v3 6/9] target-arm: Infer Thumb2 feature from ARMv7, Andreas Färber, 2011/12/05
- [Qemu-devel] [PATCH v3 5/9] target-arm: Infer AUXCR feature from ARMv6, Andreas Färber, 2011/12/05
- [Qemu-devel] [PATCH v3 8/9] target-arm: Infer VFP feature from VFPv3, Andreas Färber, 2011/12/05
- [Qemu-devel] [PATCH v3 4/9] target-arm: Infer ARMv6(K) feature from ARMv7,
Andreas Färber <=
- [Qemu-devel] [PATCH v3 7/9] target-arm: Infer Thumb division feature from M profile, Andreas Färber, 2011/12/05
- [Qemu-devel] [PATCH v3 9/9] target-arm: Infer VFPv3 feature from VFPv4, Andreas Färber, 2011/12/05
- Re: [Qemu-devel] [PATCH v3 for-1.1 0/9] target-arm: More inference rules for features, Peter Maydell, 2011/12/06
- Re: [Qemu-devel] [PATCH v3 for-1.1 0/9] target-arm: More inference rules for features, Peter Maydell, 2011/12/06