From: Chris Hanson <org/chris-hanson/cph>
Date: Mon, 29 Aug 1988 22:54:31 +0000 (+0000)
Subject: Use `move-to-temporary-register!' to correctly reuse a data register
X-Git-Tag: 20090517-FFI~12572
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=079267de1517e85c706f97ecf44d7d338b3c2fec;p=mit-scheme.git

Use `move-to-temporary-register!' to correctly reuse a data register
for a particular rule.  Previously was doing something ad hoc.
---

diff --git a/v7/src/compiler/machines/bobcat/rules3.scm b/v7/src/compiler/machines/bobcat/rules3.scm
index c2aedfe67..3c5984210 100644
--- a/v7/src/compiler/machines/bobcat/rules3.scm
+++ b/v7/src/compiler/machines/bobcat/rules3.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/bobcat/rules3.scm,v 4.9 1988/06/14 08:48:47 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/bobcat/rules3.scm,v 4.10 1988/08/29 22:54:31 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -207,8 +207,13 @@ MIT in each case. |#
 	   (LABEL ,label)
 	   ,@(generate/move-frame-up* frame-size temp)))))
 
-(define (object->address*dynamic-link frame-size dreg)
-  (let ((label (generate-label))
+(define-rule statement
+  (INVOCATION-PREFIX:DYNAMIC-LINK (? frame-size)
+				  (OBJECT->ADDRESS (REGISTER (? source)))
+				  (REGISTER 12))
+  (QUALIFIER (pseudo-register? source))
+  (let ((dreg (move-to-temporary-register! source 'DATA))
+	(label (generate-label))
 	(temp (allocate-temporary-register! 'ADDRESS)))
     (let ((areg (register-reference temp)))
       (LAP (AND L ,mask-reference ,dreg)
@@ -219,18 +224,6 @@ MIT in each case. |#
 	   (LABEL ,label)
 	   ,@(generate/move-frame-up* frame-size temp)))))
 
-(define-rule statement
-  (INVOCATION-PREFIX:DYNAMIC-LINK (? frame-size)
-				  (OBJECT->ADDRESS (REGISTER (? source)))
-				  (REGISTER 12))
-  (if (and (dead-register? source)
-	   (register-has-alias? source 'DATA))
-      (object->address*dynamic-link frame-size
-       (register-reference (register-alias source 'DATA)))
-      (let ((temp (reference-temporary-register! 'DATA)))
-	(LAP (MOV L ,(coerce->any source) ,temp)
-	     ,@(object->address*dynamic-link frame-size temp)))))
-
 (define (generate/move-frame-up frame-size destination)
   (let ((temp (allocate-temporary-register! 'ADDRESS)))
     (LAP (LEA ,destination ,(register-reference temp))