mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target-arm: Infer ARMv6 feature from v6K

Browse Source 
V6K => V6

Signed-off-by: Andreas Färber <andreas.faerber@web.de>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Andreas Färber 2011-12-13 18:19:24 +00:00 committed by Peter Maydell
parent 08c40f3c62
commit 6bf62124f5
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target-arm/helper.c
View File

@ -98,7 +98,6 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t id)
env->cp15.c1_sys = 0x00050078; env->cp15.c1_sys = 0x00050078;
break; break;
case ARM_CPUID_ARM1176: case ARM_CPUID_ARM1176:
set_feature(env, ARM_FEATURE_V6);
set_feature(env, ARM_FEATURE_V6K); set_feature(env, ARM_FEATURE_V6K);
set_feature(env, ARM_FEATURE_VFP); set_feature(env, ARM_FEATURE_VFP);
set_feature(env, ARM_FEATURE_AUXCR); set_feature(env, ARM_FEATURE_AUXCR);
@ -112,7 +111,6 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t id)
env->cp15.c1_sys = 0x00050078; env->cp15.c1_sys = 0x00050078;
break; break;
case ARM_CPUID_ARM11MPCORE: case ARM_CPUID_ARM11MPCORE:
set_feature(env, ARM_FEATURE_V6);
set_feature(env, ARM_FEATURE_V6K); set_feature(env, ARM_FEATURE_V6K);
set_feature(env, ARM_FEATURE_VFP); set_feature(env, ARM_FEATURE_VFP);
set_feature(env, ARM_FEATURE_AUXCR); set_feature(env, ARM_FEATURE_AUXCR);
@ -125,7 +123,6 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t id)
env->cp15.c0_cachetype = 0x1dd20d2; env->cp15.c0_cachetype = 0x1dd20d2;
break; break;
case ARM_CPUID_CORTEXA8: case ARM_CPUID_CORTEXA8:
set_feature(env, ARM_FEATURE_V6);
set_feature(env, ARM_FEATURE_V6K); set_feature(env, ARM_FEATURE_V6K);
set_feature(env, ARM_FEATURE_V7); set_feature(env, ARM_FEATURE_V7);
set_feature(env, ARM_FEATURE_AUXCR); set_feature(env, ARM_FEATURE_AUXCR);
@ -147,7 +144,6 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t id)
env->cp15.c1_sys = 0x00c50078; env->cp15.c1_sys = 0x00c50078;
break; break;
case ARM_CPUID_CORTEXA9: case ARM_CPUID_CORTEXA9:
set_feature(env, ARM_FEATURE_V6);
set_feature(env, ARM_FEATURE_V6K); set_feature(env, ARM_FEATURE_V6K);
set_feature(env, ARM_FEATURE_V7); set_feature(env, ARM_FEATURE_V7);
set_feature(env, ARM_FEATURE_AUXCR); set_feature(env, ARM_FEATURE_AUXCR);
@ -181,7 +177,6 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t id)
set_feature(env, ARM_FEATURE_THUMB_DIV); set_feature(env, ARM_FEATURE_THUMB_DIV);
break; break;
case ARM_CPUID_ANY: /* For userspace emulation. */ case ARM_CPUID_ANY: /* For userspace emulation. */
set_feature(env, ARM_FEATURE_V6);
set_feature(env, ARM_FEATURE_V6K); set_feature(env, ARM_FEATURE_V6K);
set_feature(env, ARM_FEATURE_V7); set_feature(env, ARM_FEATURE_V7);
set_feature(env, ARM_FEATURE_THUMB2); set_feature(env, ARM_FEATURE_THUMB2);
@ -243,6 +238,9 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t id)
if (arm_feature(env, ARM_FEATURE_V7)) { if (arm_feature(env, ARM_FEATURE_V7)) {
set_feature(env, ARM_FEATURE_VAPA); set_feature(env, ARM_FEATURE_VAPA);
} }
if (arm_feature(env, ARM_FEATURE_V6K)) {
set_feature(env, ARM_FEATURE_V6);
}
if (arm_feature(env, ARM_FEATURE_V6)) { if (arm_feature(env, ARM_FEATURE_V6)) {
set_feature(env, ARM_FEATURE_V5); set_feature(env, ARM_FEATURE_V5);
} }