X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fassembly%2Fassemfile.lisp;h=ac8ab34479ecb4bb87aa84a93c2e1c2deb2d1aa3;hb=964e644f3f1ec2c169b1def87f11e2f5b09a748e;hp=10fe4d8a570795e7785adc72cf7bcc13dc557ab0;hpb=5384ab22e633886f56e981054bf83580765008ad;p=sbcl.git

diff --git a/src/assembly/assemfile.lisp b/src/assembly/assemfile.lisp
index 10fe4d8..ac8ab34 100644
--- a/src/assembly/assemfile.lisp
+++ b/src/assembly/assemfile.lisp
@@ -13,7 +13,7 @@
 (in-package "SB!C")
 
 ;;; If non-NIL, emit assembly code. If NIL, emit VOP templates.
-(defvar *do-assembly* nil)
+(defvar *emit-assembly-code-not-vops-p* nil)
 
 ;;; a list of (NAME . LABEL) for every entry point
 (defvar *entry-points* nil)
@@ -31,7 +31,7 @@
 		      (output-file (make-pathname :defaults name
 						  :type "assem")))
   ;; FIXME: Consider nuking the filename defaulting logic here.
-  (let* ((*do-assembly* t)
+  (let* ((*emit-assembly-code-not-vops-p* t)
 	 (name (pathname name))
 	 ;; the fasl file currently being output to
 	 (lap-fasl-output (open-fasl-output (pathname output-file) name))
@@ -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
@@ -191,6 +191,6 @@
 	(values (car name&options)
 		(cdr name&options)))
     (let ((regs (mapcar (lambda (var) (apply #'parse-reg-spec var)) vars)))
-      (if *do-assembly*
+      (if *emit-assembly-code-not-vops-p*
 	  (emit-assemble name options regs code)
 	  (emit-vop name options regs)))))