From patchwork Thu Nov 10 10:31:56 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: 124843 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 059791007D1 for ; Thu, 10 Nov 2011 21:32:43 +1100 (EST) Received: from localhost ([::1]:51510 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RORvv-0005vo-1m for incoming@patchwork.ozlabs.org; Thu, 10 Nov 2011 05:32:35 -0500 Received: from eggs.gnu.org ([140.186.70.92]:33239) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RORvd-0005Rx-Pm for qemu-devel@nongnu.org; Thu, 10 Nov 2011 05:32:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RORvZ-0007kh-2U for qemu-devel@nongnu.org; Thu, 10 Nov 2011 05:32:17 -0500 Received: from fmmailgate05.web.de ([217.72.192.243]:57715) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RORvY-0007k9-Nx for qemu-devel@nongnu.org; Thu, 10 Nov 2011 05:32:13 -0500 Received: from moweb002.kundenserver.de (moweb002.kundenserver.de [172.19.20.108]) by fmmailgate05.web.de (Postfix) with ESMTP id C352E677C7AE for ; Thu, 10 Nov 2011 11:32:10 +0100 (CET) Received: from localhost.localdomain ([2.39.114.236]) by smtp.web.de (mrweb001) with ESMTPA (Nemesis) id 0LsQ9o-1QvjxC03SK-0122uO; Thu, 10 Nov 2011 11:32:10 +0100 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Thu, 10 Nov 2011 11:31:56 +0100 Message-Id: <1320921120-11574-2-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:Yv5EzSfaA9pAUxJfQzO+8XkiMKfncJYr5jtiTxCEXv8 p4ba0HMZxF5stycrnbPhJldxzlu2Yv+/5JCYnHfmXmOlAb2aZj hqLfFqgWN5c0nhBZKnAxr2o8rGOhX9aemh7Sgt+r5dUGC7M1dg yUl204+caLSpk6tymC7J5RJu6W3LfR0Y4wcDnPLeHRe+MYBt7g EJPKhVT6NOLqPpoW/sORg== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 217.72.192.243 Cc: Peter Maydell , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [RFC 1/5] target-arm: Infer ARMv4T feature 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 ARMv5 => ARMv4T Cc: Peter Maydell Signed-off-by: Andreas Färber --- target-arm/helper.c | 15 +++------------ 1 files changed, 3 insertions(+), 12 deletions(-) diff --git a/target-arm/helper.c b/target-arm/helper.c index 3daf2f2..0d7635b 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -52,7 +52,6 @@ static void cpu_reset_model_id(CPUARMState *env) { switch (env->cp15_c0_cpuid) { case ARM_CPUID_ARM926: - set_feature(env, ARM_FEATURE_V4T); set_feature(env, ARM_FEATURE_V5); set_feature(env, ARM_FEATURE_VFP); env->vfp.xregs[ARM_VFP_FPSID] = 0x41011090; @@ -60,14 +59,12 @@ static void cpu_reset_model_id(CPUARMState *env) env->cp15.c1_sys = 0x00090078; break; case ARM_CPUID_ARM946: - set_feature(env, ARM_FEATURE_V4T); set_feature(env, ARM_FEATURE_V5); set_feature(env, ARM_FEATURE_MPU); env->cp15.c0_cachetype = 0x0f004006; env->cp15.c1_sys = 0x00000078; break; case ARM_CPUID_ARM1026: - set_feature(env, ARM_FEATURE_V4T); set_feature(env, ARM_FEATURE_V5); set_feature(env, ARM_FEATURE_VFP); set_feature(env, ARM_FEATURE_AUXCR); @@ -84,7 +81,6 @@ static void cpu_reset_model_id(CPUARMState *env) * older core than plain "arm1136". In particular this does not * have the v6K features. */ - set_feature(env, ARM_FEATURE_V4T); set_feature(env, ARM_FEATURE_V5); set_feature(env, ARM_FEATURE_V6); set_feature(env, ARM_FEATURE_VFP); @@ -102,7 +98,6 @@ static void cpu_reset_model_id(CPUARMState *env) env->cp15.c1_sys = 0x00050078; break; case ARM_CPUID_ARM1176: - set_feature(env, ARM_FEATURE_V4T); set_feature(env, ARM_FEATURE_V5); set_feature(env, ARM_FEATURE_V6); set_feature(env, ARM_FEATURE_V6K); @@ -118,7 +113,6 @@ static void cpu_reset_model_id(CPUARMState *env) env->cp15.c1_sys = 0x00050078; break; case ARM_CPUID_ARM11MPCORE: - set_feature(env, ARM_FEATURE_V4T); set_feature(env, ARM_FEATURE_V5); set_feature(env, ARM_FEATURE_V6); set_feature(env, ARM_FEATURE_V6K); @@ -133,7 +127,6 @@ static void cpu_reset_model_id(CPUARMState *env) env->cp15.c0_cachetype = 0x1dd20d2; break; case ARM_CPUID_CORTEXA8: - set_feature(env, ARM_FEATURE_V4T); set_feature(env, ARM_FEATURE_V5); set_feature(env, ARM_FEATURE_V6); set_feature(env, ARM_FEATURE_V6K); @@ -157,7 +150,6 @@ static void cpu_reset_model_id(CPUARMState *env) env->cp15.c1_sys = 0x00c50078; break; case ARM_CPUID_CORTEXA9: - set_feature(env, ARM_FEATURE_V4T); set_feature(env, ARM_FEATURE_V5); set_feature(env, ARM_FEATURE_V6); set_feature(env, ARM_FEATURE_V6K); @@ -186,7 +178,6 @@ static void cpu_reset_model_id(CPUARMState *env) env->cp15.c1_sys = 0x00c50078; break; case ARM_CPUID_CORTEXM3: - set_feature(env, ARM_FEATURE_V4T); set_feature(env, ARM_FEATURE_V5); set_feature(env, ARM_FEATURE_V6); set_feature(env, ARM_FEATURE_THUMB2); @@ -195,7 +186,6 @@ static void cpu_reset_model_id(CPUARMState *env) set_feature(env, ARM_FEATURE_THUMB_DIV); break; case ARM_CPUID_ANY: /* For userspace emulation. */ - set_feature(env, ARM_FEATURE_V4T); set_feature(env, ARM_FEATURE_V5); set_feature(env, ARM_FEATURE_V6); set_feature(env, ARM_FEATURE_V6K); @@ -225,7 +215,6 @@ static void cpu_reset_model_id(CPUARMState *env) case ARM_CPUID_PXA260: case ARM_CPUID_PXA261: case ARM_CPUID_PXA262: - set_feature(env, ARM_FEATURE_V4T); set_feature(env, ARM_FEATURE_V5); set_feature(env, ARM_FEATURE_XSCALE); /* JTAG_ID is ((id << 28) | 0x09265013) */ @@ -238,7 +227,6 @@ static void cpu_reset_model_id(CPUARMState *env) case ARM_CPUID_PXA270_B1: case ARM_CPUID_PXA270_C0: case ARM_CPUID_PXA270_C5: - set_feature(env, ARM_FEATURE_V4T); set_feature(env, ARM_FEATURE_V5); set_feature(env, ARM_FEATURE_XSCALE); /* JTAG_ID is ((id << 28) | 0x09265013) */ @@ -261,6 +249,9 @@ static void cpu_reset_model_id(CPUARMState *env) if (arm_feature(env, ARM_FEATURE_V7)) { set_feature(env, ARM_FEATURE_VAPA); } + if (arm_feature(env, ARM_FEATURE_V5)) { + set_feature(env, ARM_FEATURE_V4T); + } if (arm_feature(env, ARM_FEATURE_ARM_DIV)) { set_feature(env, ARM_FEATURE_THUMB_DIV); }