the dynamic stack is really a stack now, instead of a list

* libguile/dynstack.h:
* libguile/dynstack.c: New files, implementing the dynamic stack as a
  true stack instead of a linked list.  This lowers the cost of
  dynwinds: frames, winders, prompts, with-fluids, and dynamic-wind.
  For the most part, we allocate these items directly on the stack.

* libguile/dynwinds.h:
* libguile/dynwinds.c: Adapt all manipulators of the wind stack to use
  interfaces from dynstack.c.  Remove heap-allocated winder and frame
  object types.
  (scm_dowinds, scm_i_dowinds): Remove these.  The first was exported,
  but it was not a public interface.

* libguile/continuations.c:
* libguile/continuations.h (scm_t_contregs): Continuation objects
  reference scm_t_dynstack* values now.  Adapt to the new interfaces.

* libguile/control.c:
* libguile/control.h: There is no longer a scm_tc7_prompt kind of object
  that can be allocated on the heap.  Instead, the prompt flags, key,
  and registers are pushed on the dynwind stack.  (The registers are
  still on the heap.)  Also, since the vm_cont will reference the
  dynwinds, make the partial continuation stub take just one extra arg,
  instead of storing the intwinds separately in the object table.

* libguile/fluids.c:
* libguile/fluids.h: No more with-fluids objects; instead, the fluids go
  on the dynstack.  The values still have to be on the heap, though.
  (scm_prepare_fluids, scm_swap_fluids): New internal functions,
  replacing scm_i_make_with_fluids and scm_i_swap_with_fluids.

* libguile/print.c: Remove prompt and with-fluids printers.

* libguile/tags.h: Revert prompt and with-fluids tc7 values to what they
  were before they were allocated.

* libguile/vm-i-system.c (partial_cont_call): Just pop the vmcont, the
  intwinds will not be passed as a second arg.  Rewind the dynamic stack
  from within the VM, so that any rewinder sees valid prompt entries.
  (call_cc, tail_call_cc): Adapt to pass the dynstack to
  scm_i_vm_capture_stack.
  (prompt, wind, unwind, wind_fluids, unwind_fluids): Adapt to the new
  interfaces.

* libguile/vm.h (scm_i_capture_current_stack): Rename from
  scm_i_vm_capture_continuation.
  (scm_i_vm_capture_stack): Take a dynstack as an argument.
* libguile/vm.c (vm_reinstate_partial_continuation): Don't wind here, as
  that could result in winders seeing invalid prompts.

* libguile/eval.c:
* libguile/root.c:
* libguile/stacks.c:
* libguile/threads.c:
* libguile/threads.h:
* libguile/throw.c: Adapt other users of dynwinds to use the dynstack.

1 files changed, 31 insertions, 24 deletions

diff --git a/libguile/eval.c b/libguile/eval.c
index 5a42b1ead..142d20abf 100644
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011
+/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012
  * Free Software Foundation, Inc.
  * 
  * This library is free software; you can redistribute it and/or
@@ -266,14 +266,14 @@ eval (SCM x, SCM env)
 
     case SCM_M_DYNWIND:
       {
-        SCM in, out, res, old_winds;
+        SCM in, out, res;
+        scm_i_thread *t = SCM_I_CURRENT_THREAD;
         in = EVAL1 (CAR (mx), env);
         out = EVAL1 (CDDR (mx), env);
         scm_call_0 (in);
-        old_winds = scm_i_dynwinds ();
-        scm_i_set_dynwinds (scm_acons (in, out, old_winds));
+        scm_dynstack_push_dynwind (&t->dynstack, in, out);
         res = eval (CADR (mx), env);
-        scm_i_set_dynwinds (old_winds);
+        scm_dynstack_pop (&t->dynstack);
         scm_call_0 (out);
         return res;
       }
@@ -281,7 +281,9 @@ eval (SCM x, SCM env)
     case SCM_M_WITH_FLUIDS:
       {
         long i, len;
-        SCM *fluidv, *valuesv, walk, wf, res;
+        SCM *fluidv, *valuesv, walk, res;
+        scm_i_thread *thread = SCM_I_CURRENT_THREAD;
+
         len = scm_ilength (CAR (mx));
         fluidv = alloca (sizeof (SCM)*len);
         for (i = 0, walk = CAR (mx); i < len; i++, walk = CDR (walk))
@@ -290,12 +292,10 @@ eval (SCM x, SCM env)
         for (i = 0, walk = CADR (mx); i < len; i++, walk = CDR (walk))
           valuesv[i] = EVAL1 (CAR (walk), env);
         
-        wf = scm_i_make_with_fluids (len, fluidv, valuesv);
-        scm_i_swap_with_fluids (wf, SCM_I_CURRENT_THREAD->dynamic_state);
-        scm_i_set_dynwinds (scm_cons (wf, scm_i_dynwinds ()));
+        scm_dynstack_push_fluids (&thread->dynstack, len, fluidv, valuesv,
+                                  thread->dynamic_state);
         res = eval (CDDR (mx), env);
-        scm_i_swap_with_fluids (wf, SCM_I_CURRENT_THREAD->dynamic_state);
-        scm_i_set_dynwinds (CDR (scm_i_dynwinds ()));
+        scm_dynstack_unwind_fluids (&thread->dynstack, thread->dynamic_state);
         
         return res;
       }
@@ -437,20 +437,27 @@ eval (SCM x, SCM env)
 
     case SCM_M_PROMPT:
       {
-        SCM vm, res;
-        /* We need the prompt and handler values after a longjmp case,
-           so make sure they are volatile.  */
-        volatile SCM handler, prompt;
-
-        vm = scm_the_vm ();
-        prompt = scm_c_make_prompt (EVAL1 (CAR (mx), env),
-                                    SCM_VM_DATA (vm)->fp,
-                                    SCM_VM_DATA (vm)->sp, SCM_VM_DATA (vm)->ip,
-                                    0, -1, scm_i_dynwinds ());
+        SCM vm, k, res;
+        scm_t_dynstack_prompt_flags flags;
+        scm_t_prompt_registers *regs;
+        /* We need the handler after nonlocal return to the setjmp, so
+           make sure it is volatile.  */
+        volatile SCM handler;
+
+        k = EVAL1 (CAR (mx), env);
         handler = EVAL1 (CDDR (mx), env);
-        scm_i_set_dynwinds (scm_cons (prompt, scm_i_dynwinds ()));
+        vm = scm_the_vm ();
+
+        /* Push the prompt onto the dynamic stack. */
+        regs = scm_c_make_prompt_registers (SCM_VM_DATA (vm)->fp,
+                                            SCM_VM_DATA (vm)->sp,
+                                            SCM_VM_DATA (vm)->ip,
+                                            -1);
+        flags = SCM_F_DYNSTACK_PROMPT_ESCAPE_ONLY;
+        scm_dynstack_push_prompt (&SCM_I_CURRENT_THREAD->dynstack,
+                                  flags, k, regs);
 
-        if (SCM_PROMPT_SETJMP (prompt))
+        if (SCM_I_SETJMP (regs->regs))
           {
             /* The prompt exited nonlocally. */
             proc = handler;
@@ -459,7 +466,7 @@ eval (SCM x, SCM env)
           }
         
         res = eval (CADR (mx), env);
-        scm_i_set_dynwinds (CDR (scm_i_dynwinds ()));
+        scm_dynstack_pop (&SCM_I_CURRENT_THREAD->dynstack);
         return res;
       }