Changeset 15225

Timestamp:

Feb 25, 2012, 6:55:09 PM (13 years ago)

Author:

Gary Byers

Message:

If a function uses &aux variables and *x862-tail-label* needs to
be emitted, make sure that the label is emitted before the &aux
variables are processed.
(This was causing failures in maxima's test suite, among other
things.)

File:

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

trunk/source/compiler/X86/x862.lisp

@@ -1062 +1062 @@
 
 
-(defun x862-bind-lambda (seg lcells req opt rest keys auxen optsupvloc passed-in-regs lexpr &optional inherited
+(defun x862-bind-lambda (seg lcells req opt rest keys auxen optsupvloc passed-in-regs lexpr inherited tail-label
                              &aux (vloc 0) (numopt (list-length (%car opt)))
                              (nkeys (list-length (%cadr keys))) 
@@ -1105 +1105 @@
             (x862-copy-register seg reg *x862-arg-z*)
             (x862-set-var-ea seg rest reg))
-            (let* ((loc *x862-vstack*))
-              (x862-vpush-register seg *x862-arg-z* :reserved)
-              (x862-note-top-cell rest)
-              (x862-bind-var seg rest loc *x862-top-vstack-lcell*))))
+          (let* ((loc *x862-vstack*))
+            (x862-vpush-register seg *x862-arg-z* :reserved)
+            (x862-note-top-cell rest)
+            (x862-bind-var seg rest loc *x862-top-vstack-lcell*))))
       (let* ((rvloc (+ vloc (* 2 *x862-target-node-size* nkeys))))
         (if (setq reg (nx2-assign-register-var rest))
           (x862-init-regvar seg rest reg (x862-vloc-ea rvloc))
           (x862-bind-var seg rest rvloc (pop lcells))))))
-    (when keys
-      (apply #'x862-init-keys seg vloc lcells keys))
+  (when keys
+    (apply #'x862-init-keys seg vloc lcells keys))
+  (when tail-label
+    (with-x86-local-vinsn-macros (seg)
+      (@+ tail-label)))
   (x862-seq-bind seg (%car auxen) (%cadr auxen)))
 
@@ -6723 +6726 @@
           (setq *x862-entry-vstack* *x862-vstack*)
           (setq reserved-lcells (x862-collect-lcells :reserved))
-          (x862-bind-lambda seg reserved-lcells req opt rest keys auxen optsupvloc arg-regs lexprp inherited-vars)
-          (when *x862-tail-label*
-            (@+ *x862-tail-label*))
+          (x862-bind-lambda seg reserved-lcells req opt rest keys auxen optsupvloc arg-regs lexprp inherited-vars *x862-tail-label*)
           (when next-method-var-scope-info
             (push next-method-var-scope-info *x862-recorded-symbols*)))