diff options
author | Andy Wingo <wingo@pobox.com> | 2010-01-05 18:50:17 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2010-01-07 23:42:41 +0100 |
commit | a6029b97ea84d9e9a13d71b21213b6fd0be41e87 (patch) | |
tree | 5a60c3aebe8cdb826e24633a2712ea008171a609 /libguile/init.c | |
parent | f3056b42cf2ddb52cdd7de013ada33e4aa953ada (diff) | |
download | guile-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/init.c')
-rw-r--r-- | libguile/init.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libguile/init.c b/libguile/init.c index 21fefb43f..e2e90a1d7 100644 --- a/libguile/init.c +++ b/libguile/init.c @@ -57,6 +57,7 @@ #include "libguile/filesys.h" #include "libguile/fluids.h" #include "libguile/fports.h" +#include "libguile/frames.h" #include "libguile/gc.h" #include "libguile/gdbint.h" #include "libguile/generalized-arrays.h" @@ -68,6 +69,7 @@ #include "libguile/hooks.h" #include "libguile/gettext.h" #include "libguile/i18n.h" +#include "libguile/instructions.h" #include "libguile/iselect.h" #include "libguile/ioext.h" #include "libguile/keywords.h" @@ -80,6 +82,7 @@ #include "libguile/modules.h" #include "libguile/net_db.h" #include "libguile/numbers.h" +#include "libguile/objcodes.h" #include "libguile/objprop.h" #include "libguile/options.h" #include "libguile/pairs.h" @@ -91,6 +94,7 @@ #include "libguile/print.h" #include "libguile/procprop.h" #include "libguile/procs.h" +#include "libguile/programs.h" #include "libguile/promises.h" #include "libguile/properties.h" #include "libguile/array-map.h" @@ -122,7 +126,7 @@ #include "libguile/variable.h" #include "libguile/vectors.h" #include "libguile/version.h" -#include "libguile/vm-bootstrap.h" +#include "libguile/vm.h" #include "libguile/vports.h" #include "libguile/weaks.h" #include "libguile/guardians.h" @@ -518,7 +522,11 @@ scm_i_init_guile (SCM_STACKITEM *base) scm_init_arrays (); /* Requires smob_prehistory, array-handle */ scm_init_array_map (); - scm_bootstrap_vm (); /* requires smob_prehistory, gc_permanent_object */ + scm_bootstrap_frames (); /* requires smob_prehistory */ + scm_bootstrap_instructions (); + scm_bootstrap_objcodes (); /* requires smob_prehistory */ + scm_bootstrap_programs (); + scm_bootstrap_vm (); /* requires smob_prehistory */ scm_init_frames (); /* Requires smob_prehistory */ scm_init_stacks (); /* Requires strings, struct, frames */ |