summaryrefslogtreecommitdiff
path: root/libguile/objcodes.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2010-01-05 18:50:17 +0100
committerAndy Wingo <wingo@pobox.com>2010-01-07 23:42:41 +0100
commita6029b97ea84d9e9a13d71b21213b6fd0be41e87 (patch)
tree5a60c3aebe8cdb826e24633a2712ea008171a609 /libguile/objcodes.c
parentf3056b42cf2ddb52cdd7de013ada33e4aa953ada (diff)
downloadguile-a6029b97ea84d9e9a13d71b21213b6fd0be41e87.tar.gz
properly integrate vm bootstrapping into init.c
* libguile/Makefile.am (modinclude_HEADERS): * libguile/vm-bootstrap.h: Remove vm-bootstrap.h. * libguile/frames.c: No more vm-bootstrap.h. * libguile/instructions.c (scm_init_instructions): * libguile/objcodes.c (scm_init_objcodes): * libguile/programs.c (scm_init_programs): No need to call scm_bootstrap_vm, init.c does that for us. * libguile/vm.c (scm_bootstrap_vm): No need call e.g. scm_bootstrap_frames, init.c does that. Remove a twice-calling guard, should be unnecessary. Don't define the load-compiled subr here. * libguile/load.c (scm_init_load): Define the load-compiled subr here. * libguile/vm.h: Declare scm_bootstrap_vm here. * libguile/init.c (scm_i_init_guile): Properly integrate VM bootstrapping into this file.
Diffstat (limited to 'libguile/objcodes.c')
-rw-r--r--libguile/objcodes.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/libguile/objcodes.c b/libguile/objcodes.c
index f73265727..cd5506f53 100644
--- a/libguile/objcodes.c
+++ b/libguile/objcodes.c
@@ -30,7 +30,6 @@
#include <alignof.h>
#include "_scm.h"
-#include "vm-bootstrap.h"
#include "programs.h"
#include "objcodes.h"
@@ -274,8 +273,6 @@ scm_bootstrap_objcodes (void)
void
scm_init_objcodes (void)
{
- scm_bootstrap_vm ();
-
#ifndef SCM_MAGIC_SNARFER
#include "libguile/objcodes.x"
#endif