From 8731d807a71de8435e500229fedc35a31402aaf2 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Thu, 16 Aug 2001 19:28:22 +0000
Subject: [PATCH] Synchronize "compiler.sf" on all the back ends.
---
v7/src/compiler/machines/C/compiler.sf | 30 ++++++-------
v7/src/compiler/machines/alpha/compiler.sf | 45 +++++++++----------
v7/src/compiler/machines/bobcat/compiler.sf | 41 ++++++++---------
v7/src/compiler/machines/i386/compiler.sf | 12 ++---
v7/src/compiler/machines/mips/compiler.sf-big | 44 +++++++++---------
.../compiler/machines/mips/compiler.sf-little | 44 +++++++++---------
v7/src/compiler/machines/spectrum/compiler.sf | 41 ++++++++---------
v7/src/compiler/machines/vax/compiler.sf | 41 ++++++++---------
8 files changed, 148 insertions(+), 150 deletions(-)
diff --git a/v7/src/compiler/machines/C/compiler.sf b/v7/src/compiler/machines/C/compiler.sf
index 6a58d33bd..5876ff735 100644
--- a/v7/src/compiler/machines/C/compiler.sf
+++ b/v7/src/compiler/machines/C/compiler.sf
@@ -1,8 +1,8 @@
#| -*-Scheme-*-
-$Id: compiler.sf,v 1.6 1999/01/02 06:06:43 cph Exp $
+$Id: compiler.sf,v 1.7 2001/08/16 19:28:21 cph Exp $
-Copyright (c) 1992-1999 Massachusetts Institute of Technology
+Copyright (c) 1992-1999, 2001 Massachusetts Institute of Technology
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -16,7 +16,8 @@ General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+USA.
|#
;;;; Script to incrementally syntax the compiler
@@ -26,14 +27,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
;; Guarantee that the compiler's package structure exists.
(if (not (name->package '(COMPILER)))
(begin
- ;; If there is no existing package constructor, generate one.
- (if (not (file-exists? "compiler.bco"))
- (begin
- ((access cref/generate-trivial-constructor
- (->environment '(CROSS-REFERENCE)))
- "compiler")
- (sf "compiler.con")))
- (load "compiler.bco")))
+ (if (not (file-exists? "compiler.pkd"))
+ (cref/generate-trivial-constructor "compiler"))
+ (construct-packages-from-file (fasload "compiler.pkd"))))
;; Guarantee that the necessary syntactic transforms and optimizers
;; are loaded.
@@ -45,7 +41,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
(load (string-append file ".bin") package))
files))))
(load-option 'HASH-TABLE)
- (write-string "\n\n---- Loading compile-time files ----")
+ (fresh-line)
+ (newline)
+ (write-string "---- Loading compile-time files ----")
+ (newline)
(sf-and-load '("base/switch") '(COMPILER))
(sf-and-load '("base/macros") '(COMPILER MACROS))
((access initialize-package! (->environment '(COMPILER MACROS))))
@@ -61,8 +60,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
(->environment '(COMPILER MACROS)))))
(sf-and-load '("machines/C/machin") '(COMPILER)))
(set! (access endianness (->environment '(COMPILER))) 'BIG)
- (sf-and-load '("back/syntax")
- '(COMPILER LAP-SYNTAXER))
+ (sf-and-load '("back/syntax") '(COMPILER LAP-SYNTAXER))
(sf-and-load '("base/scode") '(COMPILER))
(sf-and-load '("base/pmerly") '(COMPILER PATTERN-MATCHER/EARLY))))
@@ -70,6 +68,4 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
((access syntax-files! (->environment '(COMPILER))))
;; Rebuild the package constructors and cref.
-(cref/generate-constructors "compiler")
-(sf "compiler.con")
-(sf "compiler.ldr")
\ No newline at end of file
+(cref/generate-constructors "compiler")
\ No newline at end of file
diff --git a/v7/src/compiler/machines/alpha/compiler.sf b/v7/src/compiler/machines/alpha/compiler.sf
index bafae25bb..a06f8809a 100644
--- a/v7/src/compiler/machines/alpha/compiler.sf
+++ b/v7/src/compiler/machines/alpha/compiler.sf
@@ -1,8 +1,8 @@
#| -*-Scheme-*-
-$Id: compiler.sf,v 1.6 1999/01/02 06:48:57 cph Exp $
+$Id: compiler.sf,v 1.7 2001/08/16 19:28:21 cph Exp $
-Copyright (c) 1992-1999 Massachusetts Institute of Technology
+Copyright (c) 1992-1999, 2001 Massachusetts Institute of Technology
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -16,8 +16,8 @@ General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+USA.
|#
;;;; Script to incrementally syntax the compiler
@@ -27,14 +27,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
;; Guarantee that the compiler's package structure exists.
(if (not (name->package '(COMPILER)))
(begin
- ;; If there is no existing package constructor, generate one.
- (if (not (file-exists? "compiler.bco"))
- (begin
- ((access cref/generate-trivial-constructor
- (->environment '(CROSS-REFERENCE)))
- "compiler")
- (sf "compiler.con")))
- (load "compiler.bco")))
+ (if (not (file-exists? "compiler.pkd"))
+ (cref/generate-trivial-constructor "compiler"))
+ (construct-packages-from-file (fasload "compiler.pkd"))))
;; Guarantee that the necessary syntactic transforms and optimizers
;; are loaded.
@@ -46,7 +41,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
(load (string-append file ".bin") package))
files))))
(load-option 'HASH-TABLE)
- (write-string "\n\n---- Loading compile-time files ----")
+ (fresh-line)
+ (newline)
+ (write-string "---- Loading compile-time files ----")
+ (newline)
(sf-and-load '("base/switch") '(COMPILER))
(sf-and-load '("base/macros") '(COMPILER MACROS))
((access initialize-package! (->environment '(COMPILER MACROS))))
@@ -67,10 +65,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
(integrate-external "machin")
(usual-definition (set expt)))))
(sf-and-load '("machines/alpha/assmd") '(COMPILER ASSEMBLER)))
- (sf-and-load '("back/syntax")
- '(COMPILER LAP-SYNTAXER))
- (sf-and-load '("machines/alpha/coerce" "back/asmmac"
- "machines/alpha/insmac")
+ (sf-and-load '("back/syntax") '(COMPILER LAP-SYNTAXER))
+ (sf-and-load '("machines/alpha/coerce"
+ "back/asmmac"
+ "machines/alpha/insmac")
'(COMPILER LAP-SYNTAXER))
(sf-and-load '("base/scode") '(COMPILER))
(sf-and-load '("base/pmerly") '(COMPILER PATTERN-MATCHER/EARLY))
@@ -81,9 +79,12 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
(in-package (->environment '(COMPILER LAP-SYNTAXER))
(if (and compiler:enable-expansion-declarations?
(null? early-instructions))
- (fluid-let ((load-noisily? false)
- (load/suppress-loading-message? false))
- (write-string "\n\n---- Pre-loading instruction sets ----")
+ (fluid-let ((load-noisily? #f)
+ (load/suppress-loading-message? #f))
+ (fresh-line)
+ (newline)
+ (write-string "---- Pre-loading instruction sets ----")
+ (newline)
(for-each (lambda (name)
(load (string-append "machines/alpha/" name ".scm")
'(COMPILER LAP-SYNTAXER)
@@ -94,6 +95,4 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
((access syntax-files! (->environment '(COMPILER))))
;; Rebuild the package constructors and cref.
-(cref/generate-constructors "compiler")
-(sf "compiler.con")
-(sf "compiler.ldr")
\ No newline at end of file
+(cref/generate-constructors "compiler")
\ No newline at end of file
diff --git a/v7/src/compiler/machines/bobcat/compiler.sf b/v7/src/compiler/machines/bobcat/compiler.sf
index e84669eeb..19706f185 100644
--- a/v7/src/compiler/machines/bobcat/compiler.sf
+++ b/v7/src/compiler/machines/bobcat/compiler.sf
@@ -1,8 +1,8 @@
#| -*-Scheme-*-
-$Id: compiler.sf,v 1.18 1999/01/02 06:06:43 cph Exp $
+$Id: compiler.sf,v 1.19 2001/08/16 19:28:21 cph Exp $
-Copyright (c) 1988-1999 Massachusetts Institute of Technology
+Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -16,7 +16,8 @@ General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+USA.
|#
;;;; Script to incrementally syntax the compiler
@@ -26,14 +27,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
;; Guarantee that the compiler's package structure exists.
(if (not (name->package '(COMPILER)))
(begin
- ;; If there is no existing package constructor, generate one.
- (if (not (file-exists? "compiler.bco"))
- (begin
- ((access cref/generate-trivial-constructor
- (->environment '(CROSS-REFERENCE)))
- "compiler")
- (sf "compiler.con")))
- (load "compiler.bco")))
+ (if (not (file-exists? "compiler.pkd"))
+ (cref/generate-trivial-constructor "compiler"))
+ (construct-packages-from-file (fasload "compiler.pkd"))))
;; Guarantee that the necessary syntactic transforms and optimizers
;; are loaded.
@@ -45,7 +41,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
(load (string-append file ".bin") package))
files))))
(load-option 'HASH-TABLE)
- (write-string "\n\n---- Loading compile-time files ----")
+ (fresh-line)
+ (newline)
+ (write-string "---- Loading compile-time files ----")
+ (newline)
(sf-and-load '("base/switch") '(COMPILER))
(sf-and-load '("base/macros") '(COMPILER MACROS))
((access initialize-package! (->environment '(COMPILER MACROS))))
@@ -65,8 +64,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
(usual-definition (set expt)))))
(sf-and-load '("machines/bobcat/assmd") '(COMPILER ASSEMBLER)))
(sf-and-load '("back/syntax") '(COMPILER LAP-SYNTAXER))
- (sf-and-load '("machines/bobcat/coerce" "back/asmmac"
- "machines/bobcat/insmac")
+ (sf-and-load '("machines/bobcat/coerce"
+ "back/asmmac"
+ "machines/bobcat/insmac")
'(COMPILER LAP-SYNTAXER))
(sf-and-load '("base/scode") '(COMPILER))
(sf-and-load '("base/pmerly") '(COMPILER PATTERN-MATCHER/EARLY))
@@ -77,9 +77,12 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
(in-package (->environment '(COMPILER LAP-SYNTAXER))
(if (and compiler:enable-expansion-declarations?
(null? early-instructions))
- (fluid-let ((load-noisily? false)
- (load/suppress-loading-message? false))
- (write-string "\n\n---- Pre-loading instruction sets ----")
+ (fluid-let ((load-noisily? #f)
+ (load/suppress-loading-message? #f))
+ (fresh-line)
+ (newline)
+ (write-string "---- Pre-loading instruction sets ----")
+ (newline)
(for-each (lambda (name)
(load (string-append "machines/bobcat/" name ".scm")
'(COMPILER LAP-SYNTAXER)
@@ -91,6 +94,4 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
((access syntax-files! (->environment '(COMPILER))))
;; Rebuild the package constructors and cref.
-(cref/generate-constructors "compiler")
-(sf "compiler.con")
-(sf "compiler.ldr")
\ No newline at end of file
+(cref/generate-constructors "compiler")
\ No newline at end of file
diff --git a/v7/src/compiler/machines/i386/compiler.sf b/v7/src/compiler/machines/i386/compiler.sf
index 6a5883a78..8316776a5 100644
--- a/v7/src/compiler/machines/i386/compiler.sf
+++ b/v7/src/compiler/machines/i386/compiler.sf
@@ -1,6 +1,6 @@
#| -*-Scheme-*-
-$Id: compiler.sf,v 1.12 2001/08/16 19:09:28 cph Exp $
+$Id: compiler.sf,v 1.13 2001/08/16 19:28:21 cph Exp $
Copyright (c) 1992-2001 Massachusetts Institute of Technology
@@ -27,7 +27,6 @@ USA.
;; Guarantee that the compiler's package structure exists.
(if (not (name->package '(COMPILER)))
(begin
- ;; If there is no existing package constructor, generate one.
(if (not (file-exists? "compiler.pkd"))
(cref/generate-trivial-constructor "compiler"))
(construct-packages-from-file (fasload "compiler.pkd"))))
@@ -65,8 +64,9 @@ USA.
(usual-definition (set expt)))))
(sf-and-load '("machines/i386/assmd") '(COMPILER ASSEMBLER)))
(sf-and-load '("back/syntax") '(COMPILER LAP-SYNTAXER))
- (sf-and-load '("machines/i386/coerce" "back/asmmac"
- "machines/i386/insmac")
+ (sf-and-load '("machines/i386/coerce"
+ "back/asmmac"
+ "machines/i386/insmac")
'(COMPILER LAP-SYNTAXER))
(sf-and-load '("base/scode") '(COMPILER))
(sf-and-load '("base/pmerly") '(COMPILER PATTERN-MATCHER/EARLY))
@@ -77,8 +77,8 @@ USA.
(in-package (->environment '(COMPILER LAP-SYNTAXER))
(if (and compiler:enable-expansion-declarations?
(null? early-instructions))
- (fluid-let ((load-noisily? false)
- (load/suppress-loading-message? false))
+ (fluid-let ((load-noisily? #f)
+ (load/suppress-loading-message? #f))
(fresh-line)
(newline)
(write-string "---- Pre-loading instruction sets ----")
diff --git a/v7/src/compiler/machines/mips/compiler.sf-big b/v7/src/compiler/machines/mips/compiler.sf-big
index 82277eb6b..77812e27f 100644
--- a/v7/src/compiler/machines/mips/compiler.sf-big
+++ b/v7/src/compiler/machines/mips/compiler.sf-big
@@ -1,8 +1,8 @@
#| -*-Scheme-*-
-$Id: compiler.sf-big,v 1.8 1999/01/02 06:06:43 cph Exp $
+$Id: compiler.sf-big,v 1.9 2001/08/16 19:28:21 cph Exp $
-Copyright (c) 1988-1999 Massachusetts Institute of Technology
+Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -16,7 +16,8 @@ General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+USA.
|#
;;;; Script to incrementally syntax the compiler
@@ -26,14 +27,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
;; Guarantee that the compiler's package structure exists.
(if (not (name->package '(COMPILER)))
(begin
- ;; If there is no existing package constructor, generate one.
- (if (not (file-exists? "compiler.bco"))
- (begin
- ((access cref/generate-trivial-constructor
- (->environment '(CROSS-REFERENCE)))
- "compiler")
- (sf "compiler.con")))
- (load "compiler.bco")))
+ (if (not (file-exists? "compiler.pkd"))
+ (cref/generate-trivial-constructor "compiler"))
+ (construct-packages-from-file (fasload "compiler.pkd"))))
;; Guarantee that the necessary syntactic transforms and optimizers
;; are loaded.
@@ -45,7 +41,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
(load (string-append file ".bin") package))
files))))
(load-option 'HASH-TABLE)
- (write-string "\n\n---- Loading compile-time files ----")
+ (fresh-line)
+ (newline)
+ (write-string "---- Loading compile-time files ----")
+ (newline)
(sf-and-load '("base/switch") '(COMPILER))
(sf-and-load '("base/macros") '(COMPILER MACROS))
((access initialize-package! (->environment '(COMPILER MACROS))))
@@ -66,10 +65,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
(integrate-external "machin")
(usual-definition (set expt)))))
(sf-and-load '("machines/mips/assmd") '(COMPILER ASSEMBLER)))
- (sf-and-load '("back/syntax")
- '(COMPILER LAP-SYNTAXER))
- (sf-and-load '("machines/mips/coerce" "back/asmmac"
- "machines/mips/insmac")
+ (sf-and-load '("back/syntax") '(COMPILER LAP-SYNTAXER))
+ (sf-and-load '("machines/mips/coerce"
+ "back/asmmac"
+ "machines/mips/insmac")
'(COMPILER LAP-SYNTAXER))
(sf-and-load '("base/scode") '(COMPILER))
(sf-and-load '("base/pmerly") '(COMPILER PATTERN-MATCHER/EARLY))
@@ -80,9 +79,12 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
(in-package (->environment '(COMPILER LAP-SYNTAXER))
(if (and compiler:enable-expansion-declarations?
(null? early-instructions))
- (fluid-let ((load-noisily? false)
- (load/suppress-loading-message? false))
- (write-string "\n\n---- Pre-loading instruction sets ----")
+ (fluid-let ((load-noisily? #f)
+ (load/suppress-loading-message? #f))
+ (fresh-line)
+ (newline)
+ (write-string "---- Pre-loading instruction sets ----")
+ (newline)
(for-each (lambda (name)
(load (string-append "machines/mips/" name ".scm")
'(COMPILER LAP-SYNTAXER)
@@ -93,6 +95,4 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
((access syntax-files! (->environment '(COMPILER))))
;; Rebuild the package constructors and cref.
-(cref/generate-constructors "compiler")
-(sf "compiler.con")
-(sf "compiler.ldr")
\ No newline at end of file
+(cref/generate-constructors "compiler")
\ No newline at end of file
diff --git a/v7/src/compiler/machines/mips/compiler.sf-little b/v7/src/compiler/machines/mips/compiler.sf-little
index d6daa2537..73145bd12 100644
--- a/v7/src/compiler/machines/mips/compiler.sf-little
+++ b/v7/src/compiler/machines/mips/compiler.sf-little
@@ -1,8 +1,8 @@
#| -*-Scheme-*-
-$Id: compiler.sf-little,v 1.8 1999/01/02 06:06:43 cph Exp $
+$Id: compiler.sf-little,v 1.9 2001/08/16 19:28:22 cph Exp $
-Copyright (c) 1988-1999 Massachusetts Institute of Technology
+Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -16,7 +16,8 @@ General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+USA.
|#
;;;; Script to incrementally syntax the compiler
@@ -26,14 +27,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
;; Guarantee that the compiler's package structure exists.
(if (not (name->package '(COMPILER)))
(begin
- ;; If there is no existing package constructor, generate one.
- (if (not (file-exists? "compiler.bco"))
- (begin
- ((access cref/generate-trivial-constructor
- (->environment '(CROSS-REFERENCE)))
- "compiler")
- (sf "compiler.con")))
- (load "compiler.bco")))
+ (if (not (file-exists? "compiler.pkd"))
+ (cref/generate-trivial-constructor "compiler"))
+ (construct-packages-from-file (fasload "compiler.pkd"))))
;; Guarantee that the necessary syntactic transforms and optimizers
;; are loaded.
@@ -45,7 +41,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
(load (string-append file ".bin") package))
files))))
(load-option 'HASH-TABLE)
- (write-string "\n\n---- Loading compile-time files ----")
+ (fresh-line)
+ (newline)
+ (write-string "---- Loading compile-time files ----")
+ (newline)
(sf-and-load '("base/switch") '(COMPILER))
(sf-and-load '("base/macros") '(COMPILER MACROS))
((access initialize-package! (->environment '(COMPILER MACROS))))
@@ -66,10 +65,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
(integrate-external "machin")
(usual-definition (set expt)))))
(sf-and-load '("machines/mips/assmd") '(COMPILER ASSEMBLER)))
- (sf-and-load '("back/syntax")
- '(COMPILER LAP-SYNTAXER))
- (sf-and-load '("machines/mips/coerce" "back/asmmac"
- "machines/mips/insmac")
+ (sf-and-load '("back/syntax") '(COMPILER LAP-SYNTAXER))
+ (sf-and-load '("machines/mips/coerce"
+ "back/asmmac"
+ "machines/mips/insmac")
'(COMPILER LAP-SYNTAXER))
(sf-and-load '("base/scode") '(COMPILER))
(sf-and-load '("base/pmerly") '(COMPILER PATTERN-MATCHER/EARLY))
@@ -80,9 +79,12 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
(in-package (->environment '(COMPILER LAP-SYNTAXER))
(if (and compiler:enable-expansion-declarations?
(null? early-instructions))
- (fluid-let ((load-noisily? false)
- (load/suppress-loading-message? false))
- (write-string "\n\n---- Pre-loading instruction sets ----")
+ (fluid-let ((load-noisily? #f)
+ (load/suppress-loading-message? #f))
+ (fresh-line)
+ (newline)
+ (write-string "---- Pre-loading instruction sets ----")
+ (newline)
(for-each (lambda (name)
(load (string-append "machines/mips/" name ".scm")
'(COMPILER LAP-SYNTAXER)
@@ -93,6 +95,4 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
((access syntax-files! (->environment '(COMPILER))))
;; Rebuild the package constructors and cref.
-(cref/generate-constructors "compiler")
-(sf "compiler.con")
-(sf "compiler.ldr")
\ No newline at end of file
+(cref/generate-constructors "compiler")
\ No newline at end of file
diff --git a/v7/src/compiler/machines/spectrum/compiler.sf b/v7/src/compiler/machines/spectrum/compiler.sf
index a3f073ecd..700166c2b 100644
--- a/v7/src/compiler/machines/spectrum/compiler.sf
+++ b/v7/src/compiler/machines/spectrum/compiler.sf
@@ -1,8 +1,8 @@
#| -*-Scheme-*-
-$Id: compiler.sf,v 1.18 1999/01/02 06:06:43 cph Exp $
+$Id: compiler.sf,v 1.19 2001/08/16 19:28:22 cph Exp $
-Copyright (c) 1988-1999 Massachusetts Institute of Technology
+Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -16,7 +16,8 @@ General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+USA.
|#
;;;; Script to incrementally syntax the compiler
@@ -26,14 +27,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
;; Guarantee that the compiler's package structure exists.
(if (not (name->package '(COMPILER)))
(begin
- ;; If there is no existing package constructor, generate one.
- (if (not (file-exists? "compiler.bco"))
- (begin
- ((access cref/generate-trivial-constructor
- (->environment '(CROSS-REFERENCE)))
- "compiler")
- (sf "compiler.con")))
- (load "compiler.bco")))
+ (if (not (file-exists? "compiler.pkd"))
+ (cref/generate-trivial-constructor "compiler"))
+ (construct-packages-from-file (fasload "compiler.pkd"))))
;; Guarantee that the necessary syntactic transforms and optimizers
;; are loaded.
@@ -45,7 +41,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
(load (string-append file ".bin") package))
files))))
(load-option 'HASH-TABLE)
- (write-string "\n\n---- Loading compile-time files ----")
+ (fresh-line)
+ (newline)
+ (write-string "---- Loading compile-time files ----")
+ (newline)
(sf-and-load '("base/switch") '(COMPILER))
(sf-and-load '("base/macros") '(COMPILER MACROS))
((access initialize-package! (->environment '(COMPILER MACROS))))
@@ -65,8 +64,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
(usual-definition (set expt)))))
(sf-and-load '("machines/spectrum/assmd") '(COMPILER ASSEMBLER)))
(sf-and-load '("back/syntax") '(COMPILER LAP-SYNTAXER))
- (sf-and-load '("machines/spectrum/coerce" "back/asmmac"
- "machines/spectrum/insmac")
+ (sf-and-load '("machines/spectrum/coerce"
+ "back/asmmac"
+ "machines/spectrum/insmac")
'(COMPILER LAP-SYNTAXER))
(sf-and-load '("base/scode") '(COMPILER))
(sf-and-load '("base/pmerly") '(COMPILER PATTERN-MATCHER/EARLY))
@@ -77,9 +77,12 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
(in-package (->environment '(COMPILER LAP-SYNTAXER))
(if (and compiler:enable-expansion-declarations?
(null? early-instructions))
- (fluid-let ((load-noisily? false)
- (load/suppress-loading-message? false))
- (write-string "\n\n---- Pre-loading instruction sets ----")
+ (fluid-let ((load-noisily? #f)
+ (load/suppress-loading-message? #f))
+ (fresh-line)
+ (newline)
+ (write-string "---- Pre-loading instruction sets ----")
+ (newline)
(for-each (lambda (name)
(load (string-append "machines/spectrum/" name ".scm")
'(COMPILER LAP-SYNTAXER)
@@ -90,6 +93,4 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
((access syntax-files! (->environment '(COMPILER))))
;; Rebuild the package constructors and cref.
-(cref/generate-constructors "compiler")
-(sf "compiler.con")
-(sf "compiler.ldr")
\ No newline at end of file
+(cref/generate-constructors "compiler")
\ No newline at end of file
diff --git a/v7/src/compiler/machines/vax/compiler.sf b/v7/src/compiler/machines/vax/compiler.sf
index 185379428..614239705 100644
--- a/v7/src/compiler/machines/vax/compiler.sf
+++ b/v7/src/compiler/machines/vax/compiler.sf
@@ -1,8 +1,8 @@
#| -*-Scheme-*-
-$Id: compiler.sf,v 1.9 1999/01/02 06:06:43 cph Exp $
+$Id: compiler.sf,v 1.10 2001/08/16 19:28:22 cph Exp $
-Copyright (c) 1988-1999 Massachusetts Institute of Technology
+Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -16,7 +16,8 @@ General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+USA.
|#
;;;; Script to incrementally syntax the compiler
@@ -26,14 +27,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
;; Guarantee that the compiler's package structure exists.
(if (not (name->package '(COMPILER)))
(begin
- ;; If there is no existing package constructor, generate one.
- (if (not (file-exists? "compiler.bco"))
- (begin
- ((access cref/generate-trivial-constructor
- (->environment '(CROSS-REFERENCE)))
- "compiler")
- (sf "compiler.con")))
- (load "compiler.bco")))
+ (if (not (file-exists? "compiler.pkd"))
+ (cref/generate-trivial-constructor "compiler"))
+ (construct-packages-from-file (fasload "compiler.pkd"))))
;; Guarantee that the necessary syntactic transforms and optimizers
;; are loaded.
@@ -45,7 +41,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
(load (string-append file ".bin") package))
files))))
(load-option 'HASH-TABLE)
- (write-string "\n\n---- Loading compile-time files ----")
+ (fresh-line)
+ (newline)
+ (write-string "---- Loading compile-time files ----")
+ (newline)
(sf-and-load '("base/switch") '(COMPILER))
(sf-and-load '("base/macros") '(COMPILER MACROS))
((access initialize-package! (->environment '(COMPILER MACROS))))
@@ -65,8 +64,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
(usual-definition (set expt)))))
(sf-and-load '("machines/vax/assmd") '(COMPILER ASSEMBLER)))
(sf-and-load '("back/syntax") '(COMPILER LAP-SYNTAXER))
- (sf-and-load '("machines/vax/coerce" "back/asmmac"
- "machines/vax/insmac")
+ (sf-and-load '("machines/vax/coerce"
+ "back/asmmac"
+ "machines/vax/insmac")
'(COMPILER LAP-SYNTAXER))
(sf-and-load '("base/scode") '(COMPILER))
(sf-and-load '("base/pmerly") '(COMPILER PATTERN-MATCHER/EARLY))
@@ -81,9 +81,12 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
(in-package (->environment '(COMPILER LAP-SYNTAXER))
(if (and compiler:enable-expansion-declarations?
(null? early-instructions))
- (fluid-let ((load-noisily? false)
- (load/suppress-loading-message? false))
- (write-string "\n\n---- Pre-loading instruction sets ----")
+ (fluid-let ((load-noisily? #f)
+ (load/suppress-loading-message? #f))
+ (fresh-line)
+ (newline)
+ (write-string "---- Pre-loading instruction sets ----")
+ (newline)
(for-each (lambda (name)
(load (string-append "machines/vax/" name ".scm")
'(COMPILER LAP-SYNTAXER)
@@ -94,6 +97,4 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
((access syntax-files! (->environment '(COMPILER))))
;; Rebuild the package constructors and cref.
-(cref/generate-constructors "compiler")
-(sf "compiler.con")
-(sf "compiler.ldr")
\ No newline at end of file
+(cref/generate-constructors "compiler")
\ No newline at end of file
--
2.25.1