From d516543d5de77b20431cbd27b2fc09a8b210f73c Mon Sep 17 00:00:00 2001
From: "Guillermo J. Rozas" <edu/mit/csail/zurich/gjr>
Date: Thu, 24 Jun 1993 06:26:55 +0000
Subject: [PATCH] Global NT merge.

---
 v7/src/microcode/option.c   | 70 ++++++++++++++++++++-----------------
 v7/src/microcode/os.h       | 10 ++----
 v7/src/microcode/oscond.h   |  4 +--
 v7/src/microcode/osscheme.c | 12 +++----
 v7/src/microcode/osscheme.h |  8 ++---
 v7/src/microcode/posixtyp.h |  4 +--
 v7/src/microcode/prmcon.c   |  7 ++--
 v7/src/microcode/psbmap.h   | 12 ++-----
 v7/src/microcode/ptrvec.c   | 12 +++----
 v7/src/microcode/purify.c   | 14 ++++----
 v7/src/microcode/purutl.c   | 19 +++++-----
 v7/src/microcode/returns.h  |  4 +--
 v7/src/microcode/scheme.h   |  5 +--
 v7/src/microcode/stack.h    |  8 ++---
 v7/src/microcode/term.c     | 50 ++++++++++++++------------
 v7/src/microcode/transact.c |  8 +++--
 v8/src/microcode/psbmap.h   | 12 ++-----
 v8/src/microcode/returns.h  |  4 +--
 18 files changed, 129 insertions(+), 134 deletions(-)

diff --git a/v7/src/microcode/option.c b/v7/src/microcode/option.c
index f6354085f..42ffa919c 100644
--- a/v7/src/microcode/option.c
+++ b/v7/src/microcode/option.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: option.c,v 1.32 1993/06/09 20:30:00 jawilson Exp $
+$Id: option.c,v 1.33 1993/06/24 06:07:24 gjr Exp $
 
 Copyright (c) 1990-1993 Massachusetts Institute of Technology
 
@@ -34,7 +34,6 @@ MIT in each case. */
 
 /* Command-line option processing */
 
-#include <stdio.h>
 #include <ctype.h>
 #include "ansidecl.h"
 #include "obstack.h"
@@ -55,6 +54,10 @@ extern int access ();
 extern int strlen ();
 #endif
 
+#ifndef NULL
+# define NULL 0
+#endif
+
 extern struct obstack scratch_obstack;
 extern CONST char * scheme_program_name;
 extern void EXFUN (termination_init_error, (void));
@@ -353,7 +356,7 @@ The following options are only meaningful to bchscheme:
 #endif
 
 #ifndef DEFAULT_LARGE_CONSTANT
-#define DEFAULT_LARGE_CONSTANT 1010
+#define DEFAULT_LARGE_CONSTANT 1100
 #endif
 
 #ifndef DEFAULT_EDWIN_CONSTANT
@@ -521,6 +524,7 @@ DEFUN (string_compare_ci, (string1, string2),
      : ((length1 < length2) ? (-1) : 1));
 }
 
+#if 0
 static char *
 DEFUN (strchr, (s, c), CONST char * s AND int c)
 {
@@ -531,6 +535,7 @@ DEFUN (strchr, (s, c), CONST char * s AND int c)
       if (c1 == '\0') return (0);
     }
 }
+#endif
 
 static PTR
 DEFUN (xmalloc, (n), unsigned long n)
@@ -539,7 +544,7 @@ DEFUN (xmalloc, (n), unsigned long n)
   PTR result = (malloc (n));
   if (result == 0)
     {
-      fprintf (stderr, "%s: unable to allocate space while parsing options.\n",
+      outf_fatal ("%s: unable to allocate space while parsing options.\n",
 	       scheme_program_name);
       termination_init_error ();
     }
@@ -613,7 +618,7 @@ DEFUN (parse_options, (argc, argv), int argc AND CONST char ** argv)
 		  (*value_cell) = (*scan_argv++);
 		else
 		  {
-		    fprintf (stderr, "%s: option %s requires an argument.\n",
+		    outf_fatal ("%s: option %s requires an argument.\n",
 			     scheme_program_name, option);
 		    termination_init_error ();
 		  }
@@ -698,7 +703,7 @@ DEFUN (non_negative_numeric_option, (option, optval, variable, defval),
       long n = (strtol (optval, ((char **) NULL), 0));
       if (n < 0)
 	{
-	  fprintf (stderr, "%s: illegal argument %s for option %s.\n",
+	  outf_fatal ("%s: illegal argument %s for option %s.\n",
 		   scheme_program_name, optval, option);
 	  termination_init_error ();
 	}
@@ -711,7 +716,7 @@ DEFUN (non_negative_numeric_option, (option, optval, variable, defval),
 	long n = (strtol (t, ((char **) NULL), 0));
 	if (n < 0)
 	  {
-	    fprintf (stderr, "%s: illegal value %s for variable %s.\n",
+	    outf_fatal ("%s: illegal value %s for variable %s.\n",
 		     scheme_program_name, t, variable);
 	    termination_init_error ();
 	  }
@@ -733,7 +738,7 @@ DEFUN (standard_numeric_option, (option, optval, variable, defval),
       int n = (atoi (optval));
       if (n <= 0)
 	{
-	  fprintf (stderr, "%s: illegal argument %s for option %s.\n",
+	  outf_fatal ("%s: illegal argument %s for option %s.\n",
 		   scheme_program_name, optval, option);
 	  termination_init_error ();
 	}
@@ -746,7 +751,7 @@ DEFUN (standard_numeric_option, (option, optval, variable, defval),
 	int n = (atoi (t));
 	if (n <= 0)
 	  {
-	    fprintf (stderr, "%s: illegal value %s for variable %s.\n",
+	    outf_fatal ("%s: illegal value %s for variable %s.\n",
 		     scheme_program_name, t, variable);
 	    termination_init_error ();
 	  }
@@ -910,21 +915,21 @@ DEFUN (search_path_for_file, (option, filename, default_p, fail_p),
   {
     CONST char ** scan_path = option_library_path;
 
-    fprintf (stderr, "%s: can't find a readable %s",
+    outf_fatal ("%s: can't find a readable %s",
 	     scheme_program_name, (default_p ? "default" : "file"));
     if (option != 0)
-      fprintf (stderr, " for option %s", option);
-    fprintf (stderr, ".\n");
-    fprintf (stderr, "\tsearched for file %s in these directories:\n",
+      outf_fatal (" for option %s", option);
+    outf_fatal (".\n");
+    outf_fatal ("\tsearched for file %s in these directories:\n",
 	     filename);
     if (!default_p)
-      fprintf (stderr, "\t.\n");
+      outf_fatal ("\t.\n");
     while (1)
     {
       CONST char * element = (*scan_path++);
       if (element == 0)
 	break;
-      fprintf (stderr, "\t%s\n", element);
+      outf_fatal ("\t%s\n", element);
     }
     termination_init_error ();
     /*NOTREACHED*/
@@ -947,7 +952,7 @@ DEFUN (standard_filename_option, (option, optval, variable, defval, fail_p),
 	{
 	  if (fail_p)
 	    {
-	      fprintf (stderr, "%s: can't read file %s for option %s.\n",
+	      outf_fatal ("%s: can't read file %s for option %s.\n",
 		       scheme_program_name, optval, option);
 	      termination_init_error ();
 	    }
@@ -963,7 +968,7 @@ DEFUN (standard_filename_option, (option, optval, variable, defval, fail_p),
       {
 	if ((! (FILE_READABLE (filename))) && fail_p)
 	  {
-	    fprintf (stderr, "%s: can't read default file %s for option %s.\n",
+	    outf_fatal ("%s: can't read default file %s for option %s.\n",
 		     scheme_program_name, filename, option);
 	    termination_init_error ();
 	  }
@@ -979,7 +984,7 @@ DEFUN (conflicting_options, (option1, option2),
        CONST char * option1 AND
        CONST char * option2)
 {
-  fprintf (stderr, "%s: can't specify both options %s and %s.\n",
+  outf_fatal ("%s: can't specify both options %s and %s.\n",
 	   scheme_program_name, option1, option2);
   termination_init_error ();
 }
@@ -989,7 +994,7 @@ DEFUN (describe_boolean_option, (name, value),
        CONST char * name AND
        int value)
 {
-  fprintf (stderr, "  %s: %s\n", name, (value ? "yes" : "no"));
+  outf_fatal ("  %s: %s\n", name, (value ? "yes" : "no"));
 }
 
 static void
@@ -997,7 +1002,7 @@ DEFUN (describe_string_option, (name, value),
        CONST char * name AND
        CONST char * value)
 {
-  fprintf (stderr, "  %s: %s\n", name, value);
+  outf_fatal ("  %s: %s\n", name, value);
 }
 
 static void
@@ -1005,7 +1010,7 @@ DEFUN (describe_numeric_option, (name, value),
        CONST char * name AND
        int value)
 {
-  fprintf (stderr, "  %s: %d\n", name, value);
+  outf_fatal ("  %s: %d\n", name, value);
 }
 
 static void
@@ -1013,7 +1018,7 @@ DEFUN (describe_size_option, (name, value),
        CONST char * name AND
        unsigned int value)
 {
-  fprintf (stderr, "  %s size: %d\n", name, value);
+  outf_fatal ("  %s size: %d\n", name, value);
 }
 
 static void
@@ -1021,24 +1026,24 @@ DEFUN (describe_path_option, (name, value),
        CONST char * name AND
        CONST char ** value)
 {
-  fprintf (stderr, "  %s: ", name);
+  outf_fatal ("  %s: ", name);
   {
     CONST char ** scan = value;
-    fprintf (stderr, "%s", (*scan++));
+    outf_fatal ("%s", (*scan++));
     while (1)
       {
 	CONST char * element = (*scan++);
 	if (element == 0) break;
-	fprintf (stderr, ":%s", element);
+	outf_fatal (":%s", element);
       }
   }
-  fprintf (stderr, "\n");
+  outf_fatal ("\n");
 }
 
 static void
 DEFUN_VOID (describe_options)
 {
-  fprintf (stderr, "Summary of configuration options:\n");
+  outf_fatal ("Summary of configuration options:\n");
   describe_size_option ("heap", option_heap_size);
   describe_size_option ("constant-space", option_constant_size);
   describe_size_option ("stack", option_stack_size);
@@ -1073,17 +1078,16 @@ DEFUN_VOID (describe_options)
   describe_boolean_option ("force interactive", option_force_interactive);
   describe_boolean_option ("disable core dump", option_disable_core_dump);
   if (option_unused_argc == 0)
-    fprintf (stderr, "  no unused arguments\n");
+    outf_fatal ("  no unused arguments\n");
   else
     {
       CONST char ** scan = option_unused_argv;
       CONST char ** end = (scan + option_unused_argc);
-      fprintf (stderr, "  unused arguments:");
+      outf_fatal ("  unused arguments:");
       while (scan < end)
-	fprintf (stderr, " %s", (*scan++));
-      fprintf (stderr, "\n");
+	outf_fatal (" %s", (*scan++));
+      outf_fatal ("\n");
     }
-  fflush (stderr);
 }
 
 void
@@ -1130,7 +1134,7 @@ DEFUN (read_command_line_options, (argc, argv),
 #ifndef NATIVE_CODE_IS_C
 	if (! (FILE_READABLE (option_fasl_file)))
 	  {
-	    fprintf (stderr, "%s: can't read option file: -fasl %s\n",
+	    outf_fatal ("%s: can't read option file: -fasl %s\n",
 		     scheme_program_name, option_fasl_file);
 	    termination_init_error ();
 	  }
diff --git a/v7/src/microcode/os.h b/v7/src/microcode/os.h
index d9db3b07e..7a81417e6 100644
--- a/v7/src/microcode/os.h
+++ b/v7/src/microcode/os.h
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: os.h,v 1.3 1993/02/11 02:27:13 adams Exp $
+$Id: os.h,v 1.4 1993/06/24 06:08:38 gjr Exp $
 
-Copyright (c) 1990 Massachusetts Institute of Technology
+Copyright (c) 1990-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,11 +38,7 @@ MIT in each case. */
 #include "ansidecl.h"
 #include "oscond.h"
 
-#ifdef WINNT
-#include "posixtyp.h"  /* SRA : renamed for 8 char name length*/
-#else
-#include "posixtype.h"
-#endif
+#include "posixtyp.h"
 
 typedef unsigned int Tchannel;
 
diff --git a/v7/src/microcode/oscond.h b/v7/src/microcode/oscond.h
index f5d759466..fc76af04f 100644
--- a/v7/src/microcode/oscond.h
+++ b/v7/src/microcode/oscond.h
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: oscond.h,v 1.13 1993/02/11 02:29:29 adams Exp $
+$Id: oscond.h,v 1.14 1993/06/24 06:09:34 gjr Exp $
 
-Copyright (c) 1990-1992 Massachusetts Institute of Technology
+Copyright (c) 1990-1993 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
diff --git a/v7/src/microcode/osscheme.c b/v7/src/microcode/osscheme.c
index 336374ddd..37672e943 100644
--- a/v7/src/microcode/osscheme.c
+++ b/v7/src/microcode/osscheme.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/osscheme.c,v 1.6 1992/02/04 04:14:32 jinx Exp $
+$Id: osscheme.c,v 1.7 1993/06/24 06:12:14 gjr Exp $
 
-Copyright (c) 1990-92 Massachusetts Institute of Technology
+Copyright (c) 1990-1993 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -115,12 +115,12 @@ DEFUN (set_interrupt_mask, (mask), long mask)
 }
 
 void
-DEFUN (debug_back_trace, (stream), FILE * stream)
+DEFUN (debug_back_trace, (stream), outf_channel stream)
 {
-  fputs ("*** Scheme Microcode Back Trace: ***\n", stream);
+  outf (stream, "*** Scheme Microcode Back Trace: ***\n");
   Back_Trace (stream);
-  fputs ("*** End of Back Trace ***\n", stream);
-  fflush (stream);
+  outf (stream, "*** End of Back Trace ***\n");
+  outf_flush (stream);
   return;
 }
 
diff --git a/v7/src/microcode/osscheme.h b/v7/src/microcode/osscheme.h
index 131670e5c..c7e94e7e6 100644
--- a/v7/src/microcode/osscheme.h
+++ b/v7/src/microcode/osscheme.h
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: osscheme.h,v 1.7 1992/08/29 13:04:26 jinx Exp $
+$Id: osscheme.h,v 1.8 1993/06/24 06:11:12 gjr Exp $
 
-Copyright (c) 1990-1992 Massachusetts Institute of Technology
+Copyright (c) 1990-1993 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -35,7 +35,7 @@ MIT in each case. */
 #ifndef SCM_OSSCHEME_H
 #define SCM_OSSCHEME_H
 
-#include <stdio.h>
+#include "outf.h"
 #include "os.h"
 
 extern Tchannel EXFUN (arg_channel, (int arg_number));
@@ -45,7 +45,7 @@ extern int option_emacs_subprocess;
 extern int EXFUN (executing_scheme_primitive_p, (void));
 
 extern void EXFUN (debug_edit_flags, (void));
-extern void EXFUN (debug_back_trace, (FILE *));
+extern void EXFUN (debug_back_trace, (outf_channel));
 extern void EXFUN (debug_examine_memory, (long address, CONST char * label));
 
 extern void EXFUN (error_out_of_channels, (void));
diff --git a/v7/src/microcode/posixtyp.h b/v7/src/microcode/posixtyp.h
index 656853109..d3a8bbf35 100644
--- a/v7/src/microcode/posixtyp.h
+++ b/v7/src/microcode/posixtyp.h
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/posixtyp.h,v 1.7 1993/02/11 02:32:45 adams Exp $
+$Id: posixtyp.h,v 1.8 1993/06/24 06:13:23 gjr Exp $
 
-Copyright (c) 1990-91 Massachusetts Institute of Technology
+Copyright (c) 1990-1993 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
diff --git a/v7/src/microcode/prmcon.c b/v7/src/microcode/prmcon.c
index 2ad634122..7a167cef9 100644
--- a/v7/src/microcode/prmcon.c
+++ b/v7/src/microcode/prmcon.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/prmcon.c,v 1.1 1990/11/21 07:00:14 jinx Rel $
+$Id: prmcon.c,v 1.2 1993/06/24 06:14:23 gjr Exp $
 
-Copyright (c) 1990 Massachusetts Institute of Technology
+Copyright (c) 1990-1993 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -58,8 +58,7 @@ DEFUN (suspend_primitive,
   primitive = (Regs[REGBLOCK_PRIMITIVE]);
   if (!PRIMITIVE_P (primitive))
   {
-    fprintf (stderr,
-	     "\nsuspend_primitive invoked when not in primitive!\n");
+    outf_fatal ("\nsuspend_primitive invoked when not in primitive!\n");
     Microcode_Termination (TERM_BAD_BACK_OUT);
   }
 
diff --git a/v7/src/microcode/psbmap.h b/v7/src/microcode/psbmap.h
index 8a0c469ea..8007f126b 100644
--- a/v7/src/microcode/psbmap.h
+++ b/v7/src/microcode/psbmap.h
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: psbmap.h,v 9.38 1993/02/11 02:35:32 adams Exp $
+$Id: psbmap.h,v 9.39 1993/06/24 06:15:32 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
@@ -51,13 +51,7 @@ MIT in each case. */
 #include "types.h"
 #include "object.h"
 #include "bignum.h"
-
-#ifdef WINNT
-#include "bignumin.h" /* SRA: rename bignumint.h  bignumin.h*/
-#else
-#include "bignumint.h"
-#endif
-
+#include "bignmint.h"
 #include "bitstr.h"
 #include "sdata.h"
 #include "const.h"
diff --git a/v7/src/microcode/ptrvec.c b/v7/src/microcode/ptrvec.c
index 2b4da5a81..b295eafd8 100644
--- a/v7/src/microcode/ptrvec.c
+++ b/v7/src/microcode/ptrvec.c
@@ -14,9 +14,9 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-/* $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/ptrvec.c,v 1.1 1990/06/20 19:38:50 cph Rel $ */
+/* $Id: ptrvec.c,v 1.2 1993/06/24 06:17:08 gjr Exp $ */
 
-#include <stdio.h>
+#include "outf.h"
 #include "dstack.h"
 
 static PTR
@@ -26,8 +26,8 @@ DEFUN (xmalloc, (length), unsigned int length)
   PTR result = (malloc (length));
   if (result == 0)
     {
-      fputs ("malloc: memory allocation failed\n", stderr);
-      fflush (stderr);
+      outf_fatal ("malloc: memory allocation failed\n");
+      outf_flush_fatal ();
       abort ();
     }
   return (result);
@@ -40,8 +40,8 @@ DEFUN (xrealloc, (ptr, length), PTR ptr AND unsigned int length)
   PTR result = (realloc (ptr, length));
   if (result == 0)
     {
-      fputs ("realloc: memory allocation failed\n", stderr);
-      fflush (stderr);
+      outf_fatal ("realloc: memory allocation failed\n");
+      outf_flush_fatal ();
       abort ();
     }
   return (result);
diff --git a/v7/src/microcode/purify.c b/v7/src/microcode/purify.c
index fac805ce2..de1f38b00 100644
--- a/v7/src/microcode/purify.c
+++ b/v7/src/microcode/purify.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: purify.c,v 9.48 1993/03/10 17:20:04 cph Exp $
+$Id: purify.c,v 9.49 1993/06/24 06:18:24 gjr Exp $
 
-Copyright (c) 1988-93 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
@@ -420,7 +420,7 @@ DEFUN (Purify,
   Result = GCLoop (Heap_Start, &Free);
   if (Free != Result)
   {
-    fprintf (stderr, "\nPurify: Pure Scan ended too early.\n");
+    outf_fatal ("\nPurify: Pure Scan ended too early.\n");
     Microcode_Termination (TERM_BROKEN_HEART);
   }
   Length = ((Free - Heap_Start) - 1);		/* Length of object */
@@ -469,7 +469,7 @@ DEFUN (Purify_Pass_2,
 
     if (Free_Constant != Result)
     {
-      fprintf (stderr, "\nPurify: Pure Copy ended too early.\n");
+      outf_fatal ("\nPurify: Pure Copy ended too early.\n");
       Microcode_Termination (TERM_BROKEN_HEART);
     }
     Pure_Length = ((Free_Constant - New_Object) + 1);
@@ -485,7 +485,7 @@ DEFUN (Purify_Pass_2,
     Result = PurifyLoop ((New_Object + 1), &Free_Constant, CONSTANT_COPY);
     if (Result != Free_Constant)
     {
-      fprintf (stderr, "\nPurify: Pure Copy ended too early.\n");
+      outf_fatal ("\nPurify: Pure Copy ended too early.\n");
       Microcode_Termination (TERM_BROKEN_HEART);
     }
   }
@@ -499,7 +499,7 @@ DEFUN (Purify_Pass_2,
     Result = GCLoop ((New_Object + 1), &Free_Constant);
     if (Result != Free_Constant)
     {
-      fprintf (stderr, "\nPurify: Constant Copy ended too early.\n");
+      outf_fatal ("\nPurify: Constant Copy ended too early.\n");
       Microcode_Termination (TERM_BROKEN_HEART);
     }
   }
@@ -508,7 +508,7 @@ DEFUN (Purify_Pass_2,
   *Free_Constant++ = (MAKE_OBJECT (END_OF_BLOCK, (Recomputed_Length + 5)));
   if (!(TEST_CONSTANT_TOP (Free_Constant)))
   {
-    fprintf (stderr,
+    outf_fatal (
 	     "\nPurify overrun: Constant_Top = 0x%lx, Free_Constant = 0x%lx\n",
 	     Constant_Top, Free_Constant);
     Microcode_Termination (TERM_EXIT);
diff --git a/v7/src/microcode/purutl.c b/v7/src/microcode/purutl.c
index 26b2ebfe4..291680d3e 100644
--- a/v7/src/microcode/purutl.c
+++ b/v7/src/microcode/purutl.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/purutl.c,v 9.43 1992/02/03 23:37:07 jinx Exp $
+$Id: purutl.c,v 9.44 1993/06/24 06:20:03 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
@@ -136,8 +136,8 @@ DEFUN (Make_Impure,
     case TC_MANIFEST_SPECIAL_NM_VECTOR:
     case_Non_Pointer:
 #if FALSE
-      fprintf(stderr, "\nImpurify Non-Pointer (0x%lx)\n", Object);
-      Microcode_Termination(TERM_NON_POINTER_RELOCATION);
+      outf_fatal ("\nImpurify Non-Pointer (0x%lx)\n", Object);
+      Microcode_Termination (TERM_NON_POINTER_RELOCATION);
       /* fall through */
 #endif
     case TC_BIG_FLONUM:
@@ -170,12 +170,14 @@ DEFUN (Make_Impure,
     case TC_MANIFEST_CLOSURE:
     case_compiled_entry_point:
     default:
-      fprintf(stderr, "\nImpurify: Bad type code = 0x%02x.\n",
-	      OBJECT_TYPE (Object));
 #ifdef BAD_TYPES_LETHAL
-      Microcode_Termination(TERM_INVALID_TYPE_CODE);
+      outf_fatal ("\nImpurify: Bad type code = 0x%02x.\n",
+	          OBJECT_TYPE (Object));
+      Microcode_Termination (TERM_INVALID_TYPE_CODE);
       /*NOTREACHED*/
 #else /* not BAD_TYPES_LETHAL */
+      outf_error ("\nImpurify: Bad type code = 0x%02x.\n",
+	          OBJECT_TYPE (Object));
       return (ERR_ARG_1_WRONG_TYPE);
 #endif /* BAD_TYPES_LETHAL */
   }
@@ -373,8 +375,7 @@ DEFUN (copy_to_constant_space,
   dest = Free_Constant;
   if (!(TEST_CONSTANT_TOP (dest + nobjects + 6)))
   {
-    fprintf (stderr,
-	    "copy_to_constant_space: Not enough constant space!\n");
+    outf_fatal ("copy_to_constant_space: Not enough constant space!\n");
     Microcode_Termination (TERM_NO_SPACE);
   }
   *dest++ = (MAKE_OBJECT (TC_MANIFEST_SPECIAL_NM_VECTOR, 3));
diff --git a/v7/src/microcode/returns.h b/v7/src/microcode/returns.h
index f2f5acf6d..f282eab21 100644
--- a/v7/src/microcode/returns.h
+++ b/v7/src/microcode/returns.h
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/returns.h,v 9.40 1992/02/08 14:54:12 cph Exp $
+$Id: returns.h,v 9.41 1993/06/24 06:20:49 gjr Exp $
 
-Copyright (c) 1987-92 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
diff --git a/v7/src/microcode/scheme.h b/v7/src/microcode/scheme.h
index 1ea708433..cc3b479f3 100644
--- a/v7/src/microcode/scheme.h
+++ b/v7/src/microcode/scheme.h
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/scheme.h,v 9.34 1990/11/27 19:15:21 cph Rel $
+$Id: scheme.h,v 9.35 1993/06/24 06:22:01 gjr Exp $
 
-Copyright (c) 1987, 1988, 1989, 1990 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
@@ -88,6 +88,7 @@ MIT in each case. */
 #include "butterfly.h"
 #endif
 
+#include "outf.h"	/* Formatted output for errors */
 #include "bkpt.h"	/* Shadows some defaults */
 #include "default.h"	/* Defaults for various hooks. */
 #include "extern.h"	/* External declarations */
diff --git a/v7/src/microcode/stack.h b/v7/src/microcode/stack.h
index 88a9f35e9..6369a1765 100644
--- a/v7/src/microcode/stack.h
+++ b/v7/src/microcode/stack.h
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: stack.h,v 9.33 1992/09/26 02:55:03 cph Exp $
+$Id: stack.h,v 9.34 1993/06/24 06:22:52 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
@@ -102,8 +102,8 @@ extern void EXFUN (dos386_stack_reset, (void));
 {									\
   if (Stack_Pointer < Stack_Guard)					\
   {									\
-    fprintf(stderr, "\nStack_Pointer: 0x%lx, Guard: 0x%lx\n",		\
-            ((long) Stack_Pointer), ((long) Stack_Guard));		\
+    outf_fatal ("\nStack_Pointer: 0x%lx, Guard: 0x%lx\n",		\
+                ((long) Stack_Pointer), ((long) Stack_Guard));		\
     Microcode_Termination(TERM_EXIT);					\
   }									\
   Internal_Terminate_Old_Stacklet();					\
diff --git a/v7/src/microcode/term.c b/v7/src/microcode/term.c
index e55ba1b7a..6b158f2e4 100644
--- a/v7/src/microcode/term.c
+++ b/v7/src/microcode/term.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/term.c,v 1.5 1991/08/26 15:00:20 arthur Exp $
+$Id: term.c,v 1.6 1993/06/24 06:25:34 gjr Exp $
 
-Copyright (c) 1990 Massachusetts Institute of Technology
+Copyright (c) 1990-1993 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -62,7 +62,7 @@ DEFUN_VOID (init_exit_scheme)
 static void
 DEFUN (attempt_termination_backout, (code), int code)
 {
-  fflush (stderr);
+  outf_flush_error(); /* NOT flush_fatal */
   if ((WITHIN_CRITICAL_SECTION_P ())
       || (code == TERM_HALT)
       || (! (Valid_Fixed_Obj_Vector ())))
@@ -101,15 +101,15 @@ DEFUN (termination_prefix, (code), int code)
 {
   attempt_termination_backout (code);
   OS_restore_external_state ();
-  putc ('\n', stdout);
+  outf_fatal("\n");
   if ((code < 0) || (code > MAX_TERMINATION))
-    fprintf (stdout, "Unknown termination code 0x%x", code);
+    outf_fatal("Unknown termination code 0x%x", code);
   else
-    fputs ((Term_Messages [code]), stdout);
+    outf_fatal("%s", (Term_Messages [code]));
   if ((WITHIN_CRITICAL_SECTION_P ()) && (code != TERM_HALT))
-    fprintf (stdout, " within critical section \"%s\"",
-	     (CRITICAL_SECTION_NAME ()));
-  fputs (".\n", stdout);
+    outf_fatal (" within critical section \"%s\"",
+                (CRITICAL_SECTION_NAME ()));
+  outf_fatal(".\n");
 }
 
 static void
@@ -119,7 +119,12 @@ DEFUN (termination_suffix, (code, value, abnormal_p),
 #ifdef EXIT_HOOK
   EXIT_HOOK (code, value, abnormal_p);
 #endif
-  fflush (stdout);
+#if WINNT
+  if (code != TERM_HALT)  outf_flush_fatal(); /*dont salute*/
+  winnt_deallocate_registers();
+#else
+  outf_flush_fatal();
+#endif
   Reset_Memory ();
   EXIT_SCHEME (value);
 }
@@ -129,8 +134,8 @@ DEFUN (termination_suffix_trace, (code), int code)
 {
   if (Trace_On_Error)
     {
-      fprintf (stdout, "\n\n**** Stack trace ****\n\n");
-      Back_Trace (stdout);
+      outf_error ("\n\n**** Stack trace ****\n\n");
+      Back_Trace (error_output);
     }
   termination_suffix (code, 1, 1);
 }
@@ -161,7 +166,7 @@ DEFUN_VOID (termination_end_of_computation)
 {
   termination_prefix (TERM_END_OF_COMPUTATION);
   Print_Expression (Val, "Final result");
-  putc ('\n', stdout);
+  outf_console("\n");
   termination_suffix (TERM_END_OF_COMPUTATION, 0, 0);
 }
 
@@ -184,12 +189,12 @@ DEFUN_VOID (termination_no_error_handler)
       long heap_size;
       long const_size;
       get_band_parameters (&heap_size, &const_size);
-      fputs ("Try again with values at least as large as\n", stdout);
-      fprintf (stdout, "  -heap %d (%d + %d)\n",
+      outf_fatal ("Try again with values at least as large as\n");
+      outf_fatal ("  -heap %d (%d + %d)\n",
 	       (MIN_HEAP_DELTA + (BYTES_TO_BLOCKS (heap_size))),
 	       (BYTES_TO_BLOCKS (heap_size)),
 	       MIN_HEAP_DELTA);
-      fprintf (stdout, "  -constant %d\n", (BYTES_TO_BLOCKS (const_size)));
+      outf_fatal ("  -constant %d\n", (BYTES_TO_BLOCKS (const_size)));
     }
   termination_suffix (TERM_NO_ERROR_HANDLER, 1, 1);
 }
@@ -198,12 +203,11 @@ void
 DEFUN_VOID (termination_gc_out_of_space)
 {
   termination_prefix (TERM_GC_OUT_OF_SPACE);
-  fputs ("You are out of space at the end of a Garbage Collection!\n",
-	 stdout);
-  fprintf (stdout, "Free = 0x%lx; MemTop = 0x%lx; Heap_Top = 0x%lx\n",
-	   Free, MemTop, Heap_Top);
-  fprintf (stdout, "Words required = %ld; Words available = %ld\n",
-	   (MemTop - Free), GC_Space_Needed);
+  outf_fatal ("You are out of space at the end of a Garbage Collection!\n");
+  outf_fatal ("Free = 0x%lx; MemTop = 0x%lx; Heap_Top = 0x%lx\n",
+	      Free, MemTop, Heap_Top);
+  outf_fatal ("Words required = %ld; Words available = %ld\n",
+	      (MemTop - Free), GC_Space_Needed);
   termination_suffix_trace (TERM_GC_OUT_OF_SPACE);
 }
 
@@ -219,7 +223,7 @@ DEFUN (termination_signal, (signal_name), CONST char * signal_name)
   if (signal_name != 0)
     {
       termination_prefix (TERM_SIGNAL);
-      fprintf (stdout, "Killed by %s.\n", signal_name);
+      outf_fatal ("Killed by %s.\n");
     }
   else
     attempt_termination_backout (TERM_SIGNAL);
diff --git a/v7/src/microcode/transact.c b/v7/src/microcode/transact.c
index f162a83f5..6c7aa7e43 100644
--- a/v7/src/microcode/transact.c
+++ b/v7/src/microcode/transact.c
@@ -14,9 +14,11 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-/* $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/transact.c,v 1.1 1990/06/20 19:38:56 cph Rel $ */
+/* $Id: transact.c,v 1.2 1993/06/24 06:26:55 gjr Exp $ */
 
 #include <stdio.h>
+#include "ansidecl.h"
+#include "outf.h"
 #include "dstack.h"
 
 static void
@@ -24,8 +26,8 @@ DEFUN (error, (procedure_name, message),
        CONST char * procedure_name AND
        CONST char * message)
 {
-  fprintf (stderr, "%s: %s\n", procedure_name, message);
-  fflush (stderr);
+  outf_fatal ("%s: %s\n", procedure_name, message);
+  outf_flush_fatal ();
   abort ();
 }
 
diff --git a/v8/src/microcode/psbmap.h b/v8/src/microcode/psbmap.h
index 8a0c469ea..8007f126b 100644
--- a/v8/src/microcode/psbmap.h
+++ b/v8/src/microcode/psbmap.h
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: psbmap.h,v 9.38 1993/02/11 02:35:32 adams Exp $
+$Id: psbmap.h,v 9.39 1993/06/24 06:15:32 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
@@ -51,13 +51,7 @@ MIT in each case. */
 #include "types.h"
 #include "object.h"
 #include "bignum.h"
-
-#ifdef WINNT
-#include "bignumin.h" /* SRA: rename bignumint.h  bignumin.h*/
-#else
-#include "bignumint.h"
-#endif
-
+#include "bignmint.h"
 #include "bitstr.h"
 #include "sdata.h"
 #include "const.h"
diff --git a/v8/src/microcode/returns.h b/v8/src/microcode/returns.h
index c0e3082bd..f282eab21 100644
--- a/v8/src/microcode/returns.h
+++ b/v8/src/microcode/returns.h
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/microcode/returns.h,v 9.40 1992/02/08 14:54:12 cph Exp $
+$Id: returns.h,v 9.41 1993/06/24 06:20:49 gjr Exp $
 
-Copyright (c) 1987-92 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
-- 
2.25.1