From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=37281 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PcmSA-0008HR-K4 for qemu-devel@nongnu.org; Tue, 11 Jan 2011 17:12:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PcmS3-0003ng-BZ for qemu-devel@nongnu.org; Tue, 11 Jan 2011 17:12:34 -0500 Received: from mnementh.archaic.org.uk ([81.2.115.146]:5366) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PcmS3-0003mW-1v for qemu-devel@nongnu.org; Tue, 11 Jan 2011 17:12:27 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.69) (envelope-from ) id 1PcmRu-00057B-Cg for qemu-devel@nongnu.org; Tue, 11 Jan 2011 22:12:18 +0000 From: Peter Maydell Date: Tue, 11 Jan 2011 22:12:15 +0000 Message-Id: <1294783938-19629-6-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1294783938-19629-1-git-send-email-peter.maydell@linaro.org> References: <1294783938-19629-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 5/8] target-arm: Translate with Thumb state from TB flags, not CPUState List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org The Thumb/ARM state for the TB being translated should come from the TB flags, not the CPUState. Signed-off-by: Peter Maydell --- target-arm/translate.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target-arm/translate.c b/target-arm/translate.c index 624a443..bda5d47 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -9074,7 +9074,7 @@ static inline void gen_intermediate_code_internal(CPUState *env, dc->pc = pc_start; dc->singlestep_enabled = env->singlestep_enabled; dc->condjmp = 0; - dc->thumb = env->thumb; + dc->thumb = ARM_TBFLAG_THUMB(tb->flags); dc->condexec_mask = (env->condexec_bits & 0xf) << 1; dc->condexec_cond = env->condexec_bits >> 4; #if !defined(CONFIG_USER_ONLY) @@ -9161,7 +9161,7 @@ static inline void gen_intermediate_code_internal(CPUState *env, if (num_insns + 1 == max_insns && (tb->cflags & CF_LAST_IO)) gen_io_start(); - if (env->thumb) { + if (dc->thumb) { disas_thumb_insn(env, dc); if (dc->condexec_mask) { dc->condexec_cond = (dc->condexec_cond & 0xe) @@ -9275,7 +9275,7 @@ done_generating: if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) { qemu_log("----------------\n"); qemu_log("IN: %s\n", lookup_symbol(pc_start)); - log_target_disas(pc_start, dc->pc - pc_start, env->thumb); + log_target_disas(pc_start, dc->pc - pc_start, dc->thumb); qemu_log("\n"); } #endif -- 1.6.3.3