Change `cons-closure' from a statement to an expression. This allows

us more freedom in choosing the target register.

diff --git a/v7/src/compiler/machines/bobcat/dassm2.scm b/v7/src/compiler/machines/bobcat/dassm2.scm
index 8e8654c2d25849370c11df30d2e54de8d38f24e3..ef80ed40f1b96f67f29bbb4a3055143adfa39ada 100644 (file)
--- a/v7/src/compiler/machines/bobcat/dassm2.scm
+++ b/v7/src/compiler/machines/bobcat/dassm2.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/bobcat/dassm2.scm,v 4.9 1988/11/04 02:24:53 jinx Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/bobcat/dassm2.scm,v 4.10 1988/11/08 08:24:13 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -326,7 +326,6 @@ MIT in each case. |#
       (8  . (REGISTER VALUE))
       (12 . (REGISTER ENVIRONMENT))
       (16 . (REGISTER TEMPORARY))
-      (20 . (REGISTER INTERPRETER-CALL-RESULT:ENCLOSE))
       ;; Compiler temporaries
       ,@(let loop ((index 40) (i 0))
          (if (= i 50)

diff --git a/v7/src/compiler/machines/bobcat/machin.scm b/v7/src/compiler/machines/bobcat/machin.scm
index 2e7a6764285400404a20dce331ca371ecb269899..86b267f8f50f80da45ab5fd7e4c0c39304fc468d 100644 (file)
--- a/v7/src/compiler/machines/bobcat/machin.scm
+++ b/v7/src/compiler/machines/bobcat/machin.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/bobcat/machin.scm,v 4.12 1988/11/03 06:31:15 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/bobcat/machin.scm,v 4.13 1988/11/08 08:23:25 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -80,7 +80,6 @@ MIT in each case. |#
     ((VALUE) 2)
     ((ENVIRONMENT) 3)
     ((TEMPORARY) 4)
-    ((INTERPRETER-CALL-RESULT:ENCLOSE) 5)
     (else false)))
 
 (define (rtl:interpreter-register->offset locative)
@@ -157,9 +156,6 @@ MIT in each case. |#
 (define-integrable (interpreter-register:cache-unassigned?)
   (rtl:make-machine-register d0))
 
-(define-integrable (interpreter-register:enclose)
-  (rtl:make-offset (interpreter-regs-pointer) 5))
-
 (define-integrable (interpreter-register:lookup)
   (rtl:make-machine-register d0))
 

diff --git a/v7/src/compiler/rtlbase/rtlexp.scm b/v7/src/compiler/rtlbase/rtlexp.scm
index 57b6a5cc3a4f6bccc8649beaec0cedb0c667c193..d0441b2a68bccac998fa77d495be468ecae55cb5 100644 (file)
--- a/v7/src/compiler/rtlbase/rtlexp.scm
+++ b/v7/src/compiler/rtlbase/rtlexp.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/rtlbase/rtlexp.scm,v 4.9 1988/11/01 04:52:48 jinx Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/rtlbase/rtlexp.scm,v 4.10 1988/11/08 08:21:41 cph Exp $
 
 Copyright (c) 1987, 1988 Massachusetts Institute of Technology
 
@@ -52,6 +52,7 @@ MIT in each case. |#
 (define-integrable (rtl:trivial-expression? expression)
   (memq (rtl:expression-type expression)
        '(ASSIGNMENT-CACHE
+         CONS-CLOSURE
          CONSTANT
          ENTRY:CONTINUATION
          ENTRY:PROCEDURE
@@ -64,6 +65,7 @@ MIT in each case. |#
       (memq (rtl:expression-type expression)
            '(ASSIGNMENT-CACHE
              CHAR->ASCII
+             CONS-CLOSURE
              FIXNUM-1-ARG
              FIXNUM-2-ARGS
              OBJECT->ADDRESS

diff --git a/v7/src/compiler/rtlbase/rtlty1.scm b/v7/src/compiler/rtlbase/rtlty1.scm
index aabac53055920c792bf9d3a53a67a558cbec5951..b2514b2b707689bf9760e84dbdaa88a3b22196c0 100644 (file)
--- a/v7/src/compiler/rtlbase/rtlty1.scm
+++ b/v7/src/compiler/rtlbase/rtlty1.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/rtlbase/rtlty1.scm,v 4.12 1988/11/01 04:53:11 jinx Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/rtlbase/rtlty1.scm,v 4.13 1988/11/08 08:21:03 cph Rel $
 
 Copyright (c) 1987, 1988 Massachusetts Institute of Technology
 
@@ -51,6 +51,7 @@ MIT in each case. |#
 (define-rtl-expression pre-increment rtl: register number)
 (define-rtl-expression post-increment rtl: register number)
 
+(define-rtl-expression cons-closure rtl: procedure min max size)
 (define-rtl-expression cons-pointer rtl: type datum)
 (define-rtl-expression constant % value)
 (define-rtl-expression assignment-cache rtl: name)
@@ -86,8 +87,6 @@ MIT in each case. |#
 (define-rtl-statement procedure-header rtl: procedure min max)
 (define-rtl-statement closure-header rtl: procedure)
 
-(define-rtl-statement cons-closure rtl: procedure min max size)
-
 (define-rtl-statement interpreter-call:access % environment name)
 (define-rtl-statement interpreter-call:define % environment name value)
 (define-rtl-statement interpreter-call:lookup % environment name safe?)

diff --git a/v7/src/compiler/rtlbase/rtlty2.scm b/v7/src/compiler/rtlbase/rtlty2.scm
index fde72c17d01aeac065928dc3430f152dc63c32dc..2c11bc3576694569bc967c17688ad8dceb9d80bb 100644 (file)
--- a/v7/src/compiler/rtlbase/rtlty2.scm
+++ b/v7/src/compiler/rtlbase/rtlty2.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/rtlbase/rtlty2.scm,v 4.5 1988/06/14 08:37:23 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/rtlbase/rtlty2.scm,v 4.6 1988/11/08 08:24:57 cph Rel $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -77,9 +77,6 @@ MIT in each case. |#
 (define-integrable (rtl:interpreter-call-result:cache-unassigned?)
   (rtl:make-fetch 'INTERPRETER-CALL-RESULT:CACHE-UNASSIGNED?))
 
-(define-integrable (rtl:interpreter-call-result:enclose)
-  (rtl:make-fetch 'INTERPRETER-CALL-RESULT:ENCLOSE))
-
 (define-integrable (rtl:interpreter-call-result:lookup)
   (rtl:make-fetch 'INTERPRETER-CALL-RESULT:LOOKUP))