diff options
author | Andy Wingo <wingo@pobox.com> | 2013-11-21 18:09:29 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2013-11-21 18:09:29 +0100 |
commit | 4fcbc1b0d8207df2dafce5fa80b942366d0ed7ed (patch) | |
tree | 77e824c778766e940def7446afaf2f3b44780d93 /libguile/throw.c | |
parent | 9b4c3ab5fa293310a7853d99768426b7dba4005b (diff) | |
download | guile-4fcbc1b0d8207df2dafce5fa80b942366d0ed7ed.tar.gz |
scm_i_prompt_pop_abort_args_x takes struct scm_vm* as arg
* libguile/control.h:
* libguile/control.c (scm_i_prompt_pop_abort_args_x): Change to take VP
as an arg, not VM.
* libguile/eval.c (eval):
* libguile/throw.c (pre_init_catch): Adapt.
Diffstat (limited to 'libguile/throw.c')
-rw-r--r-- | libguile/throw.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/libguile/throw.c b/libguile/throw.c index e68f428a8..252632c32 100644 --- a/libguile/throw.c +++ b/libguile/throw.c @@ -456,7 +456,8 @@ SCM_SYMBOL (sym_pre_init_catch_tag, "%pre-init-catch-tag"); static SCM pre_init_catch (SCM tag, SCM thunk, SCM handler, SCM pre_unwind_handler) { - volatile SCM vm, v_handler; + struct scm_vm *vp; + volatile SCM v_handler; SCM res; scm_t_dynstack *dynstack = &SCM_I_CURRENT_THREAD->dynstack; scm_i_jmp_buf registers; @@ -469,7 +470,7 @@ pre_init_catch (SCM tag, SCM thunk, SCM handler, SCM pre_unwind_handler) /* These two are volatile, so we know we can access them after a nonlocal return to the setjmp. */ - vm = scm_the_vm (); + vp = SCM_VM_DATA (scm_the_vm ()); v_handler = handler; /* Push the prompt onto the dynamic stack. */ @@ -477,15 +478,18 @@ pre_init_catch (SCM tag, SCM thunk, SCM handler, SCM pre_unwind_handler) SCM_F_DYNSTACK_PROMPT_ESCAPE_ONLY | SCM_F_DYNSTACK_PROMPT_PUSH_NARGS, sym_pre_init_catch_tag, - SCM_VM_DATA (vm)->fp - SCM_VM_DATA (vm)->stack_base, - SCM_VM_DATA (vm)->sp - SCM_VM_DATA (vm)->stack_base, - SCM_VM_DATA (vm)->ip, + vp->fp - vp->stack_base, + vp->sp - vp->stack_base, + vp->ip, ®isters); if (SCM_I_SETJMP (registers)) { /* nonlocal exit */ - SCM args = scm_i_prompt_pop_abort_args_x (vm); + SCM args; + /* vp is not volatile */ + vp = SCM_VM_DATA (scm_the_vm ()); + args = scm_i_prompt_pop_abort_args_x (vp); /* cdr past the continuation */ return scm_apply_0 (v_handler, scm_cdr (args)); } |