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/control.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/control.c')
-rw-r--r-- | libguile/control.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libguile/control.c b/libguile/control.c index 4f7cc78d2..f4abce11b 100644 --- a/libguile/control.c +++ b/libguile/control.c @@ -39,18 +39,18 @@ /* Only to be called if the SCM_I_SETJMP returns 1 */ SCM -scm_i_prompt_pop_abort_args_x (SCM vm) +scm_i_prompt_pop_abort_args_x (struct scm_vm *vp) { size_t i, n; SCM vals = SCM_EOL; - n = scm_to_size_t (SCM_VM_DATA (vm)->sp[0]); + n = scm_to_size_t (vp->sp[0]); for (i = 0; i < n; i++) - vals = scm_cons (SCM_VM_DATA (vm)->sp[-(i + 1)], vals); + vals = scm_cons (vp->sp[-(i + 1)], vals); /* The abort did reset the VM's registers, but then these values were pushed on; so we need to pop them ourselves. */ - SCM_VM_DATA (vm)->sp -= n + 1; + vp->sp -= n + 1; /* FIXME NULLSTACK */ return vals; |