Get the console code to compile correctly

Add support for some thigns that M5 needs
Make this better support Tru64 v5.1

console/Makefile:
    I couldn't figure out the old build system since I was missing
    a bunch of tools at the time, so I kinda rewrote it.
console/console.c:
    Get the includes right, and make things compile
    little bit of cleanup along the way
console/paljtokern.s:
    formatting junk
console/printf.c:
    Formatting
    get const right
h/lib.h:
    fiddle with the includes that we need
console/console.c:
    Get the BOOTDEVICE_NAME right
    Add a bit of support for grabbing console environment variables

7 files changed, 857 insertions, 176 deletions

diff --git a/system/alpha/console/Makefile b/system/alpha/console/Makefile
index 9b8748f13..6c2ee111c 100644
--- a/system/alpha/console/Makefile
+++ b/system/alpha/console/Makefile
@@ -2,43 +2,48 @@
 all: console
 
 DBMENTRY	= fffffc0000010000
-INCLUDES        = -I$(PALCODE) -I$(INCLUDEH) -I$(SIMTOOLS)/cpus-alpha/simos
-#-I/udir/bugnion/ebfw/h -I/udir/bugnion/ebfw/palcode/xxm
+INCLUDES        = -I$(PALCODE) -I$(INCLUDEH) -I$(M5)/dev
 
 SOURDIR = ./
-EB_TOOLBOX = /wrl/proj/simos/bin/tools/osf
 PALCODE  = ../palcode
 INCLUDEH = ../h
 
 dbmentry.o: dbmentry.s 
-	$(AS)  $(INCLUDES) -o $*.o $*.s
+	$(AS)  $(INCLUDES) -nointrinsics -o $*.o $*.s
 
 console.o: console.c 
-	$(CC)  -g3 $(INCLUDES) -o $*.o -c $*.c
+	$(CC)  -g3 $(INCLUDES) -nointrinsics -o $*.o -c $*.c
 
 printf.o: printf.c 
-	$(CC)  -g3 $(INCLUDES) -o $*.o -c $*.c
-
-paljtokern.o: $(SOURCEDIR)paljtokern.s
-	rm $(OBJDIR)paljtokern.i
-	cpp -I$(PALCODE) $(SOURCEDIR)paljtokern.s $(OBJDIR)paljtokern.i
-	$(EB_TOOLBOX)/gas -21164 -o $(OBJDIR)paljtokern.aout.o $(OBJDIR)paljtokern.i
-	$(EB_TOOLBOX)/astrip -a $(OBJDIR)paljtokern.aout.o $(OBJDIR)paljtokern.strip
-	$(EB_TOOLBOX)/strip2array $(OBJDIR)paljtokern.strip $(OBJDIR)paljtokern.c
-	$(CC) $(CCFLAGS) -o $(OBJDIR)paljtokern.o -c $(INCLUDES) $(OBJDIR)paljtokern.c
-
-paljtoslave.o: $(SOURCEDIR)paljtoslave.s
-	rm $(OBJDIR)paljtoslave.i
-	cpp -I$(PALCODE) $(SOURCEDIR)paljtoslave.s $(OBJDIR)paljtoslave.i
-	$(EB_TOOLBOX)/gas -21164 -o $(OBJDIR)paljtoslave.aout.o $(OBJDIR)paljtoslave.i
-	$(EB_TOOLBOX)/astrip -a $(OBJDIR)paljtoslave.aout.o $(OBJDIR)paljtoslave.strip
-	$(EB_TOOLBOX)/strip2array $(OBJDIR)paljtoslave.strip $(OBJDIR)paljtoslave.tmp
-	sed -e 's/palJToKern/palJToSlave/' $(OBJDIR)paljtoslave.tmp >$(OBJDIR)paljtoslave.c
-	$(CC) $(CCFLAGS) -o $(OBJDIR)paljtoslave.o -c $(INCLUDES) $(OBJDIR)paljtoslave.c
-
-console: console.o dbmentry.o printf.o paljtokern.o paljtoslave.o 
-	$(LD) -o console  -N -T $(DBMENTRY) -non_shared dbmentry.o console.o \
-	printf.o paljtokern.o paljtoslave.o -lc
+	$(CC)  -g3 $(INCLUDES) -nointrinsics -o $*.o -c $*.c
+
+paljtokern.s.o: paljtokern.s
+	g++ -I ../palcode -E -P -nostdinc -nostdinc++ -x c++ paljtokern.s | \
+	gas -m 21164 -o paljtokern.s.o
+
+paljtoslave.s.o: paljtoslave.s
+	g++ -I ../palcode -E -P -nostdinc -nostdinc++ -x c++ paljtoslave.s | \
+	gas -m 21164 -o paljtoslave.s.o
+
+paljtokern.c: paljtokern.s.o
+	echo 'unsigned int palJToKern[] = {' > paljtokern.c
+	dis paljtokern.s.o | awk '{print "0x"$$2","}' >> paljtokern.c
+	echo "0x0\n};" >> paljtokern.c
+
+paljtoslave.c: paljtoslave.s.o
+	echo "unsigned int palJToSlave[] = {" > paljtoslave.c
+	dis paljtoslave.s.o | awk '{print "0x"$$2","}' >> paljtoslave.c
+	echo "0x0\n};" >> paljtoslave.c
+
+paljtokern.c.o: paljtokern.c
+	$(CC) -g3 -nointrinsics -o paljtokern.c.o -c paljtokern.c
+
+paljtoslave.c.o: paljtoslave.c
+	$(CC) -g3 -nointrinsics -o paljtoslave.c.o -c paljtoslave.c
+
+console: console.o dbmentry.o printf.o paljtokern.c.o paljtoslave.c.o 
+	$(LD) -o console  -N -T $(DBMENTRY) -non_shared \
+	dbmentry.o console.o printf.o paljtokern.c.o paljtoslave.c.o -lc
 
 clean:
-	rm *.o; rm console; rm *.strip; rm paljtokern.c paljtoslave.c; touch paljtokern.i paljtoslave.i
+	rm -f *.o console *.strip paljtokern.c paljtoslave.c
diff --git a/system/alpha/console/console.c b/system/alpha/console/console.c
index c6a61a10e..6763a332f 100644
--- a/system/alpha/console/console.c
+++ b/system/alpha/console/console.c
@@ -10,10 +10,14 @@
 
 /* from simos */
 typedef unsigned long long uint64;
-#include "machine_defs.h"
-#include "new_aouthdr.h"
+typedef unsigned int uint32;
+
+#define CONSOLE
 #include "alpha_access.h"
+#include "machine_defs.h"
+
 #if 0
+#include "new_aouthdr.h"
 #include "srcmax.h"
 #endif
 
@@ -64,7 +68,7 @@ void jToPal(ul bootadr);
 void SlaveLoop(int cpu);
 
 
-AlphaAccess simosConf;
+struct AlphaAccess simosConf;
 
 /* **************************************************************
  * Console callbacks use VMS calling conventions
@@ -112,6 +116,12 @@ void InitConsole(void)
 #endif
 }
 
+char GetChar()
+{
+   struct AlphaAccess *k1Conf = (struct AlphaAccess *)(__MAGIC_ZONE(0, 0, MAGIC_ZONE_EV5_ALIAS));
+   return 0;
+}
+
 void PutChar(char c)
 {
 #if 0
@@ -120,22 +130,21 @@ void PutChar(char c)
 #if 0
    *(int*) PHYS_TO_K1(SLOT_D_COM1<<5) = c;
 #endif
-   AlphaAccess *k1Conf = (AlphaAccess *)(__MAGIC_ZONE(0, 0, MAGIC_ZONE_EV5_ALIAS));
+   struct AlphaAccess *k1Conf = (struct AlphaAccess *)(__MAGIC_ZONE(0, 0, MAGIC_ZONE_EV5_ALIAS));
    k1Conf->outputChar = c;
 
 }
 
 
-int passArgs(int argc)
-{
-   ;
-}
-
+int
+passArgs(int argc)
+{ return 0; }
 
+int
 main(int argc, char **argv)
 {
    int x,i;
-   AlphaAccess *k1Conf = (AlphaAccess *)(__MAGIC_ZONE(0, 0, MAGIC_ZONE_EV5_ALIAS));
+   struct AlphaAccess *k1Conf = (struct AlphaAccess *)(__MAGIC_ZONE(0, 0, MAGIC_ZONE_EV5_ALIAS));
    ui *k1ptr,*ksegptr;
 
 
@@ -175,7 +184,8 @@ main(int argc, char **argv)
  */
 struct rpb xxm_rpb = {
    NULL,		/* 000: physical self-reference */
-   'H'|('W'<<8)|('R'<<16)|('P'<<24)|('B'<<32),	/* 008: contains string "HWRPB" */
+   ((long)'H') | (((long)'W') << 8) | (((long)'R') << 16) |
+   ((long)'P' << 24) | (((long)'B') << 32),  /* 008: contains string "HWRPB" */
    6,			/* 010: HWRPB version number */
    /* the byte count is wrong, but who needs it? - lance */
    0,			/* 018: bytes in RPB perCPU CTB CRB MEDSC */
@@ -243,7 +253,7 @@ struct rpb_percpu xxm_rpb_percpu = {
    0x4000,				/* 098: phys addr of palcode mem space */
    0x2000,				/* 0A0: phys addr of palcode scratch space */
    (2 << 16) | (5 << 8) | 1,		/* 0A8: PALcode rev required */
-   5|(2<<32),				/* 0B0: processor type */
+   5 | (2L  << 32),				/* 0B0: processor type */
    7,					/* 0B8: processor variation */
    'D'|('a'<<8)|('v'<<16)|('e'<<24),	/* 0C0: processor revision */
    {'D','a','v','e','C','o','n','r','o','y',0,0,0,0,0,0},	/* 0C8: proc serial num: 10 ascii chars */
@@ -371,6 +381,8 @@ ul *first = 0;
 ul *third_rpb = 0;
 ul *reservedFixup = 0;
 
+int strcpy(char *dst, char *src);
+
 struct rpb *rpb;
 
 unixBoot(int go, int argc, char **argv)
@@ -777,7 +789,11 @@ unixBoot(int go, int argc, char **argv)
  {
      ul *ptr = (ul*)((char*)rpb_dsr + sizeof(struct rpb_dsr ));
      rpb_crb->rpb_pa_disp = KSEG_TO_PHYS(ptr);
+#if 0
      rpb_crb->rpb_va_disp = 0x10000000 + ((ul)ptr&(0x2000*HWRPB_PAGES-1));
+#else
+     rpb_crb->rpb_va_disp = 0x10000000 + ((ul)ptr & 0x1fff);
+#endif
      printf("ConsoleDispatch at virt %x phys %x val %x\n",
              rpb_crb->rpb_va_disp,
             rpb_crb->rpb_pa_disp,
@@ -785,7 +801,11 @@ unixBoot(int go, int argc, char **argv)
      *ptr++ = 0;
      *ptr++ = (ul) consoleCallback;
      rpb_crb->rpb_pa_fixup = KSEG_TO_PHYS(ptr);
+#if 0
      rpb_crb->rpb_va_fixup = 0x10000000 + ((ul)ptr& (0x2000*HWRPB_PAGES-1));
+#else
+     rpb_crb->rpb_va_fixup = 0x10000000 + ((ul)ptr & 0x1fff);
+#endif
      *ptr++ = 0;
      *ptr++ = (ul) consoleFixup;
   }
@@ -807,7 +827,7 @@ unixBoot(int go, int argc, char **argv)
   {
      int i;
      for (i=1;i<simosConf.numCPUs;i++) {
-        volatile AlphaAccess *k1Conf = (volatile AlphaAccess *)
+        volatile struct AlphaAccess *k1Conf = (volatile struct AlphaAccess *)
            (__MAGIC_ZONE(0, 0, MAGIC_ZONE_EV5_ALIAS));
         SpinLock(&theLock);
         printf("Bootstraping CPU %d with sp=0x%x \n",
@@ -944,11 +964,12 @@ struct {
    char name[128];
 } deviceState[32];
 
-#define BOOTDEVICE_NAME "SCSI 1 0 0 1 100"
+#define BOOTDEVICE_NAME "SCSI 1 0 0 1 100 0"
 
-void DeviceOperation(long op,long channel, long count, long address, long block)
+void
+DeviceOperation(long op, long channel, long count, long address, long block)
 {
-   AlphaAccess *k1Conf = (AlphaAccess *)
+   struct AlphaAccess *k1Conf = (struct AlphaAccess *)
       (__MAGIC_ZONE(0, 0, MAGIC_ZONE_EV5_ALIAS));
 
    long pAddr;
@@ -993,35 +1014,137 @@ void DeviceOperation(long op,long channel, long count, long address, long block)
 #define CONSCB_GETENV 0x22
 
 /* AXP manual 2-26 */
+#define	ENV_AUTO_ACTION		0X01
+#define	ENV_BOOT_DEV		0X02
+#define	ENV_BOOTDEF_DEV		0X03
+#define	ENV_BOOTED_DEV		0X04
+#define	ENV_BOOT_FILE		0X05
+#define	ENV_BOOTED_FILE		0X06
+#define	ENV_BOOT_OSFLAGS	0X07
+#define	ENV_BOOTED_OSFLAGS	0X08
+#define	ENV_BOOT_RESET		0X09
+#define	ENV_DUMP_DEV		0X0A
+#define	ENV_ENABLE_AUDIT	0X0B
+#define	ENV_LICENSE		0X0C
+#define	ENV_CHAR_SET		0X0D
+#define	ENV_LANGUAGE		0X0E
+#define	ENV_TTY_DEV		0X0F
+#define	ENV_SCSIID		0X42
+#define	ENV_SCSIFAST		0X43
+#define	ENV_COM1_BAUD		0X44
+#define	ENV_COM1_MODEM		0X45
+#define	ENV_COM1_FLOW		0X46
+#define	ENV_COM1_MISC		0X47
+#define	ENV_COM2_BAUD		0X48
+#define	ENV_COM2_MODEM		0X49
+#define	ENV_COM2_FLOW		0X4A
+#define	ENV_COM2_MISC		0X4B
+#define	ENV_PASSWORD		0X4C
+#define	ENV_SECURE		0X4D
+#define	ENV_LOGFAIL		0X4E
+#define	ENV_SRM2DEV_ID		0X4F
+
+#define MAX_ENVLEN 32
+
+char	env_booted_dev[MAX_ENVLEN]	= BOOTDEVICE_NAME;
+char	env_booted_osflags[MAX_ENVLEN]	= "";
+char	env_com1_baud[MAX_ENVLEN]	= "";
+char	env_secure[MAX_ENVLEN]		= "";
 
-#define ENV_BOOTED_DEV     0x4
-#define ENV_BOOTED_OSFLAGS 0x8
+#if 0
+char	env_auto_action[MAX_ENVLEN]	= "";
+char	env_boot_dev[MAX_ENVLEN]	= "";
+char	env_bootdef_dev[MAX_ENVLEN]	= "";
+char	env_boot_file[MAX_ENVLEN]	= "";
+char	env_booted_file[MAX_ENVLEN]	= "";
+char	env_boot_osflags[MAX_ENVLEN]	= "";
+char	env_boot_reset[MAX_ENVLEN]	= "";
+char	env_dump_dev[MAX_ENVLEN]	= "";
+char	env_enable_audit[MAX_ENVLEN]	= "";
+char	env_license[MAX_ENVLEN]		= "";
+char	env_char_set[MAX_ENVLEN]	= "";
+int	env_language			= 0;
+char	env_tty_dev[MAX_ENVLEN]		= "";
+char	env_scsiid[MAX_ENVLEN]		= "";
+char	env_scsifast[MAX_ENVLEN]	= "";
+char	env_com1_modem[MAX_ENVLEN]	= "";
+char	env_com1_flow[MAX_ENVLEN]	= "";
+char	env_com1_misc[MAX_ENVLEN]	= "";
+char	env_com2_baud[MAX_ENVLEN]	= "";
+char	env_com2_modem[MAX_ENVLEN]	= "";
+char	env_com2_flow[MAX_ENVLEN]	= "";
+char	env_com2_misc[MAX_ENVLEN]	= "";
+char	env_password[MAX_ENVLEN]	= "";
+char	env_logfail[MAX_ENVLEN]		= "";
+char	env_srm2dev_id[MAX_ENVLEN]	= "";
+#endif
 
-long CallBackDispatcher(long a0, long a1, long a2, long a3, long a4)
+long
+CallBackDispatcher(long a0, long a1, long a2, long a3, long a4)
 {
-   int i;
+   long i;
    switch (a0) {
+   case CONSCB_GETC:
+      break;
+
    case CONSCB_PUTS:
-      for(i=0;i<a3;i++) {
+      for(i = 0; i < a3; i++) {
          PutChar(*(char *)a2+i);
       }
       return a3;
+
    case CONSCB_GETENV:
       switch (a1) {
       case ENV_BOOTED_DEV:
-         i = strcpy((char*)a2,BOOTDEVICE_NAME);
-         break;
+        i = strcpy((char*)a2, env_booted_dev);
+        break;
+
       case ENV_BOOTED_OSFLAGS:
-         /*
-          * 'c':ignores the sysconfigtab
-          *
-          * i= strcpy((char*)a2,"c");
-          */
-         i = strcpy((char*)a2,"");
-         break;
+        i = strcpy((char*)a2, env_booted_osflags);
+        break;
+
+      case ENV_COM1_BAUD:
+        i = strcpy((char*)a2, env_com1_baud);
+        break;
+
+      case ENV_SECURE:
+        i = strcpy((char *)a2, env_secure);
+        break;
+
+#if 0
+      case ENV_AUTO_ACTION:
+      case ENV_BOOT_DEV:
+      case ENV_BOOTDEF_DEV:
+      case ENV_BOOT_FILE:
+      case ENV_BOOTED_FILE:
+      case ENV_BOOT_OSFLAGS:
+      case ENV_BOOT_RESET:
+      case ENV_DUMP_DEV:
+      case ENV_ENABLE_AUDIT:
+      case ENV_LICENSE:
+      case ENV_CHAR_SET:
+      case ENV_LANGUAGE:
+      case ENV_TTY_DEV:
+      case ENV_SCSIID:
+      case ENV_SCSIFAST:
+      case ENV_COM1_MODEM:
+      case ENV_COM1_FLOW:
+      case ENV_COM1_MISC:
+      case ENV_COM2_BAUD:
+      case ENV_COM2_MODEM:
+      case ENV_COM2_FLOW:
+      case ENV_COM2_MISC:
+      case ENV_PASSWORD:
+      case ENV_LOGFAIL:
+      case ENV_SRM2DEV_ID:
+#endif
       default:
-         i = strcpy((char*)a2,"");
-         printf ("GETENV unsupported option %d\n", a1);
+         strcpy((char*)a2,"");
+         i = (long)0xc000000000000000;
+         if (a1 >= 0 && a1 < 100)
+           printf ("GETENV unsupported option %d\n", a1);
+         else
+           printf ("GETENV unsupported option %s\n", a1);
          break;
       }
       if (i > a3) {
diff --git a/system/alpha/console/paljtokern.s b/system/alpha/console/paljtokern.s
index 30497ef01..979d719a9 100644
--- a/system/alpha/console/paljtokern.s
+++ b/system/alpha/console/paljtokern.s
@@ -1,8 +1,8 @@
-#include	"dc21164.h"	// DECchip 21164 specific definitions
-#include	"osf.h"		// OSF/1 specific definitions
-#include	"macros.h"	// Global macro definitions
-#include	"ev5_impure.h"	// Scratch & logout area data structures
-#include	"platform.h"	// Platform specific definitions
+#include "dc21164.h"	// DECchip 21164 specific definitions
+#include "osf.h"	// OSF/1 specific definitions
+#include "macros.h"	// Global macro definitions
+#include "ev5_impure.h"	// Scratch & logout area data structures
+#include "platform.h"	// Platform specific definitions
 
 	.global	palJToKern
 	.text	3
diff --git a/system/alpha/console/paljtoslave.tmp b/system/alpha/console/paljtoslave.tmp
deleted file mode 100644
index 69d212b1e..000000000
--- a/system/alpha/console/paljtoslave.tmp
+++ /dev/null
@@ -1,92 +0,0 @@
-unsigned int palJToKern[] = {
-0x467f041b,
-0x47ff0419,
-0x47ff041a,
-0x76940208,
-0x76940113,
-0x67ff0140,
-0x203f0004,
-0x67ff0140,
-0x7421020f,
-0x67ff0140,
-0x203f0000,
-0x74210200,
-0x74210103,
-0x245f2000,
-0x20420000,
-0x67ff0140,
-0x64210118,
-0x67ff0140,
-0x44220401,
-0x74210118,
-0x67ff0140,
-0x67ff0140,
-0x67ff0140,
-0x67ff0140,
-0x67ff0140,
-0x6d359010,
-0x4921b729,
-0x67ff0140,
-0x75290154,
-0x67ff0140,
-0x6fd59000,
-0x77ff020a,
-0x77ff0105,
-0x7631010b,
-0x67ff0140,
-0x67ff0140,
-0x77ff020a,
-0x77ff0105,
-0xffffffffc3e00001,
-0x0,
-0x47ff041f,
-0x77ff0119,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x47ff041f,
-0x7bffc000,
-0x0,
-};
diff --git a/system/alpha/console/printf.c b/system/alpha/console/printf.c
index e0dc0426b..24efa802e 100644
--- a/system/alpha/console/printf.c
+++ b/system/alpha/console/printf.c
@@ -79,19 +79,22 @@ static char *rcsid = "$Id: printf.c,v 1.1.1.1 1997/10/30 23:27:12 verghese Exp $
 
 
 /* The string s is terminated by a '\0' */
-void PutString(char *s)
+void
+PutString(const char *s)
 {
   while (*s) PutChar(*s++);
 }
 
 /* print c count times */
-void PutRepChar(char c, int count)
+void
+PutRepChar(char c, int count)
 {
   while (count--) PutChar(c);
 }
 
 /* put string reverse */
-void PutStringReverse(char *s, int index)
+void
+PutStringReverse(const char *s, int index)
 {
   while ((index--) > 0) PutChar(s[index]);
 }
@@ -103,7 +106,8 @@ void PutStringReverse(char *s, int index)
    if width is 0, use whatever is needed
    if fill is 0, use ' '
  */
-void PutNumber(sl value, int radix, int width, char fill)
+void
+PutNumber(sl value, int radix, int width, char fill)
 {
   char buffer[40];
   ui bufferindex = 0;
@@ -195,7 +199,8 @@ void putFloat(double a, int fieldwidth, char fill)
      PutChar((char)(b % 10) + '0');
    }
 }
-char *FormatItem(char *f, va_list *ap)
+const char *
+FormatItem(const char *f, va_list *ap)
 {
   char c;
   int fieldwidth = 0;
@@ -222,12 +227,12 @@ char *FormatItem(char *f, va_list *ap)
         return(f);
         }
       case 's': {
-        char *a = va_arg(*ap, char *);
+        const char *a = va_arg(*ap, const char *);
 
-        if (leftjust) PutString((char *) a);
-        if (fieldwidth > strlen((char *) a))
-          PutRepChar(fill, fieldwidth - strlen((char *)a));
-        if (!leftjust) PutString((char *) a);
+        if (leftjust) PutString((const char *) a);
+        if (fieldwidth > strlen((const char *) a))
+          PutRepChar(fill, fieldwidth - strlen((const char *)a));
+        if (!leftjust) PutString((const char *) a);
         return(f);
         }
       case 'd': radix = -10;
@@ -260,7 +265,8 @@ char *FormatItem(char *f, va_list *ap)
   return(f);
 }
 
-void printf(char *f, ...)
+int
+printf(const char *f, ...)
 {
   va_list ap;
 
@@ -277,9 +283,11 @@ void printf(char *f, ...)
   }
 
   va_end(ap);         /* clean up */
+  return 0;
 }
 
-void panic(char *f, ...)
+void
+panic(const char *f, ...)
 {
   va_list ap;
 
diff --git a/system/alpha/h/lib.h b/system/alpha/h/lib.h
index def67fb25..aa28f69ab 100644
--- a/system/alpha/h/lib.h
+++ b/system/alpha/h/lib.h
@@ -196,8 +196,8 @@ extern ul _edata;
 
 #ifndef _TIME_T
 #define _TIME_T
-/* typedef int time_t; */
-typedef ui time_t;
+typedef int time_t;
+/* typedef ui time_t; */
 #endif
 
 /*::::::::::::::
@@ -318,9 +318,11 @@ void wr_bcache (ui argc, ul arg1, ul arg2, ui select);
 /*::::::::::::::
 ffcsubs.c
 ::::::::::::::*/
-extern int strlen(char * s);
-extern void bzero(char * s , int count);
-extern void bcopy(char * from , char * to , int count);
+extern size_t strlen(const char *s);
+#if 0
+extern void bzero(void *s, int count);
+extern void bcopy(void *from, void *to, int count);
+#endif
 extern int tolower(int c);
 extern int toupper(int c);
 extern int IsAlpha(char c);
@@ -414,8 +416,8 @@ extern void PutCR(void);
 /*::::::::::::::
 printf.c
 ::::::::::::::*/
-extern void PutString(char * s);
-extern void printf(char * f , ...);
+extern void PutString(const char * s);
+extern int printf(const char *f, ...);
 
 /*::::::::::::::
 search.c
diff --git a/system/alpha/h/machine_defs.h b/system/alpha/h/machine_defs.h
new file mode 100644
index 000000000..cc4ae6426
--- /dev/null
+++ b/system/alpha/h/machine_defs.h
@@ -0,0 +1,635 @@
+/*
+ * Copyright (C) 1998 by the Board of Trustees
+ *    of Leland Stanford Junior University.
+ * Copyright (C) 1998 Digital Equipment Corporation
+ *
+ * This file is part of the SimOS distribution.
+ * See LICENSE file for terms of the license.
+ *
+ */
+
+  /***********************************************************************
+
+     machine_defs.h
+
+   ***********************************************************************/
+
+  /*************************************************************************
+   *                                                                       *
+   *               Copyright (C) 1993-1996 Stanford University             *
+   *                                                                       *
+   *  These coded instructions, statements, and computer programs contain  *
+   *  unpublished proprietary information of Stanford University, and      *
+   *  are protected by Federal copyright law.  They may not be disclosed   *
+   *  to third parties or copied or duplicated in any form, in whole or    *
+   *  in part, without the prior written consent of Stanford University.   *
+   *                                                                       *
+   *************************************************************************/
+
+#ifndef __DPGCC__
+#ifndef _HEADER_STACK_
+#define _HEADER_STACK_
+#endif
+#endif
+
+#ifndef _MACHINE_DEFS_H
+#define _MACHINE_DEFS_H
+
+/*
+ * Created by: Dan Teodosiu, 07/96
+ *
+ * This header file defines the OS view of the MAGIC service address space
+ * and of the device registers.
+ *
+ * The service address space addresses used by the OS are VIRTUAL addresses.
+ * Depending on whether we simulate a 32 bit or a 64 bit processor,
+ * the service address mappings will be different. MAGIC physical addresses
+ * are 40 bits wide, so in 32 bit mode (current SimOS) we had to squeeze
+ * the service address space into less address bits.
+ *
+ * There are two kinds of macros in this file:
+ *
+ *  - MAGIC definitions, pertaining to the services offered by the
+ *    MAGIC node controller. All these macros start with MAGIC_...,
+ *    Those definitions are further subdivided into ones which do not
+ *    depend on the address mappings (such as MAGIC register numbers,
+ *    error codes, etc.), and ones which do (such as the macros that help
+ *    construct MAGIC PPR addresses).
+ *    The current simulated MAGIC only supports doubleword accesses.
+ *
+ *  - devices register definitions, of the form DEV_... These defs
+ *    describe the various device registers. Devices are accessed by
+ *    performing uncached word (32bit) reads and writes to their registers.
+ *
+ * Notes:
+ *    The macro SIMOS64BIT selects the 64 bit version of those definitions;
+ *    by default, you get the 32 bit version. 64 bit is currently not
+ *    implemented.
+ *
+ * Related documents:
+ *  - FLASH: Physical Address Layout
+ *  - FLASH: PP Software Services
+ *  - SimOS to FLASH Physical Address Mapping
+ *
+ */
+
+
+/***************************************************************************
+ MAGIC defs which do not depend on the virtual -> physical address mapping
+ ***************************************************************************/
+
+/** zone numbering for service address space **/
+
+#define MAGIC_ZONE_FRAM_ALIAS       0
+#define MAGIC_ZONE_PPR_ALIAS        1
+#define MAGIC_ZONE_PPC_ALIAS        2
+#define MAGIC_ZONE_FIREWALL         3
+#define MAGIC_ZONE_DMAMAP           4
+#define MAGIC_ZONE_SWTLB            5
+#define MAGIC_ZONE_MISSCNT          6
+#define MAGIC_ZONE_NODEMAP          7
+#define MAGIC_ZONE_PPR              8
+#define MAGIC_ZONE_PPC              9
+#define MAGIC_ZONE_MILO_ALIAS       10
+#define MAGIC_ZONE_EV5_ALIAS        10
+#define MAGIC_ZONE_NODECOMM         11        /* node communication zone */
+                                              /* do not def zone 12: see below why */
+#define MAGIC_ZONE_BDOOR_DEV        14        /* backdoor area for devices */
+#define MAGIC_ZONE_FPROM_ALIAS      15
+
+#ifndef SIMOS64BIT
+#undef  MAGIC_ZONE_FPROM_ALIAS                /* In 32bit Simos, 0xbfc00000 maps to... */
+#define MAGIC_ZONE_FPROM_ALIAS      12        /* ... zone 12 */
+#endif
+
+/** PPR numbering **/
+
+/* Individual MAGIC registers */
+
+#define MAGIC_PPR_IECHIGH            0x0000    /* r */
+#define MAGIC_PPR_ACKINTERNAL        0x0001    /* w */
+#define MAGIC_PPR_IECENABLE          0x0002    /* r/w */
+#define MAGIC_PPR_SENDIPI            0x0003    /* w */
+#define MAGIC_PPR_OPSPACE            0x0004    /* r/w */
+#define MAGIC_PPR_ASID               0x0005    /* r/w */
+#define MAGIC_PPR_TLBINVAL           0x0006    /* w */
+#define MAGIC_PPR_TLBINUSE           0x0007    /* r */
+#define MAGIC_PPR_MSGTAG             0x0008    /* r/w */
+#define MAGIC_PPR_STALLOSPC          0x0009    /* r/w */
+#define MAGIC_PPR_CYCLECOUNT         0x000a    /* r */
+#define MAGIC_PPR_NETMSGTIME         0x000b    /* r */
+#define MAGIC_PPR_RESERVED_C         0x000c    /* */
+#define MAGIC_PPR_RESERVED_D         0x000d    /* */
+#define MAGIC_PPR_RESERVED_E         0x000e    /* */
+#define MAGIC_PPR_RESERVED_F         0x000f    /* */
+
+#define MAGIC_PPR_UNUSED10           0x0010    /* r */
+#define MAGIC_PPR_PROTVERSION        0x0011    /* r */
+#define MAGIC_PPR_HWVERSION          0x0012    /* r */
+#define MAGIC_PPR_REMAPMASK          0x0013    /* r/w */
+#define MAGIC_PPR_PROTCONTROL        0x0014    /* r/w */
+#define MAGIC_PPR_RESERVED_15        0x0015    /* */
+#define MAGIC_PPR_RESERVED_16        0x0016    /* */
+#define MAGIC_PPR_RESERVED_17        0x0017    /* */
+#define MAGIC_PPR_OUTOFRANGE         0x0018    /* r */
+#define MAGIC_PPR_INTERVAL           0x0019    /* r/w */
+#define MAGIC_PPR_SLOTMAP            0x001a    /* r/w */
+#define    MAGIC_SLOTMAP_SLOT0_OFFS         0
+#define    MAGIC_SLOTMAP_SLOT0_MASK         0x00000000000000FFLL
+#define    MAGIC_SLOTMAP_SLOT1_OFFS         8
+#define    MAGIC_SLOTMAP_SLOT1_MASK         0x000000000000FF00LL
+#define    MAGIC_SLOTMAP_SLOT2_OFFS         16
+#define    MAGIC_SLOTMAP_SLOT2_MASK         0x0000000000FF0000LL
+#define    MAGIC_SLOTMAP_SLOT3_OFFS         24
+#define    MAGIC_SLOTMAP_SLOT3_MASK         0x00000000FF000000LL
+#define MAGIC_PPR_FWSHIFT            0x001b    /* r/w */
+#define MAGIC_PPR_RECOVERYSYNC       0x001c    /* r */
+#define    MAGIC_RECOVERYSYNC_PHASE_MASK    0xF000000000000000LL;
+#define    MAGIC_RECOVERYSYNC_PHASE_SHIFT   60
+#define    MAGIC_RECOVERYSYNC_PHASE_ZERO    (0x0LL << MAGIC_RECOVERYSYNC_PHASE_SHIFT)
+#define    MAGIC_RECOVERYSYNC_PHASE_ONE     (0x1LL << MAGIC_RECOVERYSYNC_PHASE_SHIFT)
+#define    MAGIC_RECOVERYSYNC_PHASE_TWO     (0x2LL << MAGIC_RECOVERYSYNC_PHASE_SHIFT)
+#define    MAGIC_RECOVERYSYNC_PHASE_THREE   (0x3LL << MAGIC_RECOVERYSYNC_PHASE_SHIFT)
+#define    MAGIC_RECOVERYSYNC_TIMESTAMP_MASK  0x0FFFFFFFFFFFFFFFLL
+#define    MAGIC_RECOVERYSYNC_TIMESTAMP_SHIFT 0
+#define MAGIC_PPR_REPORT_DIAG_RESULT 0x001d    /* w */
+#define    MAGIC_REPORT_PASS_DIAG           0  /* other values indicate fail */
+#define MAGIC_PPR_RESERVED_1E        0x001e    /* w */
+#define MAGIC_PPR_DRAIN_POLL         0x001f    /* r */
+
+#define MAGIC_PPR_NODECONFIG         0x0020    /* r */
+#define    MAGIC_NODECONFIG_THISNODE_OFFS    0
+#define    MAGIC_NODECONFIG_THISNODE_MASK    0x0000000000000fffLL
+#define    MAGIC_NODECONFIG_FIRSTNODE_OFFS   12
+#define    MAGIC_NODECONFIG_FIRSTNODE_MASK   0x0000000000fff000LL
+#define    MAGIC_NODECONFIG_NODESINCELL_OFFS 24
+#define    MAGIC_NODECONFIG_NODESINCELL_MASK 0x0000000fff000000LL
+#define    MAGIC_NODECONFIG_THISCELL_OFFS    36
+#define    MAGIC_NODECONFIG_THISCELL_MASK    0x0000fff000000000LL
+#define    MAGIC_NODECONFIG_NCELLS_OFFS      48
+#define    MAGIC_NODECONFIG_NCELLS_MASK      0x0fff000000000000LL
+
+#define    MAGIC_NODECONFIG_THISNODE(val)                                  \
+ (((val)&MAGIC_NODECONFIG_THISNODE_MASK)>>MAGIC_NODECONFIG_THISNODE_OFFS)
+#define    MAGIC_NODECONFIG_FIRSTNODE(val)                                 \
+ (((val)&MAGIC_NODECONFIG_FIRSTNODE_MASK)>>MAGIC_NODECONFIG_FIRSTNODE_OFFS)
+#define    MAGIC_NODECONFIG_NODESINCELL(val)                               \
+ (((val)&MAGIC_NODECONFIG_NODESINCELL_MASK)>>MAGIC_NODECONFIG_NODESINCELL_OFFS)
+#define    MAGIC_NODECONFIG_THISCELL(val)                                  \
+ (((val)&MAGIC_NODECONFIG_THISCELL_MASK)>>MAGIC_NODECONFIG_THISCELL_OFFS)
+#define    MAGIC_NODECONFIG_NCELLS(val)                                    \
+ (((val)&MAGIC_NODECONFIG_NCELLS_MASK)>>MAGIC_NODECONFIG_NCELLS_OFFS)
+
+#define MAGIC_PPR_ADDRCONFIG         0x0021    /* r */
+#define    MAGIC_ADDRCONFIG_PAGES_OFFS       0
+#define    MAGIC_ADDRCONFIG_PAGES_MASK       0x0000ffffffffLL
+#define    MAGIC_ADDRCONFIG_NNBITS_OFFS      32
+#define    MAGIC_ADDRCONFIG_NNBITS_MASK      0x00ff00000000LL
+#define    MAGIC_ADDRCONFIG_MASBITS_OFFS     40
+#define    MAGIC_ADDRCONFIG_MASBITS_MASK     0xff0000000000LL
+
+#define    MAGIC_ADDRCONFIG_PAGES(val) \
+ (((val)&MAGIC_ADDRCONFIG_PAGES_MASK)>>MAGIC_ADDRCONFIG_PAGES_OFFS)
+#define    MAGIC_ADDRCONFIG_NNBITS(val)                                    \
+ (((val)&MAGIC_ADDRCONFIG_NNBITS_MASK)>>MAGIC_ADDRCONFIG_NNBITS_OFFS)
+#define    MAGIC_ADDRCONFIG_MASBITS(val)                                   \
+ (((val)&MAGIC_ADDRCONFIG_MASBITS_MASK)>>MAGIC_ADDRCONFIG_MASBITS_OFFS)
+
+/* OSPC mirror in uncached space (used by FPROM) */
+#define MAGIC_PPR_OSPC               0x1000    /* r */
+
+
+/** PPC error codes **/
+
+#define MAGIC_PPC_NOT_SUCCESSFUL_BIT   0x8000000000000000LL /* set for error */
+/* these return values should be ORed with the "not successful" bit */
+#define MAGIC_PPC_RETRY_CODE           0x00   /* please retry request (default) */
+#define MAGIC_PPC_BADGROUP             0x01   /* PPC group was invalid */
+#define MAGIC_PPC_BADOPCODE            0x02   /* PPC opcode was invalid */
+#define MAGIC_PPC_ARGOUTOFRANGE        0x03   /* some arg to the PPC was bad */
+#define MAGIC_PPC_BUSY                 0x04   /* operation needed some
+                                               * resource that was unavail */
+/* these results indicate the request cannot be serviced, and it should
+   not be retried.  The interpretation of these is protocol-dependent
+   One example is: the physical pages are remote.  The application
+   can't know this, but the sequence was otherwise valid.  If a protocol
+   can't handle remote pages, this is a possibility. So, e.g. fmemcpy
+   uses PROT_FAIL1 to indicate it can't handle the pages.  See the
+   individual _interface files to describe the interpretation*/
+#define MAGIC_PPC_PROT_FAIL1           0x11
+#define MAGIC_PPC_PROT_FAIL2           0x12
+#define MAGIC_PPC_PROT_FAIL3           0x13
+#define MAGIC_PPC_RETRY                (MAGIC_PPC_NOT_SUCCESSFUL_BIT|MAGIC_PPC_RETRY_CODE)
+
+/** PPC groups **/
+
+#define MAGIC_PPC_GROUP_KERNEL       0x000
+#define MAGIC_PPC_GROUP_MSG          0x001
+
+/** kernel group opcodes **/
+
+#define MAGIC_PPC_OP_SIPSLO          0x000
+#define MAGIC_PPC_OP_SIPSHI          0x001
+#define MAGIC_PPC_OP_MEMCPY          0x002
+#define MAGIC_PPC_OP_IBITWRITE       0x003
+#define MAGIC_PPC_OP_IBITREAD        0x004
+#define MAGIC_PPC_OP_DONATE          0x005
+#define MAGIC_PPC_OP_RESETPOOL       0x006
+#define MAGIC_PPC_OP_LOADSTATE       0x007
+#define MAGIC_PPC_OP_STORESTATE      0x008
+#define MAGIC_PPC_OP_MEMRESET        0x009
+#define MAGIC_PPC_OP_VECTORPKT       0x00A
+#define MAGIC_PPC_OP_BZERO           0x00B
+/* HLL/Diag opcodes within kernel region */
+#define MAGIC_PPC_OP_PRINTF1         0x00C
+/* config info opcodes within kernel region */
+/* note: result has same format as MAGIC_PPR_NODECONFIG and
+ *       MAGIC_PPR_ADDRCONFIG PPR's.
+ */
+#define MAGIC_PPC_OP_CELLNODECONFIG  0x010
+#define MAGIC_PPC_OP_NODEADDRCONFIG  0x011
+#define MAGIC_PPC_OP_STARTSLAVENODE  0x012
+
+/** msg group opcodes **/
+#define MAGIC_PPC_OP_MEMCPY_V        0x000
+#define MAGIC_PPC_OP_SIPS_V          0x001
+#define MAGIC_PPC_OP_BZERO_V         0x002
+
+
+/** OSPC defs **/
+
+/* OSPC opcodes.
+ *
+ * Note:
+ * In the future we will probably add more structure to the header dword...
+ * for example, in SIPS it would be nice to have the sender CPU from the
+ * message header there, which authenticates the sender at a lower level
+ * than the sender cell info in the SIPS header.  Because this will happen
+ * eventually, these opcodes are not defined as 0x01LL.
+ */
+#define MAGIC_OSPC_LO_NONE           0xff     /* no OSPC pending */
+#define MAGIC_OSPC_LO_SIPSREQ        0x01     /* lopri SIPS pending */
+#define MAGIC_OSPC_LO_CACHECTR       0x02     /* ??? */
+
+#define MAGIC_OSPC_HI_NONE           0xff     /* no OSPC pending */
+#define MAGIC_OSPC_HI_SIPSREPLY      0x81     /* hipri SIPS pending */
+#define MAGIC_OSPC_HI_TLBMISS        0x82     /* ??? */
+
+/* For vector packet payload retrieval... in the future we'll move to some
+   method other than OSPCs for this. */
+#define MAGIC_OSPC_VEC_REQ_NONE 0xff
+#define MAGIC_OSPC_VEC_REQ      0xd1
+#define MAGIC_OSPC_VEC_REP_NONE 0xff
+#define MAGIC_OSPC_VEC_REP      0xe1
+
+/* OSPC offsets */
+#define MAGIC_OSPC_SIZE              128      /* OSPC size == 1 cache line */
+
+#define MAGIC_OSPC_LO_OFFS           0*MAGIC_OSPC_SIZE /* lopri SIPS */
+#define MAGIC_OSPC_HI_OFFS           1*MAGIC_OSPC_SIZE /* hipri SIPS */
+#define MAGIC_OSPC_VEC_REQ_OFFS      2*MAGIC_OSPC_SIZE /* VP request */
+#define MAGIC_OSPC_VEC_REP_OFFS      3*MAGIC_OSPC_SIZE /* VP reply   */
+
+/***************************************************************************
+ MAGIC defs which reflect the virtual -> physical address mapping
+ ***************************************************************************/
+
+/* auxiliary defs -- ONLY FOR INTERNAL USE IN THIS FILE */
+
+#ifndef SIMOS64BIT     /* 32 bit address space (current SimOS version) */
+
+/* virtual addresses for start of FPROM and FRAM */
+#define FPROM_BASE _SEXT(0xbfc00000)
+#define FRAM_BASE  _SEXT(0xa0000000)
+
+#ifdef _KERNEL
+#define __MAGIC_BASE                COMPAT_K1BASE /* KSEG1 */
+#define __MAGIC_BASE_32             COMPAT_K1BASE_32 /* KSEG1 */
+#define __MAGIC_BASE_ACC            COMPAT_K1BASE /* still KSEG1 */
+#else
+#define __MAGIC_BASE                K1BASE /* KSEG1 */
+#define __MAGIC_BASE_32             K1BASE_32 /* KSEG1 */
+#define __MAGIC_BASE_ACC            K1BASE /* still KSEG1 */
+#endif
+#define __MAGIC_OSPC_BASE           (K0BASE+0x1000) /* OSPC right after remap */
+#define __MAGIC_OSPC_END            (K0BASE+0x2000) /* 1 page-alias for each node */
+
+#define __MAGIC_NODE_BITS           5  /* max. 32 nodes */
+#define __MAGIC_NODE_OFFS           24
+
+#define __MAGIC_ZONE_BITS           4  /* 16 zones / node */
+#define __MAGIC_ZONE_OFFS           20 /* 1MB / zone */
+
+#define __MAGIC_REG_BITS            17
+#define __MAGIC_REG_OFFS            3  /* registers are 64bit */
+
+#define __MAGIC_PPC_SEQ_BITS        7  /* one cache line */
+#define __MAGIC_PPC_SEQ_OFFS        0
+#define __MAGIC_PPC_OPC_BITS        5  /* group corresponds to a 4K page */
+#define __MAGIC_PPC_OPC_OFFS        __MAGIC_PPC_SEQ_BITS
+#define __MAGIC_PPC_GRP_BITS        8
+#define __MAGIC_PPC_GRP_OFFS        (__MAGIC_PPC_SEQ_BITS+__MAGIC_PPC_OPC_BITS)
+
+#define __MAGIC_ZONE(node, nbits, zone)                                    \
+   ( __MAGIC_BASE | ((node) << __MAGIC_NODE_OFFS)                          \
+                  | ((zone) << __MAGIC_ZONE_OFFS) )
+#define __MAGIC_ZONE_32(node, nbits, zone)                                    \
+   ( __MAGIC_BASE_32 | ((node) << __MAGIC_NODE_OFFS)                          \
+                     | ((zone) << __MAGIC_ZONE_OFFS) )
+#define __MAGIC_ZONE_ACC(node, nbits, zone)                                \
+   ( __MAGIC_BASE_ACC | ((node) << __MAGIC_NODE_OFFS)                      \
+                      | ((zone) << __MAGIC_ZONE_OFFS) )
+#define __MAGIC_ZONE_ALIAS(zone)                                           \
+   ( __MAGIC_BASE | ((zone) << __MAGIC_ZONE_OFFS) )
+#define __MAGIC_ZONE_ALIAS_ACC(zone)                                       \
+   ( __MAGIC_BASE_ACC | ((zone) << __MAGIC_ZONE_OFFS) )
+#define __MAGIC_OSPC_RANGE(node, nbits)                                    \
+   ( __MAGIC_OSPC_BASE )
+
+#define MAGIC_MAX_REMAP_PAGES       1  /* max. sz of remap area (limited
+                                        * by OSPC in following page) */
+
+/* offsets in bdoor zone of simulated devices (64KB each) */
+#define __MAGIC_BDOOR_CLOCK_OFFS        0x00000000 /* CMOS rt clock */
+#define __MAGIC_BDOOR_CNSLE_OFFS        0x00001000 /* console interface */
+#define __MAGIC_BDOOR_ETHER_OFFS        0x00002000 /* ethernet controller */
+#define __MAGIC_BDOOR_DISKS_OFFS        0x00010000 /* scsi disk controller */
+
+#ifdef TORNADO
+#define __MAGIC_BDOOR_GIZMO_OFFS	                                       \
+    ((__MAGIC_BDOOR_DISKS_OFFS + sizeof(DevDiskRegisters)*DEV_DISK_MAX_DISKS + \
+      0x1000 - 1) & ~(0x1000-1))		   /* gizmo interface */
+#endif
+
+#else /* SIMOS64BIT */ /* 64 bit address space */
+not yet implemented, will not compile;
+#endif /* SIMOS64BIT */
+
+#ifdef LANGUAGE_ASSEMBLY
+#define MagicRegister int
+#define MAGICREGP_CAST
+#else
+typedef uint64 MagicRegister;
+#define MAGICREGP_CAST (MagicRegister *)
+#endif
+
+/* PPR access */
+#define MAGIC_PPR(node, nbits, reg)                                        \
+   ((MagicRegister*)                                                       \
+    (__MAGIC_ZONE(node,nbits,MAGIC_ZONE_PPR) | ((reg) << __MAGIC_REG_OFFS)))
+#define MAGIC_PPR_ALIAS(reg)                                               \
+   (MAGICREGP_CAST                                                       \
+    (__MAGIC_ZONE_ALIAS(MAGIC_ZONE_PPR_ALIAS) | ((reg) << __MAGIC_REG_OFFS)))
+#define MAGIC_PPR_NODE(addr, nbits)                                        \
+   ( ((addr) >> __MAGIC_NODE_OFFS) & ((1LL << (nbits)) - 1) )
+#define MAGIC_PPR_ZONE(addr)                                               \
+   ( ((addr) >> __MAGIC_ZONE_OFFS) & ((1LL << __MAGIC_ZONE_BITS) - 1) )
+#define MAGIC_PPR_REG(addr)                                                \
+   ( ((addr) >> __MAGIC_REG_OFFS) & ((1LL << __MAGIC_REG_BITS) - 1) )
+
+/* PPC access */
+#define MAGIC_PPC(node, nbits, grp, opc)                                   \
+   ((MagicRegister*)                                                       \
+    ( __MAGIC_ZONE(node,nbits,MAGIC_ZONE_PPC) |                            \
+      ((grp) << __MAGIC_PPC_GRP_OFFS) |                                    \
+      ((opc) << __MAGIC_PPC_OPC_OFFS) ))
+#define MAGIC_PPC_ACC(node, nbits, grp, opc)                               \
+   ((MagicRegister*)                                                       \
+    ( __MAGIC_ZONE_ACC(node,nbits,MAGIC_ZONE_PPC) |                        \
+      ((grp) << __MAGIC_PPC_GRP_OFFS) |                                    \
+      ((opc) << __MAGIC_PPC_OPC_OFFS) ))
+#define MAGIC_PPC_ALIAS(grp, opc)                                          \
+   (MAGICREGP_CAST                                                         \
+    ( __MAGIC_ZONE_ALIAS(MAGIC_ZONE_PPC_ALIAS)                             \
+                   | ((grp) << __MAGIC_PPC_GRP_OFFS)                       \
+                   | ((opc) << __MAGIC_PPC_OPC_OFFS) ))
+#define MAGIC_PPC_ALIAS_ACC(grp, opc)                                      \
+   ((MagicRegister*)                                                       \
+    ( __MAGIC_ZONE_ALIAS_ACC(MAGIC_ZONE_PPC_ALIAS)                         \
+                   | ((grp) << __MAGIC_PPC_GRP_OFFS)                       \
+                   | ((opc) << __MAGIC_PPC_OPC_OFFS) ))
+
+#define MAGIC_PPC_NODE(addr,nbits)                                         \
+   ( ((addr) >> __MAGIC_NODE_OFFS) & ((1LL << (nbits)) - 1) )
+#define MAGIC_PPC_ZONE(addr)                                               \
+   ( ((addr) >> __MAGIC_ZONE_OFFS) & ((1LL << __MAGIC_ZONE_BITS) - 1) )
+#define MAGIC_PPC_GRP(addr)                                                \
+   ( ((addr) >> __MAGIC_PPC_GRP_OFFS) & ((1LL << __MAGIC_PPC_GRP_BITS) - 1) )
+#define MAGIC_PPC_OPC(addr)                                                \
+   ( ((addr) >> __MAGIC_PPC_OPC_OFFS) & ((1LL << __MAGIC_PPC_OPC_BITS) - 1) )
+
+/* Nodemap access */
+#define MAGIC_NODEMAP(node, nbits, reg)                                    \
+   ((MagicRegister*)                                                       \
+    (__MAGIC_ZONE(node,nbits,MAGIC_ZONE_NODEMAP) | ((reg) << __MAGIC_REG_OFFS)))
+
+/* Nodecomm access */
+#define MAGIC_NODECOMM(node, nbits, n)                                     \
+   ((MagicRegister*)                                                       \
+    (__MAGIC_ZONE(node,nbits,MAGIC_ZONE_NODECOMM) | ((n) << __MAGIC_REG_OFFS)))
+
+/* OSPC access */
+#define MAGIC_OSPC(node, nbits, ospc)                                      \
+   ( (MagicRegister*)(__MAGIC_OSPC_RANGE(node, nbits) + (ospc)) )
+
+#define MAGIC_UNCACHED_OSPC(node, nbits, offs)                             \
+   MAGIC_PPR(node, nbits, MAGIC_PPR_OSPC + ((offs) >> __MAGIC_REG_OFFS))
+
+#define MAGIC_UNCACHED_OSPC_ALIAS(offs)                                    \
+   MAGIC_PPR_ALIAS(MAGIC_PPR_OSPC + ((offs) >> __MAGIC_REG_OFFS))
+
+#define MAGIC_OSPC_OPCODE(val) ((int)((val) & ((MagicRegister)0xff)))
+
+/* firewall access */
+#define MAGIC_FW_RANGE(node, nbits)                                        \
+   ((MagicRegister*) __MAGIC_ZONE(node,nbits,MAGIC_ZONE_FIREWALL))
+
+
+/***************************************************************************
+ definitions of the simulated devices and of various parameters
+ which depend on the simulator.
+ ***************************************************************************/
+
+#define MAGIC_MAX_CPUS                32 /* max no of nodes in a simulation */
+#define MAGIC_MAX_CELLS               32 /* max no of cells in a simulation */
+
+
+/* needed so assembly files can include machine_defs */
+#ifndef LANGUAGE_ASSEMBLY
+
+
+typedef unsigned int DevRegister;
+
+/* disk device:
+ * there is currently one controller per cell. The controller
+ * can be accessed through the backdoor zone of the first node
+ * in the cell.
+ */
+
+#define DEV_DISK_CMD_SIZE            12
+#define DEV_DISK_MAX_DMA_LENGTH      1024 /* max no of pages for one request */
+#define DEV_DISK_MAX_DISKS           128  /* max disks per controller (cell) */
+
+typedef struct DevDiskRegisters {
+    DevRegister intr_pending;     /* r:int posted for this disk / w:ack int */
+    DevRegister errnoVal;         /* status of last i/o */
+    DevRegister bytesTransferred; /* bytes transferred during last i/o */
+
+    DevRegister interruptNode;    /* node to interrupt upon completion */
+    DevRegister k0Addr[DEV_DISK_MAX_DMA_LENGTH]; /* page addresses */
+    DevRegister offset;           /* page offset for first page */
+    DevRegister command[DEV_DISK_CMD_SIZE]; /* i/o command */
+
+    DevRegister startIO;          /* write here causes i/o initiation */
+    DevRegister doneIO;           /* tells when i/o complete */
+
+    DevRegister filler[16];       /* filler: resize when you add new regs */
+} DevDiskRegisters;
+
+#define DEV_DISK_REGISTERS(node, nbits, disk)                               \
+   ( ((volatile DevDiskRegisters*)                                          \
+        (__MAGIC_ZONE(node, nbits, MAGIC_ZONE_BDOOR_DEV) +                  \
+         __MAGIC_BDOOR_DISKS_OFFS)) +                                       \
+     (disk) )
+
+
+/* console device:
+ * there is currently one console per cell. The console registers
+ * can be accessed through the backdoor zone of the first node
+ * in the cell. The console always interrupts this node.
+ */
+
+#define DEV_CNSLE_TX_INTR            0x01 /* intr enable / state bits */
+#define DEV_CNSLE_RX_INTR            0x02
+
+typedef struct DevConsoleRegisters {
+    DevRegister intr_status;      /* r: intr state / w: intr enable */
+    DevRegister data;             /* r: current char / w: send char */
+} DevConsoleRegisters;
+
+#define DEV_CONSOLE_REGISTERS(node, nbits)                                  \
+   ( ((volatile DevConsoleRegisters*)                                       \
+        (__MAGIC_ZONE(node, nbits, MAGIC_ZONE_BDOOR_DEV) +                  \
+         __MAGIC_BDOOR_CNSLE_OFFS)) )
+
+
+/* ethernet device:
+ * there is currently one ether interface per cell. The ether registers
+ * can be accessed through the backdoor zone of the first node
+ * in the cell. The ether interface always interrupts this node.
+ */
+
+#define DEV_ETHER_MAX_RCV_ENTRIES    64
+#define DEV_ETHER_MAX_SND_ENTRIES    64
+#define DEV_ETHER_MAX_SND_CHUNKS     128
+
+#define DEV_ETHER_MAX_TRANSFER_SIZE  1800
+
+typedef struct DevEtherRegisters {
+  DevRegister etheraddr[6];       /* controller tells OS its ethernet addr */
+  DevRegister numRcvEntries;      /* read by OS, indicates how many receive
+                                   * ring buffer entries will be used. OS must
+                                   * allocate a receive buffer for each of
+                                   * these entries */
+  DevRegister numSndEntries;      /* read by OS, indicates how many send ring
+                                   * buffer entries will be used so it knows
+                                   * when to wrap its index pointer */
+  DevRegister numSndChunks;       /* same as numSndEntries */
+
+  struct {
+    DevRegister pAddr;
+    DevRegister maxLen;
+    DevRegister len;
+    DevRegister flag;
+  } rcvEntries[ DEV_ETHER_MAX_RCV_ENTRIES ];
+
+  struct {
+    DevRegister firstChunk;
+    DevRegister lastChunk;
+    DevRegister flag; /* triggers send */
+  } sndEntries[ DEV_ETHER_MAX_SND_ENTRIES ];
+
+  struct {
+    DevRegister pAddr;
+    DevRegister len;
+  } sndChunks[ DEV_ETHER_MAX_SND_CHUNKS ];
+
+  /* note: sndChunks is last because we might extend the number of
+   * send chunks in the future and don't want to break OS compatibility when
+   * we do it */
+} DevEtherRegisters;
+
+/* values for flag field */
+#define DEV_ETHER_OS_OWNED           (DevRegister)1
+#define DEV_ETHER_CONTROLLER_OWNED   (DevRegister)2
+
+#define DEV_ETHER_REGISTERS(node, nbits)                                  \
+   ( ((volatile DevEtherRegisters*)                                       \
+        (__MAGIC_ZONE(node, nbits, MAGIC_ZONE_BDOOR_DEV) +                \
+         __MAGIC_BDOOR_ETHER_OFFS)) )
+
+
+/* CMOS RT clock device:
+ * This simulates a very primitive CMOS clock. This device only
+ * has one register that contains the time since January 1, 1970
+ * (same as the Unix gettimeofday() result).
+ */
+
+typedef struct DevClockRegisters {
+  DevRegister ctime;              /* current time */
+} DevClockRegisters;
+
+#define DEV_CLOCK_REGISTERS(node, nbits)                                  \
+   ( ((volatile DevClockRegisters*)                                       \
+        (__MAGIC_ZONE(node, nbits, MAGIC_ZONE_BDOOR_DEV) +                \
+         __MAGIC_BDOOR_CLOCK_OFFS)) )
+
+
+#endif /* LANGUAGE_ASSEMBLY */
+
+
+/* Interrupt bit assignments:
+ *
+ * There are 64 external interrupt lines coming into MAGIC. The
+ * following defines show to what interrupt line each device is
+ * connected.
+ *
+ * NOTE: when MAGIC posts an interrupt, the IEChigh register will
+ * contain the bit number of the highest level interrupt pending,
+ * so the bit numbers are also IEC's (Interrupt Exception Codes).
+ */
+
+#define DEV_IEC_SCSI                0x08    /* scsi disk controller */
+#define DEV_IEC_ETHER               0x09    /* ether controller */
+#define DEV_IEC_OSPC_LO             0x0a    /* low-priority SIPS */
+#define DEV_IEC_VEC_REQ             0x0b    /* vector packet request */
+#define DEV_IEC_KEYBDMOUSE          0x10    /* console */
+#define DEV_IEC_DUART               0x11    /* serial line on FLASH board */
+#define DEV_IEC_OSPC_HI             0x12    /* high-priority SIPS */
+#define DEV_IEC_RECOVERY            0x13    /* recov int (posted by MAGIC) */
+#define DEV_IEC_VEC_REPLY           0x14    /* vector packet reply */
+#define DEV_IEC_CLOCK               0x18    /* clock */
+#define DEV_IEC_IPI                 0x20    /* inter-processor interrupt */
+#define DEV_IEC_DEBUG               0x21    /* ??? */
+#define DEV_IEC_PROFTIM             0x28    /* prof timer (currently unused) */
+#define DEV_IEC_MAGICWARN           0x29    /* ??? */
+#define DEV_IEC_MAGICERR            0x31    /* ??? */
+#define DEV_IEC_POWERFAIL           0x38    /* ??? */
+
+#define DEV_IEC_MAX                 0x3f    /* 64 bits */
+
+
+/* PCI slot assignments:
+ *
+ * NOTE:
+ * On the real system these slot assignments wouldn't be fixed (you
+ * could plug a card into any slot on the I/O bus) but this isn't
+ * particularly interesting to model.
+ */
+
+#define DEV_PCI_DISK_SLOT           0
+#define DEV_PCI_ETHER_SLOT          1
+#define DEV_PCI_CONSOLE_SLOT        2
+
+
+#endif /* _MACHINE_DEFS_H */