Implement new mechanism to catch `abort_to_interpreter' throws from

primitives.

diff --git a/v7/src/microcode/interp.c b/v7/src/microcode/interp.c
index 4dfdce89e6c4742f62538d00ed3c1b5acdd2ee1b..56c4c10f574a7eeb00c2d01c7fab3619e4e8ae4e 100644 (file)
--- a/v7/src/microcode/interp.c
+++ b/v7/src/microcode/interp.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: interp.c,v 9.80 1993/11/03 19:19:53 jmiller Exp $
+$Id: interp.c,v 9.81 1993/11/08 20:40:03 cph Exp $
 
 Copyright (c) 1988-1993 Massachusetts Institute of Technology
 
@@ -383,23 +383,33 @@ if (GC_Check(Amount))                                                     \
   The EVAL/APPLY ying/yang
  */
 
-typedef struct interpreter_state_s * interpreter_state_t;
 
-struct interpreter_state_s
-{
-  unsigned int nesting_level;
-  PTR dstack_position;
-  jmp_buf catch_env;
-  int throw_argument;
-  interpreter_state_t previous_state;
-};
+interpreter_state_t interpreter_state = NULL_INTERPRETER_STATE;
 
-#define interpreter_catch_dstack_position interpreter_state->dstack_position
-#define interpreter_catch_env interpreter_state->catch_env
-#define interpreter_throw_argument interpreter_state->throw_argument
-#define NULL_INTERPRETER_STATE ((interpreter_state_t) NULL)
+void
+DEFUN (bind_interpreter_state, (s), interpreter_state_t s)
+{
+  (s -> previous_state) = interpreter_state;
+  (s -> nesting_level) =
+    ((interpreter_state == NULL_INTERPRETER_STATE)
+     ? 0
+     : (1 + (interpreter_state -> nesting_level)));
+  (s -> dstack_position) = dstack_position;
+  interpreter_state = s;
+}
 
-static interpreter_state_t interpreter_state = NULL_INTERPRETER_STATE;
+void
+DEFUN (unbind_interpreter_state, (s), interpreter_state_t s)
+{
+  interpreter_state = s;
+  {
+    long old_mask = (FETCH_INTERRUPT_MASK ());
+    SET_INTERRUPT_MASK (0);
+    dstack_set_position (s -> dstack_position);
+    SET_INTERRUPT_MASK (old_mask);
+  }
+  interpreter_state = (s -> previous_state);
+}
 
 void
 DEFUN (abort_to_interpreter, (argument), int argument)
@@ -435,20 +445,11 @@ DEFUN (Interpret, (pop_return_p), Boolean pop_return_p)
 {
   long Which_Way;
   fast SCHEME_OBJECT * Reg_Block, * Reg_Stack_Pointer, * Reg_History;
-  struct interpreter_state_s new_state_s;
-  interpreter_state_t new_state = & new_state_s;
+  struct interpreter_state_s new_state;
   extern long enter_compiled_expression();
   extern long apply_compiled_procedure();
   extern long return_to_compiled_code();
 
-  new_state->previous_state = interpreter_state;
-  new_state->nesting_level =
-    ((interpreter_state == NULL_INTERPRETER_STATE)
-     ? 0
-     : (1 + (interpreter_state->nesting_level)));
-
-  interpreter_state = new_state;
-
   Reg_Block = &Registers[0];
 
   /* Primitives jump back here for errors, requests to evaluate an
@@ -460,7 +461,7 @@ DEFUN (Interpret, (pop_return_p), Boolean pop_return_p)
    * for operation.
    */
 
-  interpreter_catch_dstack_position = dstack_position;
+  bind_interpreter_state (&new_state);
   preserve_signal_mask ();
   Which_Way = (setjmp (interpreter_catch_env));
   Set_Time_Zone (Zone_Working);

diff --git a/v7/src/microcode/interp.h b/v7/src/microcode/interp.h
index cb31e2f8cca1b7984301746ec8fd54b54f8f4bc2..0613a42af5fd07cefce5fcaef6778bfd81d40adc 100644 (file)
--- a/v7/src/microcode/interp.h
+++ b/v7/src/microcode/interp.h
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: interp.h,v 9.38 1993/08/03 08:29:51 gjr Exp $
+$Id: interp.h,v 9.39 1993/11/08 20:40:10 cph Exp $
 
 Copyright (c) 1987-1993 Massachusetts Institute of Technology
 
@@ -239,3 +239,23 @@ extern SCHEME_OBJECT EXFUN
 }
 
 #define POP_PRIMITIVE_FRAME(arity) Stack_Pointer = (STACK_LOC (arity))
+
+typedef struct interpreter_state_s * interpreter_state_t;
+
+struct interpreter_state_s
+{
+  interpreter_state_t previous_state;
+  unsigned int nesting_level;
+  PTR dstack_position;
+  jmp_buf catch_env;
+  int throw_argument;
+};
+
+#define interpreter_catch_dstack_position interpreter_state->dstack_position
+#define interpreter_catch_env interpreter_state->catch_env
+#define interpreter_throw_argument interpreter_state->throw_argument
+#define NULL_INTERPRETER_STATE ((interpreter_state_t) NULL)
+
+extern interpreter_state_t interpreter_state;
+extern void EXFUN (bind_interpreter_state, (interpreter_state_t));
+extern void EXFUN (unbind_interpreter_state, (interpreter_state_t));

diff --git a/v8/src/microcode/interp.c b/v8/src/microcode/interp.c
index 4dfdce89e6c4742f62538d00ed3c1b5acdd2ee1b..56c4c10f574a7eeb00c2d01c7fab3619e4e8ae4e 100644 (file)
--- a/v8/src/microcode/interp.c
+++ b/v8/src/microcode/interp.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: interp.c,v 9.80 1993/11/03 19:19:53 jmiller Exp $
+$Id: interp.c,v 9.81 1993/11/08 20:40:03 cph Exp $
 
 Copyright (c) 1988-1993 Massachusetts Institute of Technology
 
@@ -383,23 +383,33 @@ if (GC_Check(Amount))                                                     \
   The EVAL/APPLY ying/yang
  */
 
-typedef struct interpreter_state_s * interpreter_state_t;
 
-struct interpreter_state_s
-{
-  unsigned int nesting_level;
-  PTR dstack_position;
-  jmp_buf catch_env;
-  int throw_argument;
-  interpreter_state_t previous_state;
-};
+interpreter_state_t interpreter_state = NULL_INTERPRETER_STATE;
 
-#define interpreter_catch_dstack_position interpreter_state->dstack_position
-#define interpreter_catch_env interpreter_state->catch_env
-#define interpreter_throw_argument interpreter_state->throw_argument
-#define NULL_INTERPRETER_STATE ((interpreter_state_t) NULL)
+void
+DEFUN (bind_interpreter_state, (s), interpreter_state_t s)
+{
+  (s -> previous_state) = interpreter_state;
+  (s -> nesting_level) =
+    ((interpreter_state == NULL_INTERPRETER_STATE)
+     ? 0
+     : (1 + (interpreter_state -> nesting_level)));
+  (s -> dstack_position) = dstack_position;
+  interpreter_state = s;
+}
 
-static interpreter_state_t interpreter_state = NULL_INTERPRETER_STATE;
+void
+DEFUN (unbind_interpreter_state, (s), interpreter_state_t s)
+{
+  interpreter_state = s;
+  {
+    long old_mask = (FETCH_INTERRUPT_MASK ());
+    SET_INTERRUPT_MASK (0);
+    dstack_set_position (s -> dstack_position);
+    SET_INTERRUPT_MASK (old_mask);
+  }
+  interpreter_state = (s -> previous_state);
+}
 
 void
 DEFUN (abort_to_interpreter, (argument), int argument)
@@ -435,20 +445,11 @@ DEFUN (Interpret, (pop_return_p), Boolean pop_return_p)
 {
   long Which_Way;
   fast SCHEME_OBJECT * Reg_Block, * Reg_Stack_Pointer, * Reg_History;
-  struct interpreter_state_s new_state_s;
-  interpreter_state_t new_state = & new_state_s;
+  struct interpreter_state_s new_state;
   extern long enter_compiled_expression();
   extern long apply_compiled_procedure();
   extern long return_to_compiled_code();
 
-  new_state->previous_state = interpreter_state;
-  new_state->nesting_level =
-    ((interpreter_state == NULL_INTERPRETER_STATE)
-     ? 0
-     : (1 + (interpreter_state->nesting_level)));
-
-  interpreter_state = new_state;
-
   Reg_Block = &Registers[0];
 
   /* Primitives jump back here for errors, requests to evaluate an
@@ -460,7 +461,7 @@ DEFUN (Interpret, (pop_return_p), Boolean pop_return_p)
    * for operation.
    */
 
-  interpreter_catch_dstack_position = dstack_position;
+  bind_interpreter_state (&new_state);
   preserve_signal_mask ();
   Which_Way = (setjmp (interpreter_catch_env));
   Set_Time_Zone (Zone_Working);