From patchwork Thu Feb 24 13:37:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jarno X-Patchwork-Id: 84393 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 96809B6EEE for ; Fri, 25 Feb 2011 00:39:50 +1100 (EST) Received: from localhost ([127.0.0.1]:33753 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PsbQ3-0003A7-Sf for incoming@patchwork.ozlabs.org; Thu, 24 Feb 2011 08:39:47 -0500 Received: from [140.186.70.92] (port=41599 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PsbOt-0002r3-6F for qemu-devel@nongnu.org; Thu, 24 Feb 2011 08:38:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PsbOs-0006EU-11 for qemu-devel@nongnu.org; Thu, 24 Feb 2011 08:38:35 -0500 Received: from hall.aurel32.net ([88.191.126.93]:44943) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PsbOr-0006EH-S4 for qemu-devel@nongnu.org; Thu, 24 Feb 2011 08:38:33 -0500 Received: from [2001:470:d4ed:0:5e26:aff:fe2b:6f5b] (helo=volta.aurel32.net) by hall.aurel32.net with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1PsbOp-0007lA-7J; Thu, 24 Feb 2011 14:38:31 +0100 Received: from aurel32 by volta.aurel32.net with local (Exim 4.72) (envelope-from ) id 1PsbOH-0005DY-7F; Thu, 24 Feb 2011 14:37:57 +0100 From: Aurelien Jarno To: qemu-devel@nongnu.org Date: Thu, 24 Feb 2011 14:37:53 +0100 Message-Id: <1298554673-20025-1-git-send-email-aurelien@aurel32.net> X-Mailer: git-send-email 1.7.2.3 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 88.191.126.93 Cc: Paolo Bonzini , Aurelien Jarno Subject: [Qemu-devel] [PATCH v2] target-sh4: move intr_at_halt out of cpu_halted() 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 All targets except SH4 have the same cpu_halted() routine, and it has only one caller. It is therefore a good candidate for inlining. The difference is the handling of the intr_at_halt, which is necessary to ignore SR.BL when sleeping. Move intr_at_halt handling out of it, by setting this variable while executing the sleep instruction, and clearing it when the CPU has been woken-up by an interrupt, whatever the state of SR.BL. Also rename this variable in_sleep. Cc: Paolo Bonzini Signed-off-by: Aurelien Jarno --- target-sh4/cpu.h | 2 +- target-sh4/exec.h | 1 - target-sh4/helper.c | 4 ++-- target-sh4/op_helper.c | 1 + 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/target-sh4/cpu.h b/target-sh4/cpu.h index d9f94e6..dd711cc 100644 --- a/target-sh4/cpu.h +++ b/target-sh4/cpu.h @@ -188,7 +188,7 @@ typedef struct CPUSH4State { uint32_t cvr; /* Cache Version Register */ void *intc_handle; - int intr_at_halt; /* SR_BL ignored during sleep */ + int in_sleep; /* SR_BL ignored during sleep */ memory_content *movcal_backup; memory_content **movcal_backup_tail; } CPUSH4State; diff --git a/target-sh4/exec.h b/target-sh4/exec.h index 2999c02..61bc121 100644 --- a/target-sh4/exec.h +++ b/target-sh4/exec.h @@ -37,7 +37,6 @@ static inline int cpu_halted(CPUState *env) { return 0; if (cpu_has_work(env)) { env->halted = 0; - env->intr_at_halt = 1; return 0; } return EXCP_HALTED; diff --git a/target-sh4/helper.c b/target-sh4/helper.c index b9fcba6..dd1941a 100644 --- a/target-sh4/helper.c +++ b/target-sh4/helper.c @@ -90,11 +90,11 @@ void do_interrupt(CPUState * env) if (do_exp && env->exception_index != 0x1e0) { env->exception_index = 0x000; /* masked exception -> reset */ } - if (do_irq && !env->intr_at_halt) { + if (do_irq && !env->in_sleep) { return; /* masked */ } - env->intr_at_halt = 0; } + env->in_sleep = 0; if (do_irq) { irq_vector = sh_intc_get_pending_vector(env->intc_handle, diff --git a/target-sh4/op_helper.c b/target-sh4/op_helper.c index 30f9842..b8f4ca2 100644 --- a/target-sh4/op_helper.c +++ b/target-sh4/op_helper.c @@ -119,6 +119,7 @@ void helper_debug(void) void helper_sleep(uint32_t next_pc) { env->halted = 1; + env->in_sleep = 1; env->exception_index = EXCP_HLT; env->pc = next_pc; cpu_loop_exit();