From: Sergey Fedorov <s.fedorov@samsung.com>
Date: Fri, 24 Oct 2014 11:19:14 +0000 (+0100)
Subject: target-arm: reject switching to monitor mode
X-Git-Tag: v2.2.0-rc0~29^2~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=027fc52704b815bd67a92399d255f066308ca70c;p=users%2Fdwmw2%2Fqemu.git

target-arm: reject switching to monitor mode

Reject switching to monitor mode from non-secure state.

Signed-off-by: Sergey Fedorov <s.fedorov@samsung.com>
Signed-off-by: Fabian Aggeler <aggelerf@ethz.ch>
Signed-off-by: Greg Bellows <greg.bellows@linaro.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1413910544-20150-4-git-send-email-greg.bellows@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

diff --git a/target-arm/helper.c b/target-arm/helper.c
index 53527c2003..f5d6e68186 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;
     }