From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LKXdp-0000iP-1h
	for qemu-devel@nongnu.org; Wed, 07 Jan 2009 07:36:09 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LKXdo-0000gT-CM
	for qemu-devel@nongnu.org; Wed, 07 Jan 2009 07:36:08 -0500
Received: from [199.232.76.173] (port=50570 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LKXdn-0000fs-SS
	for qemu-devel@nongnu.org; Wed, 07 Jan 2009 07:36:07 -0500
Received: from savannah.gnu.org ([199.232.41.3]:34838 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1LKXdn-0006Vi-K0
	for qemu-devel@nongnu.org; Wed, 07 Jan 2009 07:36:07 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1LKXdn-0005aq-1G
	for qemu-devel@nongnu.org; Wed, 07 Jan 2009 12:36:07 +0000
Received: from edgar_igl by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <edgar_igl@savannah.gnu.org>) id 1LKXdm-0005ak-Nc
	for qemu-devel@nongnu.org; Wed, 07 Jan 2009 12:36:06 +0000
MIME-Version: 1.0
Errors-To: edgar_igl
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
Message-Id: <E1LKXdm-0005ak-Nc@cvs.savannah.gnu.org>
Date: Wed, 07 Jan 2009 12:36:06 +0000
Subject: [Qemu-devel] [6201] CRIS: NMI wakes up the core.
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 6201
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6201
Author:   edgar_igl
Date:     2009-01-07 12:36:06 +0000 (Wed, 07 Jan 2009)

Log Message:
-----------
CRIS: NMI wakes up the core.

Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>

Modified Paths:
--------------
    trunk/target-cris/exec.h

Modified: trunk/target-cris/exec.h
===================================================================
--- trunk/target-cris/exec.h	2009-01-07 12:35:08 UTC (rev 6200)
+++ trunk/target-cris/exec.h	2009-01-07 12:36:06 UTC (rev 6201)
@@ -46,7 +46,10 @@
 static inline int cpu_halted(CPUState *env) {
 	if (!env->halted)
 		return 0;
-	if (env->interrupt_request & CPU_INTERRUPT_HARD) {
+
+	/* IRQ, NMI and GURU execeptions wakes us up.  */
+	if (env->interrupt_request
+	    & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI)) {
 		env->halted = 0;
 		return 0;
 	}