From 572eef50c2d902d34427945dd504ba03af666e48 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Tue, 29 Mar 2011 17:41:31 +0200 Subject: fix prompt and abort with the boot evaluator * libguile/control.h: * libguile/control.c (scm_i_prompt_pop_abort_args_x): Take a VM instead of a prompt, given that it's the VM's registers that record the abort arguments, not the prompt registers (which actually point right below the abort values). * libguile/eval.c (eval): * libguile/throw.c (pre_init_catch): Pass the vm instead of a prompt. --- libguile/throw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libguile/throw.c') diff --git a/libguile/throw.c b/libguile/throw.c index 750e6a286..9c293516d 100644 --- a/libguile/throw.c +++ b/libguile/throw.c @@ -467,7 +467,7 @@ pre_init_catch (SCM tag, SCM thunk, SCM handler, SCM pre_unwind_handler) if (SCM_PROMPT_SETJMP (prompt)) { /* nonlocal exit */ - SCM args = scm_i_prompt_pop_abort_args_x (prompt); + SCM args = scm_i_prompt_pop_abort_args_x (vm); /* cdr past the continuation */ return scm_apply_0 (handler, scm_cdr (args)); } -- cgit v1.2.3