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/load.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/load.c')
-rw-r--r-- | libguile/load.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libguile/load.c b/libguile/load.c index 7c2dcfbe1..abd5b1ca3 100644 --- a/libguile/load.c +++ b/libguile/load.c @@ -908,6 +908,10 @@ scm_init_load () scm_fluid_set_x (the_reader, SCM_BOOL_F); scm_c_define("current-reader", the_reader); + scm_c_define ("load-compiled", + scm_c_make_gsubr ("load-compiled/vm", 1, 0, 0, + scm_load_compiled_with_vm)); + init_build_info (); #include "libguile/load.x" |