From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:53323) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXiwv-0005W1-OF 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-0007hh-K9 for qemu-devel@nongnu.org; Mon, 05 Dec 2011 19:31:57 -0500 Received: from mout.web.de ([212.227.15.4]:56498) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXiwt-0007hT-1V for qemu-devel@nongnu.org; Mon, 05 Dec 2011 19:31:55 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 6 Dec 2011 01:30:44 +0100 Message-Id: <1323131446-21864-8-git-send-email-andreas.faerber@web.de> 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v3 7/9] target-arm: Infer Thumb division feature from M profile 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?= M => THUMB_DIV Signed-off-by: Andreas Färber Cc: 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 a0908ef..a4c3aa0 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -163,7 +163,6 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t id) case ARM_CPUID_CORTEXM3: set_feature(env, ARM_FEATURE_V7); set_feature(env, ARM_FEATURE_M); - set_feature(env, ARM_FEATURE_THUMB_DIV); break; case ARM_CPUID_ANY: /* For userspace emulation. */ set_feature(env, ARM_FEATURE_V7); @@ -243,6 +242,9 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t id) if (arm_feature(env, ARM_FEATURE_V5)) { set_feature(env, ARM_FEATURE_V4T); } + if (arm_feature(env, ARM_FEATURE_M)) { + set_feature(env, ARM_FEATURE_THUMB_DIV); + } if (arm_feature(env, ARM_FEATURE_ARM_DIV)) { set_feature(env, ARM_FEATURE_THUMB_DIV); } -- 1.7.7