DFG refactorings

[bpt/guile.git] / module / Makefile.am

diff --git a/module/Makefile.am b/module/Makefile.am
index 4daf7cf..b3e573b 100644 (file)
--- a/module/Makefile.am
+++ b/module/Makefile.am
@@ -32,7 +32,11 @@ nobase_ccache_DATA += ice-9/eval.go
 EXTRA_DIST += ice-9/eval.scm
 ETAGS_ARGS += ice-9/eval.scm
 
+VM_TARGETS := system/vm/assembler.go system/vm/disassembler.go
+$(VM_TARGETS): $(top_builddir)/libguile/vm-operations.h
+
 ice-9/boot-9.go: ice-9/boot-9.scm ice-9/quasisyntax.scm ice-9/r6rs-libraries.scm
+ice-9/match.go: ice-9/match.scm ice-9/match.upstream.scm
 
 # We can compile these in any order, but it's fastest if we compile
 # psyntax and boot-9 first, then the compiler itself, then the rest of
@@ -49,6 +53,8 @@ SOURCES =                                     \
   language/glil.scm                            \
   language/assembly.scm                                \
   $(TREE_IL_LANG_SOURCES)                      \
+  $(CPS_LANG_SOURCES)                          \
+  $(RTL_LANG_SOURCES)                          \
   $(GLIL_LANG_SOURCES)                         \
   $(ASSEMBLY_LANG_SOURCES)                     \
   $(BYTECODE_LANG_SOURCES)                     \
@@ -107,10 +113,28 @@ TREE_IL_LANG_SOURCES =                                            \
   language/tree-il/canonicalize.scm                             \
   language/tree-il/analyze.scm                                 \
   language/tree-il/inline.scm                                  \
+  language/tree-il/compile-cps.scm                             \
   language/tree-il/compile-glil.scm                            \
   language/tree-il/debug.scm                                   \
   language/tree-il/spec.scm
 
+CPS_LANG_SOURCES =                                             \
+  language/cps.scm                                             \
+  language/cps/arities.scm                                     \
+  language/cps/closure-conversion.scm                          \
+  language/cps/compile-rtl.scm                                 \
+  language/cps/contification.scm                               \
+  language/cps/dfg.scm                                         \
+  language/cps/primitives.scm                                  \
+  language/cps/reify-primitives.scm                            \
+  language/cps/slot-allocation.scm                             \
+  language/cps/spec.scm                                                \
+  language/cps/verify.scm
+
+RTL_LANG_SOURCES =                                             \
+  language/rtl.scm                                             \
+  language/rtl/spec.scm
+
 GLIL_LANG_SOURCES =                                            \
   language/glil/spec.scm language/glil/compile-assembly.scm
 
@@ -347,7 +371,9 @@ OOP_SOURCES = \
 SYSTEM_SOURCES =                               \
   system/vm/inspect.scm                                \
   system/vm/coverage.scm                       \
+  system/vm/dwarf.scm                          \
   system/vm/elf.scm                            \
+  system/vm/linker.scm                         \
   system/vm/frame.scm                          \
   system/vm/instruction.scm                    \
   system/vm/objcode.scm                                \
@@ -355,6 +381,9 @@ SYSTEM_SOURCES =                            \
   system/vm/trace.scm                          \
   system/vm/traps.scm                          \
   system/vm/trap-state.scm                     \
+  system/vm/assembler.scm                      \
+  system/vm/debug.scm                          \
+  system/vm/disassembler.scm                   \
   system/vm/vm.scm                             \
   system/foreign.scm                           \
   system/xref.scm                              \