diff options
author | Andy Wingo <wingo@pobox.com> | 2010-02-25 17:33:12 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2010-02-26 11:05:44 +0100 |
commit | d296431516dbf14535fc6eaba551fede19c09772 (patch) | |
tree | 462156635e207a35b0f03d7bb044833278467c72 /libguile/control.h | |
parent | b8af64db76bc602517be300128be0dfb67fac89f (diff) | |
download | guile-d296431516dbf14535fc6eaba551fede19c09772.tar.gz |
fix a prompt bug
* libguile/control.h:
* libguile/control.c (scm_c_make_prompt): Instead of taking a VM arg,
take the registers directly.
(scm_c_abort): Declare as returning void. In fact it will never
return.
* libguile/eval.c (eval):
* libguile/throw.c (pre_init_catch): Adapt to prompt API change.
* libguile/vm-i-system.c (prompt): Pass the abort ip as the ip to
scm_c_make_prompt. This fixes a bug in which we used the "offset"
local var, but it wasn't guaranteed to be around after a longjmp.
Diffstat (limited to 'libguile/control.h')
-rw-r--r-- | libguile/control.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libguile/control.h b/libguile/control.h index 19e841eda..806a8eef0 100644 --- a/libguile/control.h +++ b/libguile/control.h @@ -45,12 +45,14 @@ struct scm_prompt_registers SCM_INTERNAL SCM scm_sys_default_prompt_tag; -SCM_INTERNAL SCM scm_c_make_prompt (SCM vm, SCM k, scm_t_uint8 escape_only_p, - scm_t_int64 cookie); +SCM_INTERNAL SCM scm_c_make_prompt (SCM k, SCM *fp, SCM *sp, + scm_t_uint8 *abort_ip, + scm_t_uint8 escape_only_p, + scm_t_int64 vm_cookie); SCM_INTERNAL SCM scm_i_prompt_pop_abort_args_x (SCM prompt); -SCM_INTERNAL SCM scm_c_abort (SCM vm, SCM tag, size_t n, SCM *argv, - scm_t_int64 cookie) SCM_NORETURN; +SCM_INTERNAL void scm_c_abort (SCM vm, SCM tag, size_t n, SCM *argv, + scm_t_int64 cookie) SCM_NORETURN; SCM_INTERNAL SCM scm_at_abort (SCM tag, SCM args) SCM_NORETURN; |