From 59fbb5e67427acc5a27206c96b79a88d001c746e Mon Sep 17 00:00:00 2001 From: "Guillermo J. Rozas" Date: Thu, 24 Jun 1993 05:50:22 +0000 Subject: [PATCH] Global NT merge. --- v7/src/microcode/hppacach.c | 4 ++-- v7/src/microcode/hppanwca.c | 6 +++--- v7/src/microcode/interp.c | 4 ++-- v7/src/microcode/interp.h | 9 ++++----- v7/src/microcode/liarc.h | 4 ++-- v7/src/microcode/lookup.c | 32 +++++++++++--------------------- v8/src/microcode/interp.c | 4 ++-- v8/src/microcode/liarc.h | 4 ++-- v8/src/microcode/lookup.c | 32 +++++++++++--------------------- 9 files changed, 39 insertions(+), 60 deletions(-) diff --git a/v7/src/microcode/hppacach.c b/v7/src/microcode/hppacach.c index 8bd9d38c6..b198f6661 100644 --- a/v7/src/microcode/hppacach.c +++ b/v7/src/microcode/hppacach.c @@ -1,6 +1,6 @@ /* -*-C-*- -$Id: hppacach.c,v 1.8 1993/06/08 04:17:43 gjr Exp $ +$Id: hppacach.c,v 1.9 1993/06/24 05:41:02 gjr Exp $ Copyright (c) 1990-1993 Massachusetts Institute of Technology @@ -40,7 +40,7 @@ MIT in each case. */ #include #include -#include "hppacache.h" +#include "hppacach.h" #define true 1 #define false 0 diff --git a/v7/src/microcode/hppanwca.c b/v7/src/microcode/hppanwca.c index 9b36e27c0..38000b3c7 100644 --- a/v7/src/microcode/hppanwca.c +++ b/v7/src/microcode/hppanwca.c @@ -1,8 +1,8 @@ /* -*-C-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/hppanwca.c,v 1.1 1992/01/07 16:53:10 jinx Exp $ +$Id: hppanwca.c,v 1.2 1993/06/24 05:43:10 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 @@ -43,7 +43,7 @@ MIT in each case. */ */ #include -#include "hppacache.h" +#include "hppacach.h" struct pdc_cache_written { diff --git a/v7/src/microcode/interp.c b/v7/src/microcode/interp.c index 6e77e92af..bf508f160 100644 --- a/v7/src/microcode/interp.c +++ b/v7/src/microcode/interp.c @@ -1,6 +1,6 @@ /* -*-C-*- -$Id: interp.c,v 9.74 1993/02/23 20:18:50 gjr Exp $ +$Id: interp.c,v 9.75 1993/06/24 05:44:06 gjr Exp $ Copyright (c) 1988-1993 Massachusetts Institute of Technology @@ -416,7 +416,7 @@ DEFUN (abort_to_interpreter, (argument), int argument) { if (interpreter_state == NULL_INTERPRETER_STATE) { - fprintf (stderr, "abort_to_interpreter: Interpreter not set up.\n"); + outf_fatal ("abort_to_interpreter: Interpreter not set up.\n"); termination_init_error (); } diff --git a/v7/src/microcode/interp.h b/v7/src/microcode/interp.h index 053cdf828..1b619eb91 100644 --- a/v7/src/microcode/interp.h +++ b/v7/src/microcode/interp.h @@ -1,8 +1,8 @@ /* -*-C-*- -$Id: interp.h,v 9.36 1992/09/26 02:55:01 cph Exp $ +$Id: interp.h,v 9.37 1993/06/24 05:45:06 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 @@ -272,9 +272,8 @@ extern long EXFUN (primitive_to_arguments, (SCHEME_OBJECT primitive)); /* If the primitive failed to unwind the dynamic stack, lose. */ \ if (PRIMITIVE_APPLY_INTERNAL_position != dstack_position) \ { \ - fprintf (stderr, "\nPrimitive slipped the dynamic stack: %s\n", \ - (primitive_to_name (primitive))); \ - fflush (stderr); \ + outf_fatal ("\nPrimitive slipped the dynamic stack: %s\n", \ + (primitive_to_name (primitive))); \ Microcode_Termination (TERM_EXIT); \ } \ } \ diff --git a/v7/src/microcode/liarc.h b/v7/src/microcode/liarc.h index f60e54061..70cbc2ba4 100644 --- a/v7/src/microcode/liarc.h +++ b/v7/src/microcode/liarc.h @@ -1,6 +1,6 @@ /* -*-C-*- -$Id: liarc.h,v 1.1 1993/06/08 06:13:32 gjr Exp $ +$Id: liarc.h,v 1.2 1993/06/24 05:46:01 gjr Exp $ Copyright (c) 1992-1993 Massachusetts Institute of Technology @@ -47,7 +47,7 @@ MIT in each case. */ #include "interp.h" #include "prim.h" #include "cmpgc.h" -#include "cmpint2.h" +#include "cmpintmd.h" #ifdef __STDC__ # define USE_STDARG diff --git a/v7/src/microcode/lookup.c b/v7/src/microcode/lookup.c index ada718a62..4bc3d6794 100644 --- a/v7/src/microcode/lookup.c +++ b/v7/src/microcode/lookup.c @@ -1,8 +1,8 @@ /* -*-C-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/lookup.c,v 9.51 1992/02/27 22:25:45 jinx Exp $ +$Id: lookup.c,v 9.52 1993/06/24 05:50:22 gjr Exp $ -Copyright (c) 1988-1992 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 @@ -832,9 +832,7 @@ DEFUN (lookup_fluid, (trap), fast SCHEME_OBJECT trap) if (this_pair[CONS_CAR] == trap) { if (Fluids_Debug) - { - fprintf(stderr, "Fluid found.\n"); - } + outf_error ("Fluid found.\n"); return (&this_pair[CONS_CDR]); } @@ -845,9 +843,7 @@ DEFUN (lookup_fluid, (trap), fast SCHEME_OBJECT trap) /* Not found in fluid binding alist, so use default. */ if (Fluids_Debug) - { - fprintf(stderr, "Fluid not found, using default.\n"); - } + outf_error ("Fluid not found, using default.\n"); return (MEMORY_LOC (trap, TRAP_EXTRA)); } @@ -1315,11 +1311,8 @@ DEFUN (Local_Set, (env, sym, value), long result; if (Define_Debug) - { - fprintf(stderr, - "\n;; Local_Set: defining %s.", - (STRING_LOC ((MEMORY_REF (sym, SYMBOL_NAME)), 0))); - } + outf_error ("\n;; Local_Set: defining %s.", + (STRING_LOC ((MEMORY_REF (sym, SYMBOL_NAME)), 0))); result = (extend_frame (env, sym, value, env, true)); Val = sym; return (result); @@ -2541,16 +2534,13 @@ DEFUN (compiler_recache, /* We've lost BIG. */ if (temp == PRIM_INTERRUPT) - fprintf (stderr, - "\ncompiler_recache: Ran out of guaranteed space!\n"); + outf_fatal ("\ncompiler_recache: Ran out of guaranteed space!\n"); else if (temp > 0) - fprintf (stderr, - "\ncompiler_recache: Unexpected error value %d (%s)\n", - temp, Abort_Names[temp]); + outf_fatal ("\ncompiler_recache: Unexpected error value %d (%s)\n", + temp, Abort_Names[temp]); else - fprintf (stderr, - "\ncompiler_recache: Unexpected abort value %d (%s)\n", - -temp, Abort_Names[(-temp) - 1]); + outf_fatal ("\ncompiler_recache: Unexpected abort value %d (%s)\n", + -temp, Abort_Names[(-temp) - 1]); Microcode_Termination (TERM_EXIT); } } diff --git a/v8/src/microcode/interp.c b/v8/src/microcode/interp.c index 6e77e92af..bf508f160 100644 --- a/v8/src/microcode/interp.c +++ b/v8/src/microcode/interp.c @@ -1,6 +1,6 @@ /* -*-C-*- -$Id: interp.c,v 9.74 1993/02/23 20:18:50 gjr Exp $ +$Id: interp.c,v 9.75 1993/06/24 05:44:06 gjr Exp $ Copyright (c) 1988-1993 Massachusetts Institute of Technology @@ -416,7 +416,7 @@ DEFUN (abort_to_interpreter, (argument), int argument) { if (interpreter_state == NULL_INTERPRETER_STATE) { - fprintf (stderr, "abort_to_interpreter: Interpreter not set up.\n"); + outf_fatal ("abort_to_interpreter: Interpreter not set up.\n"); termination_init_error (); } diff --git a/v8/src/microcode/liarc.h b/v8/src/microcode/liarc.h index f60e54061..70cbc2ba4 100644 --- a/v8/src/microcode/liarc.h +++ b/v8/src/microcode/liarc.h @@ -1,6 +1,6 @@ /* -*-C-*- -$Id: liarc.h,v 1.1 1993/06/08 06:13:32 gjr Exp $ +$Id: liarc.h,v 1.2 1993/06/24 05:46:01 gjr Exp $ Copyright (c) 1992-1993 Massachusetts Institute of Technology @@ -47,7 +47,7 @@ MIT in each case. */ #include "interp.h" #include "prim.h" #include "cmpgc.h" -#include "cmpint2.h" +#include "cmpintmd.h" #ifdef __STDC__ # define USE_STDARG diff --git a/v8/src/microcode/lookup.c b/v8/src/microcode/lookup.c index 87f6a5b6b..4bc3d6794 100644 --- a/v8/src/microcode/lookup.c +++ b/v8/src/microcode/lookup.c @@ -1,8 +1,8 @@ /* -*-C-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/microcode/lookup.c,v 9.51 1992/02/27 22:25:45 jinx Exp $ +$Id: lookup.c,v 9.52 1993/06/24 05:50:22 gjr Exp $ -Copyright (c) 1988-1992 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 @@ -832,9 +832,7 @@ DEFUN (lookup_fluid, (trap), fast SCHEME_OBJECT trap) if (this_pair[CONS_CAR] == trap) { if (Fluids_Debug) - { - fprintf(stderr, "Fluid found.\n"); - } + outf_error ("Fluid found.\n"); return (&this_pair[CONS_CDR]); } @@ -845,9 +843,7 @@ DEFUN (lookup_fluid, (trap), fast SCHEME_OBJECT trap) /* Not found in fluid binding alist, so use default. */ if (Fluids_Debug) - { - fprintf(stderr, "Fluid not found, using default.\n"); - } + outf_error ("Fluid not found, using default.\n"); return (MEMORY_LOC (trap, TRAP_EXTRA)); } @@ -1315,11 +1311,8 @@ DEFUN (Local_Set, (env, sym, value), long result; if (Define_Debug) - { - fprintf(stderr, - "\n;; Local_Set: defining %s.", - (STRING_LOC ((MEMORY_REF (sym, SYMBOL_NAME)), 0))); - } + outf_error ("\n;; Local_Set: defining %s.", + (STRING_LOC ((MEMORY_REF (sym, SYMBOL_NAME)), 0))); result = (extend_frame (env, sym, value, env, true)); Val = sym; return (result); @@ -2541,16 +2534,13 @@ DEFUN (compiler_recache, /* We've lost BIG. */ if (temp == PRIM_INTERRUPT) - fprintf (stderr, - "\ncompiler_recache: Ran out of guaranteed space!\n"); + outf_fatal ("\ncompiler_recache: Ran out of guaranteed space!\n"); else if (temp > 0) - fprintf (stderr, - "\ncompiler_recache: Unexpected error value %d (%s)\n", - temp, Abort_Names[temp]); + outf_fatal ("\ncompiler_recache: Unexpected error value %d (%s)\n", + temp, Abort_Names[temp]); else - fprintf (stderr, - "\ncompiler_recache: Unexpected abort value %d (%s)\n", - -temp, Abort_Names[(-temp) - 1]); + outf_fatal ("\ncompiler_recache: Unexpected abort value %d (%s)\n", + -temp, Abort_Names[(-temp) - 1]); Microcode_Termination (TERM_EXIT); } } -- 2.25.1