From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37231) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZKC0-0007PL-4p for qemu-devel@nongnu.org; Fri, 26 Feb 2016 10:20:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aZKBz-0004kz-4t for qemu-devel@nongnu.org; Fri, 26 Feb 2016 10:20:32 -0500 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:55995) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZKBy-0004kh-Uz for qemu-devel@nongnu.org; Fri, 26 Feb 2016 10:20:31 -0500 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84) (envelope-from ) id 1aZKBy-0003Kp-Bi for qemu-devel@nongnu.org; Fri, 26 Feb 2016 15:20:30 +0000 From: Peter Maydell Date: Fri, 26 Feb 2016 15:20:10 +0000 Message-Id: <1456500025-28761-6-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1456500025-28761-1-git-send-email-peter.maydell@linaro.org> References: <1456500025-28761-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PULL 05/20] target-arm: In cpsr_write() ignore mode switches from User mode List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org The only case where we can attempt a cpsr_write() mode switch from User is from the gdbstub; all other cases are handled in the calling code (notably translate.c). Architecturally attempts to alter the mode bits from user mode are simply ignored (and not treated as a bad mode switch, which in v8 sets CPSR.IL). Make mode switches from User ignored in cpsr_write() as well, for consistency. Signed-off-by: Peter Maydell Reviewed-by: Sergey Fedorov Message-id: 1455556977-3644-6-git-send-email-peter.maydell@linaro.org --- target-arm/helper.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target-arm/helper.c b/target-arm/helper.c index c491cd8..b2d2440 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -5316,6 +5316,7 @@ void cpsr_write(CPUARMState *env, uint32_t val, uint32_t mask, env->daif |= val & CPSR_AIF & mask; if (write_type != CPSRWriteRaw && + (env->uncached_cpsr & CPSR_M) != CPSR_USER && ((env->uncached_cpsr ^ val) & mask & CPSR_M)) { if (bad_mode_switch(env, val & CPSR_M)) { /* Attempt to switch to an invalid mode: this is UNPREDICTABLE. -- 1.9.1