diff options
author | Andy Wingo <wingo@pobox.com> | 2013-11-21 12:12:38 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2013-11-21 16:51:15 +0100 |
commit | 0bca90aac9a209b2ae06281b00d5c3b9939d605e (patch) | |
tree | 4d7e5f3c9d182644b815bda04bb5cd5e1a318ad2 /libguile/dynstack.h | |
parent | a3da449801895e3f61aa2e085e7f4ff27c0f202c (diff) |
The dynamic stack records SP and FP values as offsets
* libguile/dynstack.h:
* libguile/dynstack.c (PROMPT_FP, PROMPT_SP):
(scm_dynstack_push_prompt, scm_dynstack_find_prompt): Prompts on the
dynstack are recorded as offsets from the base stack address in this
thread.
* libguile/control.c (scm_c_abort):
* libguile/eval.c (eval):
* libguile/stacks.c (find_prompt, narrow_stack):
* libguile/throw.c (pre_init_catch):
* libguile/vm-engine.c (prompt): Adapt.
Diffstat (limited to 'libguile/dynstack.h')
-rw-r--r-- | libguile/dynstack.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libguile/dynstack.h b/libguile/dynstack.h index fe5bb5483..d4a604dec 100644 --- a/libguile/dynstack.h +++ b/libguile/dynstack.h @@ -155,7 +155,9 @@ SCM_INTERNAL void scm_dynstack_push_fluid (scm_t_dynstack *, SCM_INTERNAL void scm_dynstack_push_prompt (scm_t_dynstack *, scm_t_dynstack_prompt_flags, SCM key, - SCM *fp, SCM *sp, scm_t_uint32 *ip, + scm_t_ptrdiff fp_offset, + scm_t_ptrdiff sp_offset, + scm_t_uint32 *ip, scm_i_jmp_buf *registers); SCM_INTERNAL void scm_dynstack_push_dynwind (scm_t_dynstack *, SCM enter, SCM leave); @@ -191,7 +193,9 @@ SCM_INTERNAL void scm_dynstack_unwind_fluid (scm_t_dynstack *dynstack, SCM_INTERNAL scm_t_bits* scm_dynstack_find_prompt (scm_t_dynstack *, SCM, scm_t_dynstack_prompt_flags *, - SCM **, SCM **, scm_t_uint32 **, + scm_t_ptrdiff *, + scm_t_ptrdiff *, + scm_t_uint32 **, scm_i_jmp_buf **); SCM_INTERNAL void scm_dynstack_wind_prompt (scm_t_dynstack *, scm_t_bits *, |