[movitz-cvs] CVS update: movitz/compiler.lisp

[Frode Vatvedt Fjeld]

Update of /project/movitz/cvsroot/movitz
In directory common-lisp.net:/tmp/cvs-serv17969

Modified Files:
	compiler.lisp 
Log Message:
Fixed a bug that caused compilation of some 1req1opt functions to
fail.

Date: Thu Feb 26 08:48:43 2004
Author: ffjeld

Index: movitz/compiler.lisp
diff -u movitz/compiler.lisp:1.32 movitz/compiler.lisp:1.33
--- movitz/compiler.lisp:1.32	Sun Feb 22 10:55:03 2004
+++ movitz/compiler.lisp	Thu Feb 26 08:48:42 2004
@@ -8,7 +8,7 @@
 ;;;; Created at:    Wed Oct 25 12:30:49 2000
 ;;;; Distribution:  See the accompanying file COPYING.
 ;;;;                
-;;;; $Id: compiler.lisp,v 1.32 2004/02/22 15:55:03 ffjeld Exp $
+;;;; $Id: compiler.lisp,v 1.33 2004/02/26 13:48:42 ffjeld Exp $
 ;;;;                
 ;;;;------------------------------------------------------------------
 
@@ -599,7 +599,7 @@
       finally
 	(multiple-value-bind (const-list num-jumpers jumpers-map)
 	    (layout-funobj-vector all-constants-plist
-				  jumper-sets
+				  all-jumper-sets
 				  (length (borrowed-bindings funobj)))
 	  (setf (movitz-funobj-num-jumpers funobj) num-jumpers
 		(movitz-funobj-const-list funobj) const-list
@@ -705,9 +705,9 @@
 						       use-stack-frame-p)))))
       (let ((optimized-function-code
 	     (optimize-code function-code
-			    :keep-labels (nconc (subseq (movitz-funobj-const-list funobj)
-							0 (movitz-funobj-num-jumpers funobj))
-						'(entry%1op entry%2op)))))
+			    :keep-labels (append (subseq (movitz-funobj-const-list funobj)
+							 0 (movitz-funobj-num-jumpers funobj))
+						 '(entry%1op entry%2op)))))
 	(assemble-funobj funobj optimized-function-code)))))
 
 (defun complete-funobj-default (funobj)
@@ -731,11 +731,11 @@
 					   have-normalized-ecx-p)))
 		     (let ((optimized-function-code
 			    (optimize-code function-code
-					   :keep-labels (nconc (subseq (movitz-funobj-const-list funobj)
-								       0 (movitz-funobj-num-jumpers funobj))
-							       '(entry%1op
-								 entry%2op
-								 entry%3op)))))
+					   :keep-labels (append (subseq (movitz-funobj-const-list funobj)
+									0 (movitz-funobj-num-jumpers funobj))
+								'(entry%1op
+								  entry%2op
+								  entry%3op)))))
 		       (cons numargs optimized-function-code))))))))
     (let ((code1 (cdr (assoc 1 code-specs)))
 	  (code2 (cdr (assoc 2 code-specs)))