X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Fvalues.lisp;h=55cbe21959e718b95289a17521566c6aff0f15c1;hb=bcbcc0d0660b3b3741203b3dfdd3443b201bf690;hp=0677168d1b2066ffd5f529e8479b96d9943784fe;hpb=a530bbe337109d898d5b4a001fc8f1afa3b5dc39;p=sbcl.git

diff --git a/src/compiler/x86/values.lisp b/src/compiler/x86/values.lisp
index 0677168..55cbe21 100644
--- a/src/compiler/x86/values.lisp
+++ b/src/compiler/x86/values.lisp
@@ -11,9 +11,6 @@
 
 (in-package "SB!VM")
 
-(file-comment
- "$Header$")
-
 (define-vop (reset-stack-pointer)
   (:args (ptr :scs (any-reg)))
   (:generator 1
@@ -55,18 +52,18 @@
   (:generator 0
     (move list arg)
     (move start esp-tn)			; WARN pointing 1 below
-    (inst mov nil-temp *nil-value*)
+    (inst mov nil-temp nil-value)
 
     LOOP
     (inst cmp list nil-temp)
     (inst jmp :e done)
-    (pushw list cons-car-slot list-pointer-type)
-    (loadw list list cons-cdr-slot list-pointer-type)
+    (pushw list cons-car-slot list-pointer-lowtag)
+    (loadw list list cons-cdr-slot list-pointer-lowtag)
     (inst mov eax list)
     (inst and al-tn lowtag-mask)
-    (inst cmp al-tn list-pointer-type)
+    (inst cmp al-tn list-pointer-lowtag)
     (inst jmp :e loop)
-    (error-call vop bogus-argument-to-values-list-error list)
+    (error-call vop bogus-arg-to-values-list-error list)
 
     DONE
     (inst mov count start)		; start is high address
@@ -98,9 +95,10 @@
 	      (move count num))
 	     (t
 	      (inst lea src (make-ea :dword :base context
-				     :disp (- (* (tn-value skip) word-bytes))))
+				     :disp (- (* (tn-value skip)
+						 n-word-bytes))))
 	      (move count num)
-	      (inst sub count (* (tn-value skip) word-bytes)))))
+	      (inst sub count (* (tn-value skip) n-word-bytes)))))
 
       (any-reg
        (move src context)