--- trunk/src/cpu.c	2007/10/08 16:18:38	12
+++ trunk/src/cpu.c	2007/10/08 16:19:23	20
@@ -25,7 +25,7 @@
  *  SUCH DAMAGE.
  *
  *
- *  $Id: cpu.c,v 1.316 2005/08/16 05:37:09 debug Exp $
+ *  $Id: cpu.c,v 1.323 2005/11/13 22:34:21 debug Exp $
  *
  *  Common routines for CPU emulation. (Not specific to any CPU type.)
  */
@@ -181,8 +181,8 @@
  *
  *  Dump cpu registers in a relatively readable format.
  *
- *  gprs: set to non-zero to dump GPRs. (CPU dependant.)
- *  coprocs: set bit 0..x to dump registers in coproc 0..x. (CPU dependant.)
+ *  gprs: set to non-zero to dump GPRs. (CPU dependent.)
+ *  coprocs: set bit 0..x to dump registers in coproc 0..x. (CPU dependent.)
  */
 void cpu_register_dump(struct machine *m, struct cpu *cpu,
 	int gprs, int coprocs)
@@ -244,6 +244,8 @@
 		fatal("cpu%i:\t", cpu->cpu_id);
 
 	cpu->trace_tree_depth ++;
+	if (cpu->trace_tree_depth > 100)
+		cpu->trace_tree_depth = 100;
 	for (i=0; i<cpu->trace_tree_depth; i++)
 		fatal("  ");
 
@@ -307,8 +309,8 @@
 	 *  There might be other translation pointers that still point to
 	 *  within the translation_cache region. Let's invalidate those too:
 	 */
-	if (cpu->invalidate_code_translation_caches != NULL)
-		cpu->invalidate_code_translation_caches(cpu);
+	if (cpu->invalidate_code_translation != NULL)
+		cpu->invalidate_code_translation(cpu, 0, INVALIDATE_ALL);
 }
 
 
@@ -334,7 +336,7 @@
  *  cpu_dumpinfo():
  *
  *  Dumps info about a CPU using debug(). "cpu0: CPUNAME, running" (or similar)
- *  is outputed, and it is up to CPU dependant code to complete the line.
+ *  is outputed, and it is up to CPU dependent code to complete the line.
  */
 void cpu_dumpinfo(struct machine *m, struct cpu *cpu)
 {
@@ -653,6 +655,18 @@
 	add_cpu_family(arm_cpu_family_init, ARCH_ARM);
 #endif
 
+#ifdef ENABLE_AVR
+	add_cpu_family(avr_cpu_family_init, ARCH_AVR);
+#endif
+
+#ifdef ENABLE_HPPA
+	add_cpu_family(hppa_cpu_family_init, ARCH_HPPA);
+#endif
+
+#ifdef ENABLE_I960
+	add_cpu_family(i960_cpu_family_init, ARCH_I960);
+#endif
+
 #ifdef ENABLE_IA64
 	add_cpu_family(ia64_cpu_family_init, ARCH_IA64);
 #endif
@@ -665,10 +679,18 @@
 	add_cpu_family(mips_cpu_family_init, ARCH_MIPS);
 #endif
 
+#ifdef ENABLE_NEWMIPS
+	add_cpu_family(newmips_cpu_family_init, ARCH_NEWMIPS);
+#endif
+
 #ifdef ENABLE_PPC
 	add_cpu_family(ppc_cpu_family_init, ARCH_PPC);
 #endif
 
+#ifdef ENABLE_SH
+	add_cpu_family(sh_cpu_family_init, ARCH_SH);
+#endif
+
 #ifdef ENABLE_SPARC
 	add_cpu_family(sparc_cpu_family_init, ARCH_SPARC);
 #endif