From 61f74d6a290d606504e4fbd6a94cbee3ce277533 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Fri, 14 Jan 2011 20:39:19 +0100 Subject: [PATCH] target-arm: Translate with user-state from TB flags, not CPUState When translating, get the user/priv state from the TB flags, not the CPUState. Signed-off-by: Peter Maydell Reviewed-by: Aurelien Jarno Signed-off-by: Aurelien Jarno --- target-arm/translate.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/target-arm/translate.c b/target-arm/translate.c index 0e28ffd290..10bd54522d 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -9099,11 +9099,7 @@ static inline void gen_intermediate_code_internal(CPUState *env, dc->condexec_mask = (ARM_TBFLAG_CONDEXEC(tb->flags) & 0xf) << 1; dc->condexec_cond = ARM_TBFLAG_CONDEXEC(tb->flags) >> 4; #if !defined(CONFIG_USER_ONLY) - if (IS_M(env)) { - dc->user = ((env->v7m.exception == 0) && (env->v7m.control & 1)); - } else { - dc->user = (env->uncached_cpsr & 0x1f) == ARM_CPU_MODE_USR; - } + dc->user = (ARM_TBFLAG_PRIV(tb->flags) == 0); #endif dc->vfp_enabled = ARM_TBFLAG_VFPEN(tb->flags); dc->vec_len = ARM_TBFLAG_VECLEN(tb->flags); -- 2.11.4.GIT