summaryrefslogtreecommitdiff
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
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.
-rw-r--r--libguile/control.c38
-rw-r--r--libguile/control.h4
-rw-r--r--libguile/dynstack.h1
-rw-r--r--libguile/vm-engine.c2
-rw-r--r--libguile/vm.c10
5 files changed, 27 insertions, 28 deletions
diff --git a/libguile/control.c b/libguile/control.c
index e32608688..4f7cc78d2 100644
--- a/libguile/control.c
+++ b/libguile/control.c
@@ -78,7 +78,7 @@ make_partial_continuation (SCM vm_cont)
}
static SCM
-reify_partial_continuation (SCM vm,
+reify_partial_continuation (struct scm_vm *vp,
SCM *saved_fp,
SCM *saved_sp,
scm_t_uint32 *saved_ip,
@@ -103,7 +103,7 @@ reify_partial_continuation (SCM vm,
could determine the stack bottom in O(1) time, but that's no longer
the case, since the thunk application doesn't occur where the
prompt is saved. */
- for (bottom_fp = SCM_VM_DATA (vm)->fp;
+ for (bottom_fp = vp->fp;
SCM_FRAME_DYNAMIC_LINK (bottom_fp) > saved_fp;
bottom_fp = SCM_FRAME_DYNAMIC_LINK (bottom_fp));
@@ -112,9 +112,9 @@ reify_partial_continuation (SCM vm,
/* Capture from the top of the thunk application frame up to the end. */
vm_cont = scm_i_vm_capture_stack (&SCM_FRAME_LOCAL (bottom_fp, 0),
- SCM_VM_DATA (vm)->fp,
- SCM_VM_DATA (vm)->sp,
- SCM_VM_DATA (vm)->ip,
+ vp->fp,
+ vp->sp,
+ vp->ip,
dynstack,
flags);
@@ -122,7 +122,7 @@ reify_partial_continuation (SCM vm,
}
void
-scm_c_abort (SCM vm, SCM tag, size_t n, SCM *argv,
+scm_c_abort (struct scm_vm *vp, SCM tag, size_t n, SCM *argv,
scm_i_jmp_buf *current_registers)
{
SCM cont;
@@ -142,8 +142,8 @@ scm_c_abort (SCM vm, SCM tag, size_t n, SCM *argv,
if (!prompt)
scm_misc_error ("abort", "Abort to unknown prompt", scm_list_1 (tag));
- fp = SCM_VM_DATA (vm)->stack_base + fp_offset;
- sp = SCM_VM_DATA (vm)->stack_base + sp_offset;
+ fp = vp->stack_base + fp_offset;
+ sp = vp->stack_base + sp_offset;
/* Only reify if the continuation referenced in the handler. */
if (flags & SCM_F_DYNSTACK_PROMPT_ESCAPE_ONLY)
@@ -153,32 +153,28 @@ scm_c_abort (SCM vm, SCM tag, size_t n, SCM *argv,
scm_t_dynstack *captured;
captured = scm_dynstack_capture (dynstack, SCM_DYNSTACK_NEXT (prompt));
- cont = reify_partial_continuation (vm, fp, sp, ip, registers, captured,
+ cont = reify_partial_continuation (vp, fp, sp, ip, registers, captured,
current_registers);
}
/* Unwind. */
scm_dynstack_unwind (dynstack, prompt);
- /* Unwinding may have changed the current thread's VM, so use the
- new one. */
- vm = scm_the_vm ();
-
/* Restore VM regs */
- SCM_VM_DATA (vm)->fp = fp;
- SCM_VM_DATA (vm)->sp = sp;
- SCM_VM_DATA (vm)->ip = ip;
+ vp->fp = fp;
+ vp->sp = sp;
+ vp->ip = ip;
/* Since we're jumping down, we should always have enough space. */
- if (SCM_VM_DATA (vm)->sp + n + 1 >= SCM_VM_DATA (vm)->stack_limit)
+ if (vp->sp + n + 1 >= vp->stack_limit)
abort ();
/* Push vals */
- *(++(SCM_VM_DATA (vm)->sp)) = cont;
+ *(++(vp->sp)) = cont;
for (i = 0; i < n; i++)
- *(++(SCM_VM_DATA (vm)->sp)) = argv[i];
+ *(++(vp->sp)) = argv[i];
if (flags & SCM_F_DYNSTACK_PROMPT_PUSH_NARGS)
- *(++(SCM_VM_DATA (vm)->sp)) = scm_from_size_t (n+1); /* +1 for continuation */
+ *(++(vp->sp)) = scm_from_size_t (n+1); /* +1 for continuation */
/* Jump! */
SCM_I_LONGJMP (*registers, 1);
@@ -202,7 +198,7 @@ SCM_DEFINE (scm_abort_to_prompt_star, "abort-to-prompt*", 2, 0, 0,
for (i = 0; i < n; i++, args = scm_cdr (args))
argv[i] = scm_car (args);
- scm_c_abort (scm_the_vm (), tag, n, argv, NULL);
+ scm_c_abort (SCM_VM_DATA (scm_the_vm ()), tag, n, argv, NULL);
/* Oh, what, you're still here? The abort must have been reinstated. Actually,
that's quite impossible, given that we're already in C-land here, so...
diff --git a/libguile/control.h b/libguile/control.h
index db383cf63..b9a7e2336 100644
--- a/libguile/control.h
+++ b/libguile/control.h
@@ -19,10 +19,12 @@
#ifndef SCM_CONTROL_H
#define SCM_CONTROL_H
+#include "libguile/vm.h"
+
SCM_INTERNAL SCM scm_i_prompt_pop_abort_args_x (SCM vm);
-SCM_INTERNAL void scm_c_abort (SCM vm, SCM tag, size_t n, SCM *argv,
+SCM_INTERNAL void scm_c_abort (struct scm_vm *vp, SCM tag, size_t n, SCM *argv,
scm_i_jmp_buf *registers) SCM_NORETURN;
SCM_INTERNAL SCM scm_abort_to_prompt_star (SCM tag, SCM args) SCM_NORETURN;
diff --git a/libguile/dynstack.h b/libguile/dynstack.h
index d4a604dec..7b31acedf 100644
--- a/libguile/dynstack.h
+++ b/libguile/dynstack.h
@@ -24,7 +24,6 @@
#include "libguile/__scm.h"
-#include "libguile/control.h"
diff --git a/libguile/vm-engine.c b/libguile/vm-engine.c
index 295730d09..113669fe5 100644
--- a/libguile/vm-engine.c
+++ b/libguile/vm-engine.c
@@ -1043,7 +1043,7 @@ VM_NAME (SCM vm, SCM program, SCM *argv, size_t nargs_)
it continues with the next instruction. */
ip++;
SYNC_IP ();
- vm_abort (vm, LOCAL_REF (1), nlocals - 2, LOCAL_ADDRESS (2),
+ vm_abort (vp, LOCAL_REF (1), nlocals - 2, LOCAL_ADDRESS (2),
SCM_EOL, LOCAL_ADDRESS (0), &registers);
/* vm_abort should not return */
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