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/eval.c | |
parent | a3da449801895e3f61aa2e085e7f4ff27c0f202c (diff) | |
download | guile-0bca90aac9a209b2ae06281b00d5c3b9939d605e.tar.gz |
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/eval.c')
-rw-r--r-- | libguile/eval.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libguile/eval.c b/libguile/eval.c index df4b64f94..7b09d84f7 100644 --- a/libguile/eval.c +++ b/libguile/eval.c @@ -449,14 +449,14 @@ eval (SCM x, SCM env) vm = scm_the_vm (); /* Push the prompt onto the dynamic stack. */ - scm_dynstack_push_prompt (&SCM_I_CURRENT_THREAD->dynstack, - SCM_F_DYNSTACK_PROMPT_ESCAPE_ONLY - | SCM_F_DYNSTACK_PROMPT_PUSH_NARGS, - k, - SCM_VM_DATA (vm)->fp, - SCM_VM_DATA (vm)->sp, - SCM_VM_DATA (vm)->ip, - ®isters); + scm_dynstack_push_prompt + (&SCM_I_CURRENT_THREAD->dynstack, + SCM_F_DYNSTACK_PROMPT_ESCAPE_ONLY | SCM_F_DYNSTACK_PROMPT_PUSH_NARGS, + k, + 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, + ®isters); if (SCM_I_SETJMP (registers)) { |