[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/10] target-arm: Infer AUXCR feature from ARMv6
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 06/10] target-arm: Infer AUXCR feature from ARMv6 |
Date: |
Tue, 13 Dec 2011 18:30:13 +0000 |
From: Andreas Färber <address@hidden>
V6 && !M => AUXCR
Signed-off-by: Andreas Färber <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
target-arm/helper.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/target-arm/helper.c b/target-arm/helper.c
index 1108156..0a7f745 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -84,7 +84,6 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t id)
*/
set_feature(env, ARM_FEATURE_V6);
set_feature(env, ARM_FEATURE_VFP);
- set_feature(env, ARM_FEATURE_AUXCR);
/* These ID register values are correct for 1136 but may be wrong
* for 1136_r2 (in particular r0p2 does not actually implement most
* of the ID registers).
@@ -100,7 +99,6 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t id)
case ARM_CPUID_ARM1176:
set_feature(env, ARM_FEATURE_V6K);
set_feature(env, ARM_FEATURE_VFP);
- set_feature(env, ARM_FEATURE_AUXCR);
set_feature(env, ARM_FEATURE_VAPA);
env->vfp.xregs[ARM_VFP_FPSID] = 0x410120b5;
env->vfp.xregs[ARM_VFP_MVFR0] = 0x11111111;
@@ -113,7 +111,6 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t
id)
case ARM_CPUID_ARM11MPCORE:
set_feature(env, ARM_FEATURE_V6K);
set_feature(env, ARM_FEATURE_VFP);
- set_feature(env, ARM_FEATURE_AUXCR);
set_feature(env, ARM_FEATURE_VAPA);
env->vfp.xregs[ARM_VFP_FPSID] = 0x410120b4;
env->vfp.xregs[ARM_VFP_MVFR0] = 0x11111111;
@@ -124,7 +121,6 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t
id)
break;
case ARM_CPUID_CORTEXA8:
set_feature(env, ARM_FEATURE_V7);
- set_feature(env, ARM_FEATURE_AUXCR);
set_feature(env, ARM_FEATURE_THUMB2);
set_feature(env, ARM_FEATURE_VFP);
set_feature(env, ARM_FEATURE_VFP3);
@@ -144,7 +140,6 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t
id)
break;
case ARM_CPUID_CORTEXA9:
set_feature(env, ARM_FEATURE_V7);
- set_feature(env, ARM_FEATURE_AUXCR);
set_feature(env, ARM_FEATURE_THUMB2);
set_feature(env, ARM_FEATURE_VFP);
set_feature(env, ARM_FEATURE_VFP3);
@@ -244,6 +239,9 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t
id)
}
if (arm_feature(env, ARM_FEATURE_V6)) {
set_feature(env, ARM_FEATURE_V5);
+ if (!arm_feature(env, ARM_FEATURE_M)) {
+ set_feature(env, ARM_FEATURE_AUXCR);
+ }
}
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 <=
- [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, 2011/12/13
- [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