From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:53049) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXhs1-000278-Sj for qemu-devel@nongnu.org; Mon, 05 Dec 2011 18:22:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RXhs0-000322-C1 for qemu-devel@nongnu.org; Mon, 05 Dec 2011 18:22:49 -0500 Received: from cantor2.suse.de ([195.135.220.15]:36454 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXhs0-00031t-1E for qemu-devel@nongnu.org; Mon, 05 Dec 2011 18:22:48 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 6 Dec 2011 00:21:19 +0100 Message-Id: <1323127282-20306-7-git-send-email-afaerber@suse.de> In-Reply-To: <1323127282-20306-1-git-send-email-afaerber@suse.de> References: <1323127282-20306-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 6/9] target-arm: Infer Thumb2 feature from ARMv7 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?= From: Andreas F=C3=A4rber V7 =3D> THUMB2 Signed-off-by: Andreas F=C3=A4rber Cc: Peter Maydell --- 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 7b52792..7b1a02f 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -121,7 +121,6 @@ static void cpu_reset_model_id(CPUARMState *env, uint= 32_t id) break; case ARM_CPUID_CORTEXA8: set_feature(env, ARM_FEATURE_V7); - set_feature(env, ARM_FEATURE_THUMB2); set_feature(env, ARM_FEATURE_VFP); set_feature(env, ARM_FEATURE_VFP3); set_feature(env, ARM_FEATURE_NEON); @@ -140,7 +139,6 @@ static void cpu_reset_model_id(CPUARMState *env, uint= 32_t id) break; case ARM_CPUID_CORTEXA9: set_feature(env, ARM_FEATURE_V7); - set_feature(env, ARM_FEATURE_THUMB2); set_feature(env, ARM_FEATURE_VFP); set_feature(env, ARM_FEATURE_VFP3); set_feature(env, ARM_FEATURE_VFP_FP16); @@ -163,14 +161,12 @@ static void cpu_reset_model_id(CPUARMState *env, ui= nt32_t id) env->cp15.c1_sys =3D 0x00c50078; break; case ARM_CPUID_CORTEXM3: - 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_V7); - set_feature(env, ARM_FEATURE_THUMB2); set_feature(env, ARM_FEATURE_VFP); set_feature(env, ARM_FEATURE_VFP3); set_feature(env, ARM_FEATURE_VFP4); @@ -228,6 +224,7 @@ static void cpu_reset_model_id(CPUARMState *env, uint= 32_t id) /* Some features automatically imply others: */ if (arm_feature(env, ARM_FEATURE_V7)) { set_feature(env, ARM_FEATURE_VAPA); + set_feature(env, ARM_FEATURE_THUMB2); if (!arm_feature(env, ARM_FEATURE_M)) { set_feature(env, ARM_FEATURE_V6K); } else { --=20 1.7.7