summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2013-11-21 17:52:00 +0100
committerAndy Wingo <wingo@pobox.com>2013-11-21 17:52:00 +0100
commit9b4c3ab5fa293310a7853d99768426b7dba4005b (patch)
tree01a4da17d314d29a75868caa2d8b3b307384ecdf
parent796e54a74ce30a22d4a49aa9f63001c572bc2481 (diff)
downloadguile-9b4c3ab5fa293310a7853d99768426b7dba4005b.tar.gz
Engine takes struct scm_vm* as argument
* libguile/vm-engine.c: * libguile/vm.c (scm_c_vm_run): VM engine now takes struct scm_vm* as argument, not SCM vm.
-rw-r--r--libguile/vm-engine.c3
-rw-r--r--libguile/vm.c5
2 files changed, 4 insertions, 4 deletions
diff --git a/libguile/vm-engine.c b/libguile/vm-engine.c
index 2461b1469..b50751116 100644
--- a/libguile/vm-engine.c
+++ b/libguile/vm-engine.c
@@ -424,7 +424,7 @@
((scm_t_uintptr) (ptr) % alignof_type (type) == 0)
static SCM
-VM_NAME (SCM vm, SCM program, SCM *argv, size_t nargs_)
+VM_NAME (struct scm_vm *vp, SCM program, SCM *argv, size_t nargs_)
{
/* Instruction pointer: A pointer to the opcode that is currently
running. */
@@ -439,7 +439,6 @@ VM_NAME (SCM vm, SCM program, SCM *argv, size_t nargs_)
register scm_t_uint32 op;
/* Cached variables. */
- struct scm_vm *vp = SCM_VM_DATA (vm);
scm_i_thread *current_thread = SCM_I_CURRENT_THREAD;
scm_i_jmp_buf registers; /* used for prompts */
diff --git a/libguile/vm.c b/libguile/vm.c
index 27990f934..c76187258 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -737,7 +737,8 @@ initialize_default_stack_size (void)
#undef VM_USE_HOOKS
#undef VM_NAME
-typedef SCM (*scm_t_vm_engine) (SCM vm, SCM program, SCM *argv, size_t nargs);
+typedef SCM (*scm_t_vm_engine) (struct scm_vm *vp,
+ SCM program, SCM *argv, size_t nargs);
static const scm_t_vm_engine vm_engines[SCM_VM_NUM_ENGINES] =
{ vm_regular_engine, vm_debug_engine };
@@ -822,7 +823,7 @@ 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](vm, program, argv, nargs);
+ return vm_engines[vp->engine](vp, program, argv, nargs);
}
SCM