--- trunk/src/include/machine.h	2007/10/08 16:18:11	6
+++ trunk/src/include/machine.h	2007/10/08 16:18:27	10
@@ -28,7 +28,7 @@
  *  SUCH DAMAGE.
  *
  *
- *  $Id: machine.h,v 1.53 2005/06/02 17:11:36 debug Exp $
+ *  $Id: machine.h,v 1.58 2005/06/24 19:15:08 debug Exp $
  */
 
 #include <sys/types.h>
@@ -57,6 +57,7 @@
 struct ps2_data;
 struct dec5800_data;
 struct au1x00_ic_data;
+struct malta_data;
 struct vr41xx_data;
 struct jazz_data;
 struct crime_data;
@@ -65,6 +66,8 @@
 struct sgi_ip22_data;
 struct sgi_ip30_data;
 
+#define	MACHINE_NAME_MAXBUF		200
+
 struct machine {
 	/*  Pointer back to the emul struct we are in:  */
 	struct emul *emul;
@@ -118,10 +121,11 @@
 	struct cpu **cpus;
 
 	/*  These are used by stuff in cpu.c, mostly:  */
-	struct timeval starttime;
 	int64_t ncycles;
 	int64_t	ncycles_show;
 	int64_t	ncycles_flush;
+	int64_t	ncycles_since_gettimeofday;
+	struct timeval starttime;
 	int	a_few_cycles;
 	int	a_few_instrs;
 
@@ -191,6 +195,7 @@
 		struct au1x00_ic_data *au1x00_ic_data;
 		struct vr41xx_data *vr41xx_data;       
 		struct jazz_data *jazz_data;
+		struct malta_data *malta_data;
 		struct sgi_ip20_data *sgi_ip20_data;
 		struct sgi_ip22_data *sgi_ip22_data;
 		struct sgi_ip30_data *sgi_ip30_data;
@@ -238,6 +243,8 @@
 #define	MACHINE_MESHCUBE	1008
 #define	MACHINE_NETGEAR		1009
 #define	MACHINE_SONYNEWS	1010
+#define	MACHINE_EVBMIPS		1011
+#define	MACHINE_PSP		1012
 
 /*  PPC:  */
 #define	MACHINE_BAREPPC		2000
@@ -296,9 +303,7 @@
 #define	DEC_PROM_TCINFO			0xffffffffbfc2c000ULL
 #define	DEC_MEMMAP_ADDR			0xffffffffbfc30000ULL
 
-
 /*  HPCmips:  */
-/*  Machine types:  */
 #define	MACHINE_HPCMIPS_CASIO_BE300		1
 #define	MACHINE_HPCMIPS_CASIO_E105		2
 #define	MACHINE_HPCMIPS_NEC_MOBILEPRO_770	3
@@ -323,6 +328,10 @@
 #define	MACHINE_ARC_JAZZ_M700		7
 #define	MACHINE_ARC_NEC_R96		8
 
+/*  EVBMIPS:  */
+#define	MACHINE_EVBMIPS_MALTA		1
+#define	MACHINE_EVBMIPS_PB1000		2
+
 /*  MacPPC:  TODO: Real model names  */
 #define	MACHINE_MACPPC_G4		1
 #define	MACHINE_MACPPC_G5		2