mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00
Code Activity

build fixes

Browse source 
* benchmark/measure.scm: Update for module changes.

* module/system/vm/Makefile.am: Update the set of modules needing
  compilation.

* src/guile-vm.c: Bootstrap the VM, now that we have a function for it.

* testsuite/Makefile.am:
* testsuite/run-vm-tests.scm: Update to fix make check, broken since we
  merged with Guile.
This commit is contained in:
Andy Wingo 2008-08-07 13:29:15 +02:00
parent 07e56b27a1
commit d0927dde97
5 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
benchmark/measure.scm
View file

@ -9,7 +9,7 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
(define-module (measure) (define-module (measure)
:export (measure) :export (measure)
:use-module (system vm core) :use-module (system vm vm)
:use-module (system vm disasm) :use-module (system vm disasm)
:use-module (system base compile) :use-module (system base compile)
:use-module (system base language)) :use-module (system base language))

5
module/system/vm/Makefile.am
View file

@ -1,4 +1,5 @@
SOURCES = assemble.scm bootstrap.scm conv.scm core.scm debug.scm \ SOURCES = assemble.scm bootstrap.scm conv.scm debug.scm \
disasm.scm frame.scm profile.scm trace.scm disasm.scm frame.scm instruction.scm objcode.scm \
profile.scm program.scm trace.scm vm.scm
moddir = $(guiledir)/system/vm moddir = $(guiledir)/system/vm
include $(top_srcdir)/guilec.mk include $(top_srcdir)/guilec.mk

2
src/guile-vm.c
View file

@ -44,11 +44,13 @@
#endif #endif
#include <libguile.h> #include <libguile.h>
#include "bootstrap.h"
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {
scm_init_guile (); scm_init_guile ();
scm_bootstrap_vm ();
scm_shell (argc, argv); scm_shell (argc, argv);
return 0; /* never reached */ return 0; /* never reached */
} }

3
testsuite/Makefile.am
View file

@ -22,6 +22,7 @@ EXTRA_DIST = run-vm-tests.scm $(vm_test_files)
check: check:
$(GUILE_VM) -L $(top_srcdir)/module \ $(top_builddir)/pre-inst-guile-env $(GUILE_VM) \
-L $(top_srcdir)/module \
-l run-vm-tests.scm -e run-vm-tests \ -l run-vm-tests.scm -e run-vm-tests \
$(vm_test_files) $(vm_test_files)

2
testsuite/run-vm-tests.scm
View file

@ -18,7 +18,7 @@
;;; Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ;;; Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
(use-modules (system vm core) (use-modules (system vm vm)
(system vm disasm) (system vm disasm)
(system base compile) (system base compile)
(system base language) (system base language)