From patchwork Tue Jan 26 16:00:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 43713 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C2CC0B7DBE for ; Wed, 27 Jan 2010 03:13:30 +1100 (EST) Received: from localhost ([127.0.0.1]:57959 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZo0I-0000EP-LF for incoming@patchwork.ozlabs.org; Tue, 26 Jan 2010 11:10:58 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZnpu-0007xf-0g for qemu-devel@nongnu.org; Tue, 26 Jan 2010 11:00:14 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZnpr-0007tW-OS for qemu-devel@nongnu.org; Tue, 26 Jan 2010 11:00:11 -0500 Received: from [199.232.76.173] (port=45571 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZnpq-0007sx-M2 for qemu-devel@nongnu.org; Tue, 26 Jan 2010 11:00:10 -0500 Received: from afflict.kos.to ([92.243.29.197]:36709) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NZnpp-0000Wa-SI for qemu-devel@nongnu.org; Tue, 26 Jan 2010 11:00:10 -0500 Received: by afflict.kos.to (Postfix, from userid 1000) id D9A7C2658A; Tue, 26 Jan 2010 16:00:04 +0000 (UTC) From: Riku Voipio To: qemu-devel@nongnu.org Date: Tue, 26 Jan 2010 16:00:04 +0000 Message-Id: <1264521604-2020-6-git-send-email-riku.voipio@iki.fi> X-Mailer: git-send-email 1.6.5 In-Reply-To: <1264521604-2020-1-git-send-email-riku.voipio@iki.fi> References: <1264521604-2020-1-git-send-email-riku.voipio@iki.fi> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: Riku Voipio Subject: [Qemu-devel] [PATCH 5/5] target-arm: Thread ID Registers are ARMv6K + X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Riku Voipio Change the system-emulation code also to only support accessing the cp15.c13 Thread ID registers on ARMv6K and newer. Signed-off-by: Riku Voipio --- target-arm/helper.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/target-arm/helper.c b/target-arm/helper.c index 68578ce..1245d9d 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -1517,12 +1517,18 @@ void HELPER(set_cp15)(CPUState *env, uint32_t insn, uint32_t val) env->cp15.c13_context = val; break; case 2: + if (!arm_feature(env, ARM_FEATURE_V6K)) + goto bad_reg; env->cp15.c13_tls1 = val; break; case 3: + if (!arm_feature(env, ARM_FEATURE_V6K)) + goto bad_reg; env->cp15.c13_tls2 = val; break; case 4: + if (!arm_feature(env, ARM_FEATURE_V6K)) + goto bad_reg; env->cp15.c13_tls3 = val; break; default: @@ -1805,10 +1811,16 @@ uint32_t HELPER(get_cp15)(CPUState *env, uint32_t insn) case 1: return env->cp15.c13_context; case 2: + if (!arm_feature(env, ARM_FEATURE_V6K)) + goto bad_reg; return env->cp15.c13_tls1; case 3: + if (!arm_feature(env, ARM_FEATURE_V6K)) + goto bad_reg; return env->cp15.c13_tls2; case 4: + if (!arm_feature(env, ARM_FEATURE_V6K)) + goto bad_reg; return env->cp15.c13_tls3; default: goto bad_reg;