Skip to content
  • Andy Wingo's avatar
    the dynamic stack is really a stack now, instead of a list · 9ede013f
    Andy Wingo authored
    * 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.
    9ede013f