Changeset 15172

Timestamp:

Jan 23, 2012, 10:35:32 AM (13 years ago)

Author:

Gary Byers

Message:

In X862-ALLOCATE-INITIALIZED-GVECTOR, we need to invalidate regmap
entries for values pushed and later popped into the vector.
(On x86, we arguably should invalidate the entry for the top of
stack whenever we push anything without going through X862-VPUSH-REGISTER;
we push stack markers, constants, and simple memory references. I didn't
do that.) If we push a value in a register to initialize a vector, don't
invalidate the location when it's popped/discarded, then push a constant
or memory reference, we might think that the register still contains the
stack location; this is the symptom described in

<​http://clozure.com/pipermail/openmcl-devel/2012-January/013318.html>

-Most- things that push and discard registers are associated with function
calls (which will invalidate the regmap). Inlined VECTOR is one exception;
I don't know if there are others.

File:

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

trunk/source/compiler/X86/x862.lisp

@@ -865 +865 @@
       (setf (svref *x862-gpr-locations* gpr) (list loc)))
     (setq *x862-gpr-locations-valid-mask*
-          (logior *x862-gpr-locations-valid-mask* (ash 1 gpr)))))
+          (logior *x862-gpr-locations-valid-mask* (ash 1 gpr)))))
   
 ;;; For vpush: nothing else should claim to contain loc.
@@ -1963 +1963 @@
                     (x862-box-s64 seg target s64-reg)))))
              (t
-                (with-imm-target () (u64-reg :u64)
-                  (if (eql vreg-mode hard-reg-class-gpr-mode-u64)
-                    (setq u64-reg vreg))
-                  (if (and index-known-fixnum (<= index-known-fixnum (arch::target-max-64-bit-constant-index arch)))
-                    (! misc-ref-c-u64 u64-reg src index-known-fixnum)
-                    (progn
-                      (if index-known-fixnum
-                        (x862-absolute-natural seg unscaled-idx nil (+ (arch::target-misc-data-offset arch) (ash index-known-fixnum 3))))
-                      (! misc-ref-u64 u64-reg src unscaled-idx)))
-                  (unless (eq u64-reg vreg)
-                    (ensuring-node-target (target vreg)
-                      (x862-box-u64 seg target u64-reg)))))))
+              (with-imm-target () (u64-reg :u64)
+                (if (eql vreg-mode hard-reg-class-gpr-mode-u64)
+                  (setq u64-reg vreg))
+                (if (and index-known-fixnum (<= index-known-fixnum (arch::target-max-64-bit-constant-index arch)))
+                  (! misc-ref-c-u64 u64-reg src index-known-fixnum)
+                  (progn
+                    (if index-known-fixnum
+                      (x862-absolute-natural seg unscaled-idx nil (+ (arch::target-misc-data-offset arch) (ash index-known-fixnum 3))))
+                    (! misc-ref-u64 u64-reg src unscaled-idx)))
+                (unless (eq u64-reg vreg)
+                  (ensuring-node-target (target vreg)
+                    (x862-box-u64 seg target u64-reg)))))))
           (t
            (unless is-1-bit
@@ -5423 +5423 @@
       (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*))
@@ -5481 +5482 @@
                          (! misc-set-c-node reg target index)))))
                  (! vstack-discard nntriv))
-               ))))
+               ))
+        (x862-regmap-note-vstack-delta entry-vstack *x862-vstack*)))
      (^)))