From patchwork Tue Dec 13 18:30:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 131162 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 5CDDA1007D5 for ; Wed, 14 Dec 2011 05:30:43 +1100 (EST) Received: from localhost ([::1]:49967 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RaX7g-0003qt-4o for incoming@patchwork.ozlabs.org; Tue, 13 Dec 2011 13:30:40 -0500 Received: from eggs.gnu.org ([140.186.70.92]:41462) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RaX7Z-0003qf-7u for qemu-devel@nongnu.org; Tue, 13 Dec 2011 13:30:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RaX7Y-00058r-1k for qemu-devel@nongnu.org; Tue, 13 Dec 2011 13:30:33 -0500 Received: from mnementh.archaic.org.uk ([81.2.115.146]:37867) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RaX7X-00058d-RL for qemu-devel@nongnu.org; Tue, 13 Dec 2011 13:30:32 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1RaX7K-0004gr-0T; Tue, 13 Dec 2011 18:30:18 +0000 From: Peter Maydell To: Anthony Liguori Date: Tue, 13 Dec 2011 18:30:17 +0000 Message-Id: <1323801017-17986-11-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1323801017-17986-1-git-send-email-peter.maydell@linaro.org> References: <1323801017-17986-1-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 81.2.115.146 Cc: Paul Brook , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 10/10] target-arm: Infer VFPv3 feature from VFPv4 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 From: Andreas Färber VFP4 => VFP3 Signed-off-by: Andreas Färber Signed-off-by: Peter Maydell --- target-arm/helper.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/target-arm/helper.c b/target-arm/helper.c index bd5576c..65f4fbf 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -164,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_VFP3); set_feature(env, ARM_FEATURE_VFP4); set_feature(env, ARM_FEATURE_VFP_FP16); set_feature(env, ARM_FEATURE_NEON); @@ -245,6 +244,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_VFP4)) { + set_feature(env, ARM_FEATURE_VFP3); + } if (arm_feature(env, ARM_FEATURE_VFP3)) { set_feature(env, ARM_FEATURE_VFP); }