--- trunk/src/include/cpu.h	2007/10/08 16:18:19	8
+++ trunk/src/include/cpu.h	2007/10/08 16:18:27	10
@@ -28,7 +28,7 @@
  *  SUCH DAMAGE.
  *
  *
- *  $Id: cpu.h,v 1.24 2005/06/11 20:59:12 debug Exp $
+ *  $Id: cpu.h,v 1.27 2005/06/27 10:43:17 debug Exp $
  *
  *  See cpu.c.
  */
@@ -41,12 +41,9 @@
 /*  This is needed for undefining 'mips' or 'ppc', on weird systems:  */
 #include "../../config.h"
 
-#include "cpu_alpha.h"
 #include "cpu_arm.h"
-#include "cpu_hppa.h"
 #include "cpu_mips.h"
 #include "cpu_ppc.h"
-#include "cpu_sparc.h"
 #include "cpu_urisc.h"
 #include "cpu_x86.h"
 
@@ -62,7 +59,7 @@
 
 	/*  These are filled in by each CPU family's init function:  */
 	char			*name;
-	struct cpu		*(*cpu_new)(struct memory *mem,
+	int			(*cpu_new)(struct cpu *cpu, struct memory *mem,
 				    struct machine *machine,
 				    int cpu_id, char *cpu_type_name);
 	void			(*list_available_types)(void);
@@ -120,12 +117,9 @@
 
 	/*  CPU-family dependant:  */
 	union {
-		struct alpha_cpu   alpha;
 		struct arm_cpu     arm;
-		struct hppa_cpu    hppa;
 		struct mips_cpu    mips;
 		struct ppc_cpu     ppc;
-		struct sparc_cpu   sparc;
 		struct urisc_cpu   urisc;
 		struct x86_cpu     x86;
 	} cd;
@@ -150,8 +144,7 @@
 void cpu_run_deinit(struct emul *emul, struct machine *machine);
 void cpu_dumpinfo(struct machine *m, struct cpu *cpu);
 void cpu_list_available_types(void);
-void cpu_show_cycles(struct machine *machine,
-	struct timeval *starttime, int64_t ncycles, int forced);
+void cpu_show_cycles(struct machine *machine, int forced);
 struct cpu_family *cpu_family_ptr_by_number(int arch);
 void cpu_init(void);