X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Futils.lisp;h=d4192d316f3e720fc4efdcc204d7e1cc47a2c182;hb=19319c931fc1636835dbef71808cc10e252bcf45;hp=bbe98d24e3ffa878b529eaa759d13b10f7d2bbcd;hpb=7646aefa188758e2892fea2ad02be4f29b3938f2;p=sbcl.git

diff --git a/src/compiler/generic/utils.lisp b/src/compiler/generic/utils.lisp
index bbe98d2..d4192d3 100644
--- a/src/compiler/generic/utils.lisp
+++ b/src/compiler/generic/utils.lisp
@@ -15,8 +15,18 @@
 ;;; Make a fixnum out of NUM. (I.e. shift by two bits if it will fit.)
 (defun fixnumize (num)
   (if (fixnump num)
-      (ash num (1- n-lowtag-bits))
+      (ash num n-fixnum-tag-bits)
       (error "~W is too big for a fixnum." num)))
+
+;;; Determining whether a constant offset fits in an addressing mode.
+#!+(or x86 x86-64)
+(defun foldable-constant-offset-p (element-size lowtag data-offset offset)
+  (if (< element-size n-byte-bits)
+      nil
+      (multiple-value-bind (min max)
+          (sb!impl::displacement-bounds lowtag element-size data-offset)
+        (<= min offset max))))
+
 
 ;;;; routines for dealing with static symbols
 
@@ -28,11 +38,11 @@
 (defun static-symbol-offset (symbol)
   (if symbol
       (let ((posn (position symbol *static-symbols*)))
-	(unless posn (error "~S is not a static symbol." symbol))
-	(+ (* posn (pad-data-block symbol-size))
-	   (pad-data-block (1- symbol-size))
-	   other-pointer-lowtag
-	   (- list-pointer-lowtag)))
+        (unless posn (error "~S is not a static symbol." symbol))
+        (+ (* posn (pad-data-block symbol-size))
+           (pad-data-block (1- symbol-size))
+           other-pointer-lowtag
+           (- list-pointer-lowtag)))
       0))
 
 ;;; Given a byte offset, OFFSET, return the appropriate static symbol.
@@ -40,25 +50,32 @@
   (if (zerop offset)
       nil
       (multiple-value-bind (n rem)
-	  (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*))))
-	  (error "The byte offset ~W is not valid." offset))
-	(elt *static-symbols* n))))
+          (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*))))
+          (error "The byte offset ~W is not valid." offset))
+        (elt *static-symbols* n))))
 
 ;;; Return the (byte) offset from NIL to the start of the fdefn object
 ;;; for the static function NAME.
-(defun static-fun-offset (name)
+(defun static-fdefn-offset (name)
   (let ((static-syms (length *static-symbols*))
-	(static-fun-index (position name *static-funs*)))
+        (static-fun-index (position name *static-funs*)))
     (unless static-fun-index
       (error "~S isn't a static function." name))
     (+ (* static-syms (pad-data-block symbol-size))
        (pad-data-block (1- symbol-size))
        (- list-pointer-lowtag)
        (* static-fun-index (pad-data-block fdefn-size))
-       (* fdefn-raw-addr-slot n-word-bytes))))
+       other-pointer-lowtag)))
+
+;;; Return the (byte) offset from NIL to the raw-addr slot of the
+;;; fdefn object for the static function NAME.
+(defun static-fun-offset (name)
+  (+ (static-fdefn-offset name)
+     (- other-pointer-lowtag)
+     (* fdefn-raw-addr-slot n-word-bytes)))
 
 ;;; Various error-code generating helpers
 (defvar *adjustable-vectors* nil)