From be40175f10c989e72ce876984a4a0b8728716998 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Sat, 14 Apr 2007 03:55:06 +0000
Subject: [PATCH] Restructure bundling so that each subsystem has its own
 bundle.  Add necessary shared-library declarations in a few places.

---
 v7/src/Setup.sh                            |  4 +--
 v7/src/compiler/machines/C/make.scm        | 32 ++++++++---------
 v7/src/cref/make.scm                       |  3 +-
 v7/src/etc/c-initial-bands.sh              |  6 ++--
 v7/src/microcode/makegen/bundles-liarc.scm | 40 ++++++++++++----------
 v7/src/microcode/makegen/makegen.scm       |  8 +++--
 v7/src/sf/make.scm                         |  3 +-
 v7/src/star-parser/load.scm                | 10 ++++--
 8 files changed, 61 insertions(+), 45 deletions(-)

diff --git a/v7/src/Setup.sh b/v7/src/Setup.sh
index ae6e61ded..7db975383 100755
--- a/v7/src/Setup.sh
+++ b/v7/src/Setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: Setup.sh,v 1.18 2007/04/05 17:49:54 cph Exp $
+# $Id: Setup.sh,v 1.19 2007/04/14 03:54:37 cph Exp $
 #
 # Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
 #     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -50,7 +50,7 @@ maybe_link lib/edwin/autoload ../../edwin
 
 # lib/shared
 maybe_mkdir lib/shared
-for BUNDLE in sf+compiler edwin 6001 cref imail sos ssp xdoc xml; do
+for BUNDLE in 6001 compiler cref edwin imail sf sos ssp star-parser xdoc xml; do
     maybe_link "lib/shared/${BUNDLE}.so" "../../microcode/${BUNDLE}.so"
 done
 
diff --git a/v7/src/compiler/machines/C/make.scm b/v7/src/compiler/machines/C/make.scm
index 6b7f08d00..0611bc7e5 100644
--- a/v7/src/compiler/machines/C/make.scm
+++ b/v7/src/compiler/machines/C/make.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: make.scm,v 1.9 2007/01/05 21:19:20 cph Exp $
+$Id: make.scm,v 1.10 2007/04/14 03:54:42 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -29,18 +29,18 @@ USA.
 
 (declare (usual-integrations))
 
-(load-option 'synchronous-subprocess)
-
-(begin
-  (declare-shared-library "sf+compiler" (lambda () true))
-  (let ((value ((load "base/make")
-		(string-append "C/" microcode-id/machine-type))))
-    (set! (access compiler:compress-top-level? (->environment '(compiler)))
-	  true)
-    (set! (access compiler:compile-data-files-as-expressions?
-		  (->environment '(compiler top-level)))
-	  false)
-    (set! (access compiler:fggen-unmap-reference-traps-early?
-		  (->environment '(compiler fg-generator)))
-	  false)
-    value))
\ No newline at end of file
+(load-option 'SYNCHRONOUS-SUBPROCESS)
+
+(declare-shared-library "compiler" (lambda () #t))
+(let ((value ((load "base/make")
+	      (string-append "C/" microcode-id/machine-type))))
+  (set! (access compiler:compress-top-level?
+		(->environment '(compiler)))
+	#t)
+  (set! (access compiler:compile-data-files-as-expressions?
+		(->environment '(compiler top-level)))
+	false)
+  (set! (access compiler:fggen-unmap-reference-traps-early?
+		(->environment '(compiler fg-generator)))
+	false)
+  value)
\ No newline at end of file
diff --git a/v7/src/cref/make.scm b/v7/src/cref/make.scm
index fac050231..66a6bab3a 100644
--- a/v7/src/cref/make.scm
+++ b/v7/src/cref/make.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: make.scm,v 1.30 2007/01/05 21:19:23 cph Exp $
+$Id: make.scm,v 1.31 2007/04/14 03:54:46 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -30,6 +30,7 @@ USA.
 (declare (usual-integrations))
 
 (load-option 'RB-TREE)
+(declare-shared-library "cref" (lambda () #t))
 (with-working-directory-pathname (directory-pathname (current-load-pathname))
   (lambda ()
     ((access with-directory-rewriting-rule
diff --git a/v7/src/etc/c-initial-bands.sh b/v7/src/etc/c-initial-bands.sh
index dddb747ea..0571d2f48 100755
--- a/v7/src/etc/c-initial-bands.sh
+++ b/v7/src/etc/c-initial-bands.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: c-initial-bands.sh,v 1.2 2007/04/09 16:44:06 cph Exp $
+# $Id: c-initial-bands.sh,v 1.3 2007/04/14 03:54:50 cph Exp $
 #
 # Copyright 2007 Massachusetts Institute of Technology
 #
@@ -25,15 +25,15 @@ set -e
 
 (
     cd runtime
-    ../microcode/scheme --library ../lib --fasl runtime_make <<EOF
+    ../microcode/scheme --library ../lib --fasl runtime_make.bin <<EOF
 (disk-save "../lib/runtime.com")
 EOF
 )
 
 microcode/scheme --library lib --large <<EOF
 (begin
-  (load "microcode/sf+compiler.so")
   (load-option (quote SF))
+  (load "lib/shared/compiler.so")
   (with-working-directory-pathname "compiler"
     (lambda ()
       (load "machines/C/make")))
diff --git a/v7/src/microcode/makegen/bundles-liarc.scm b/v7/src/microcode/makegen/bundles-liarc.scm
index f3b0ba793..d8ecfd1a8 100644
--- a/v7/src/microcode/makegen/bundles-liarc.scm
+++ b/v7/src/microcode/makegen/bundles-liarc.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: bundles-liarc.scm,v 1.3 2007/04/11 19:33:28 cph Exp $
+$Id: bundles-liarc.scm,v 1.4 2007/04/14 03:54:54 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -36,11 +36,14 @@ USA.
 ;++ This is fragile: excluding filenames is bogus.  But it will work
 ;++ until we get a real module system.
 
-("sf+compiler"
- ("../sf/sf"
-  ("../compiler/compiler" "unx")
-  "../star-parser/parser")
- ("../sf")
+;; These are listed alphabetically; I don't think the order matters.
+
+("6001"
+ ("../6001/6001")
+ ("../6001"))
+
+("compiler"
+ (("../compiler/compiler" "unx"))
  ("../compiler")
  ("../compiler/base")
  ("../compiler/back")
@@ -49,27 +52,24 @@ USA.
  ("../compiler/machines/C")
  ("../compiler/rtlbase")
  ("../compiler/rtlgen")
- ("../compiler/rtlopt")
- ("../star-parser" "compile" "ed-ffi" "load" "test-parser"))
-
-("edwin"
- ("../edwin/edwin")
- ("../edwin" "decls"))
-
-;; These are listed alphabetically; I don't think the order matters.
-
-("6001"
- ("../6001/6001")
- ("../6001"))
+ ("../compiler/rtlopt"))
 
 ("cref"
  ("../cref/cref")
  ("../cref"))
 
+("edwin"
+ ("../edwin/edwin")
+ ("../edwin" "decls"))
+
 ("imail"
  ("../imail/imail")
  ("../imail" "compile" "ed-ffi" "fake-env" "load"))
 
+("sf"
+ ("../sf/sf")
+ ("../sf"))
+
 ("sos"
  ("../sos/sos")
  ("../sos" "compile" "ed-ffi" "load" "microbench"))
@@ -78,6 +78,10 @@ USA.
  ("../ssp/ssp")
  ("../ssp" "compile" "load"))
 
+("star-parser"
+ ("../star-parser/parser")
+ ("../star-parser" "compile" "ed-ffi" "load" "test-parser"))
+
 ("xdoc"
  ("../xdoc/xdoc")
  ("../xdoc" "compile" "load" "validate-xdoc"))
diff --git a/v7/src/microcode/makegen/makegen.scm b/v7/src/microcode/makegen/makegen.scm
index a3d517902..f679182ca 100644
--- a/v7/src/microcode/makegen/makegen.scm
+++ b/v7/src/microcode/makegen/makegen.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: makegen.scm,v 1.17 2007/04/09 16:43:24 cph Exp $
+$Id: makegen.scm,v 1.18 2007/04/14 03:54:58 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -87,7 +87,11 @@ USA.
 		  output)
       (newline output)
       (newline output)
-      (write-rule "LIARC_BOOT_BUNDLES" "=" '("sf+compiler.so" "cref.so") output)
+      (write-rule "LIARC_BOOT_BUNDLES" "="
+		  (map (lambda (name)
+			 (string-append name ".so"))
+		       '("sf" "compiler" "star-parser" "cref"))
+		  output)
       (newline output)
       (write-rule "LIARC_INSTALL" "=" '("install-liarc-bundles") output)
       (newline output)
diff --git a/v7/src/sf/make.scm b/v7/src/sf/make.scm
index 43159eb6d..051bd89fb 100644
--- a/v7/src/sf/make.scm
+++ b/v7/src/sf/make.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: make.scm,v 4.46 2007/01/05 21:19:29 cph Exp $
+$Id: make.scm,v 4.47 2007/04/14 03:55:02 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -29,6 +29,7 @@ USA.
 
 (declare (usual-integrations))
 
+(declare-shared-library "sf" (lambda () #t))
 (with-working-directory-pathname
     (directory-pathname (current-load-pathname))
   (lambda ()
diff --git a/v7/src/star-parser/load.scm b/v7/src/star-parser/load.scm
index 5e0bdb390..b70adb508 100644
--- a/v7/src/star-parser/load.scm
+++ b/v7/src/star-parser/load.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: load.scm,v 1.20 2007/01/05 21:19:29 cph Exp $
+$Id: load.scm,v 1.21 2007/04/14 03:55:06 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -27,5 +27,11 @@ USA.
 
 (with-working-directory-pathname (directory-pathname (current-load-pathname))
   (lambda ()
-    (load-package-set "parser")))
+    ((access with-directory-rewriting-rule
+	     (->environment '(RUNTIME COMPILER-INFO)))
+     (working-directory-pathname)
+     (pathname-as-directory "star-parser")
+     (lambda ()
+       (load-package-set "parser")))))
+(declare-shared-library "star-parser" (lambda () (global-parser-macros)))
 (add-subsystem-identification! "*Parser" '(0 13))
\ No newline at end of file
-- 
2.25.1