X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fassembly%2Fassemfile.lisp;h=ac8ab34479ecb4bb87aa84a93c2e1c2deb2d1aa3;hb=f1acc17f83cdfa9454a53bd0ee9bd0e9b9482817;hp=dd2cabfa084576df84cdfecdd9c4448f6e679384;hpb=08307967c71c580058a503d46aa087cfefcf8c69;p=sbcl.git

diff --git a/src/assembly/assemfile.lisp b/src/assembly/assemfile.lisp
index dd2cabf..ac8ab34 100644
--- a/src/assembly/assemfile.lisp
+++ b/src/assembly/assemfile.lisp
@@ -40,7 +40,7 @@
 	 (*code-segment* nil)
 	 (*elsewhere* nil)
 	 (*assembly-optimize* nil)
-	 (*fixups* nil))
+	 (*fixup-notes* nil))
     (unwind-protect
 	(let ((*features* (cons :sb-assembling *features*)))
 	  (init-assembler)
@@ -53,7 +53,7 @@
 	  (let ((length (sb!assem:finalize-segment *code-segment*)))
 	    (dump-assembler-routines *code-segment*
 				     length
-				     *fixups*
+				     *fixup-notes*
 				     *entry-points*
 				     lap-fasl-output))
 	  (setq won t))
@@ -120,9 +120,9 @@
 	`(:target ,(reg-spec-temp reg)))))
 
 (defun emit-vop (name options vars)
-  (let* ((args (remove :arg vars :key #'reg-spec-kind :test-not #'eq))
-	 (temps (remove :temp vars :key #'reg-spec-kind :test-not #'eq))
-	 (results (remove :res vars :key #'reg-spec-kind :test-not #'eq))
+  (let* ((args (remove :arg vars :key #'reg-spec-kind :test #'neq))
+	 (temps (remove :temp vars :key #'reg-spec-kind :test #'neq))
+	 (results (remove :res vars :key #'reg-spec-kind :test #'neq))
 	 (return-style (or (cadr (assoc :return-style options)) :raw))
 	 (cost (or (cadr (assoc :cost options)) 247))
 	 (vop (make-symbol "VOP")))
@@ -164,7 +164,7 @@
 		  ,@(apply #'append
 			   (mapcar #'cdr
 				   (remove :ignore call-temps
-					   :test-not #'eq :key #'car))))
+					   :test #'neq :key #'car))))
 	 ,@(remove-if (lambda (x)
 			(member x '(:return-style :cost)))
 		      options