summaryrefslogtreecommitdiff
path: root/libguile/stacks.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2012-03-07 10:27:16 +0100
committerAndy Wingo <wingo@pobox.com>2012-03-07 10:27:16 +0100
commit9d381ba4788b4d447acd3238c2fc8b86da4998b2 (patch)
tree5fd37ed1b9d73a20dbfadce6c4681bba8f05c75e /libguile/stacks.c
parent3c12fc359561aedb179a524667ba03481333f482 (diff)
downloadguile-9d381ba4788b4d447acd3238c2fc8b86da4998b2.tar.gz
dynstack: pushing a prompt no longer allocates memory
* libguile/control.h: Remove scm_t_prompt_registers and scm_c_make_prompt_registers. (scm_c_abort): Take a pointer to a jmpbuf instead of a cookie. It will serve the same purpose. * libguile/control.c (reify_partial_continuation, scm_at_abort): Adapt to new prompt representation. * libguile/dynstack.h: * libguile/dynstack.c (scm_dynstack_push_prompt): Prompts now have 5 words instead of 2, as they now push the fp, sp, ip, and jmpbuf on the stack separately. This avoids allocation. (scm_dynstack_find_prompt): Likewise, add return values for fp, sp, etc. (scm_dynstack_wind_prompt): Replaces scm_dynstack_relocate_prompt. * libguile/eval.c (eval): * libguile/stacks.c (find_prompt): * libguile/throw.c (pre_init_catch): Adapt to the new prompt mechanism. * libguile/vm-engine.c (vm_engine): Setjmp an on-stack jmpbuf every time the VM enters. We can then re-use that jmpbuf for all prompts in that invocation. * libguile/vm-i-system.c (partial_cont_call): Adapt to change in prompt representation. We don't need to wind here any more, since we pass in the prompt's jmpbuf. (prompt): Adapt to scm_dynstack_push_prompt change. (abort): Adapt to vm_abort change. * libguile/vm.h (struct scm_vm): No more cookie. * libguile/vm.c (vm_abort): Adapt to scm_c_abort change. (vm_reinstate_partial_continuation): Rewind the dynamic stack here, now that we do have a valid jmpbuf. (make_vm): No need to initialize a cookie.
Diffstat (limited to 'libguile/stacks.c')
-rw-r--r--libguile/stacks.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libguile/stacks.c b/libguile/stacks.c
index 610a36e24..13d347a95 100644
--- a/libguile/stacks.c
+++ b/libguile/stacks.c
@@ -98,14 +98,14 @@ stack_depth (SCM frame)
static SCM*
find_prompt (SCM key)
{
- scm_t_prompt_registers *regs;
+ SCM *fp;
if (!scm_dynstack_find_prompt (&SCM_I_CURRENT_THREAD->dynstack, key,
- &regs, NULL))
+ NULL, &fp, NULL, NULL, NULL))
scm_misc_error ("make-stack", "Prompt tag not found while narrowing stack",
scm_list_1 (key));
- return regs->fp;
+ return fp;
}
static void