X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fassembly%2Fx86%2Farith.lisp;h=68cdc1b5ee3eebbf3ce19e0d4896f55c9e5a390c;hb=b5703d98da9ebfd688c87e14862ab4e26dc94d14;hp=55e86e0d76f840dfef08ce55d90670f900e3e5f4;hpb=a530bbe337109d898d5b4a001fc8f1afa3b5dc39;p=sbcl.git

diff --git a/src/assembly/x86/arith.lisp b/src/assembly/x86/arith.lisp
index 55e86e0..68cdc1b 100644
--- a/src/assembly/x86/arith.lisp
+++ b/src/assembly/x86/arith.lisp
@@ -10,9 +10,6 @@
 ;;;; files for more information.
 
 (in-package "SB!VM")
-
-(file-comment
- "$Header$")
 
 ;;;; addition, subtraction, and multiplication
 
@@ -52,7 +49,7 @@
 		(inst mov ecx (fixnumize 2)) ; arg count
 		(inst jmp
 		      (make-ea :dword
-			       :disp (+ *nil-value*
+			       :disp (+ nil-value
 					(static-function-offset
 					 ',(symbolicate "TWO-ARG-" fun)))))
 
@@ -147,7 +144,7 @@
   (inst push eax)
   (inst mov ecx (fixnumize 1))	  ; arg count
   (inst jmp (make-ea :dword
-		     :disp (+ *nil-value* (static-function-offset '%negate))))
+		     :disp (+ nil-value (static-function-offset '%negate))))
 
   FIXNUM
   (move res x)
@@ -198,14 +195,14 @@
 					; SINGLE-FLOAT-BITS are parallel,
 					; should be named parallelly.
 		(inst jmp (make-ea :dword
-				   :disp (+ *nil-value*
+				   :disp (+ nil-value
 					    (static-function-offset
 					     ',static-fn))))
 
 		INLINE-FIXNUM-COMPARE
 		(inst cmp x y)
 		(inst jmp ,test RETURN-TRUE)
-		(inst mov res *nil-value*)
+		(inst mov res nil-value)
 		;; FIXME: A note explaining this return convention, or a
 		;; symbolic name for it, would be nice. (It looks as though we
 		;; should be hand-crafting the same return sequence as would be
@@ -243,7 +240,7 @@
   (inst jmp :nz DO-STATIC-FN)
 
   RETURN-NIL
-  (inst mov res *nil-value*)
+  (inst mov res nil-value)
   (inst pop eax)
   (inst add eax 2)
   (inst jmp eax)
@@ -256,7 +253,7 @@
   (inst push eax)
   (inst mov ecx (fixnumize 2))
   (inst jmp (make-ea :dword
-		     :disp (+ *nil-value* (static-function-offset 'eql))))
+		     :disp (+ nil-value (static-function-offset 'eql))))
 
   RETURN-T
   (load-symbol res t)
@@ -278,13 +275,13 @@
 			  (:temp ecx unsigned-reg ecx-offset)
 			  )
   (inst test x 3)		       ; descriptor?
-  (inst jmp :nz DO-STATIC-FN)	   ; yes do it here
+  (inst jmp :nz DO-STATIC-FN)          ; yes, do it here
   (inst test y 3)		       ; descriptor?
   (inst jmp :nz DO-STATIC-FN)
   (inst cmp x y)
   (inst jmp :e RETURN-T)		; ok
 
-  (inst mov res *nil-value*)
+  (inst mov res nil-value)
   (inst pop eax)
   (inst add eax 2)
   (inst jmp eax)
@@ -297,7 +294,7 @@
   (inst push eax)
   (inst mov ecx (fixnumize 2))
   (inst jmp (make-ea :dword
-		     :disp (+ *nil-value* (static-function-offset 'two-arg-=))))
+		     :disp (+ nil-value (static-function-offset 'two-arg-=))))
 
   RETURN-T
   (load-symbol res t))