summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2008-08-07 13:29:15 +0200
committerAndy Wingo <wingo@pobox.com>2008-08-07 13:29:15 +0200
commitd0927dde9759bee23a1bdafdd0148f6192b1e20f (patch)
tree67b9d6ac810ad63165bff03308582b8d52444a28
parent07e56b27a1841d70e562ac69b9ef9d25d489ceb3 (diff)
downloadguile-d0927dde9759bee23a1bdafdd0148f6192b1e20f.tar.gz
build fixes
* 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.
-rwxr-xr-xbenchmark/measure.scm2
-rw-r--r--module/system/vm/Makefile.am5
-rw-r--r--src/guile-vm.c2
-rw-r--r--testsuite/Makefile.am3
-rw-r--r--testsuite/run-vm-tests.scm2
5 files changed, 9 insertions, 5 deletions
diff --git a/benchmark/measure.scm b/benchmark/measure.scm
index aadbc516d..f100397cf 100755
--- a/benchmark/measure.scm
+++ b/benchmark/measure.scm
@@ -9,7 +9,7 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
(define-module (measure)
:export (measure)
- :use-module (system vm core)
+ :use-module (system vm vm)
:use-module (system vm disasm)
:use-module (system base compile)
:use-module (system base language))
diff --git a/module/system/vm/Makefile.am b/module/system/vm/Makefile.am
index 0a68b3406..29b50b747 100644
--- a/module/system/vm/Makefile.am
+++ b/module/system/vm/Makefile.am
@@ -1,4 +1,5 @@
-SOURCES = assemble.scm bootstrap.scm conv.scm core.scm debug.scm \
- disasm.scm frame.scm profile.scm trace.scm
+SOURCES = assemble.scm bootstrap.scm conv.scm debug.scm \
+ disasm.scm frame.scm instruction.scm objcode.scm \
+ profile.scm program.scm trace.scm vm.scm
moddir = $(guiledir)/system/vm
include $(top_srcdir)/guilec.mk
diff --git a/src/guile-vm.c b/src/guile-vm.c
index 342fc4659..2cc5efc49 100644
--- a/src/guile-vm.c
+++ b/src/guile-vm.c
@@ -44,11 +44,13 @@
#endif
#include <libguile.h>
+#include "bootstrap.h"
int
main (int argc, char **argv)
{
scm_init_guile ();
+ scm_bootstrap_vm ();
scm_shell (argc, argv);
return 0; /* never reached */
}
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index d839ff349..0169b42c8 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -22,6 +22,7 @@ EXTRA_DIST = run-vm-tests.scm $(vm_test_files)
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 \
$(vm_test_files)
diff --git a/testsuite/run-vm-tests.scm b/testsuite/run-vm-tests.scm
index 64568b171..9f07d0561 100644
--- a/testsuite/run-vm-tests.scm
+++ b/testsuite/run-vm-tests.scm
@@ -18,7 +18,7 @@
;;; 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 base compile)
(system base language)