Changeset 14983

Timestamp:

Sep 16, 2011, 3:15:23 AM (13 years ago)

Author:

Gary Byers

Message:

NX-ADJUST-SETQ-COUNT: the value of the VAR-REFS slot isn't necessarily
a FIXNUM (when the loop nesting level was overestimated, it sometimes
wasn't a fixnum on 32-bit platforms, causing builds after r14982 to
break), so don't do fixnum arithmetic on it.

NX1-TAGBODY: try to estimate the loop nesting level better. (The VAR-REFS
slot can still overflow MOST-POSITIVE-FIXNUM especially on 32-bit machines.)

NX2-BIGGER-CDR-THAN: the sums of the VAR-REFS slots of several disjoint vars
may not be a fixnum.

Location:

trunk/source/compiler

Files:

• nx1.lisp (modified) (1 diff)
• nx2.lisp (modified) (1 diff)
• nxenv.lisp (modified) (1 diff)

trunk/source/compiler/nx1.lisp

@@ -1429 +1429 @@
       (push tag *nx-tags*))
     (let* ((body nil)
-           (*nx-loop-nesting-level* (1+ *nx-loop-nesting-level*)))
+           (level *nx-loop-nesting-level*)
+           (*nx-loop-nesting-level* level))
+           
       (dolist (form args (setq body (nreverse body)))
         (push 
          (if (atom form)
            (let ((info (nx-tag-info form)))
+             (when (eql level *nx-loop-nesting-level*)
+               (setq *nx-loop-nesting-level* (1+ level)))
              (%rplaca (%cdr (%cdr (%cdr (%cdr info)))) t)
              (cons (%nx1-operator tag-label) info))

trunk/source/compiler/nx2.lisp

@@ -22 +22 @@
 (defun nx2-bigger-cdr-than (x y)
   (declare (cons x y))
-  (> (the fixnum (cdr x)) (the fixnum (cdr y))))
+  (> (cdr x) (cdr y)))
 
 ;;; Return an unordered list of "varsets": each var in a varset can be

trunk/source/compiler/nxenv.lisp

@@ -566 +566 @@
                       by
                       (expt 4 *nx-loop-nesting-level*)))
-         (new (%i+ nsetqs scaled-by)))
+         (new (+ (var-refs var) scaled-by)))
     (nx-set-var-root-nsetqs var (1+ nsetqs))
     ;; If a variable is setq'ed from a catch nested within the construct that