From: Michael R. Blair <edu/mit/csail/zurich/ziggy>
Date: Tue, 24 Aug 1993 23:27:52 +0000 (+0000)
Subject: Merge in change to delay setting of Env register until environment is
X-Git-Tag: 20090517-FFI~7987
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=9d282480e52b098341ede4ad574e02fe1c8ac25f;p=mit-scheme.git

Merge in change to delay setting of Env register until environment is
completely constructed.
---

diff --git a/v7/src/microcode/interp.c b/v7/src/microcode/interp.c
index ed72d8b7f..e41c0437b 100644
--- a/v7/src/microcode/interp.c
+++ b/v7/src/microcode/interp.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: interp.c,v 9.76 1993/06/24 05:52:20 gjr Exp $
+$Id: interp.c,v 9.77 1993/08/24 23:27:52 ziggy Exp $
 
 Copyright (c) 1988-1993 Massachusetts Institute of Technology
 
@@ -1631,13 +1631,15 @@ apply_dispatch:
 
 	    {
 	      fast SCHEME_OBJECT *scan;
+	      fast SCHEME_OBJECT temp;
 
 	      scan = Free;
-	      Store_Env(MAKE_POINTER_OBJECT (TC_ENVIRONMENT, scan));
+	      temp = (MAKE_POINTER_OBJECT (TC_ENVIRONMENT, scan));
 	      *scan++ = MAKE_OBJECT (TC_MANIFEST_VECTOR, nargs);
 	      while(--nargs >= 0)
 		*scan++ = (STACK_POP ());
 	      Free = scan;
+	      Store_Env(temp);
 	      Reduces_To(FAST_MEMORY_REF (Function, LAMBDA_SCODE));
 	    }
           }
@@ -1716,7 +1718,7 @@ apply_dispatch:
 
           case TC_EXTENDED_PROCEDURE:
           {
-	    SCHEME_OBJECT lambda;
+	    SCHEME_OBJECT lambda, temp;
             long nargs, nparams, formals, params, auxes,
                  rest_flag, size;
 
@@ -1766,7 +1768,7 @@ apply_dispatch:
 /* Interpret(), continued */
 
 	    scan = Free;
-            Store_Env(MAKE_POINTER_OBJECT (TC_ENVIRONMENT, scan));
+	    temp = (MAKE_POINTER_OBJECT (TC_ENVIRONMENT, scan));
 	    *scan++ = MAKE_OBJECT (TC_MANIFEST_VECTOR, size);
 
 	    if (nargs <= params)
@@ -1802,6 +1804,7 @@ apply_dispatch:
 	    }
 
 	    Free = scan;
+            Store_Env (temp);
             Reduces_To(Get_Body_Elambda(lambda));
           }
 
diff --git a/v8/src/microcode/interp.c b/v8/src/microcode/interp.c
index ed72d8b7f..e41c0437b 100644
--- a/v8/src/microcode/interp.c
+++ b/v8/src/microcode/interp.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: interp.c,v 9.76 1993/06/24 05:52:20 gjr Exp $
+$Id: interp.c,v 9.77 1993/08/24 23:27:52 ziggy Exp $
 
 Copyright (c) 1988-1993 Massachusetts Institute of Technology
 
@@ -1631,13 +1631,15 @@ apply_dispatch:
 
 	    {
 	      fast SCHEME_OBJECT *scan;
+	      fast SCHEME_OBJECT temp;
 
 	      scan = Free;
-	      Store_Env(MAKE_POINTER_OBJECT (TC_ENVIRONMENT, scan));
+	      temp = (MAKE_POINTER_OBJECT (TC_ENVIRONMENT, scan));
 	      *scan++ = MAKE_OBJECT (TC_MANIFEST_VECTOR, nargs);
 	      while(--nargs >= 0)
 		*scan++ = (STACK_POP ());
 	      Free = scan;
+	      Store_Env(temp);
 	      Reduces_To(FAST_MEMORY_REF (Function, LAMBDA_SCODE));
 	    }
           }
@@ -1716,7 +1718,7 @@ apply_dispatch:
 
           case TC_EXTENDED_PROCEDURE:
           {
-	    SCHEME_OBJECT lambda;
+	    SCHEME_OBJECT lambda, temp;
             long nargs, nparams, formals, params, auxes,
                  rest_flag, size;
 
@@ -1766,7 +1768,7 @@ apply_dispatch:
 /* Interpret(), continued */
 
 	    scan = Free;
-            Store_Env(MAKE_POINTER_OBJECT (TC_ENVIRONMENT, scan));
+	    temp = (MAKE_POINTER_OBJECT (TC_ENVIRONMENT, scan));
 	    *scan++ = MAKE_OBJECT (TC_MANIFEST_VECTOR, size);
 
 	    if (nargs <= params)
@@ -1802,6 +1804,7 @@ apply_dispatch:
 	    }
 
 	    Free = scan;
+            Store_Env (temp);
             Reduces_To(Get_Body_Elambda(lambda));
           }