diff options
author | Andy Wingo <wingo@pobox.com> | 2013-11-15 15:39:38 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2013-11-15 15:39:38 +0100 |
commit | 840ec33422e7ccae5ac158584e5587d88ff42d85 (patch) | |
tree | e6e4b743559e02f309628b20107751206827d872 /libguile/vm-engine.c | |
parent | 0c247a2fb6a9872b262eb7558e62481ac1967063 (diff) | |
download | guile-840ec33422e7ccae5ac158584e5587d88ff42d85.tar.gz |
Remove MVRA accessors in libguile
* libguile/vm.c (scm_i_vm_capture_stack): Remove MVRA argument, in
preparation for removing MVRA from frames.
(scm_i_capture_current_stack): Adapt to scm_i_vm_capture_stack
change.
(vm_reinstate_partial_continuation): Remove references to MVRA.
* libguile/vm.h (struct scm_vm_cont): Remove mvra member.
* libguile/vm-engine.c (call): Set MVRA to 0. Will remove later.
(return-values): Return to RA.
(call/cc): Remove MVRA from capture call.
* libguile/frames.c:
* libguile/frames.h (SCM_FRAME_MV_RETURN_ADDRESS)
(SCM_FRAME_RTL_MV_RETURN_ADDRESS, scm_frame_mv_return_address): Remove
accessors.
* libguile/control.c (reify_partial_continuation): Adapt to
scm_i_vm_capture_stack change.
Diffstat (limited to 'libguile/vm-engine.c')
-rw-r--r-- | libguile/vm-engine.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libguile/vm-engine.c b/libguile/vm-engine.c index 7e66f4387..2c75a2a49 100644 --- a/libguile/vm-engine.c +++ b/libguile/vm-engine.c @@ -574,7 +574,7 @@ RTL_VM_NAME (SCM vm, SCM program, SCM *argv, size_t nargs_) fp = vp->fp = old_fp + proc; SCM_FRAME_SET_DYNAMIC_LINK (fp, old_fp); - SCM_FRAME_SET_RTL_MV_RETURN_ADDRESS (fp, ip + 2); + SCM_FRAME_SET_RTL_MV_RETURN_ADDRESS (fp, 0); SCM_FRAME_SET_RTL_RETURN_ADDRESS (fp, ip + 2); RESET_FRAME (nlocals); @@ -711,7 +711,7 @@ RTL_VM_NAME (SCM vm, SCM program, SCM *argv, size_t nargs_) SCM *base = fp; VM_HANDLE_INTERRUPTS; - ip = SCM_FRAME_RTL_MV_RETURN_ADDRESS (fp); + ip = SCM_FRAME_RTL_RETURN_ADDRESS (fp); fp = vp->fp = SCM_FRAME_DYNAMIC_LINK (fp); /* Clear stack frame. */ @@ -954,7 +954,6 @@ RTL_VM_NAME (SCM vm, SCM program, SCM *argv, size_t nargs_) SCM_FRAME_DYNAMIC_LINK (fp), SCM_FRAME_LOWER_ADDRESS (fp) - 1, SCM_FRAME_RETURN_ADDRESS (fp), - SCM_FRAME_MV_RETURN_ADDRESS (fp), dynstack, 0); /* FIXME: Seems silly to capture the registers here, when they are |