--- trunk/src/include/cpu.h	2007/10/08 16:19:11	18
+++ trunk/src/include/cpu.h	2007/10/08 16:19:23	20
@@ -28,7 +28,7 @@
  *  SUCH DAMAGE.
  *
  *
- *  $Id: cpu.h,v 1.51 2005/10/27 14:01:15 debug Exp $
+ *  $Id: cpu.h,v 1.54 2005/11/16 21:15:19 debug Exp $
  *
  *  See cpu.c.
  */
@@ -49,6 +49,7 @@
 #include "cpu_ia64.h"
 #include "cpu_m68k.h"
 #include "cpu_mips.h"
+#include "cpu_newmips.h"
 #include "cpu_ppc.h"
 #include "cpu_sh.h"
 #include "cpu_sparc.h"
@@ -163,8 +164,6 @@
 	int		n_translated_instrs;
 	unsigned char	*translation_cache;
 	size_t		translation_cache_cur_ofs;
-	void		(*combination_check)(struct cpu *,
-			    void * /* instr call ptr */, int low_addr);
 
 	/*
 	 *  CPU-family dependent:
@@ -178,6 +177,7 @@
 		struct ia64_cpu    ia64;
 		struct m68k_cpu    m68k;
 		struct mips_cpu    mips;
+		struct newmips_cpu newmips;
 		struct ppc_cpu     ppc;
 		struct sh_cpu      sh;
 		struct sparc_cpu   sparc;
@@ -224,6 +224,23 @@
 	struct cpu_family *fp) {					\
 	/*  Fill in the cpu_family struct with valid data for this arch.  */ \
 	fp->name = s;							\
+	fp->cpu_new = n ## _cpu_new;					\
+	fp->list_available_types = n ## _cpu_list_available_types;	\
+	fp->register_match = n ## _cpu_register_match;			\
+	fp->disassemble_instr = n ## _cpu_disassemble_instr;		\
+	fp->register_dump = n ## _cpu_register_dump;			\
+	fp->run = n ## _cpu_run;					\
+	fp->dumpinfo = n ## _cpu_dumpinfo;				\
+	fp->interrupt = n ## _cpu_interrupt; 				\
+	fp->interrupt_ack = n ## _cpu_interrupt_ack;			\
+	fp->functioncall_trace = n ## _cpu_functioncall_trace;		\
+	return 1;							\
+	}
+
+#define CPU_OLD_FAMILY_INIT(n,s)	int n ## _cpu_family_init(	\
+	struct cpu_family *fp) {					\
+	/*  Fill in the cpu_family struct with valid data for this arch.  */ \
+	fp->name = s;							\
 	fp->cpu_new = n ## _cpu_new;					\
 	fp->list_available_types = n ## _cpu_list_available_types;	\
 	fp->register_match = n ## _cpu_register_match;			\