From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34855) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xccfj-0006mV-1h for qemu-devel@nongnu.org; Fri, 10 Oct 2014 12:04:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xccfe-0007xr-Du for qemu-devel@nongnu.org; Fri, 10 Oct 2014 12:04:02 -0400 Received: from mail-oi0-f52.google.com ([209.85.218.52]:48907) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xccfe-0007xE-9a for qemu-devel@nongnu.org; Fri, 10 Oct 2014 12:03:58 -0400 Received: by mail-oi0-f52.google.com with SMTP id a3so7051999oib.11 for ; Fri, 10 Oct 2014 09:03:57 -0700 (PDT) From: Greg Bellows Date: Fri, 10 Oct 2014 11:03:14 -0500 Message-Id: <1412957023-11105-4-git-send-email-greg.bellows@linaro.org> In-Reply-To: <1412957023-11105-1-git-send-email-greg.bellows@linaro.org> References: <1412957023-11105-1-git-send-email-greg.bellows@linaro.org> Subject: [Qemu-devel] [PATCH v6 03/32] target-arm: reject switching to monitor mode List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, peter.maydell@linaro.org, serge.fdrv@gmail.com, edgar.iglesias@gmail.com, aggelerf@ethz.ch From: Sergey Fedorov Reject switching to monitor mode from non-secure state. Signed-off-by: Sergey Fedorov Signed-off-by: Fabian Aggeler Reviewed-by: Edgar E. Iglesias Signed-off-by: Greg Bellows --- target-arm/helper.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target-arm/helper.c b/target-arm/helper.c index 2669e15..d6e3b52 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -3531,6 +3531,8 @@ static int bad_mode_switch(CPUARMState *env, int mode) case ARM_CPU_MODE_IRQ: case ARM_CPU_MODE_FIQ: return 0; + case ARM_CPU_MODE_MON: + return !arm_is_secure(env); default: return 1; } -- 1.8.3.2