Changeset 15173

Timestamp:

Jan 23, 2012, 12:56:50 PM (13 years ago)

Author:

Gary Byers

Message:

Back out of the previous change, and try to fix the problem the
way I was trying to talk myself into in the last commit's log.

Make X862-REGMAP-NOTE-STORE accept a null GPR arg (and just invalidate
any GPR that references the location.) If X862-FORM is going to push
its result, use X862-REGMAP-NOTE-STORE to invalidate regmap entries
that reference the top of stack. (If a register is pushed via
X862-VPUSH-REGISTER, those entries will just be invalidated again.)

File:

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

trunk/source/compiler/X86/x862.lisp

@@ -851 +851 @@
 
 (defun x862-regmap-note-store (gpr loc)
-  (let* ((gpr (%hard-regspec-value gpr)))
+  (let* ((gpr (if gpr (%hard-regspec-value gpr))))
     ;; Any other GPRs that had contained loc no longer do so.
     (dotimes (i 16)
@@ -861 +861 @@
             (setq *x862-gpr-locations-valid-mask*
                   (logandc2 *x862-gpr-locations-valid-mask* (ash 1 i)))))))
-    (if (logbitp gpr *x862-gpr-locations-valid-mask*)
-      (push loc (svref *x862-gpr-locations* gpr))
-      (setf (svref *x862-gpr-locations* gpr) (list loc)))
-    (setq *x862-gpr-locations-valid-mask*
-          (logior *x862-gpr-locations-valid-mask* (ash 1 gpr)))))
+    (when gpr
+      (if (logbitp gpr *x862-gpr-locations-valid-mask*)
+        (push loc (svref *x862-gpr-locations* gpr))
+        (setf (svref *x862-gpr-locations* gpr) (list loc)))
+      (setq *x862-gpr-locations-valid-mask*
+            (logior *x862-gpr-locations-valid-mask* (ash 1 gpr))))))
   
 ;;; For vpush: nothing else should claim to contain loc.
@@ -1368 +1369 @@
     (apply (x862-acode-operator-function form) seg vreg xfer args)))
 
+
 (defun x862-form (seg vreg xfer form)
+  (when (eq vreg :push)
+    (x862-regmap-note-store nil *x862-vstack*))
   (with-note (form seg)
     (if (nx-null form)
@@ -3290 +3294 @@
       (dolist (arg stkargs)
         (let* ((pushform (x862-acode-operator-supports-push arg)))
-          (if pushform
+en          (if pushformne
             (progn
               (x862-form seg :push nil pushform)
@@ -5423 +5427 @@
       (dolist (f initforms) (x862-form seg nil nil f))
       (let* ((*x862-vstack* *x862-vstack*)
-             (entry-vstack *x862-vstack*)
              (*x862-top-vstack-lcell* *x862-top-vstack-lcell*)
              (arch (backend-target-arch *target-backend*))
@@ -5482 +5485 @@
                          (! misc-set-c-node reg target index)))))
                  (! vstack-discard nntriv))
-               ))
-        (x862-regmap-note-vstack-delta entry-vstack *x862-vstack*)))
+               ))))
      (^)))