From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:53074) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXhs3-0002Cm-8m for qemu-devel@nongnu.org; Mon, 05 Dec 2011 18:22:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RXhs1-00032U-PU for qemu-devel@nongnu.org; Mon, 05 Dec 2011 18:22:51 -0500 Received: from cantor2.suse.de ([195.135.220.15]:36460 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXhs1-00032C-AA for qemu-devel@nongnu.org; Mon, 05 Dec 2011 18:22:49 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 6 Dec 2011 00:21:21 +0100 Message-Id: <1323127282-20306-9-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 8/9] target-arm: Infer VFP feature from VFPv3 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 VFP3 =3D> VFP Signed-off-by: Andreas F=C3=A4rber Cc: Peter Maydell --- target-arm/helper.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target-arm/helper.c b/target-arm/helper.c index 56fec6f..a2a5084 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_VFP); set_feature(env, ARM_FEATURE_VFP3); set_feature(env, ARM_FEATURE_NEON); set_feature(env, ARM_FEATURE_THUMB2EE); @@ -139,7 +138,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_VFP); set_feature(env, ARM_FEATURE_VFP3); set_feature(env, ARM_FEATURE_VFP_FP16); set_feature(env, ARM_FEATURE_NEON); @@ -166,7 +164,6 @@ static void cpu_reset_model_id(CPUARMState *env, uint= 32_t id) break; case ARM_CPUID_ANY: /* For userspace emulation. */ set_feature(env, ARM_FEATURE_V7); - set_feature(env, ARM_FEATURE_VFP); set_feature(env, ARM_FEATURE_VFP3); set_feature(env, ARM_FEATURE_VFP4); set_feature(env, ARM_FEATURE_VFP_FP16); @@ -246,6 +243,9 @@ static void cpu_reset_model_id(CPUARMState *env, uint= 32_t id) if (arm_feature(env, ARM_FEATURE_ARM_DIV)) { set_feature(env, ARM_FEATURE_THUMB_DIV); } + if (arm_feature(env, ARM_FEATURE_VFP3)) { + set_feature(env, ARM_FEATURE_VFP); + } } =20 void cpu_reset(CPUARMState *env) --=20 1.7.7