Split toplev and move a couple of things around to make integration of

the C back end, and other back ends that use native post-processing,
easier.

diff --git a/v7/src/compiler/machines/alpha/compiler.pkg b/v7/src/compiler/machines/alpha/compiler.pkg
index ccd36622595ff828523b34e9b6bdaea0800b4483..4cd1e7af02ac9247b5fb3e08a66cfe35341c9724 100644 (file)
--- a/v7/src/compiler/machines/alpha/compiler.pkg
+++ b/v7/src/compiler/machines/alpha/compiler.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: compiler.pkg,v 1.1 1992/08/29 13:51:17 jinx Exp $
+$Id: compiler.pkg,v 1.2 1992/10/19 20:14:24 jinx Exp $
 
 Copyright (c) 1992 Digital Equipment Corporation (D.E.C.)
 
@@ -153,9 +153,11 @@ case.
 
 (define-package (compiler top-level)
   (files "base/toplev"
-        "base/crstop")
+        "base/crstop"
+        "base/asstop")
   (parent (compiler))
   (export ()
+         cbf
          cf
          compile-bin-file
          compile-procedure
@@ -624,12 +626,13 @@ case.
   (files "back/linear")
   (parent (compiler lap-syntaxer))
   (export (compiler lap-syntaxer)
-         linearize-lap
+         add-end-of-block-code!
          bblock-linearize-lap
-         add-end-of-block-code!)
-  (export (compiler top-level)
          linearize-lap
-         initialize-lap-linearizer!))
+         set-current-branches!)
+  (export (compiler top-level)
+         *end-of-block-code*
+         linearize-lap))
 \f
 (define-package (compiler lap-optimizer)
   (files "machines/alpha/lapopt")

diff --git a/v7/src/compiler/machines/alpha/decls.scm b/v7/src/compiler/machines/alpha/decls.scm
index 14cfe5f5b8307b2829b8aa6ff30ce1c5100f1d3a..8750e9377f57b5db35ea6eb2df63e2fbd0667355 100644 (file)
--- a/v7/src/compiler/machines/alpha/decls.scm
+++ b/v7/src/compiler/machines/alpha/decls.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: decls.scm,v 1.1 1992/08/29 13:51:21 jinx Exp $
+$Id: decls.scm,v 1.2 1992/10/19 20:13:46 jinx Exp $
 
 Copyright (c) 1992 Digital Equipment Corporation (D.E.C.)
 
@@ -47,7 +47,8 @@ case.
   (set! source-filenames '())
   (set! source-hash)
   (set! source-nodes)
-  (set! source-nodes/by-rank))
+  (set! source-nodes/by-rank)
+  unspecific)
 
 (define (maybe-setup-source-nodes!)
   (if (null? source-filenames)
@@ -155,7 +156,8 @@ case.
 (define (source-nodes/rank!)
   (compute-dependencies! source-nodes)
   (compute-ranks! source-nodes)
-  (set! source-nodes/by-rank (source-nodes/sort-by-rank source-nodes)))
+  (set! source-nodes/by-rank (source-nodes/sort-by-rank source-nodes))
+  unspecific)
 
 (define (compute-dependencies! nodes)
   (for-each (lambda (node)
@@ -335,11 +337,12 @@ case.
                     filenames))))
     (file-dependency/syntax/join
      (append (filename/append "base"
+                             "toplev" "asstop" "crstop"
                              "blocks" "cfg1" "cfg2" "cfg3" "constr"
-                             "contin" "crstop" "ctypes" "debug" "enumer"
+                             "contin" "ctypes" "debug" "enumer"
                              "infnew" "lvalue" "object" "pmerly" "proced"
                              "refctx" "rvalue" "scode" "sets" "subprb"
-                             "switch" "toplev" "utils")
+                             "switch" "utils")
             (filename/append "back"
                              "asmmac" "bittop" "bitutl" "insseq" "lapgn1"
                              "lapgn2" "lapgn3" "linear" "regmap" "symtab"
@@ -411,7 +414,7 @@ case.
         (instruction-base
          (filename/append "machines/alpha" "assmd" "machin"))
         (lapgen-base
-         (append (filename/append "back" "lapgn3" "regmap")
+         (append (filename/append "back" "linear" "regmap")
                  (filename/append "machines/alpha" "lapgen")))
         (assembler-base
          (filename/append "back" "symtab"))
@@ -558,7 +561,6 @@ case.
     (define-integration-dependencies "back" "lapgn1" "rtlbase"
       "regset" "rgraph" "rtlcfg")
     (define-integration-dependencies "back" "lapgn2" "rtlbase" "rtlreg")
-    (define-integration-dependencies "back" "lapgn3" "rtlbase" "rtlcfg")
     (define-integration-dependencies "back" "linear" "base" "cfg1" "cfg2")
     (define-integration-dependencies "back" "linear" "rtlbase" "rtlcfg")
     (define-integration-dependencies "back" "mermap" "back" "regmap")

diff --git a/v7/src/compiler/machines/bobcat/decls.scm b/v7/src/compiler/machines/bobcat/decls.scm
index a35ed47d02bf8e84f3d94a6e618ee58d0918c6f1..ac18e687a8751a3585a660fe79f7e5e542007662 100644 (file)
--- a/v7/src/compiler/machines/bobcat/decls.scm
+++ b/v7/src/compiler/machines/bobcat/decls.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: decls.scm,v 4.31 1992/10/19 19:18:23 jinx Exp $
+$Id: decls.scm,v 4.32 1992/10/19 20:13:01 jinx Exp $
 
 Copyright (c) 1988-1992 Massachusetts Institute of Technology
 
@@ -45,7 +45,8 @@ MIT in each case. |#
   (set! source-filenames '())
   (set! source-hash)
   (set! source-nodes)
-  (set! source-nodes/by-rank))
+  (set! source-nodes/by-rank)
+  unspecific)
 
 (define (maybe-setup-source-nodes!)
   (if (null? source-filenames)
@@ -153,7 +154,8 @@ MIT in each case. |#
 (define (source-nodes/rank!)
   (compute-dependencies! source-nodes)
   (compute-ranks! source-nodes)
-  (set! source-nodes/by-rank (source-nodes/sort-by-rank source-nodes)))
+  (set! source-nodes/by-rank (source-nodes/sort-by-rank source-nodes))
+  unspecific)
 
 (define (compute-dependencies! nodes)
   (for-each (lambda (node)

diff --git a/v7/src/compiler/machines/i386/compiler.pkg b/v7/src/compiler/machines/i386/compiler.pkg
index 6c5a077c382b67c490b98c4082db1ed563d5197e..fce5047789909a380c0363555ed4f8f50e6a85ab 100644 (file)
--- a/v7/src/compiler/machines/i386/compiler.pkg
+++ b/v7/src/compiler/machines/i386/compiler.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/i386/compiler.pkg,v 1.11 1992/08/07 19:21:55 jinx Exp $
+$Id: compiler.pkg,v 1.12 1992/10/19 20:14:15 jinx Exp $
 
 Copyright (c) 1992 Massachusetts Institute of Technology
 
@@ -153,9 +153,11 @@ MIT in each case. |#
 
 (define-package (compiler top-level)
   (files "base/toplev"
-        "base/crstop")
+        "base/crstop"
+        "base/asstop")
   (parent (compiler))
   (export ()
+         cbf
          cf
          compile-bin-file
          compile-procedure
@@ -625,12 +627,13 @@ MIT in each case. |#
   (files "back/linear")
   (parent (compiler lap-syntaxer))
   (export (compiler lap-syntaxer)
-         linearize-lap
+         add-end-of-block-code!
          bblock-linearize-lap
-         add-end-of-block-code!)
-  (export (compiler top-level)
          linearize-lap
-         initialize-lap-linearizer!))
+         set-current-branches!)
+  (export (compiler top-level)
+         *end-of-block-code*
+         linearize-lap))
 
 (define-package (compiler lap-optimizer)
   (files "machines/i386/lapopt")

diff --git a/v7/src/compiler/machines/i386/decls.scm b/v7/src/compiler/machines/i386/decls.scm
index 6922799b3511eb556a6e092886d71a337e096dbf..e62ac4e5b2fd29e92631f0918d24cd63faee6557 100644 (file)
--- a/v7/src/compiler/machines/i386/decls.scm
+++ b/v7/src/compiler/machines/i386/decls.scm
@@ -1,7 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/i386/decls.scm,v 1.2 1992/02/28 20:22:42 jinx Exp $
-$MC68020-Header: decls.scm,v 4.27 90/05/03 15:17:08 GMT jinx Exp $
+$Id: decls.scm,v 1.3 1992/10/19 20:13:24 jinx Exp $
 
 Copyright (c) 1992 Massachusetts Institute of Technology
 
@@ -34,6 +33,7 @@ promotional, or sales literature without prior written consent from
 MIT in each case. |#
 
 ;;;; Compiler File Dependencies
+;;; package: (compiler declarations)
 
 (declare (usual-integrations))
 \f
@@ -45,7 +45,8 @@ MIT in each case. |#
   (set! source-filenames '())
   (set! source-hash)
   (set! source-nodes)
-  (set! source-nodes/by-rank))
+  (set! source-nodes/by-rank)
+  unspecific)
 
 (define (maybe-setup-source-nodes!)
   (if (null? source-filenames)
@@ -153,7 +154,8 @@ MIT in each case. |#
 (define (source-nodes/rank!)
   (compute-dependencies! source-nodes)
   (compute-ranks! source-nodes)
-  (set! source-nodes/by-rank (source-nodes/sort-by-rank source-nodes)))
+  (set! source-nodes/by-rank (source-nodes/sort-by-rank source-nodes))
+  unspecific)
 
 (define (compute-dependencies! nodes)
   (for-each (lambda (node)
@@ -333,11 +335,12 @@ MIT in each case. |#
                     filenames))))
     (file-dependency/syntax/join
      (append (filename/append "base"
+                             "toplev" "asstop" "crstop"
                              "blocks" "cfg1" "cfg2" "cfg3" "constr"
-                             "contin" "crstop" "ctypes" "debug" "enumer"
+                             "contin" "ctypes" "debug" "enumer"
                              "infnew" "lvalue" "object" "pmerly" "proced"
                              "refctx" "rvalue" "scode" "sets" "subprb"
-                             "switch" "toplev" "utils")
+                             "switch" "utils")
             (filename/append "back"
                              "asmmac" "bittop" "bitutl" "insseq" "lapgn1"
                              "lapgn2" "lapgn3" "linear" "regmap" "symtab"
@@ -408,7 +411,7 @@ MIT in each case. |#
         (instruction-base
          (filename/append "machines/i386" "assmd" "machin"))
         (lapgen-base
-         (append (filename/append "back" "lapgn3" "regmap")
+         (append (filename/append "back" "linear" "regmap")
                  (filename/append "machines/i386" "lapgen")))
         (assembler-base
          (append (filename/append "back" "symtab")
@@ -554,7 +557,6 @@ MIT in each case. |#
     (define-integration-dependencies "back" "lapgn1" "rtlbase"
       "rgraph" "rtlcfg")
     (define-integration-dependencies "back" "lapgn2" "rtlbase" "rtlreg")
-    (define-integration-dependencies "back" "lapgn3" "rtlbase" "rtlcfg")
     (define-integration-dependencies "back" "linear" "base" "cfg1" "cfg2")
     (define-integration-dependencies "back" "linear" "rtlbase" "rtlcfg")
     (define-integration-dependencies "back" "mermap" "back" "regmap")

diff --git a/v7/src/compiler/machines/mips/compiler.pkg b/v7/src/compiler/machines/mips/compiler.pkg
index e6f657e11318ea83a49847c1d9e5065521fa6918..9d63899bc50f7f494b434ea924dcb2187755e7cc 100644 (file)
--- a/v7/src/compiler/machines/mips/compiler.pkg
+++ b/v7/src/compiler/machines/mips/compiler.pkg
@@ -1,9 +1,8 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/mips/compiler.pkg,v 1.8 1992/07/29 23:10:25 cph Exp $
-$MC68020-Header: /scheme/compiler/bobcat/RCS/comp.pkg,v 1.32 1991/05/06 23:09:24 jinx Exp $
+$Id: compiler.pkg,v 1.9 1992/10/19 20:14:01 jinx Exp $
 
-Copyright (c) 1988-92 Massachusetts Institute of Technology
+Copyright (c) 1988-1992 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -153,9 +152,11 @@ MIT in each case. |#
 
 (define-package (compiler top-level)
   (files "base/toplev"
-        "base/crstop")
+        "base/crstop"
+        "base/asstop")
   (parent (compiler))
   (export ()
+         cbf
          cf
          compile-bin-file
          compile-procedure
@@ -625,12 +626,13 @@ MIT in each case. |#
   (files "back/linear")
   (parent (compiler lap-syntaxer))
   (export (compiler lap-syntaxer)
-         linearize-lap
+         add-end-of-block-code!
          bblock-linearize-lap
-         add-end-of-block-code!)
-  (export (compiler top-level)
          linearize-lap
-         initialize-lap-linearizer!))
+         set-current-branches!)
+  (export (compiler top-level)
+         *end-of-block-code*
+         linearize-lap))
 \f
 (define-package (compiler lap-optimizer)
   (files "machines/mips/lapopt")

diff --git a/v7/src/compiler/machines/mips/decls.scm b/v7/src/compiler/machines/mips/decls.scm
index d8292127dcb4cdf6681b764f4e596b352511bb52..ff54ab358691eb1c0cdab4218350ec7aac9cf39c 100644 (file)
--- a/v7/src/compiler/machines/mips/decls.scm
+++ b/v7/src/compiler/machines/mips/decls.scm
@@ -1,9 +1,8 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/mips/decls.scm,v 1.5 1991/11/04 20:36:50 cph Exp $
-$MC68020-Header: decls.scm,v 4.27 90/05/03 15:17:08 GMT jinx Exp $
+$Id: decls.scm,v 1.6 1992/10/19 20:12:50 jinx Exp $
 
-Copyright (c) 1988-91 Massachusetts Institute of Technology
+Copyright (c) 1988-1992 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -46,7 +45,8 @@ MIT in each case. |#
   (set! source-filenames '())
   (set! source-hash)
   (set! source-nodes)
-  (set! source-nodes/by-rank))
+  (set! source-nodes/by-rank)
+  unspecific)
 
 (define (maybe-setup-source-nodes!)
   (if (null? source-filenames)
@@ -154,7 +154,8 @@ MIT in each case. |#
 (define (source-nodes/rank!)
   (compute-dependencies! source-nodes)
   (compute-ranks! source-nodes)
-  (set! source-nodes/by-rank (source-nodes/sort-by-rank source-nodes)))
+  (set! source-nodes/by-rank (source-nodes/sort-by-rank source-nodes))
+  unspecific)
 
 (define (compute-dependencies! nodes)
   (for-each (lambda (node)
@@ -334,11 +335,12 @@ MIT in each case. |#
                     filenames))))
     (file-dependency/syntax/join
      (append (filename/append "base"
+                             "toplev" "asstop" "crstop"
                              "blocks" "cfg1" "cfg2" "cfg3" "constr"
-                             "contin" "crstop" "ctypes" "debug" "enumer"
+                             "contin" "ctypes" "debug" "enumer"
                              "infnew" "lvalue" "object" "pmerly" "proced"
                              "refctx" "rvalue" "scode" "sets" "subprb"
-                             "switch" "toplev" "utils")
+                             "switch" "utils")
             (filename/append "back"
                              "asmmac" "bittop" "bitutl" "insseq" "lapgn1"
                              "lapgn2" "lapgn3" "linear" "regmap" "symtab"
@@ -410,7 +412,7 @@ MIT in each case. |#
         (instruction-base
          (filename/append "machines/mips" "assmd" "machin"))
         (lapgen-base
-         (append (filename/append "back" "lapgn3" "regmap")
+         (append (filename/append "back" "linear" "regmap")
                  (filename/append "machines/mips" "lapgen")))
         (assembler-base
          (filename/append "back" "symtab"))
@@ -557,7 +559,6 @@ MIT in each case. |#
     (define-integration-dependencies "back" "lapgn1" "rtlbase"
       "regset" "rgraph" "rtlcfg")
     (define-integration-dependencies "back" "lapgn2" "rtlbase" "rtlreg")
-    (define-integration-dependencies "back" "lapgn3" "rtlbase" "rtlcfg")
     (define-integration-dependencies "back" "linear" "base" "cfg1" "cfg2")
     (define-integration-dependencies "back" "linear" "rtlbase" "rtlcfg")
     (define-integration-dependencies "back" "mermap" "back" "regmap")

diff --git a/v7/src/compiler/machines/vax/compiler.pkg b/v7/src/compiler/machines/vax/compiler.pkg
index c255028d36d366732a559b559afb98e004565c41..268cd3ed30085dc2b6b0b9d5fc37d8d0eb62a49f 100644 (file)
--- a/v7/src/compiler/machines/vax/compiler.pkg
+++ b/v7/src/compiler/machines/vax/compiler.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/vax/compiler.pkg,v 1.12 1992/08/05 23:39:34 jinx Exp $
+$Id: compiler.pkg,v 1.13 1992/10/19 20:14:08 jinx Exp $
 
 Copyright (c) 1988-1992 Massachusetts Institute of Technology
 
@@ -152,9 +152,11 @@ MIT in each case. |#
 
 (define-package (compiler top-level)
   (files "base/toplev"
-        "base/crstop")
+        "base/crstop"
+        "base/asstop")
   (parent (compiler))
   (export ()
+         cbf
          cf
          compile-bin-file
          compile-procedure
@@ -620,12 +622,13 @@ MIT in each case. |#
   (files "back/linear")
   (parent (compiler lap-syntaxer))
   (export (compiler lap-syntaxer)
-         linearize-lap
+         add-end-of-block-code!
          bblock-linearize-lap
-         add-end-of-block-code!)
-  (export (compiler top-level)
          linearize-lap
-         initialize-lap-linearizer!))
+         set-current-branches!)
+  (export (compiler top-level)
+         *end-of-block-code*
+         linearize-lap))
 \f
 (define-package (compiler lap-optimizer)
   (files "machines/vax/lapopt")

diff --git a/v7/src/compiler/machines/vax/decls.scm b/v7/src/compiler/machines/vax/decls.scm
index 7cdfeb345829e8068afb17846032d0d9c0f18470..2b5d9eba65423ac0ded08ffda2e1cc1ab57ee938 100644 (file)
--- a/v7/src/compiler/machines/vax/decls.scm
+++ b/v7/src/compiler/machines/vax/decls.scm
@@ -1,9 +1,8 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/vax/decls.scm,v 4.8 1991/11/04 20:37:25 cph Exp $
-$MC68020-Header: decls.scm,v 4.27 90/05/03 15:17:08 GMT jinx Exp $
+$Id: decls.scm,v 4.9 1992/10/19 20:13:10 jinx Exp $
 
-Copyright (c) 1987-91 Massachusetts Institute of Technology
+Copyright (c) 1987-1992 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -46,7 +45,8 @@ MIT in each case. |#
   (set! source-filenames '())
   (set! source-hash)
   (set! source-nodes)
-  (set! source-nodes/by-rank))
+  (set! source-nodes/by-rank)
+  unspecific)
 
 (define (maybe-setup-source-nodes!)
   (if (null? source-filenames)
@@ -154,7 +154,8 @@ MIT in each case. |#
 (define (source-nodes/rank!)
   (compute-dependencies! source-nodes)
   (compute-ranks! source-nodes)
-  (set! source-nodes/by-rank (source-nodes/sort-by-rank source-nodes)))
+  (set! source-nodes/by-rank (source-nodes/sort-by-rank source-nodes))
+  unspecific)
 
 (define (compute-dependencies! nodes)
   (for-each (lambda (node)
@@ -334,11 +335,12 @@ MIT in each case. |#
                     filenames))))
     (file-dependency/syntax/join
      (append (filename/append "base"
+                             "toplev" "asstop" "crstop"
                              "blocks" "cfg1" "cfg2" "cfg3" "constr"
-                             "contin" "crstop" "ctypes" "debug" "enumer"
+                             "contin" "ctypes" "debug" "enumer"
                              "infnew" "lvalue" "object" "pmerly" "proced"
                              "refctx" "rvalue" "scode" "sets" "subprb"
-                             "switch" "toplev" "utils")
+                             "switch" "utils")
             (filename/append "back"
                              "asmmac" "bittop" "bitutl" "insseq" "lapgn1"
                              "lapgn2" "lapgn3" "linear" "regmap" "symtab"
@@ -413,7 +415,7 @@ MIT in each case. |#
        (instruction-base
         (filename/append "machines/vax" "assmd" "machin"))
        (lapgen-base
-        (append (filename/append "back" "lapgn3" "regmap")
+        (append (filename/append "back" "linear" "regmap")
                 (filename/append "machines/vax" "lapgen")))
        (assembler-base
         (append (filename/append "back" "symtab")
@@ -558,7 +560,6 @@ MIT in each case. |#
     (define-integration-dependencies "back" "lapgn1" "rtlbase"
       "rgraph" "rtlcfg")
     (define-integration-dependencies "back" "lapgn2" "rtlbase" "rtlreg")
-    (define-integration-dependencies "back" "lapgn3" "rtlbase" "rtlcfg")
     (define-integration-dependencies "back" "linear" "base" "cfg1" "cfg2")
     (define-integration-dependencies "back" "linear" "rtlbase" "rtlcfg")
     (define-integration-dependencies "back" "mermap" "back" "regmap")