From patchwork Tue Dec 6 00:30:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 129481 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 556631007D4 for ; Tue, 6 Dec 2011 11:40:08 +1100 (EST) Received: from localhost ([::1]:39735 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXixk-0007UL-2x for incoming@patchwork.ozlabs.org; Mon, 05 Dec 2011 19:32:48 -0500 Received: from eggs.gnu.org ([140.186.70.92]:53302) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXiwu-0005Sa-UF for qemu-devel@nongnu.org; Mon, 05 Dec 2011 19:31:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RXiwt-0007hm-Kg for qemu-devel@nongnu.org; Mon, 05 Dec 2011 19:31:56 -0500 Received: from mout.web.de ([212.227.15.4]:56501) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXiwt-0007hV-3I for qemu-devel@nongnu.org; Mon, 05 Dec 2011 19:31:55 -0500 Received: from localhost.localdomain ([2.39.114.236]) by smtp.web.de (mrweb002) with ESMTPA (Nemesis) id 0MJTHn-1RVo4Q3ysV-0037Xo; Tue, 06 Dec 2011 01:31:54 +0100 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Tue, 6 Dec 2011 01:30:45 +0100 Message-Id: <1323131446-21864-9-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1323131446-21864-1-git-send-email-andreas.faerber@web.de> References: <1323131446-21864-1-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 X-Provags-ID: V02:K0:E7yiv0oycdfZny3mkYYewCQ9CStF62Viab4SNH76lhp 675RlKKt1Yjqs1Trtty2lBoIeJcFliWRpWHdRVbcDXGgIxy+ha OLNndUDEukPMF1VAKcaPFEyjqf7DgMbn6hB0g6X6XU7OxUWqAT Bvf+xhzneLmT2BYUxIn4JtEMEA6O/7NNlVMEFfxAcIZcMLKJ6K I9WkbNluDj+mMEILwrRmA== X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 212.227.15.4 Cc: Peter Maydell , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH v3 8/9] target-arm: Infer VFP feature from VFPv3 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org VFP3 => VFP Signed-off-by: Andreas Färber 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 a4c3aa0..6c35261 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -121,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_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, uint32_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, uint32_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); @@ -248,6 +245,9 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_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); + } } void cpu_reset(CPUARMState *env)