X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fcompiler%2Fgeneric%2Futils.lisp;h=cd08569462c53f88e070d32667c125d00fdf9a64;hb=50305b602c3953440af716137a56f50cd204375d;hp=065b672bdec1acd045dbac2f4849c1a053c0559e;hpb=a530bbe337109d898d5b4a001fc8f1afa3b5dc39;p=sbcl.git

diff --git a/src/compiler/generic/utils.lisp b/src/compiler/generic/utils.lisp
index 065b672..cd08569 100644
--- a/src/compiler/generic/utils.lisp
+++ b/src/compiler/generic/utils.lisp
@@ -10,9 +10,6 @@
 ;;;; files for more information.
 
 (in-package "SB!VM")
-
-(file-comment
-  "$Header$")
 
 (defun fixnumize (num)
   #!+sb-doc
@@ -35,8 +32,8 @@
 	(unless posn (error "~S is not a static symbol." symbol))
 	(+ (* posn (pad-data-block symbol-size))
 	   (pad-data-block (1- symbol-size))
-	   other-pointer-type
-	   (- list-pointer-type)))
+	   other-pointer-lowtag
+	   (- list-pointer-lowtag)))
       0))
 
 (defun offset-static-symbol (offset)
@@ -45,7 +42,7 @@
   (if (zerop offset)
       nil
       (multiple-value-bind (n rem)
-	  (truncate (+ offset list-pointer-type (- other-pointer-type)
+	  (truncate (+ offset list-pointer-lowtag (- other-pointer-lowtag)
 		       (- (pad-data-block (1- symbol-size))))
 		    (pad-data-block symbol-size))
 	(unless (and (zerop rem) (<= 0 n (1- (length *static-symbols*))))
@@ -62,6 +59,6 @@
       (error "~S isn't a static function." name))
     (+ (* static-syms (pad-data-block symbol-size))
        (pad-data-block (1- symbol-size))
-       (- list-pointer-type)
+       (- list-pointer-lowtag)
        (* static-function-index (pad-data-block fdefn-size))
-       (* fdefn-raw-addr-slot word-bytes))))
+       (* fdefn-raw-addr-slot n-word-bytes))))