Changeset 15032

Timestamp:

Oct 20, 2011, 2:04:46 PM (13 years ago)

Author:

Gary Byers

Message:

In X862-{THREE,FOUR}-UNTARGETED-REG-FORMS: when a destination register
is determined, resolve conflicts with any that are still pending (even
if the destination is set via possibly-elided pop.)

File:

• trunk/source/compiler/X86/x862.lisp (modified) (2 diffs)

trunk/source/compiler/X86/x862.lisp

@@ -3806 +3806 @@
       (unless btriv 
         (if bconst
-          (progn
-            (setq bdest (x862-one-untargeted-reg-form seg bform breg restricted)
-                  restricted (x862-restrict-node-target bdest restricted))
-            (when (same-x86-reg-p bdest areg)
-              (setq areg breg)))
-          (x862-elide-pushes seg bpushed (x862-pop-register seg (setq bdest breg)))))
+          (setq bdest (x862-one-untargeted-reg-form seg bform breg restricted))
+          (x862-elide-pushes seg bpushed (x862-pop-register seg (setq bdest breg))))
+        (setq restricted (x862-restrict-node-target bdest restricted))
+        (when (same-x86-reg-p bdest areg)
+          (setq areg breg)))
       (unless atriv
         (if aconst
@@ -3915 +3914 @@
     (unless ctriv
       (if cconst
-        (progn
-          (setq cdest (x862-one-untargeted-reg-form seg cform creg restricted)
-                restricted (x862-restrict-node-target cdest restricted))
-          (unless adest
-            (when (same-x86-reg-p cdest areg)
-              (setq areg creg)))
-          (unless bdest
-            (when (same-x86-reg-p cdest breg)
-              (setq breg creg))))
-        (x862-elide-pushes seg cpushed (x862-pop-register seg (setq cdest creg)))))
+        (setq cdest (x862-one-untargeted-reg-form seg cform creg restricted))
+
+        (x862-elide-pushes seg cpushed (x862-pop-register seg (setq cdest creg))))
+      (setq restricted (x862-restrict-node-target cdest restricted))
+      (unless adest
+        (when (same-x86-reg-p cdest areg)
+          (setq areg creg)))
+      (unless bdest
+        (when (same-x86-reg-p cdest breg)
+          (setq breg creg))))
     (unless btriv
       (if bconst
-        (progn
-          (setq bdest (x862-one-untargeted-reg-form seg bform breg restricted)
-                restricted (x862-restrict-node-target bdest restricted))
-          (unless adest
-            (when (same-x86-reg-p bdest areg)
-              (setq areg breg))))
-        (x862-elide-pushes seg bpushed (x862-pop-register seg (setq bdest breg)))))
+        (setq bdest (x862-one-untargeted-reg-form seg bform breg restricted))
+        (x862-elide-pushes seg bpushed (x862-pop-register seg (setq bdest breg))))
+      (setq restricted (x862-restrict-node-target bdest restricted))
+      (unless adest
+        (when (same-x86-reg-p bdest areg)
+          (setq areg breg))))
     (unless atriv
       (if aconst