summaryrefslogtreecommitdiff
path: root/libguile/vm.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2013-11-21 17:36:22 +0100
committerAndy Wingo <wingo@pobox.com>2013-11-21 17:36:22 +0100
commitb44f5451f89f33d85e1601de72317460614c4193 (patch)
tree0a3c41157379207dffbe42f9a86ad0239092b1bb /libguile/vm.c
parent44ece399074281dec3bd69ab76a20dec2b0d4bfc (diff)
downloadguile-b44f5451f89f33d85e1601de72317460614c4193.tar.gz
Remove last use of SCM vm in VM
* libguile/control.h: * libguile/control.c (reify_partial_continuation, scm_c_abort): Take struct scm_vm *vp as an arg. * libguile/dynstack.h: Remove control.h include. * libguile/vm.c (vm_abort): Take struct scm_vm *vp as an arg. * libguile/vm-engine.c (abort): Adapt to vm_abort change.
Diffstat (limited to 'libguile/vm.c')
-rw-r--r--libguile/vm.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/libguile/vm.c b/libguile/vm.c
index aba83ac38..fe0a64dda 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -270,11 +270,13 @@ static void vm_dispatch_restore_continuation_hook (struct scm_vm *vp)
}
static void
-vm_abort (SCM vm, SCM tag, size_t nstack, SCM *stack_args, SCM tail, SCM *sp,
+vm_abort (struct scm_vm *vp, SCM tag,
+ size_t nstack, SCM *stack_args, SCM tail, SCM *sp,
scm_i_jmp_buf *current_registers) SCM_NORETURN;
static void
-vm_abort (SCM vm, SCM tag, size_t nstack, SCM *stack_args, SCM tail, SCM *sp,
+vm_abort (struct scm_vm *vp, SCM tag,
+ size_t nstack, SCM *stack_args, SCM tail, SCM *sp,
scm_i_jmp_buf *current_registers)
{
size_t i;
@@ -293,9 +295,9 @@ vm_abort (SCM vm, SCM tag, size_t nstack, SCM *stack_args, SCM tail, SCM *sp,
argv[i] = scm_car (tail);
/* FIXME: NULLSTACK (SCM_VM_DATA (vp)->sp - sp) */
- SCM_VM_DATA (vm)->sp = sp;
+ vp->sp = sp;
- scm_c_abort (vm, tag, nstack + tail_len, argv, current_registers);
+ scm_c_abort (vp, tag, nstack + tail_len, argv, current_registers);
}
static void