From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:33216) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RORvb-0005RF-8h for qemu-devel@nongnu.org; Thu, 10 Nov 2011 05:32:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RORvZ-0007kp-5l for qemu-devel@nongnu.org; Thu, 10 Nov 2011 05:32:15 -0500 Received: from fmmailgate05.web.de ([217.72.192.243]:57752) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RORvY-0007kN-RW for qemu-devel@nongnu.org; Thu, 10 Nov 2011 05:32:13 -0500 Received: from moweb001.kundenserver.de (moweb001.kundenserver.de [172.19.20.114]) by fmmailgate05.web.de (Postfix) with ESMTP id 1B1EB677B634 for ; Thu, 10 Nov 2011 11:32:12 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 10 Nov 2011 11:31:58 +0100 Message-Id: <1320921120-11574-4-git-send-email-andreas.faerber@web.de> In-Reply-To: <1320921120-11574-1-git-send-email-andreas.faerber@web.de> References: <1319281250-27114-1-git-send-email-andreas.faerber@web.de> <1320921120-11574-1-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [RFC 3/5] target-arm: Infer ARMv6 feature List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?Andreas=20F=C3=A4rber?= ARMv7 =3D> ARMv6 Cc: Peter Maydell Signed-off-by: Andreas F=C3=A4rber --- target-arm/helper.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/target-arm/helper.c b/target-arm/helper.c index bd6173d..3de0781 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -124,7 +124,6 @@ static void cpu_reset_model_id(CPUARMState *env) env->cp15.c0_cachetype =3D 0x1dd20d2; break; case ARM_CPUID_CORTEXA8: - set_feature(env, ARM_FEATURE_V6); set_feature(env, ARM_FEATURE_V6K); set_feature(env, ARM_FEATURE_V7); set_feature(env, ARM_FEATURE_AUXCR); @@ -146,7 +145,6 @@ static void cpu_reset_model_id(CPUARMState *env) env->cp15.c1_sys =3D 0x00c50078; break; case ARM_CPUID_CORTEXA9: - set_feature(env, ARM_FEATURE_V6); set_feature(env, ARM_FEATURE_V6K); set_feature(env, ARM_FEATURE_V7); set_feature(env, ARM_FEATURE_AUXCR); @@ -173,14 +171,12 @@ static void cpu_reset_model_id(CPUARMState *env) env->cp15.c1_sys =3D 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_V6); set_feature(env, ARM_FEATURE_V6K); set_feature(env, ARM_FEATURE_V7); set_feature(env, ARM_FEATURE_THUMB2); @@ -241,6 +237,7 @@ static void cpu_reset_model_id(CPUARMState *env) /* Some features automatically imply others: */ if (arm_feature(env, ARM_FEATURE_V7)) { set_feature(env, ARM_FEATURE_VAPA); + set_feature(env, ARM_FEATURE_V6); } if (arm_feature(env, ARM_FEATURE_V6)) { set_feature(env, ARM_FEATURE_V5); --=20 1.7.7