From 4fb36a2ab73a22b33493ab6a3c1080cd06d4008a Mon Sep 17 00:00:00 2001
From: Matt Birkholz <puck@birchwood-abbey.net>
Date: Sun, 19 Oct 2014 11:40:03 -0700
Subject: [PATCH] svm: Do fni->bci step in host, not with interpreted compress.

---
 src/compiler/base/crsend.scm | 15 +++++++++++++++
 src/etc/Stage.sh             | 11 +++++++++++
 src/etc/compile-svm.sh       | 17 ++++++++++++++---
 3 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/src/compiler/base/crsend.scm b/src/compiler/base/crsend.scm
index 04b5e4996..b03b34464 100644
--- a/src/compiler/base/crsend.scm
+++ b/src/compiler/base/crsend.scm
@@ -54,6 +54,21 @@ USA.
 			 (finish-cross-compilation:file pathname force?))))
 		(directory-read (pathname-as-directory directory))))))
 
+(define (finish-cross-compilation:info-files directory #!optional force?)
+  (let ((force? (if (default-object? force?) #f force?)))
+    (let loop ((directory directory))
+      (for-each (lambda (pathname)
+		  (cond ((file-directory? pathname)
+			 (if (not (let ((ns (file-namestring pathname)))
+				    (or (string=? ns ".")
+					(string=? ns ".."))))
+			     (loop pathname)))
+			((let ((t (pathname-type pathname)))
+			   (and (string? t)
+				(string=? t "fni")))
+			 (finish-cross-compilation:info-file pathname force?))))
+		(directory-read (pathname-as-directory directory))))))
+
 (define (finish-cross-compilation:info-file pathname #!optional force?)
   (let* ((input-file (pathname-default-type pathname "fni"))
 	 (output-file (pathname-new-type input-file "bci")))
diff --git a/src/etc/Stage.sh b/src/etc/Stage.sh
index 25faffced..c561ed8aa 100755
--- a/src/etc/Stage.sh
+++ b/src/etc/Stage.sh
@@ -52,6 +52,17 @@ make-cross)
     maybe_mv *.lap "${DIRNAME}/."
     maybe_mv *.rtl "${DIRNAME}/."
     ;;
+make-clean)
+    mkdir "${DIRNAME}"
+    maybe_mv *.bin "${DIRNAME}/."
+    maybe_mv *.ext "${DIRNAME}/."
+    maybe_mv *.com "${DIRNAME}/."
+    maybe_mv *.bci "${DIRNAME}/."
+    maybe_mv *.moc "${DIRNAME}/."
+    maybe_mv *.fni "${DIRNAME}/."
+    maybe_mv *.lap "${DIRNAME}/."
+    maybe_mv *.rtl "${DIRNAME}/."
+    ;;
 unmake)
     if [ -d "${DIRNAME}" ]; then
 	maybe_mv "${DIRNAME}"/* .
diff --git a/src/etc/compile-svm.sh b/src/etc/compile-svm.sh
index 64e21ee31..197138c64 100755
--- a/src/etc/compile-svm.sh
+++ b/src/etc/compile-svm.sh
@@ -89,6 +89,7 @@ run_cmd "${@}" --batch-mode --library lib --band x-runtime.com <<EOF
   (load-option 'CREF)
   (load-option '*PARSER)
   (load-option 'COMPILER)
+  (load "compiler/base/crsend.com" user-initial-environment)
   (disk-save "lib/x-compiler.com"))
 EOF
 
@@ -123,7 +124,12 @@ if [ "${FAST}" ]; then
     (compile-everything)))
 EOF
 
-    echo "# `mydate`: Finish-cross-compilation of everything."
+    echo "# `mydate`:     Finish-cross-compilation of fni files."
+    run_cmd "${@}" --batch-mode --library lib --band x-compiler.com <<EOF
+(finish-cross-compilation:info-files ".")
+EOF
+
+    echo "# `mydate`:     Finish-cross-compilation of everything."
     run_cmd_in_dir runtime \
 	../microcode/scheme --batch-mode --library ../lib \
 			    --fasl make.bin <<EOF
@@ -156,7 +162,12 @@ run_cmd "${@}" --batch-mode --library lib \
     (compile-boot-dirs compile-dir)))
 EOF
 
-echo "# `mydate`: Finish-cross-compilation of boot-dirs."
+echo "# `mydate`:     Finish-cross-compilation of boot-dirs fni files."
+run_cmd "${@}" --batch-mode --library lib --band x-compiler.com <<EOF
+(finish-cross-compilation:info-files ".")
+EOF
+
+echo "# `mydate`:     Finish-cross-compilation of boot-dirs."
 run_cmd_in_dir runtime \
     ../microcode/scheme --batch-mode --library ../lib --fasl make.bin <<EOF
 (begin
@@ -176,7 +187,7 @@ run_cmd_in_dir runtime \
   (disk-save "../lib/boot-compiler.com"))
 EOF
 
-run_cmd ./Stage.sh make-cross 0
+run_cmd ./Stage.sh make-clean 0
 
 echo "# `mydate`: Use the new machine and compiler to re-compile everything."
 run_cmd ./microcode/scheme --batch-mode --library lib \
-- 
2.25.1