From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52960) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1kic-0005Y7-KR for qemu-devel@nongnu.org; Mon, 30 Jun 2014 19:10:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X1kiW-00038v-Kx for qemu-devel@nongnu.org; Mon, 30 Jun 2014 19:10:38 -0400 Received: from mail-ob0-f172.google.com ([209.85.214.172]:46006) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1kiW-00038Z-GI for qemu-devel@nongnu.org; Mon, 30 Jun 2014 19:10:32 -0400 Received: by mail-ob0-f172.google.com with SMTP id uy5so9734130obc.31 for ; Mon, 30 Jun 2014 16:10:31 -0700 (PDT) From: greg.bellows@linaro.org Date: Mon, 30 Jun 2014 18:09:05 -0500 Message-Id: <1404169773-20264-6-git-send-email-greg.bellows@linaro.org> In-Reply-To: <1404169773-20264-1-git-send-email-greg.bellows@linaro.org> References: <1404169773-20264-1-git-send-email-greg.bellows@linaro.org> Subject: [Qemu-devel] [PATCH v4 05/33] target-arm: reject switching to monitor mode List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, peter.crosthwaite@xilinx.com, Sergey Fedorov , Fabian Aggeler , Greg Bellows , serge.fdrv@gmail.com, edgar.iglesias@gmail.com, christoffer.dall@linaro.org From: Sergey Fedorov ...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 1ea30fe..ed1e3c7 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -3064,6 +3064,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