From: Guillermo J. Rozas <edu/mit/csail/zurich/gjr>
Date: Thu, 24 Jun 1993 04:10:28 +0000 (+0000)
Subject: Global NT merge.
X-Git-Tag: 20090517-FFI~8311
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=c83566f6f427e20035f4ce47a351ec0023d6c83a;p=mit-scheme.git

Global NT merge.
---

diff --git a/v7/src/microcode/ansidecl.h b/v7/src/microcode/ansidecl.h
index 768fe1b35..100781a8b 100644
--- a/v7/src/microcode/ansidecl.h
+++ b/v7/src/microcode/ansidecl.h
@@ -67,6 +67,10 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* Some systems don't declare their libraries correctly, making CONST
    impossible to have. */
+#ifdef CONST
+#undef CONST
+#endif
+
 #ifdef NO_CONST
 #define CONST
 #else
diff --git a/v7/src/microcode/bchdmp.c b/v7/src/microcode/bchdmp.c
index 37d952bec..597818dba 100644
--- a/v7/src/microcode/bchdmp.c
+++ b/v7/src/microcode/bchdmp.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: bchdmp.c,v 9.69 1993/02/18 05:14:43 gjr Exp $
+$Id: bchdmp.c,v 9.70 1993/06/24 03:47:00 gjr Exp $
 
 Copyright (c) 1987-1993 Massachusetts Institute of Technology
 
@@ -58,7 +58,27 @@ DEFUN (mktemp, (fname), unsigned char * fname)
 
 #  define FASDUMP_FILENAME "\\tmp\\fasdump.bin"
 
-#else /* not DOS386 */
+#endif /* DOS386 */
+
+#ifdef WINNT
+#  include "nt.h"
+#  include "ntio.h"
+
+char *
+DEFUN (mktemp, (fname), unsigned char * fname)
+{
+  /* Should call tmpname */
+
+  return;
+}
+
+#  define FASDUMP_FILENAME "\\tmp\\fasdump.bin"
+
+#endif /* WINNT */
+
+#ifndef FASDUMP_FILENAME
+
+/* Assume Unix */
 
 #  include "ux.h"
 #  include "uxio.h"
@@ -66,8 +86,8 @@ extern int EXFUN (unlink, (CONST char *));
 
 #  define FASDUMP_FILENAME "/tmp/fasdumpXXXXXX"
 
-#endif /* DOS386 */
-
+#endif /* FASDUMP_FILENAME */
+
 #include "bchgcc.h"
 
 static Tchannel dump_channel;
diff --git a/v7/src/microcode/bchgcc.h b/v7/src/microcode/bchgcc.h
index d7848c5f2..6ccfe2162 100644
--- a/v7/src/microcode/bchgcc.h
+++ b/v7/src/microcode/bchgcc.h
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/bchgcc.h,v 9.51 1992/07/23 12:33:30 jinx Exp $
+$Id: bchgcc.h,v 9.52 1993/06/24 03:48:45 gjr Exp $
 
-Copyright (c) 1987-1992 Massachusetts Institute of Technology
+Copyright (c) 1987-1993 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -47,11 +47,15 @@ MIT in each case. */
 #  endif
 #endif
 
-#ifndef DOS386
-#  include <sys/param.h>
-#else
+#ifdef DOS386
+#  define IO_PAGE_SIZE		4096
+#endif
+#ifdef WINNT
 #  define IO_PAGE_SIZE		4096
 #endif
+#ifndef IO_PAGE_SIZE
+#    include <sys/param.h>
+#endif
 
 #ifndef BCH_START_CLOSURE_RELOCATION
 #  define BCH_START_CLOSURE_RELOCATION(scan) do { } while (0)
diff --git a/v7/src/microcode/bchmmg.c b/v7/src/microcode/bchmmg.c
index 219abb147..170fcd821 100644
--- a/v7/src/microcode/bchmmg.c
+++ b/v7/src/microcode/bchmmg.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/bchmmg.c,v 9.75 1992/06/03 21:55:24 jinx Exp $
+$Id: bchmmg.c,v 9.76 1993/06/24 03:49:40 gjr Exp $
 
-Copyright (c) 1987-1992 Massachusetts Institute of Technology
+Copyright (c) 1987-1993 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -42,12 +42,20 @@ MIT in each case. */
 #ifdef DOS386
 #  include "msdos.h"
 #  define SUB_DIRECTORY_DELIMITER '\\'
-extern char * EXFUN (mktemp, (char *));
-#else
+   extern char * EXFUN (mktemp, (char *));
+#endif
+
+#ifdef WINNT
+#  include "nt.h"
+#  define SUB_DIRECTORY_DELIMITER '\\'
+   extern char * EXFUN (mktemp, (char *));
+#endif
+
+#ifndef SUB_DIRECTORY_DELIMITER
 #  include "ux.h"
 #  define SUB_DIRECTORY_DELIMITER '/'
 #  define UNLINK_BEFORE_CLOSE
-extern int EXFUN (unlink, (CONST char *));
+   extern int EXFUN (unlink, (CONST char *));
 #endif
 
 #include "bchgcc.h"
@@ -241,7 +249,11 @@ DEFUN (io_error_retry_p, (operation_name, noise),
 	/*NOTREACHED*/
 
       case 'S':
+#ifdef WINNT
+        Sleep (1000);
+#else
 	sleep (60);
+#endif
 	/* fall through */
 
       case 'R':
@@ -258,14 +270,14 @@ DEFUN (verify_write, (position, size, success),
   if ((position >= gc_file_start_position)
       && ((position + size) <= gc_file_end_position))
     return (0);
-  fprintf (stderr,
+  outf_error (
 	   "\n%s (verify_write): attempting to write outside allowed area.\n",
 	   scheme_program_name);
-  fprintf (stderr, "\tlow position = 0x%lx; high position = 0x%lx.\n",
-	   gc_file_start_position, gc_file_end_position);
-  fprintf (stderr, "\twrite position = 0x%lx; size = 0x%lx = %d bytes.\n",
-	   position, size, size);
-  fflush (stderr);
+  outf_error("\tlow position = 0x%lx; high position = 0x%lx.\n",
+	     gc_file_start_position, gc_file_end_position);
+  outf_error("\twrite position = 0x%lx; size = 0x%lx = %d bytes.\n",
+	     position, size, size);
+  outf_flush_error();
   if (success == ((Boolean *) NULL))
   {
     Microcode_Termination (TERM_EXIT);
@@ -1888,6 +1900,12 @@ DEFUN (open_gc_file, (size, unlink_p),
   }
   else
   {
+#ifdef WINNT
+    /* SRA: for NT, for the time being, we just assume that it will be a
+       normal file */
+    exists_p = true;
+    can_dump_directly_p = true;
+#else
     /* If it is S_IFCHR, it should determine the IO block
        size and make sure that it will work.
        I don't know how to do that.
@@ -1916,6 +1934,7 @@ DEFUN (open_gc_file, (size, unlink_p),
     }
     else
       can_dump_directly_p = true;
+#endif
   }
 
   gc_file = (open (gc_file_name, flags, GC_FILE_MASK));
diff --git a/v7/src/microcode/bchutl.c b/v7/src/microcode/bchutl.c
index 168ed0984..ee87a5181 100644
--- a/v7/src/microcode/bchutl.c
+++ b/v7/src/microcode/bchutl.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/bchutl.c,v 1.2 1992/02/29 19:39:41 mhwu Exp $
+$Id: bchutl.c,v 1.3 1993/06/24 03:53:29 gjr Exp $
 
-Copyright (c) 1991 Massachusetts Institute of Technology
+Copyright (c) 1991-1993 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -38,8 +38,10 @@ MIT in each case. */
 #endif
 
 #ifndef DOS386
+#ifndef WINNT
 #include <unistd.h>
 #endif
+#endif
 
 #include "ansidecl.h"
 
@@ -49,6 +51,21 @@ extern int EXFUN (retrying_file_operation,
 		   int, char *, long, long, char *, char *, long *,
 		   int (*)(char *, char *)));
 
+#ifdef WINNT
+
+#define lseek _lseek
+
+char *
+DEFUN (error_name, (code), int code)
+{
+  static char buf[512];
+
+  sprintf (&buf[0], "%d, unknown error", code);
+  return (&buf[0]);
+}
+
+#else /* not WINNT */
+
 char *
 DEFUN (error_name, (code), int code)
 {
@@ -63,6 +80,8 @@ DEFUN (error_name, (code), int code)
   return (&buf[0]);
 }
 
+#endif /* WINNT */
+
 #ifndef SEEK_SET
 #define SEEK_SET 0
 #endif
diff --git a/v7/src/microcode/bignum.c b/v7/src/microcode/bignum.c
index 4576daf17..5d46ed8c3 100644
--- a/v7/src/microcode/bignum.c
+++ b/v7/src/microcode/bignum.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: bignum.c,v 9.39 1993/02/10 23:13:36 adams Exp $
+$Id: bignum.c,v 9.40 1993/06/24 03:55:00 gjr Exp $
 
-Copyright (c) 1989-1992 Massachusetts Institute of Technology
+Copyright (c) 1989-1993 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -41,12 +41,7 @@ MIT in each case. */
 #include "bignum.h"
 #endif
 
-#ifdef WINNT
-#include "bignumin.h"  /* SRA: renamed for 8 char name length*/
-#else
-#include "bignumint.h"
-#endif
-
+#include "bignmint.h"
 #include "limits.h"
 
 #ifndef MIT_SCHEME
diff --git a/v7/src/microcode/boot.c b/v7/src/microcode/boot.c
index 920ebb188..36d6f3963 100644
--- a/v7/src/microcode/boot.c
+++ b/v7/src/microcode/boot.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: boot.c,v 9.78 1993/06/09 20:28:14 jawilson Exp $
+$Id: boot.c,v 9.79 1993/06/24 03:55:53 gjr Exp $
 
 Copyright (c) 1988-1993 Massachusetts Institute of Technology
 
@@ -42,6 +42,7 @@ MIT in each case. */
 #include <ctype.h>
 #endif
 #include "ostop.h"
+#include "ostty.h"
 
 extern PTR EXFUN (malloc, (unsigned int size));
 extern void EXFUN (free, (PTR ptr));
@@ -71,9 +72,8 @@ DEFUN (obstack_chunk_alloc, (size), unsigned int size)
   PTR result = (malloc (size));
   if (result == 0)
     {
-      fprintf (stderr, "\n%s: unable to allocate obstack chunk of %d bytes\n",
+      outf_fatal ("\n%s: unable to allocate obstack chunk of %d bytes\n",
 	       scheme_program_name, size);
-      fflush (stderr);
       Microcode_Termination (TERM_EXIT);
     }
   return (result);
@@ -93,8 +93,7 @@ DECLARE_CRITICAL_SECTION ();
 static void
 DEFUN (usage, (error_string), CONST char * error_string)
 {
-  fprintf (stderr, "%s: %s\n\n", scheme_program_name, error_string);
-  fflush (stderr);
+  outf_fatal ("%s: %s\n\n", scheme_program_name, error_string);
   termination_init_error ();
 }
 
@@ -104,10 +103,12 @@ DEFUN (usage, (error_string), CONST char * error_string)
 #define main_type void
 #endif
 
-#define FILE_READABLE(filename) ((access ((filename), 4)) >= 0)
+#ifndef main_name
+#define main_name main
+#endif
 
 main_type
-DEFUN (main, (argc, argv),
+DEFUN (main_name, (argc, argv),
        int argc AND CONST char ** argv)
 {
   init_exit_scheme ();
@@ -117,6 +118,7 @@ DEFUN (main, (argc, argv),
   reload_saved_string = 0;
   reload_saved_string_length = 0;
   read_command_line_options (argc, argv);
+
   if (scheme_dumped_p)
     {
       extern SCHEME_OBJECT compiler_utilities;
@@ -126,15 +128,16 @@ DEFUN (main, (argc, argv),
 	     && (Stack_Size == option_stack_size)
 	     && (Constant_Size == option_constant_size)))
 	{
-	  fprintf (stderr, "%s: warning: ignoring allocation parameters.\n",
-		   scheme_program_name);
-	  fflush (stderr);
+	  outf_error ("%s: warning: ignoring allocation parameters.\n",
+		      scheme_program_name);
+	  outf_flush_error ();
 	}
       OS_reset ();
       compiler_reset (compiler_utilities);
       if (!option_band_specified)
 	{
-	  printf ("Scheme Microcode Version %d.%d\n", VERSION, SUBVERSION);
+	  outf_console ("Scheme Microcode Version %d.%d\n",
+	                VERSION, SUBVERSION);
 	  OS_initialize ();
 	  Enter_Interpreter ();
 	}
@@ -298,6 +301,14 @@ DEFUN_VOID (make_fixed_objects_vector)
   }
 #endif /* DOS386 */
 
+#ifdef WINNT
+  {
+    extern void EXFUN (NT_initialize_fov, (SCHEME_OBJECT));
+    
+    NT_initialize_fov (fixed_objects_vector);
+  }
+#endif
+
   return (fixed_objects_vector);
 }
 
@@ -308,14 +319,13 @@ DEFUN (Start_Scheme, (Start_Prim, File_Name),
        int Start_Prim AND CONST char * File_Name)
 {
   SCHEME_OBJECT FName, expr, * inner_arg, prim;
-  fast long i;
+  /* fast long i; */
   /* Parallel processor test */
   Boolean I_Am_Master = (Start_Prim != BOOT_GET_WORK);
   if (I_Am_Master)
     {
-      fprintf (stdout, "Scheme Microcode Version %d.%d\n",
-	       VERSION, SUBVERSION);
-      fflush (stdout);
+      outf_console ("Scheme Microcode Version %d.%d\n",  VERSION, SUBVERSION);
+      outf_flush_console ();
     }
   OS_initialize ();
   if (I_Am_Master)
@@ -340,29 +350,29 @@ DEFUN (Start_Scheme, (Start_Prim, File_Name),
       *Free++ = prim;
       *Free++ = FName;
       prim = (make_primitive ("SCODE-EVAL"));
-      expr = (MAKE_POINTER_OBJECT (TC_PCOMB2, Free));
+      expr = MAKE_POINTER_OBJECT (TC_PCOMB2, Free);
       *Free++ = prim;
-      *Free++ = (MAKE_POINTER_OBJECT (TC_PCOMB1, inner_arg));
-      *Free++ = (MAKE_OBJECT (GLOBAL_ENV, GO_TO_GLOBAL));
+      *Free++ = MAKE_POINTER_OBJECT (TC_PCOMB1, inner_arg);
+      *Free++ = MAKE_OBJECT (GLOBAL_ENV, GO_TO_GLOBAL);
       break;
 
     case BOOT_LOAD_BAND:	/* (LOAD-BAND <file>) */
       FName = (char_pointer_to_string ((unsigned char *) File_Name));
-      prim = (make_primitive ("LOAD-BAND"));
+      prim = make_primitive ("LOAD-BAND");
       inner_arg = Free;
       *Free++ = prim;
       *Free++ = FName;
-      expr = (MAKE_POINTER_OBJECT (TC_PCOMB1, inner_arg));
+      expr = MAKE_POINTER_OBJECT (TC_PCOMB1, inner_arg);
       break;
 
     case BOOT_GET_WORK:		/* ((GET-WORK)) */
-      prim = (make_primitive ("GET-WORK"));
+      prim = make_primitive ("GET-WORK");
       inner_arg = Free;
       *Free++ = prim;
       *Free++ = SHARP_F;
-      expr = (MAKE_POINTER_OBJECT (TC_COMBINATION, Free));
-      *Free++ = (MAKE_OBJECT (TC_MANIFEST_VECTOR, 1));
-      *Free++ = (MAKE_POINTER_OBJECT (TC_PCOMB1, inner_arg));
+      expr = MAKE_POINTER_OBJECT (TC_COMBINATION, Free);
+      *Free++ = MAKE_OBJECT (TC_MANIFEST_VECTOR, 1);
+      *Free++ = MAKE_POINTER_OBJECT (TC_PCOMB1, inner_arg);
       break;
 
     case BOOT_EXECUTE:
@@ -381,7 +391,7 @@ DEFUN (Start_Scheme, (Start_Prim, File_Name),
       
 
     default:
-      fprintf (stderr, "Unknown boot time option: %d\n", Start_Prim);
+      outf_fatal ("Unknown boot time option: %d\n", Start_Prim);
       Microcode_Termination (TERM_BAD_PRIMITIVE);
       /*NOTREACHED*/
   }
@@ -405,7 +415,7 @@ DEFUN (Start_Scheme, (Start_Prim, File_Name),
   /* Go to it! */
   if ((Stack_Pointer <= Stack_Guard) || (Free > MemTop))
   {
-    fprintf (stderr, "Configuration won't hold initial data.\n");
+    outf_fatal ("Configuration won't hold initial data.\n");
     termination_init_error ();
   }
 #ifdef ENTRY_HOOK
@@ -420,7 +430,7 @@ static void
 DEFUN_VOID (Enter_Interpreter)
 {
   Interpret (scheme_dumped_p);
-  fprintf (stderr, "\nThe interpreter returned to top level!\n");
+  outf_fatal ("\nThe interpreter returned to top level!\n");
   Microcode_Termination (TERM_EXIT);
 }
 
@@ -430,7 +440,7 @@ SCHEME_OBJECT
 DEFUN_VOID (Re_Enter_Interpreter)
 {
   Interpret (true);
-  return (Val);
+  return  Val;
 }
 
 /* Garbage collection debugging utilities. */
@@ -464,8 +474,8 @@ DEFUN (gc_death, (code, message, scan, free),
        long code AND char * message
        AND SCHEME_OBJECT * scan AND SCHEME_OBJECT * free)
 {
-  fprintf (stderr, "\n%s.\n", message);
-  fprintf (stderr, "scan = 0x%lx; free = 0x%lx\n", scan, free);
+  outf_fatal ("\n%s.\n", message);
+  outf_fatal ("scan = 0x%lx; free = 0x%lx\n", scan, free);
   deadly_scan = scan;
   deadly_free = free;
   Microcode_Termination (code);
@@ -475,11 +485,9 @@ DEFUN (gc_death, (code, message, scan, free),
 void
 DEFUN (stack_death, (name), CONST char * name)
 {
-  fprintf (stderr,
-	   "\n%s: Constant space is no longer sealed!\n",
-	   name);
-  fprintf (stderr,
-	   "Perhaps a runaway recursion has overflowed the stack.\n");
+  outf_fatal ("\n%s: Constant space is no longer sealed!\n",
+	      name);
+  outf_fatal ("Perhaps a runaway recursion has overflowed the stack.\n");
   Microcode_Termination (TERM_STACK_OVERFLOW);
   /*NOTREACHED*/
 }
diff --git a/v7/src/microcode/cmpgc.h b/v7/src/microcode/cmpgc.h
index 5bd9014a1..4e1311b4a 100644
--- a/v7/src/microcode/cmpgc.h
+++ b/v7/src/microcode/cmpgc.h
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: cmpgc.h,v 1.23 1993/03/23 22:34:54 cph Exp $
+$Id: cmpgc.h,v 1.24 1993/06/24 03:58:48 gjr Exp $
 
-Copyright (c) 1989-1992 Massachusetts Institute of Technology
+Copyright (c) 1989-1993 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -57,7 +57,7 @@ See cmpint.txt, cmpint.c, cmpint-md.h, and cmpaux-md.m4 for more details.
 
 #ifdef HAS_COMPILER_SUPPORT
 
-#include "cmpint2.h"
+#include "cmpintmd.h"
 
 /*
   The following is a kludge which is used to get return_to_interpreter
diff --git a/v7/src/microcode/cmpintmd/alpha.h b/v7/src/microcode/cmpintmd/alpha.h
index d82c01dd7..6a7243ea5 100644
--- a/v7/src/microcode/cmpintmd/alpha.h
+++ b/v7/src/microcode/cmpintmd/alpha.h
@@ -1,8 +1,8 @@
 /* -*- C -*-
 
-$Id: alpha.h,v 1.4 1992/11/18 05:03:55 gjr Exp $
+$Id: alpha.h,v 1.5 1993/06/24 04:02:18 gjr Exp $
 
-Copyright (c) 1992 Digital Equipment Corporation (D.E.C.)
+Copyright (c) 1992-1993 Digital Equipment Corporation (D.E.C.)
 
 This software was developed at the Digital Equipment Corporation
 Cambridge Research Laboratory.  Permission to copy this software, to
@@ -40,23 +40,11 @@ case. */
  *
  * Specialized for the Alpha
  */
-
-#ifndef CMPINT2_H_INCLUDED
-#define CMPINT2_H_INCLUDED
-
-#define COMPILER_NONE_TYPE			0
-#define COMPILER_MC68020_TYPE			1
-#define COMPILER_VAX_TYPE			2
-#define COMPILER_SPECTRUM_TYPE			3
-#define COMPILER_OLD_MIPS_TYPE			4
-#define COMPILER_MC68040_TYPE			5
-#define COMPILER_SPARC_TYPE			6
-#define COMPILER_RS6000_TYPE			7
-#define COMPILER_MC88K_TYPE			8
-#define COMPILER_I386_TYPE			9
-#define COMPILER_ALPHA_TYPE			10
-#define COMPILER_MIPS_TYPE			11
-#define COMPILER_LOSING_C_TYPE			12
+
+#ifndef CMPINTMD_H_INCLUDED
+#define CMPINTMD_H_INCLUDED
+
+#include "cmptype.h"
 
 /* Machine parameters to be set by the user. */
 
@@ -757,4 +745,4 @@ DEFUN (allocate_closure, (size, this_block),
 #define COMPILED_ENTRY_MAXIMUM_ARITY    COMPILED_ENTRY_FORMAT_LOW
 #define COMPILED_ENTRY_MINIMUM_ARITY    COMPILED_ENTRY_FORMAT_HIGH
 
-#endif /* CMPINT2_H_INCLUDED */
+#endif /* CMPINTMD_H_INCLUDED */
diff --git a/v7/src/microcode/cmpintmd/c.h b/v7/src/microcode/cmpintmd/c.h
index 15c3de8c9..789ee65ea 100644
--- a/v7/src/microcode/cmpintmd/c.h
+++ b/v7/src/microcode/cmpintmd/c.h
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: c.h,v 1.2 1993/06/09 20:38:09 jawilson Exp $
+$Id: c.h,v 1.3 1993/06/24 04:00:33 gjr Exp $
 
 Copyright (c) 1992-1993 Massachusetts Institute of Technology
 
@@ -32,25 +32,12 @@ Technology nor of any adaptation thereof in any advertising,
 promotional, or sales literature without prior written consent from
 MIT in each case. */
 
-#ifndef CMPINT2_H_INCLUDED
-#define CMPINT2_H_INCLUDED
+#ifndef CMPINTMD_H_INCLUDED
+#define CMPINTMD_H_INCLUDED
 
 #include "limits.h"
+#include "cmptype.h"
 
-#define COMPILER_NONE_TYPE			0
-#define COMPILER_MC68020_TYPE			1
-#define COMPILER_VAX_TYPE			2
-#define COMPILER_SPECTRUM_TYPE			3
-#define COMPILER_OLD_MIPS_TYPE			4
-#define COMPILER_MC68040_TYPE			5
-#define COMPILER_SPARC_TYPE			6
-#define COMPILER_RS6000_TYPE			7
-#define COMPILER_MC88K_TYPE			8
-#define COMPILER_I386_TYPE			9
-#define COMPILER_ALPHA_TYPE			10
-#define COMPILER_MIPS_TYPE			11
-#define COMPILER_LOSING_C_TYPE			12
-
 #define COMPILER_PROCESSOR_TYPE			COMPILER_LOSING_C_TYPE
 
 #define HALF_OBJECT_LENGTH (OBJECT_LENGTH / 2)
@@ -240,4 +227,4 @@ extern void EXFUN (interface_initialize, (void));
 #define COMPILED_ENTRY_MAXIMUM_ARITY    COMPILED_ENTRY_FORMAT_LOW
 #define COMPILED_ENTRY_MINIMUM_ARITY    COMPILED_ENTRY_FORMAT_HIGH
 
-#endif /* CMPINT2_H_INCLUDED */
+#endif /* CMPINTMD_H_INCLUDED */
diff --git a/v7/src/microcode/cmpintmd/hppa.h b/v7/src/microcode/cmpintmd/hppa.h
index 92c5aff06..1d9aa41b9 100644
--- a/v7/src/microcode/cmpintmd/hppa.h
+++ b/v7/src/microcode/cmpintmd/hppa.h
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: hppa.h,v 1.40 1993/06/12 22:31:31 gjr Exp $
+$Id: hppa.h,v 1.41 1993/06/24 04:03:22 gjr Exp $
 
 Copyright (c) 1989-1993 Massachusetts Institute of Technology
 
@@ -41,22 +41,10 @@ MIT in each case. */
  * Specialized for the HP Precision Architecture (Spectrum)
  */
 
-#ifndef CMPINT2_H_INCLUDED
-#define CMPINT2_H_INCLUDED
-
-#define COMPILER_NONE_TYPE			0
-#define COMPILER_MC68020_TYPE			1
-#define COMPILER_VAX_TYPE			2
-#define COMPILER_SPECTRUM_TYPE			3
-#define COMPILER_OLD_MIPS_TYPE			4
-#define COMPILER_MC68040_TYPE			5
-#define COMPILER_SPARC_TYPE			6
-#define COMPILER_RS6000_TYPE			7
-#define COMPILER_MC88K_TYPE			8
-#define COMPILER_I386_TYPE			9
-#define COMPILER_ALPHA_TYPE			10
-#define COMPILER_MIPS_TYPE			11
-#define COMPILER_LOSING_C_TYPE			12
+#ifndef CMPINTMD_H_INCLUDED
+#define CMPINTMD_H_INCLUDED
+
+#include "cmptype.h"
 
 /* Machine parameters to be set by the user. */
 
@@ -275,7 +263,7 @@ DEFUN (hppa_store_absolute_address, (addr, sourcev, nullify_p),
    Uses routines from cmpaux-hppa.m4.
  */
 
-#include "hppacache.h"
+#include "hppacach.h"
 #include "option.h"
 
 static struct pdc_cache_dump cache_info;
@@ -349,7 +337,7 @@ DEFUN (push_d_cache_region, (start_address, block_size),
 }
 
 #ifndef MODELS_FILENAME
-#define MODELS_FILENAME "HPPAmodels"
+#define MODELS_FILENAME "hppacach.mod"
 #endif
 
 static void
@@ -967,4 +955,4 @@ DEFUN (hppa_reset_hook, (table_length, utility_table),
 #define COMPILED_ENTRY_MAXIMUM_ARITY    COMPILED_ENTRY_FORMAT_LOW
 #define COMPILED_ENTRY_MINIMUM_ARITY    COMPILED_ENTRY_FORMAT_HIGH
 
-#endif /* CMPINT2_H_INCLUDED */
+#endif /* CMPINTMD_H_INCLUDED */
diff --git a/v7/src/microcode/cmpintmd/i386.h b/v7/src/microcode/cmpintmd/i386.h
index e7b357d1b..9ace053d4 100644
--- a/v7/src/microcode/cmpintmd/i386.h
+++ b/v7/src/microcode/cmpintmd/i386.h
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: i386.h,v 1.20 1992/11/18 05:01:56 gjr Exp $
+$Id: i386.h,v 1.21 1993/06/24 04:07:07 gjr Exp $
 
-Copyright (c) 1992 Massachusetts Institute of Technology
+Copyright (c) 1992-1993 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -41,22 +41,10 @@ MIT in each case. */
  * Specialized for the Intel 386 (and successors) architecture.
  */
 
-#ifndef CMPINT2_H_INCLUDED
-#define CMPINT2_H_INCLUDED
-
-#define COMPILER_NONE_TYPE			0
-#define COMPILER_MC68020_TYPE			1
-#define COMPILER_VAX_TYPE			2
-#define COMPILER_SPECTRUM_TYPE			3
-#define COMPILER_OLD_MIPS_TYPE			4
-#define COMPILER_MC68040_TYPE			5
-#define COMPILER_SPARC_TYPE			6
-#define COMPILER_RS6000_TYPE			7
-#define COMPILER_MC88K_TYPE			8
-#define COMPILER_I386_TYPE			9
-#define COMPILER_ALPHA_TYPE			10
-#define COMPILER_MIPS_TYPE			11
-#define COMPILER_LOSING_C_TYPE			12
+#ifndef CMPINTMD_H_INCLUDED
+#define CMPINTMD_H_INCLUDED
+
+#include "cmptype.h"
 
 /* Until cmpaux-i386.m4 is updated. */
 #define CMPINT_USE_STRUCS
@@ -524,8 +512,7 @@ DEFUN_VOID (i386_reset_hook)
 
   if (offset != ESI_TRAMPOLINE_TO_INTERFACE_OFFSET)
   {
-    fprintf (stderr,
-	     "\ni386_reset_hook: ESI_TRAMPOLINE_TO_INTERFACE_OFFSET\n");
+    outf_fatal ("\ni386_reset_hook: ESI_TRAMPOLINE_TO_INTERFACE_OFFSET\n");
     Microcode_Termination (TERM_EXIT);
   }
   SETUP_REGISTER (asm_trampoline_to_interface);		/* 2 */
@@ -617,7 +604,7 @@ DEFUN_VOID (i386_reset_hook)
 		    &inheritance, &shared, &object, &offset))
 	!= KERN_SUCCESS)
     {
-      fprintf (stderr, "compiler_reset: vm_region() failed.\n");
+      outf_fatal ( "compiler_reset: vm_region() failed.\n");
       Microcode_Termination (TERM_EXIT);
       /*NOTREACHED*/
     }
@@ -625,9 +612,9 @@ DEFUN_VOID (i386_reset_hook)
     {
       if ((max_prot & VM_PROT_SCHEME) != VM_PROT_SCHEME)
       {
-	fprintf (stderr,
+	outf_fatal (
 		 "compiler_reset: inadequate protection for Heap.\n");
-	fprintf (stderr, "maximum = 0x%lx; desired = 0x%lx\n",
+	outf_fatal ( "maximum = 0x%lx; desired = 0x%lx\n",
 		 ((unsigned long) (max_prot & VM_PROT_SCHEME)),
 		 ((unsigned long) VM_PROT_SCHEME));
 	Microcode_Termination (TERM_EXIT);
@@ -638,9 +625,9 @@ DEFUN_VOID (i386_reset_hook)
 		       0, VM_PROT_SCHEME))
 	  != KERN_SUCCESS)
       {
-	fprintf (stderr,
+	outf_fatal (
 		 "compiler_reset: unable to change protection for Heap.\n");
-	fprintf (stderr, "actual = 0x%lx; desired = 0x%lx\n",
+	outf_fatal ( "actual = 0x%lx; desired = 0x%lx\n",
 		 ((unsigned long) (prot & VM_PROT_SCHEME)),
 		 ((unsigned long) VM_PROT_SCHEME));
 	Microcode_Termination (TERM_EXIT);
@@ -769,4 +756,4 @@ DEFUN_VOID (i386_reset_hook)
 #define COMPILED_ENTRY_MAXIMUM_ARITY    COMPILED_ENTRY_FORMAT_LOW
 #define COMPILED_ENTRY_MINIMUM_ARITY    COMPILED_ENTRY_FORMAT_HIGH
 
-#endif /* CMPINT2_H_INCLUDED */
+#endif /* CMPINTMD_H_INCLUDED */
diff --git a/v7/src/microcode/cmpintmd/mc68k.h b/v7/src/microcode/cmpintmd/mc68k.h
index 87823678e..cc1c879a3 100644
--- a/v7/src/microcode/cmpintmd/mc68k.h
+++ b/v7/src/microcode/cmpintmd/mc68k.h
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: mc68k.h,v 1.34 1993/02/19 17:47:36 cph Exp $
+$Id: mc68k.h,v 1.35 1993/06/24 04:08:24 gjr Exp $
 
 Copyright (c) 1989-1993 Massachusetts Institute of Technology
 
@@ -41,22 +41,10 @@ MIT in each case. */
  * Specialized for the Motorola 68K family.
  */
 
-#ifndef CMPINT2_H_INCLUDED
-#define CMPINT2_H_INCLUDED
-
-#define COMPILER_NONE_TYPE			0
-#define COMPILER_MC68020_TYPE			1
-#define COMPILER_VAX_TYPE			2
-#define COMPILER_SPECTRUM_TYPE			3
-#define COMPILER_OLD_MIPS_TYPE			4
-#define COMPILER_MC68040_TYPE			5
-#define COMPILER_SPARC_TYPE			6
-#define COMPILER_RS6000_TYPE			7
-#define COMPILER_MC88K_TYPE			8
-#define COMPILER_I386_TYPE			9
-#define COMPILER_ALPHA_TYPE			10
-#define COMPILER_MIPS_TYPE			11
-#define COMPILER_LOSING_C_TYPE			12
+#ifndef CMPINTMD_H_INCLUDED
+#define CMPINTMD_H_INCLUDED
+
+#include "cmptype.h"
 
 /* Machine parameters to be set by the user. */
 
@@ -883,4 +871,4 @@ DEFUN (allocate_closure, (size), long size)
 #define COMPILED_ENTRY_MAXIMUM_ARITY    COMPILED_ENTRY_FORMAT_LOW
 #define COMPILED_ENTRY_MINIMUM_ARITY    COMPILED_ENTRY_FORMAT_HIGH
 
-#endif /* CMPINT2_H_INCLUDED */
+#endif /* CMPINTMD_H_INCLUDED */
diff --git a/v7/src/microcode/cmpintmd/mips.h b/v7/src/microcode/cmpintmd/mips.h
index b89f9a202..4176ba373 100644
--- a/v7/src/microcode/cmpintmd/mips.h
+++ b/v7/src/microcode/cmpintmd/mips.h
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: mips.h,v 1.17 1992/11/18 05:02:32 gjr Exp $
+$Id: mips.h,v 1.18 1993/06/24 04:09:34 gjr Exp $
 
-Copyright (c) 1989-1992 Massachusetts Institute of Technology
+Copyright (c) 1989-1993 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -41,9 +41,11 @@ MIT in each case. */
  * Specialized for the MIPS R2000/R3000
  */
 
-#ifndef CMPINT2_H_INCLUDED
-#define CMPINT2_H_INCLUDED
+#ifndef CMPINTMD_H_INCLUDED
+#define CMPINTMD_H_INCLUDED
 
+#include "cmptype.h"
+
 #ifdef _IRIX4
 
 #include <sys/cachectl.h>
@@ -91,20 +93,6 @@ extern void syscall();
 
 #endif /* not sonyrisc */
 #endif /* not _IRIX4 */
-
-#define COMPILER_NONE_TYPE			0
-#define COMPILER_MC68020_TYPE			1
-#define COMPILER_VAX_TYPE			2
-#define COMPILER_SPECTRUM_TYPE			3
-#define COMPILER_OLD_MIPS_TYPE			4
-#define COMPILER_MC68040_TYPE			5
-#define COMPILER_SPARC_TYPE			6
-#define COMPILER_RS6000_TYPE			7
-#define COMPILER_MC88K_TYPE			8
-#define COMPILER_I386_TYPE			9
-#define COMPILER_ALPHA_TYPE			10
-#define COMPILER_MIPS_TYPE			11
-#define COMPILER_LOSING_C_TYPE			12
 
 /* Machine parameters to be set by the user. */
 
@@ -742,4 +730,4 @@ DEFUN (allocate_closure, (size), long size)
 #define COMPILED_ENTRY_MAXIMUM_ARITY    COMPILED_ENTRY_FORMAT_LOW
 #define COMPILED_ENTRY_MINIMUM_ARITY    COMPILED_ENTRY_FORMAT_HIGH
 
-#endif /* CMPINT2_H_INCLUDED */
+#endif /* CMPINTMD_H_INCLUDED */
diff --git a/v7/src/microcode/cmpintmd/vax.h b/v7/src/microcode/cmpintmd/vax.h
index acc92e199..63d469193 100644
--- a/v7/src/microcode/cmpintmd/vax.h
+++ b/v7/src/microcode/cmpintmd/vax.h
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: vax.h,v 1.7 1992/11/18 05:03:16 gjr Exp $
+$Id: vax.h,v 1.8 1993/06/24 04:10:28 gjr Exp $
 
-Copyright (c) 1991-1992 Massachusetts Institute of Technology
+Copyright (c) 1991-1993 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -41,22 +41,10 @@ MIT in each case. */
  * Specialized for the Vax architecture.
  */
 
-#ifndef CMPINT2_H_INCLUDED
-#define CMPINT2_H_INCLUDED
-
-#define COMPILER_NONE_TYPE			0
-#define COMPILER_MC68020_TYPE			1
-#define COMPILER_VAX_TYPE			2
-#define COMPILER_SPECTRUM_TYPE			3
-#define COMPILER_OLD_MIPS_TYPE			4
-#define COMPILER_MC68040_TYPE			5
-#define COMPILER_SPARC_TYPE			6
-#define COMPILER_RS6000_TYPE			7
-#define COMPILER_MC88K_TYPE			8
-#define COMPILER_I386_TYPE			9
-#define COMPILER_ALPHA_TYPE			10
-#define COMPILER_MIPS_TYPE			11
-#define COMPILER_LOSING_C_TYPE			12
+#ifndef CMPNTMD_H_INCLUDED
+#define CMPNTMD_H_INCLUDED
+
+#include "cmptype.h"
 
 /* Machine parameters to be set by the user. */
 
@@ -496,4 +484,4 @@ DEFUN_VOID (vax_reset_hook)
 #define COMPILED_ENTRY_MAXIMUM_ARITY    COMPILED_ENTRY_FORMAT_LOW
 #define COMPILED_ENTRY_MINIMUM_ARITY    COMPILED_ENTRY_FORMAT_HIGH
 
-#endif /* CMPINT2_H_INCLUDED */
+#endif /* CMPNTMD_H_INCLUDED */
diff --git a/v7/src/microcode/sgraph_a.c b/v7/src/microcode/sgraph_a.c
index 5bd003566..7adc1e63d 100644
--- a/v7/src/microcode/sgraph_a.c
+++ b/v7/src/microcode/sgraph_a.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/sgraph_a.c,v 1.14 1991/08/27 08:23:53 jinx Exp $
+$Id: sgraph_a.c,v 1.15 1993/06/24 03:42:46 gjr Exp $
 
-Copyright (c) 1987-1991 Massachusetts Institute of Technology
+Copyright (c) 1987-1993 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -34,7 +34,7 @@ MIT in each case. */
 
 #include "scheme.h"
 #include "prims.h"
-#include "Sgraph.h"
+#include "sgraph.h"
 #include "array.h"
 #include "x11.h"
 
diff --git a/v7/src/microcode/sgx.c b/v7/src/microcode/sgx.c
index c8955055d..49002dade 100644
--- a/v7/src/microcode/sgx.c
+++ b/v7/src/microcode/sgx.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/sgx.c,v 1.7 1989/09/20 23:04:51 cph Rel $
+$Id: sgx.c,v 1.8 1993/06/24 03:39:57 gjr Exp $
 
-Copyright (c) 1988, 1989 Massachusetts Institute of Technology
+Copyright (c) 1988-1993 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -38,7 +38,7 @@ MIT in each case. */
 #include <X/Xhp.h>
 #include "scheme.h"
 #include "prims.h"
-#include "Sgraph.h"
+#include "sgraph.h"
 
 static Display * display = NULL;
 static Window window = 0;
diff --git a/v7/src/microcode/sgx11.c b/v7/src/microcode/sgx11.c
index ecd00b947..37515d0fc 100644
--- a/v7/src/microcode/sgx11.c
+++ b/v7/src/microcode/sgx11.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/sgx11.c,v 1.2 1989/09/20 23:04:57 cph Rel $
+$Id: sgx11.c,v 1.3 1993/06/24 03:41:23 gjr Exp $
 
-Copyright (c) 1989 Massachusetts Institute of Technology
+Copyright (c) 1989-1993 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -37,7 +37,7 @@ MIT in each case. */
 #include <X11/Xlib.h>
 #include "scheme.h"
 #include "prims.h"
-#include "Sgraph.h"
+#include "sgraph.h"
 
 static int
 x_io_error_handler (display)
diff --git a/v7/src/microcode/unxutl/cf-dist.h b/v7/src/microcode/unxutl/cf-dist.h
index 5dd6dfbe6..9260b0915 100644
--- a/v7/src/microcode/unxutl/cf-dist.h
+++ b/v7/src/microcode/unxutl/cf-dist.h
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/unxutl/Attic/cf-dist.h,v 1.14 1992/06/10 21:47:27 jinx Exp $
+$Id: cf-dist.h,v 1.15 1993/06/24 03:57:26 gjr Exp $
 
-Copyright (c) 1989-1992 Massachusetts Institute of Technology
+Copyright (c) 1989-1993 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -45,6 +45,7 @@ MIT in each case. */
 #define PROC_TYPE_I386		10
 #define PROC_TYPE_ALPHA		11
 #define PROC_TYPE_POWER		12	/* IBM RS6000 and PowerPC */
+#define PROC_TYPE_LIARC		13	/* Scheme compiled to C */
 
 /* Define this macro to use a non-standard compiler.
    It must be defined before including the m/ and s/ files because
diff --git a/v7/src/microcode/unxutl/makefile b/v7/src/microcode/unxutl/makefile
index e21dcf213..abc3f01b8 100644
--- a/v7/src/microcode/unxutl/makefile
+++ b/v7/src/microcode/unxutl/makefile
@@ -1,90 +1,94 @@
 #
 # Makefile for MIT CScheme microcode.
 #
-# $Id: makefile,v 1.25 1993/06/15 19:07:53 gjr Exp $
+# $Id: makefile,v 1.26 1993/06/24 03:37:59 gjr Exp $
 #
 CPP = cc -E
 MAKE = make  # BSD doesn't have it as a default.
 
-all: xmakefile
-	$(MAKE) $(MAKEOVERRIDES) -f xmakefile ${MFLAGS} all
+all: xmkfile
+	$(MAKE) $(MAKEOVERRIDES) -f xmkfile ${MFLAGS} all
 .PHONY: all
 
-scheme: xmakefile
-	$(MAKE) $(MAKEOVERRIDES) -f xmakefile ${MFLAGS} scheme
+scheme: xmkfile
+	$(MAKE) $(MAKEOVERRIDES) -f xmkfile ${MFLAGS} scheme
 .PHONY: scheme
 
-xscheme: xmakefile
-	$(MAKE) $(MAKEOVERRIDES) -f xmakefile ${MFLAGS} xscheme
+xscheme: xmkfile
+	$(MAKE) $(MAKEOVERRIDES) -f xmkfile ${MFLAGS} xscheme
 .PHONY: xscheme
 
-bchscheme: xmakefile
-	$(MAKE) $(MAKEOVERRIDES) -f xmakefile ${MFLAGS} bchscheme
+bchscheme: xmkfile
+	$(MAKE) $(MAKEOVERRIDES) -f xmkfile ${MFLAGS} bchscheme
 .PHONY: bchscheme
 
-bchdrn: xmakefile
-	$(MAKE) $(MAKEOVERRIDES) -f xmakefile ${MFLAGS} bchdrn
+bchdrn: xmkfile
+	$(MAKE) $(MAKEOVERRIDES) -f xmkfile ${MFLAGS} bchdrn
 .PHONY: bchdrn
 
-Psbtobin: xmakefile
-	$(MAKE) $(MAKEOVERRIDES) -f xmakefile ${MFLAGS} Psbtobin
-.PHONY: Psbtobin
+psbtobin: xmkfile
+	$(MAKE) $(MAKEOVERRIDES) -f xmkfile ${MFLAGS} psbtobin
+.PHONY: psbtobin
 
-Bintopsb: xmakefile
-	$(MAKE) $(MAKEOVERRIDES) -f xmakefile ${MFLAGS} Bintopsb
-.PHONY: Bintopsb
+bintopsb: xmkfile
+	$(MAKE) $(MAKEOVERRIDES) -f xmkfile ${MFLAGS} bintopsb
+.PHONY: bintopsb
 
-Ppband: xmakefile
-	$(MAKE) $(MAKEOVERRIDES) -f xmakefile ${MFLAGS} Ppband
-.PHONY: Ppband
+ppband: xmkfile
+	$(MAKE) $(MAKEOVERRIDES) -f xmkfile ${MFLAGS} ppband
+.PHONY: ppband
 
-hppacache: xmakefile
-	$(MAKE) $(MAKEOVERRIDES) -f xmakefile ${MFLAGS} hppacache
-.PHONY: hppacache
+hppacach: xmkfile
+	$(MAKE) $(MAKEOVERRIDES) -f xmkfile ${MFLAGS} hppacach
+.PHONY: hppacach
 
-install: xmakefile
-	$(MAKE) $(MAKEOVERRIDES) -f xmakefile ${MFLAGS} install
+install: xmkfile
+	$(MAKE) $(MAKEOVERRIDES) -f xmkfile ${MFLAGS} install
 .PHONY: install
 
-world: xmakefile
-	$(MAKE) $(MAKEOVERRIDES) -f xmakefile ${MFLAGS} world
+world: xmkfile
+	$(MAKE) $(MAKEOVERRIDES) -f xmkfile ${MFLAGS} world
 .PHONY: world
 
-install.world: xmakefile
-	$(MAKE) $(MAKEOVERRIDES) -f xmakefile ${MFLAGS} install.world
+install.world: xmkfile
+	$(MAKE) $(MAKEOVERRIDES) -f xmkfile ${MFLAGS} install.world
 .PHONY: install.world
 
-everything: xmakefile
-	$(MAKE) $(MAKEOVERRIDES) -f xmakefile ${MFLAGS} everything
+everything: xmkfile
+	$(MAKE) $(MAKEOVERRIDES) -f xmkfile ${MFLAGS} everything
 .PHONY: everything
 
 # If you have a problem with cc -E here, changing
 # the definition of CPP above may fix it.
-xmakefile: ymakefile ymake.script ymake.local ymake.cclist cf.h s.h m.h
-	rm -f xmakefile junk.c
-	cp ymakefile junk.c
-	$(CPP) junk.c | sed -n -f ymake.script > xmakefile
+xmkfile: ymkfile ymake.sed ymake.lcl ymake.ccl cf.h s.h m.h
+	rm -f xmkfile junk.c
+	cp ymkfile junk.c
+	$(CPP) junk.c | sed -n -f ymake.sed > xmkfile
 	rm -f junk.c
 
-ymake.local:
-	touch ymake.local
+ymake.lcl:
+	touch ymake.lcl
 
-ymake.cclist:
-	echo "COMPILED_SOURCES =" > ymake.cclist
+ymake.ccl:
+	echo "COMPILED_SOURCES =" > ymake.ccl
 
 clean remove:
 # the - at the beginning of the following line is what causes make to continue 
 # even if the clean.world target doesn't exist
-	- $(MAKE) $(MAKEOVERRIDES) -f xmakefile ${MFLAGS} clean.world
-	rm -f *.o *.s *.touch xmakefile
+	- $(MAKE) $(MAKEOVERRIDES) -f xmkfile ${MFLAGS} clean.world
+	rm -f *.o *.s *.touch xmkfile
 	rm -f scheme xscheme bchscheme bchdrn
-	rm -f Findprim Bintopsb Psbtobin Breakup Wsize Ppband
-	rm -f hard-params limits.h float.h
+	rm -f findprim bintopsb psbtobin breakup wsize ppband
+	rm -f hard-par limits.h float.h
 	rm -f usrdef.c bchdef.c compinit.h
 	rm -f lint.out
 
 unconfig:
-	rm -f m.h s.h cmpint2.h config.status
+	rm -f m.h s.h cmpintmd.h cmpauxmd.* config.out
+	rm -f ymkfile ymake.sed makefile
+	- rm -f cf-save.h ymake-save.lcl
+	- mv -f cf.h cf-save.h
+	- mv -f ymake.lcl ymake-save.lcl
 
 tags:
 	etags *.[ch] ../runtime/*.scm
@@ -94,7 +98,9 @@ locked:
 	rlog -L -R m/RCS/*,v
 	rlog -L -R s/RCS/*,v
 	rlog -L -R dosutl/RCS/*,v
+	rlog -L -R ntutl/RCS/*,v
+	rlog -L -R unxutl/RCS/*,v
 
-getpagesize.h : pagesize.h
-	rm -f getpagesize.h
-	cp pagesize.h getpagesize.h
+getpgsz.h : pagesize.h
+	rm -f getpgsz.h
+	cp pagesize.h getpgsz.h
diff --git a/v8/src/microcode/cmpintmd/hppa.h b/v8/src/microcode/cmpintmd/hppa.h
index 92c5aff06..1d9aa41b9 100644
--- a/v8/src/microcode/cmpintmd/hppa.h
+++ b/v8/src/microcode/cmpintmd/hppa.h
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: hppa.h,v 1.40 1993/06/12 22:31:31 gjr Exp $
+$Id: hppa.h,v 1.41 1993/06/24 04:03:22 gjr Exp $
 
 Copyright (c) 1989-1993 Massachusetts Institute of Technology
 
@@ -41,22 +41,10 @@ MIT in each case. */
  * Specialized for the HP Precision Architecture (Spectrum)
  */
 
-#ifndef CMPINT2_H_INCLUDED
-#define CMPINT2_H_INCLUDED
-
-#define COMPILER_NONE_TYPE			0
-#define COMPILER_MC68020_TYPE			1
-#define COMPILER_VAX_TYPE			2
-#define COMPILER_SPECTRUM_TYPE			3
-#define COMPILER_OLD_MIPS_TYPE			4
-#define COMPILER_MC68040_TYPE			5
-#define COMPILER_SPARC_TYPE			6
-#define COMPILER_RS6000_TYPE			7
-#define COMPILER_MC88K_TYPE			8
-#define COMPILER_I386_TYPE			9
-#define COMPILER_ALPHA_TYPE			10
-#define COMPILER_MIPS_TYPE			11
-#define COMPILER_LOSING_C_TYPE			12
+#ifndef CMPINTMD_H_INCLUDED
+#define CMPINTMD_H_INCLUDED
+
+#include "cmptype.h"
 
 /* Machine parameters to be set by the user. */
 
@@ -275,7 +263,7 @@ DEFUN (hppa_store_absolute_address, (addr, sourcev, nullify_p),
    Uses routines from cmpaux-hppa.m4.
  */
 
-#include "hppacache.h"
+#include "hppacach.h"
 #include "option.h"
 
 static struct pdc_cache_dump cache_info;
@@ -349,7 +337,7 @@ DEFUN (push_d_cache_region, (start_address, block_size),
 }
 
 #ifndef MODELS_FILENAME
-#define MODELS_FILENAME "HPPAmodels"
+#define MODELS_FILENAME "hppacach.mod"
 #endif
 
 static void
@@ -967,4 +955,4 @@ DEFUN (hppa_reset_hook, (table_length, utility_table),
 #define COMPILED_ENTRY_MAXIMUM_ARITY    COMPILED_ENTRY_FORMAT_LOW
 #define COMPILED_ENTRY_MINIMUM_ARITY    COMPILED_ENTRY_FORMAT_HIGH
 
-#endif /* CMPINT2_H_INCLUDED */
+#endif /* CMPINTMD_H_INCLUDED */