From patchwork Tue Jan 11 22:12:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 78462 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5A1F0B6F1E for ; Wed, 12 Jan 2011 09:48:20 +1100 (EST) Received: from localhost ([127.0.0.1]:58847 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pcmb5-0005Z1-61 for incoming@patchwork.ozlabs.org; Tue, 11 Jan 2011 17:21:47 -0500 Received: from [140.186.70.92] (port=37315 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PcmSF-0008Ic-Gt for qemu-devel@nongnu.org; Tue, 11 Jan 2011 17:12:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PcmS5-0003oK-E3 for qemu-devel@nongnu.org; Tue, 11 Jan 2011 17:12:39 -0500 Received: from mnementh.archaic.org.uk ([81.2.115.146]:5366) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PcmS5-0003mW-6k for qemu-devel@nongnu.org; Tue, 11 Jan 2011 17:12:29 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.69) (envelope-from ) id 1PcmRu-00057H-EK for qemu-devel@nongnu.org; Tue, 11 Jan 2011 22:12:18 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 11 Jan 2011 22:12:18 +0000 Message-Id: <1294783938-19629-9-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1294783938-19629-1-git-send-email-peter.maydell@linaro.org> References: <1294783938-19629-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH 8/8] target-arm: Translate with user-state from TB flags, not CPUState X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org When translating, get the user/priv state from the TB flags, not the CPUState. Signed-off-by: Peter Maydell Reviewed-by: Aurelien Jarno --- target-arm/translate.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/target-arm/translate.c b/target-arm/translate.c index 4fe202d..aa3c60a 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -9078,11 +9078,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);