summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libguile/control.c2
-rw-r--r--libguile/eval.c4
-rw-r--r--libguile/throw.c4
-rw-r--r--libguile/vm.c28
-rw-r--r--libguile/vm.h4
5 files changed, 17 insertions, 25 deletions
diff --git a/libguile/control.c b/libguile/control.c
index f4abce11b..347d69715 100644
--- a/libguile/control.c
+++ b/libguile/control.c
@@ -198,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_VM_DATA (scm_the_vm ()), tag, n, argv, NULL);
+ scm_c_abort (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/eval.c b/libguile/eval.c
index ac11090a6..3e828a178 100644
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -447,7 +447,7 @@ eval (SCM x, SCM env)
k = EVAL1 (CAR (mx), env);
handler = EVAL1 (CDDR (mx), env);
- vp = SCM_VM_DATA (scm_the_vm ());
+ vp = scm_the_vm ();
/* Push the prompt onto the dynamic stack. */
scm_dynstack_push_prompt (&SCM_I_CURRENT_THREAD->dynstack,
@@ -463,7 +463,7 @@ eval (SCM x, SCM env)
{
/* The prompt exited nonlocally. */
proc = handler;
- vp = SCM_VM_DATA (scm_the_vm ());
+ vp = scm_the_vm ();
args = scm_i_prompt_pop_abort_args_x (vp);
goto apply_proc;
}
diff --git a/libguile/throw.c b/libguile/throw.c
index 252632c32..4b1885eed 100644
--- a/libguile/throw.c
+++ b/libguile/throw.c
@@ -470,7 +470,7 @@ pre_init_catch (SCM tag, SCM thunk, SCM handler, SCM pre_unwind_handler)
/* These two are volatile, so we know we can access them after a
nonlocal return to the setjmp. */
- vp = SCM_VM_DATA (scm_the_vm ());
+ vp = scm_the_vm ();
v_handler = handler;
/* Push the prompt onto the dynamic stack. */
@@ -488,7 +488,7 @@ pre_init_catch (SCM tag, SCM thunk, SCM handler, SCM pre_unwind_handler)
/* nonlocal exit */
SCM args;
/* vp is not volatile */
- vp = SCM_VM_DATA (scm_the_vm ());
+ vp = scm_the_vm ();
args = scm_i_prompt_pop_abort_args_x (vp);
/* cdr past the continuation */
return scm_apply_0 (v_handler, scm_cdr (args));
diff --git a/libguile/vm.c b/libguile/vm.c
index de79a067a..284f38259 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -157,7 +157,7 @@ scm_i_capture_current_stack (void)
struct scm_vm *vp;
thread = SCM_I_CURRENT_THREAD;
- vp = SCM_VM_DATA (scm_the_vm ());
+ vp = scm_the_vm ();
return scm_i_vm_capture_stack (vp->stack_base, vp->fp, vp->sp, vp->ip,
scm_dynstack_capture_all (&thread->dynstack),
@@ -817,20 +817,14 @@ vm_stack_mark (GC_word *addr, struct GC_ms_entry *mark_stack_ptr,
SCM
-scm_c_vm_run (SCM vm, SCM program, SCM *argv, int nargs)
-{
- struct scm_vm *vp = SCM_VM_DATA (vm);
- SCM_CHECK_STACK;
- return vm_engines[vp->engine](vp, program, argv, nargs);
-}
-
-SCM
scm_call_n (SCM proc, SCM *argv, size_t nargs)
{
- return scm_c_vm_run (scm_the_vm (), proc, argv, nargs);
+ struct scm_vm *vp = scm_the_vm ();
+ SCM_CHECK_STACK;
+ return vm_engines[vp->engine](vp, proc, argv, nargs);
}
-SCM
+struct scm_vm *
scm_the_vm (void)
{
scm_i_thread *t = SCM_I_CURRENT_THREAD;
@@ -838,7 +832,7 @@ scm_the_vm (void)
if (SCM_UNLIKELY (scm_is_false (t->vm)))
t->vm = make_vm ();
- return t->vm;
+ return SCM_VM_DATA (t->vm);
}
/* Scheme interface */
@@ -846,7 +840,7 @@ scm_the_vm (void)
#define VM_DEFINE_HOOK(n) \
{ \
struct scm_vm *vp; \
- vp = SCM_VM_DATA (scm_the_vm ()); \
+ vp = scm_the_vm (); \
if (scm_is_false (vp->hooks[n])) \
vp->hooks[n] = scm_make_hook (SCM_I_MAKINUM (1)); \
return vp->hooks[n]; \
@@ -911,7 +905,7 @@ SCM_DEFINE (scm_vm_trace_level, "vm-trace-level", 0, 0, 0,
"")
#define FUNC_NAME s_scm_vm_trace_level
{
- return scm_from_int (SCM_VM_DATA (scm_the_vm ())->trace_level);
+ return scm_from_int (scm_the_vm ()->trace_level);
}
#undef FUNC_NAME
@@ -920,7 +914,7 @@ SCM_DEFINE (scm_set_vm_trace_level_x, "set-vm-trace-level!", 1, 0, 0,
"")
#define FUNC_NAME s_scm_set_vm_trace_level_x
{
- SCM_VM_DATA (scm_the_vm ())->trace_level = scm_to_int (level);
+ scm_the_vm ()->trace_level = scm_to_int (level);
return SCM_UNSPECIFIED;
}
#undef FUNC_NAME
@@ -962,7 +956,7 @@ SCM_DEFINE (scm_vm_engine, "vm-engine", 0, 0, 0,
"")
#define FUNC_NAME s_scm_vm_engine
{
- return vm_engine_to_symbol (SCM_VM_DATA (scm_the_vm ())->engine, FUNC_NAME);
+ return vm_engine_to_symbol (scm_the_vm ()->engine, FUNC_NAME);
}
#undef FUNC_NAME
@@ -974,7 +968,7 @@ scm_c_set_vm_engine_x (int engine)
SCM_MISC_ERROR ("Unknown VM engine: ~a",
scm_list_1 (scm_from_int (engine)));
- SCM_VM_DATA (scm_the_vm ())->engine = engine;
+ scm_the_vm ()->engine = engine;
}
#undef FUNC_NAME
diff --git a/libguile/vm.h b/libguile/vm.h
index 0b1a941fb..840b83553 100644
--- a/libguile/vm.h
+++ b/libguile/vm.h
@@ -56,7 +56,7 @@ SCM_API SCM scm_the_vm_fluid;
#define SCM_VM_DATA(vm) ((struct scm_vm *) SCM_CELL_WORD_1 (vm))
#define SCM_VALIDATE_VM(pos,x) SCM_MAKE_VALIDATE (pos, x, VM_P)
-SCM_API SCM scm_the_vm (void);
+SCM_INTERNAL struct scm_vm *scm_the_vm (void);
SCM_API SCM scm_call_with_vm (SCM proc, SCM args);
SCM_API SCM scm_vm_apply_hook (void);
@@ -94,8 +94,6 @@ struct scm_vm_cont {
SCM_API SCM scm_load_compiled_with_vm (SCM file);
-SCM_INTERNAL SCM scm_c_vm_run (SCM vm, SCM program, SCM *argv, int nargs);
-
SCM_INTERNAL void scm_i_vm_print (SCM x, SCM port,
scm_print_state *pstate);
SCM_INTERNAL SCM scm_i_call_with_current_continuation (SCM proc);