From patchwork Thu Nov 10 10:32:00 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: 124856 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 853BD1007D8 for ; Thu, 10 Nov 2011 21:52:20 +1100 (EST) Received: from localhost ([::1]:56334 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RORwg-0008T3-SS for incoming@patchwork.ozlabs.org; Thu, 10 Nov 2011 05:33:22 -0500 Received: from eggs.gnu.org ([140.186.70.92]:33224) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RORvb-0005RG-N5 for qemu-devel@nongnu.org; Thu, 10 Nov 2011 05:32:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RORva-0007lJ-6Y for qemu-devel@nongnu.org; Thu, 10 Nov 2011 05:32:15 -0500 Received: from fmmailgate04.web.de ([217.72.192.242]:40507) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RORvZ-0007l1-P7 for qemu-devel@nongnu.org; Thu, 10 Nov 2011 05:32:14 -0500 Received: from moweb002.kundenserver.de (moweb002.kundenserver.de [172.19.20.108]) by fmmailgate04.web.de (Postfix) with ESMTP id 281AD6EEAC65 for ; Thu, 10 Nov 2011 11:32:13 +0100 (CET) Received: from localhost.localdomain ([2.39.114.236]) by smtp.web.de (mrweb001) with ESMTPA (Nemesis) id 0MLP5m-1RNtxm2oHi-000YJu; Thu, 10 Nov 2011 11:32:13 +0100 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Thu, 10 Nov 2011 11:32:00 +0100 Message-Id: <1320921120-11574-6-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.7.7 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 X-Provags-ID: V02:K0:SixxM92hlpZ8DWSQqM2/BYxADegScwEVkyjJwynDhIT 2qvUpKH8IIS8tbbFhTxVI0UE3lEd3vqbFQTwEqkUbTe7QzXmUs MqDrOB1ETH2ObC0qaC+bJzB+u/XLB0k4TWC05HC0a5Rc3LAfyT Gd7gofHXAq/kwrhtrUtlbZCSfTbVLY+rwE+e+a+8495vUOj0A0 QmwHcBt/mF9vlWqBfYVmQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 217.72.192.242 Cc: Peter Maydell , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [FYI 5/5] target-arm: Add support for Cortex-R4F 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 Since no clean distinction between R4 and R4F can be made yet, default -cpu cortex-r4 to Cortex-R4F. Cc: Peter Maydell Signed-off-by: Andreas Färber --- target-arm/helper.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/target-arm/helper.c b/target-arm/helper.c index 4836762..15853e0 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -181,6 +181,40 @@ static void cpu_reset_model_id(CPUARMState *env) set_feature(env, ARM_FEATURE_THUMB2); set_feature(env, ARM_FEATURE_THUMB_DIV); set_feature(env, ARM_FEATURE_MPU); + { + static const struct { + uint8_t r; + uint8_t p; + uint8_t value; + } fpsid_revs[] = { + { 1, 0, 0x3 }, + { 1, 1, 0x4 }, + { 1, 2, 0x6 }, + { 1, 3, 0x7 }, + { 1, 4, 0x8 }, + {} + }; + uint8_t r = (ARM_CPUID(env) >> 20) & 0xf; + uint8_t p = ARM_CPUID(env) & 0xf; + uint8_t rev = 0; + int i; + set_feature(env, ARM_FEATURE_VFP); + set_feature(env, ARM_FEATURE_VFP3); + /* TODO VFPv3-D16 */ + /* Calculate FPSID value matching to MIDR */ + for (i = 0; fpsid_revs[i].r != 0; i++) { + if (fpsid_revs[i].r == r && fpsid_revs[i].p == p) { + rev = fpsid_revs[i].value; + break; + } + } + if (rev == 0) { + cpu_abort(env, + "Cortex-R4F r%" PRIu8 "p%" PRIu8 " unsupported", + r, p); + } + env->vfp.xregs[ARM_VFP_FPSID] = 0x41023140 | (rev & 0xf); + } memcpy(env->cp15.c0_c1, cortexr4_cp15_c0_c1, 8 * sizeof(uint32_t)); memcpy(env->cp15.c0_c2, cortexr4_cp15_c0_c2, 8 * sizeof(uint32_t)); break;