--- trunk/src/cpu_mips.c	2007/10/08 16:18:00	4
+++ trunk/src/cpu_mips.c	2007/10/08 16:18:11	6
@@ -25,7 +25,7 @@
  *  SUCH DAMAGE.
  *
  *
- *  $Id: cpu_mips.c,v 1.39 2005/04/15 21:39:59 debug Exp $
+ *  $Id: cpu_mips.c,v 1.41 2005/05/29 17:51:46 debug Exp $
  *
  *  MIPS core CPU emulation.
  */
@@ -34,8 +34,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
-#include <sys/time.h>
-#include <sys/resource.h>
 #include <ctype.h>
 
 #include "../config.h"
@@ -1613,10 +1611,14 @@
 		uint64_t offset;
 		char *symbol = get_symbol_name(&cpu->machine->symbol_context,
 		    cpu->cd.mips.pc_last, &offset);
-		fatal("[ warning: LOW reference vaddr=0x%08x, exception %s, "
-		    "pc=%08llx <%s> ]\n", (int)vaddr, exception_names[exccode],
-		    (long long)cpu->cd.mips.pc_last,
+		fatal("[ ");
+		if (cpu->machine->ncpus > 1)
+			fatal("cpu%i: ", cpu->cpu_id);
+		fatal("warning: LOW reference vaddr=0x%08llx, exception %s, "
+		    "pc=%08llx <%s> ]\n", (long long)vaddr,
+		    exception_names[exccode], (long long)cpu->cd.mips.pc_last,
 		    symbol? symbol : "(no symbol)");
+cpu->running = 0;
 	}
 
 	/*  Clear the exception code bits of the cause register...  */