summaryrefslogtreecommitdiff
path: root/libguile/vm.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2013-11-19 21:26:26 +0100
committerAndy Wingo <wingo@pobox.com>2013-11-19 21:26:26 +0100
commitf42cfbf0b72da57a1dfae29d2525ef71abe1bc9d (patch)
treeff79facc904b5a668e611514085ef7985b6a3a31 /libguile/vm.c
parent20b1b91394bf588757492bbbdbb0fab46f2e1cf4 (diff)
downloadguile-f42cfbf0b72da57a1dfae29d2525ef71abe1bc9d.tar.gz
Lingering RTL excision in vm.c
* libguile/vm-engine.c: * libguile/vm.c: Rework VM inclusion so that we don't define VM_ENGINE and expect vm-engine.c to understand that -- since there is only VM_USE_HOOKS, define that in vm.c directly. Rename rtl_vm_foo to vm_foo. * libguile/vm.h: Remove scm_t_vm_engine typedef.
Diffstat (limited to 'libguile/vm.c')
-rw-r--r--libguile/vm.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/libguile/vm.c b/libguile/vm.c
index 8e8436dbc..8758088e2 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -755,26 +755,26 @@ initialize_default_stack_size (void)
vm_stack_size = size;
}
-#define RTL_VM_NAME rtl_vm_regular_engine
+#define VM_NAME vm_regular_engine
+#define VM_USE_HOOKS 0
#define FUNC_NAME "vm-regular-engine"
-#define VM_ENGINE SCM_VM_REGULAR_ENGINE
#include "vm-engine.c"
-#undef RTL_VM_NAME
#undef FUNC_NAME
-#undef VM_ENGINE
+#undef VM_USE_HOOKS
+#undef VM_NAME
-#define RTL_VM_NAME rtl_vm_debug_engine
+#define VM_NAME vm_debug_engine
+#define VM_USE_HOOKS 1
#define FUNC_NAME "vm-debug-engine"
-#define VM_ENGINE SCM_VM_DEBUG_ENGINE
#include "vm-engine.c"
-#undef RTL_VM_NAME
#undef FUNC_NAME
-#undef VM_ENGINE
+#undef VM_USE_HOOKS
+#undef VM_NAME
-typedef SCM (*scm_t_rtl_vm_engine) (SCM vm, SCM program, SCM *argv, size_t nargs);
+typedef SCM (*scm_t_vm_engine) (SCM vm, SCM program, SCM *argv, size_t nargs);
-static const scm_t_rtl_vm_engine rtl_vm_engines[] =
- { rtl_vm_regular_engine, rtl_vm_debug_engine };
+static const scm_t_vm_engine vm_engines[SCM_VM_NUM_ENGINES] =
+ { vm_regular_engine, vm_debug_engine };
#ifdef VM_ENABLE_PRECISE_STACK_GC_SCAN
@@ -859,7 +859,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 rtl_vm_engines[vp->engine](vm, program, argv, nargs);
+ return vm_engines[vp->engine](vm, program, argv, nargs);
}
/* Scheme interface */