Remove compiled_code_error_code, no longer used.
authorGuillermo J. Rozas <edu/mit/csail/zurich/gjr>
Wed, 3 Oct 1990 15:16:32 +0000 (15:16 +0000)
committerGuillermo J. Rozas <edu/mit/csail/zurich/gjr>
Wed, 3 Oct 1990 15:16:32 +0000 (15:16 +0000)
v7/src/microcode/extern.h
v7/src/microcode/interp.c
v7/src/microcode/storage.c
v8/src/microcode/interp.c

index 26e4c52b074a57b7861d69b2179723d6af422778..b9293fcfc9bdfd6395f410a54a58d4fa1c81d1e3 100644 (file)
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/extern.h,v 9.37 1990/08/16 19:19:49 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/extern.h,v 9.38 1990/10/03 15:14:36 jinx Exp $
 
 Copyright (c) 1987, 1988, 1989, 1990 Massachusetts Institute of Technology
 
@@ -123,9 +123,7 @@ extern long
   IntEnb,              /* Interrupts enabled */
   temp_long,           /* temporary for sign extension */
   GC_Reserve,          /* Scheme pointer overflow space in heap */
-  GC_Space_Needed,     /* Amount of space needed when GC triggered */
-  /* Used to signal microcode errors from compiled code. */
-  compiled_code_error_code;
+  GC_Space_Needed;     /* Amount of space needed when GC triggered */
 
 extern char * Return_Names [];
 extern long MAX_RETURN;
index 989e7ef06e7460e7d75007ec7fc3856903dd989d..61f99e0e6fe593b544e7409871ac71b78bd5ba4d 100644 (file)
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/interp.c,v 9.56 1990/06/20 17:41:10 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/interp.c,v 9.57 1990/10/03 15:16:32 jinx Exp $
 
 Copyright (c) 1988, 1989, 1990 Massachusetts Institute of Technology
 
@@ -1688,18 +1688,18 @@ Perform_Application:
 
           case TC_COMPILED_ENTRY:
          {
-           apply_compiled_setup(STACK_ENV_EXTRA_SLOTS +
-                                OBJECT_DATUM (STACK_REF (STACK_ENV_HEADER)));
-           Export_Registers();
+           apply_compiled_setup (STACK_ENV_EXTRA_SLOTS +
+                                 (OBJECT_DATUM (STACK_REF (STACK_ENV_HEADER))));
+           Export_Registers ();
            Which_Way = apply_compiled_procedure();
 
 return_from_compiled_code:
-           Import_Registers();
+           Import_Registers ();
             switch (Which_Way)
             {
            case PRIM_DONE:
            {
-             compiled_code_done();
+             compiled_code_done ();
              goto Pop_Return;
            }
 
@@ -1724,17 +1724,6 @@ return_from_compiled_code:
              Prepare_Apply_Interrupt ();
              Interrupt (PENDING_INTERRUPTS ());
            }
-
-           /* The assembly language interfaces return errors
-              here.  The portable version does not.
-            */
-           case ERR_COMPILED_CODE_ERROR:
-           {
-             /* The compiled code is signalling a microcode error. */
-             compiled_error_backout();
-             /* The Save_Cont is done by Pop_Return_Error. */
-             Pop_Return_Error( compiled_code_error_code);
-           }
 \f
            case ERR_INAPPLICABLE_OBJECT:
            /* This error code means that apply_compiled_procedure
@@ -1746,8 +1735,8 @@ return_from_compiled_code:
 
            case ERR_WRONG_NUMBER_OF_ARGUMENTS:
            {
-             apply_compiled_backout();
-             Apply_ErrorWhich_Way);
+             apply_compiled_backout ();
+             Apply_Error (Which_Way);
            }
 
            case ERR_EXECUTE_MANIFEST_VECTOR:
@@ -1757,10 +1746,10 @@ return_from_compiled_code:
                 This is a kludge!
               */
 
-             execute_compiled_backout();
+             execute_compiled_backout ();
              Val =
                (OBJECT_NEW_TYPE (TC_COMPILED_ENTRY, (Fetch_Expression ())));
-             Pop_Return_ErrorWhich_Way);
+             Pop_Return_Error (Which_Way);
            }
 
            case ERR_INAPPLICABLE_CONTINUATION:
@@ -1770,14 +1759,14 @@ return_from_compiled_code:
                 in a system without compiler support.
               */
 
-             Store_Expression(SHARP_F);
-             Store_Return(RC_REENTER_COMPILED_CODE);
-             Pop_Return_Error(Which_Way);
+             Store_Expression (SHARP_F);
+             Store_Return (RC_REENTER_COMPILED_CODE);
+             Pop_Return_Error (Which_Way);
            }
 
            default:
-             compiled_error_backout();
-             Pop_Return_Error(Which_Way);
+             compiled_error_backout ();
+             Pop_Return_Error (Which_Way);
             }
           }
 
index 8563d179083646f824b6cba9cdb78e520b053f22..f3971ebd8b458cf467cbacd8b82b7f83ef6e5bed 100644 (file)
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/storage.c,v 9.46 1990/06/20 17:42:13 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/storage.c,v 9.47 1990/10/03 15:15:05 jinx Rel $
 
 Copyright (c) 1987, 1988, 1989, 1990 Massachusetts Institute of Technology
 
@@ -69,9 +69,7 @@ long
   IntEnb,              /* Interrupts enabled */
   temp_long,           /* temporary for sign extension */
   GC_Reserve,          /* Scheme pointer overflow space in heap */
-  GC_Space_Needed,     /* Amount of space needed when GC triggered */
-  /* Used to signal microcode errors from compiled code. */
-  compiled_code_error_code;
+  GC_Space_Needed;     /* Amount of space needed when GC triggered */
 
 Declare_Fixed_Objects ();
 
index 181e90bf703ec503d3d3171567542845058e3203..020547127c2d7890654e35f3f39b31348e54ec73 100644 (file)
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/microcode/interp.c,v 9.56 1990/06/20 17:41:10 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/microcode/interp.c,v 9.57 1990/10/03 15:16:32 jinx Exp $
 
 Copyright (c) 1988, 1989, 1990 Massachusetts Institute of Technology
 
@@ -1688,18 +1688,18 @@ Perform_Application:
 
           case TC_COMPILED_ENTRY:
          {
-           apply_compiled_setup(STACK_ENV_EXTRA_SLOTS +
-                                OBJECT_DATUM (STACK_REF (STACK_ENV_HEADER)));
-           Export_Registers();
+           apply_compiled_setup (STACK_ENV_EXTRA_SLOTS +
+                                 (OBJECT_DATUM (STACK_REF (STACK_ENV_HEADER))));
+           Export_Registers ();
            Which_Way = apply_compiled_procedure();
 
 return_from_compiled_code:
-           Import_Registers();
+           Import_Registers ();
             switch (Which_Way)
             {
            case PRIM_DONE:
            {
-             compiled_code_done();
+             compiled_code_done ();
              goto Pop_Return;
            }
 
@@ -1724,17 +1724,6 @@ return_from_compiled_code:
              Prepare_Apply_Interrupt ();
              Interrupt (PENDING_INTERRUPTS ());
            }
-
-           /* The assembly language interfaces return errors
-              here.  The portable version does not.
-            */
-           case ERR_COMPILED_CODE_ERROR:
-           {
-             /* The compiled code is signalling a microcode error. */
-             compiled_error_backout();
-             /* The Save_Cont is done by Pop_Return_Error. */
-             Pop_Return_Error( compiled_code_error_code);
-           }
 \f
            case ERR_INAPPLICABLE_OBJECT:
            /* This error code means that apply_compiled_procedure
@@ -1746,8 +1735,8 @@ return_from_compiled_code:
 
            case ERR_WRONG_NUMBER_OF_ARGUMENTS:
            {
-             apply_compiled_backout();
-             Apply_ErrorWhich_Way);
+             apply_compiled_backout ();
+             Apply_Error (Which_Way);
            }
 
            case ERR_EXECUTE_MANIFEST_VECTOR:
@@ -1757,10 +1746,10 @@ return_from_compiled_code:
                 This is a kludge!
               */
 
-             execute_compiled_backout();
+             execute_compiled_backout ();
              Val =
                (OBJECT_NEW_TYPE (TC_COMPILED_ENTRY, (Fetch_Expression ())));
-             Pop_Return_ErrorWhich_Way);
+             Pop_Return_Error (Which_Way);
            }
 
            case ERR_INAPPLICABLE_CONTINUATION:
@@ -1770,14 +1759,14 @@ return_from_compiled_code:
                 in a system without compiler support.
               */
 
-             Store_Expression(SHARP_F);
-             Store_Return(RC_REENTER_COMPILED_CODE);
-             Pop_Return_Error(Which_Way);
+             Store_Expression (SHARP_F);
+             Store_Return (RC_REENTER_COMPILED_CODE);
+             Pop_Return_Error (Which_Way);
            }
 
            default:
-             compiled_error_backout();
-             Pop_Return_Error(Which_Way);
+             compiled_error_backout ();
+             Pop_Return_Error (Which_Way);
             }
           }