From ec2c100f53fba4d1e3023fc69768d4b7304171e7 Mon Sep 17 00:00:00 2001 From: "Guillermo J. Rozas" Date: Mon, 19 Oct 1992 19:18:23 +0000 Subject: [PATCH] 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. --- v7/src/compiler/machines/bobcat/compiler.pkg | 17 +++++++++------- v7/src/compiler/machines/bobcat/decls.scm | 12 +++++------ .../compiler/machines/spectrum/compiler.pkg | 18 +++++++++-------- v7/src/compiler/machines/spectrum/decls.scm | 20 ++++++++++--------- 4 files changed, 37 insertions(+), 30 deletions(-) diff --git a/v7/src/compiler/machines/bobcat/compiler.pkg b/v7/src/compiler/machines/bobcat/compiler.pkg index f83d97f7b..383e369bd 100644 --- a/v7/src/compiler/machines/bobcat/compiler.pkg +++ b/v7/src/compiler/machines/bobcat/compiler.pkg @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: compiler.pkg,v 1.39 1992/09/24 22:07:15 cph Exp $ +$Id: compiler.pkg,v 1.40 1992/10/19 19:17:02 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 @@ -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 @@ -628,12 +630,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/bobcat/lapopt") diff --git a/v7/src/compiler/machines/bobcat/decls.scm b/v7/src/compiler/machines/bobcat/decls.scm index 3370e62e7..a35ed47d0 100644 --- a/v7/src/compiler/machines/bobcat/decls.scm +++ b/v7/src/compiler/machines/bobcat/decls.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/bobcat/decls.scm,v 4.30 1991/11/04 20:36:20 cph Exp $ +$Id: decls.scm,v 4.31 1992/10/19 19:18:23 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 @@ -333,11 +333,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" @@ -409,7 +410,7 @@ MIT in each case. |# (instruction-base (filename/append "machines/bobcat" "assmd" "machin")) (lapgen-base - (append (filename/append "back" "lapgn3" "regmap") + (append (filename/append "back" "linear" "regmap") (filename/append "machines/bobcat" "lapgen"))) (assembler-base (append (filename/append "back" "symtab") @@ -555,7 +556,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/spectrum/compiler.pkg b/v7/src/compiler/machines/spectrum/compiler.pkg index 28af0bdfb..b91a0346f 100644 --- a/v7/src/compiler/machines/spectrum/compiler.pkg +++ b/v7/src/compiler/machines/spectrum/compiler.pkg @@ -1,9 +1,8 @@ #| -*-Scheme-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/spectrum/compiler.pkg,v 1.37 1992/07/29 19:56:08 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.38 1992/10/19 19:15:35 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 @@ -627,12 +628,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/spectrum/lapopt") diff --git a/v7/src/compiler/machines/spectrum/decls.scm b/v7/src/compiler/machines/spectrum/decls.scm index d90c6d786..2b9469cc9 100644 --- a/v7/src/compiler/machines/spectrum/decls.scm +++ b/v7/src/compiler/machines/spectrum/decls.scm @@ -1,9 +1,8 @@ #| -*-Scheme-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/spectrum/decls.scm,v 4.30 1991/11/04 20:37:08 cph Exp $ -$MC68020-Header: decls.scm,v 4.27 90/05/03 15:17:08 GMT jinx Exp $ +$Id: decls.scm,v 4.31 1992/10/19 19:15:41 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 @@ -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)) @@ -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/spectrum" "assmd" "machin")) (lapgen-base - (append (filename/append "back" "lapgn3" "regmap") + (append (filename/append "back" "linear" "regmap") (filename/append "machines/spectrum" "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") -- 2.25.1