diff options
author | Andy Wingo <wingo@pobox.com> | 2011-04-11 23:30:52 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2011-04-11 23:30:52 +0200 |
commit | 21c05db45b69f8a62b84c36abc86cb935fa967d7 (patch) | |
tree | 743df01da540e7fd628f54894e7d5fbe94b03996 /libguile/control.c | |
parent | 4db853d747ac115f799c93e2de93f5159ad84109 (diff) | |
parent | c89b45299329d034875429804f18768c1ea96713 (diff) | |
download | guile-21c05db45b69f8a62b84c36abc86cb935fa967d7.tar.gz |
Merge remote branch 'origin/stable-2.0'
Conflicts:
GUILE-VERSION
test-suite/tests/srfi-4.test
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 b6a558769..dc3fed250 100644 --- a/libguile/control.c +++ b/libguile/control.c @@ -55,18 +55,18 @@ scm_c_make_prompt (SCM k, SCM *fp, SCM *sp, scm_t_uint8 *abort_ip, /* Only to be called if the SCM_PROMPT_SETJMP returns 1 */ SCM -scm_i_prompt_pop_abort_args_x (SCM prompt) +scm_i_prompt_pop_abort_args_x (SCM vm) { size_t i, n; SCM vals = SCM_EOL; - n = scm_to_size_t (SCM_PROMPT_REGISTERS (prompt)->sp[0]); + n = scm_to_size_t (SCM_VM_DATA (vm)->sp[0]); for (i = 0; i < n; i++) - vals = scm_cons (SCM_PROMPT_REGISTERS (prompt)->sp[-(i + 1)], vals); + vals = scm_cons (SCM_VM_DATA (vm)->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 (scm_the_vm ())->sp -= n + 1; + SCM_VM_DATA (vm)->sp -= n + 1; /* FIXME NULLSTACK */ return vals; |