--- trunk/src/include/machine.h	2007/10/08 16:18:27	10
+++ trunk/src/include/machine.h	2007/10/08 16:18:38	12
@@ -28,7 +28,7 @@
  *  SUCH DAMAGE.
  *
  *
- *  $Id: machine.h,v 1.58 2005/06/24 19:15:08 debug Exp $
+ *  $Id: machine.h,v 1.67 2005/08/16 05:37:13 debug Exp $
  */
 
 #include <sys/types.h>
@@ -65,6 +65,11 @@
 struct sgi_ip20_data;
 struct sgi_ip22_data;
 struct sgi_ip30_data;
+struct isa_pic_data {
+	struct pic8259_data *pic1;
+	struct pic8259_data *pic2;
+};
+
 
 #define	MACHINE_NAME_MAXBUF		200
 
@@ -138,6 +143,7 @@
 	int	memory_offset_in_mb;
 	int	prom_emulation;
 	int	register_dump;
+	int	arch_pagesize;
 
 	int	n_breakpoints;
 	char	*breakpoint_string[MAX_BREAKPOINTS];
@@ -154,6 +160,7 @@
 	int	cache_secondary_linesize;
 
 	int	dbe_on_nonexistant_memaccess;
+	int	dyntrans_alignment_check;
 	int	bintrans_enable;
 	int	old_bintrans_enable;
 	int	bintrans_enabled_from_start;
@@ -196,6 +203,7 @@
 		struct vr41xx_data *vr41xx_data;       
 		struct jazz_data *jazz_data;
 		struct malta_data *malta_data;
+		struct isa_pic_data isa_pic_data;
 		struct sgi_ip20_data *sgi_ip20_data;
 		struct sgi_ip22_data *sgi_ip22_data;
 		struct sgi_ip30_data *sgi_ip30_data;
@@ -225,11 +233,11 @@
 #define	ARCH_MIPS		1
 #define	ARCH_PPC		2
 #define	ARCH_SPARC		3
-#define	ARCH_URISC		4
-#define	ARCH_HPPA		5
-#define	ARCH_ALPHA		6
-#define	ARCH_X86		7
-#define	ARCH_ARM		8
+#define	ARCH_ALPHA		4
+#define	ARCH_X86		5
+#define	ARCH_ARM		6
+#define	ARCH_IA64		7
+#define	ARCH_M68K		8
 
 /*  MIPS:  */
 #define	MACHINE_BAREMIPS	1000
@@ -259,27 +267,29 @@
 
 /*  SPARC:  */
 #define	MACHINE_BARESPARC	3000
-#define	MACHINE_ULTRA1		3001
-
-/*  URISC:  */
-#define	MACHINE_BAREURISC	4000
-#define	MACHINE_TESTURISC	4001
-
-/*  HPPA:  */
-#define	MACHINE_BAREHPPA	5000
-#define	MACHINE_TESTHPPA	5001
+#define	MACHINE_TESTSPARC	3001
+#define	MACHINE_ULTRA1		3002
 
 /*  Alpha:  */
-#define	MACHINE_BAREALPHA	6000
-#define	MACHINE_TESTALPHA	6001
+#define	MACHINE_BAREALPHA	4000
+#define	MACHINE_TESTALPHA	4001
+#define	MACHINE_ALPHA		4002
 
 /*  X86:  */
-#define	MACHINE_BAREX86		7000
-#define	MACHINE_X86		7001
+#define	MACHINE_BAREX86		5000
+#define	MACHINE_X86		5001
 
 /*  ARM:  */
-#define	MACHINE_BAREARM		8000
-#define	MACHINE_TESTARM		8001
+#define	MACHINE_BAREARM		6000
+#define	MACHINE_TESTARM		6001
+
+/*  IA64:  */
+#define	MACHINE_BAREIA64	7000
+#define	MACHINE_TESTIA64	7001
+
+/*  M68K:  */
+#define	MACHINE_BAREM68K	8000
+#define	MACHINE_TESTM68K	8001
 
 /*  Other "pseudo"-machines:  */
 #define	MACHINE_NONE		0
@@ -330,7 +340,8 @@
 
 /*  EVBMIPS:  */
 #define	MACHINE_EVBMIPS_MALTA		1
-#define	MACHINE_EVBMIPS_PB1000		2
+#define	MACHINE_EVBMIPS_MALTA_BE	2
+#define	MACHINE_EVBMIPS_PB1000		3
 
 /*  MacPPC:  TODO: Real model names  */
 #define	MACHINE_MACPPC_G4		1