summaryrefslogtreecommitdiff
path: root/libguile/vm-engine.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2013-11-21 12:12:38 +0100
committerAndy Wingo <wingo@pobox.com>2013-11-21 16:51:15 +0100
commit0bca90aac9a209b2ae06281b00d5c3b9939d605e (patch)
tree4d7e5f3c9d182644b815bda04bb5cd5e1a318ad2 /libguile/vm-engine.c
parenta3da449801895e3f61aa2e085e7f4ff27c0f202c (diff)
downloadguile-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/vm-engine.c')
-rw-r--r--libguile/vm-engine.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libguile/vm-engine.c b/libguile/vm-engine.c
index 87d2a784b..ad6ec6297 100644
--- a/libguile/vm-engine.c
+++ b/libguile/vm-engine.c
@@ -2050,8 +2050,8 @@ VM_NAME (SCM vm, SCM program, SCM *argv, size_t nargs_)
flags = escape_only_p ? SCM_F_DYNSTACK_PROMPT_ESCAPE_ONLY : 0;
scm_dynstack_push_prompt (&current_thread->dynstack, flags,
LOCAL_REF (tag),
- fp,
- LOCAL_ADDRESS (proc_slot),
+ fp - vp->stack_base,
+ LOCAL_ADDRESS (proc_slot) - vp->stack_base,
ip + offset,
&registers);
NEXT (3);