From patchwork Tue Apr 17 11:39:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Starikovskiy X-Patchwork-Id: 153137 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 89EE9B7071 for ; Tue, 17 Apr 2012 21:39:46 +1000 (EST) Received: from localhost ([::1]:35283 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SK6l6-0008I7-FO for incoming@patchwork.ozlabs.org; Tue, 17 Apr 2012 07:39:44 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59747) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SK6kn-0008HS-EW for qemu-devel@nongnu.org; Tue, 17 Apr 2012 07:39:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SK6kl-0007De-Kl for qemu-devel@nongnu.org; Tue, 17 Apr 2012 07:39:25 -0400 Received: from mail-lb0-f173.google.com ([209.85.217.173]:44318) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SK6kl-0007DM-90 for qemu-devel@nongnu.org; Tue, 17 Apr 2012 07:39:23 -0400 Received: by lboi15 with SMTP id i15so1124966lbo.4 for ; Tue, 17 Apr 2012 04:39:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=hhZqWNrgBljHjKpTNy1IBVJBac5WlDXk4SxStokTUEo=; b=dyt9LxR8/ag7kzK1MUnejM3JSocqXam6OC/9xXnQ+pv8rFk0Z6XoBt+PAfJ+mMPKYd /6BsfSFplREobrDi3CYsx7vlVN8uy8INZaRA29+GtizYcOvKXhbDlrp6SDJTgOK1qO+p 866w9geyuqQOmEtYL5LAKsJ2QJQw1M7tAMHqJytNIMnQ+iY8eBr8W0hHIHU/oeQQE6Qk Xu+jVapQmRlkd9ucVokmztkj+N2W72E7M47vrdqoGF4SmSLyELX3mRfigHy1mUj5orwB wRB1C/dRHkQw7jq3KedepC+nnY9rYxlObvYKgYLmlfttKffNjkOrpWh0mbitMb27Ppw4 COBw== Received: by 10.152.132.4 with SMTP id oq4mr13484619lab.40.1334662760746; Tue, 17 Apr 2012 04:39:20 -0700 (PDT) Received: from [10.30.10.79] ([80.251.228.149]) by mx.google.com with ESMTPS id sv9sm22573798lab.10.2012.04.17.04.39.20 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 17 Apr 2012 04:39:20 -0700 (PDT) Message-ID: <4F8D5664.7000304@gmail.com> Date: Tue, 17 Apr 2012 15:39:16 +0400 From: Alexey Starikovskiy User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.28) Gecko/20120313 Thunderbird/3.1.20 MIME-Version: 1.0 To: qemu-devel@nongnu.org References: In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.217.173 Cc: Peter Maydell Subject: [Qemu-devel] [PATCH] Undefine SWP instruction unless SCTLR.SW bit is set 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 Signed-off-by: Alexey Starikovskiy --- target-arm/translate.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/target-arm/translate.c b/target-arm/translate.c index 7a3c7d6..b35c85f 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -7415,6 +7415,12 @@ static void disas_arm_insn(CPUARMState * env, DisasContext *s) } tcg_temp_free(addr); } else { + if (!(env->cp15.c1_sys & (1 << 10))) { + /* Check if SCTLR.SW is set. Any change to SCTLR + * invalidates all translations, so we are safe. + */ + goto illegal_op; + } /* SWP instruction */ rm = (insn) & 0xf;