Registers[REGBLOCK_PRIMITIVE] is now cleared when a primitive aborts

with a non-error/interrupt code.

diff --git a/v7/src/microcode/interp.c b/v7/src/microcode/interp.c
index c5eb997dba4448ae5b9912abb351c1d6f7e20432..50f88d54f68416b277b92ecafa22506368282e13 100644 (file)
--- a/v7/src/microcode/interp.c
+++ b/v7/src/microcode/interp.c
@@ -30,7 +30,7 @@ Technology nor of any adaptation thereof in any advertising,
 promotional, or sales literature without prior written consent from
 MIT in each case. */
 
-/* $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/interp.c,v 9.48 1989/03/27 23:15:19 jinx Exp $
+/* $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/interp.c,v 9.49 1989/03/28 20:39:19 jinx Exp $
  *
  * This file contains the heart of the Scheme Scode
  * interpreter
@@ -377,6 +377,12 @@ if (GC_Check(Amount))                                                      \
 #define CODE_MAPPED_P(code)                                            \
 ((code < (- PRIM_BIAS_AMOUNT)) ||                                      \
  (code >= PRIM_BIAS_AMOUNT))
+
+#define PROCEED_AFTER_PRIMITIVE()                                      \
+{                                                                      \
+  Regs[REGBLOCK_PRIMITIVE] = NIL;                                      \
+  LOG_FUTURES();                                                       \
+}
 \f
 /*
   The EVAL/APPLY ying/yang
@@ -412,24 +418,24 @@ Repeat_Dispatch:
   switch (Which_Way)
   {
     case PRIM_APPLY:
-      LOG_FUTURES();
+      PROCEED_AFTER_PRIMITIVE();
     case CODE_MAP(PRIM_APPLY):
       goto Internal_Apply;
 
     case PRIM_NO_TRAP_APPLY:
-      LOG_FUTURES();
+      PROCEED_AFTER_PRIMITIVE();
     case CODE_MAP(PRIM_NO_TRAP_APPLY):
       goto Apply_Non_Trapping;
 
     case PRIM_DO_EXPRESSION:
       Val = Fetch_Expression();
-      LOG_FUTURES();
+      PROCEED_AFTER_PRIMITIVE();
     case CODE_MAP(PRIM_DO_EXPRESSION):
       Reduces_To(Val);
 
     case PRIM_NO_TRAP_EVAL:
       Val = Fetch_Expression();
-      LOG_FUTURES();
+      PROCEED_AFTER_PRIMITIVE();
     case CODE_MAP(PRIM_NO_TRAP_EVAL):
       New_Reduction(Val, Fetch_Env());
       goto Eval_Non_Trapping;
@@ -445,7 +451,7 @@ Repeat_Dispatch:
       }
 
     case PRIM_POP_RETURN:
-      LOG_FUTURES();
+      PROCEED_AFTER_PRIMITIVE();
     case CODE_MAP(PRIM_POP_RETURN):
       goto Pop_Return;
 \f

diff --git a/v8/src/microcode/interp.c b/v8/src/microcode/interp.c
index 5c45b6f5841a6ea88a0b585bf7648bb4d05ef225..3a87abd22c65a1ac5a8f2aeff56975ef79c4f238 100644 (file)
--- a/v8/src/microcode/interp.c
+++ b/v8/src/microcode/interp.c
@@ -30,7 +30,7 @@ Technology nor of any adaptation thereof in any advertising,
 promotional, or sales literature without prior written consent from
 MIT in each case. */
 
-/* $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/microcode/interp.c,v 9.48 1989/03/27 23:15:19 jinx Exp $
+/* $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/microcode/interp.c,v 9.49 1989/03/28 20:39:19 jinx Exp $
  *
  * This file contains the heart of the Scheme Scode
  * interpreter
@@ -377,6 +377,12 @@ if (GC_Check(Amount))                                                      \
 #define CODE_MAPPED_P(code)                                            \
 ((code < (- PRIM_BIAS_AMOUNT)) ||                                      \
  (code >= PRIM_BIAS_AMOUNT))
+
+#define PROCEED_AFTER_PRIMITIVE()                                      \
+{                                                                      \
+  Regs[REGBLOCK_PRIMITIVE] = NIL;                                      \
+  LOG_FUTURES();                                                       \
+}
 \f
 /*
   The EVAL/APPLY ying/yang
@@ -412,24 +418,24 @@ Repeat_Dispatch:
   switch (Which_Way)
   {
     case PRIM_APPLY:
-      LOG_FUTURES();
+      PROCEED_AFTER_PRIMITIVE();
     case CODE_MAP(PRIM_APPLY):
       goto Internal_Apply;
 
     case PRIM_NO_TRAP_APPLY:
-      LOG_FUTURES();
+      PROCEED_AFTER_PRIMITIVE();
     case CODE_MAP(PRIM_NO_TRAP_APPLY):
       goto Apply_Non_Trapping;
 
     case PRIM_DO_EXPRESSION:
       Val = Fetch_Expression();
-      LOG_FUTURES();
+      PROCEED_AFTER_PRIMITIVE();
     case CODE_MAP(PRIM_DO_EXPRESSION):
       Reduces_To(Val);
 
     case PRIM_NO_TRAP_EVAL:
       Val = Fetch_Expression();
-      LOG_FUTURES();
+      PROCEED_AFTER_PRIMITIVE();
     case CODE_MAP(PRIM_NO_TRAP_EVAL):
       New_Reduction(Val, Fetch_Env());
       goto Eval_Non_Trapping;
@@ -445,7 +451,7 @@ Repeat_Dispatch:
       }
 
     case PRIM_POP_RETURN:
-      LOG_FUTURES();
+      PROCEED_AFTER_PRIMITIVE();
     case CODE_MAP(PRIM_POP_RETURN):
       goto Pop_Return;
 \f