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/instructions.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/instructions.c')
-rw-r--r-- | libguile/instructions.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libguile/instructions.c b/libguile/instructions.c index c8d95cc9b..4c1f9f16f 100644 --- a/libguile/instructions.c +++ b/libguile/instructions.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2009 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2009, 2010 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -23,7 +23,6 @@ #include <string.h> #include "_scm.h" -#include "vm-bootstrap.h" #include "instructions.h" struct scm_instruction { @@ -205,8 +204,6 @@ scm_bootstrap_instructions (void) void scm_init_instructions (void) { - scm_bootstrap_vm (); - #ifndef SCM_MAGIC_SNARFER #include "libguile/instructions.x" #endif |