New TN cost computation: directly take depth into account

[sbcl.git] / src / compiler / generic / vm-type.lisp

diff --git a/src/compiler/generic/vm-type.lisp b/src/compiler/generic/vm-type.lisp
index 618de2b..d5750cd 100644 (file)
--- a/src/compiler/generic/vm-type.lisp
+++ b/src/compiler/generic/vm-type.lisp
@@ -78,7 +78,7 @@
 ;;; FIXME: see also DEFCONSTANT MAXIMUM-BIGNUM-LENGTH in
 ;;; src/code/bignum.lisp.  -- CSR, 2004-07-19
 (sb!xc:deftype bignum-index ()
-  '(integer 0 #.(1- (ash 1 (- 32 sb!vm:n-widetag-bits)))))
+  '(integer 0 #.(1- (ash 1 (- sb!vm:n-word-bits sb!vm:n-widetag-bits)))))
 \f
 ;;;; hooks into the type system
 
@@ -172,9 +172,9 @@
 ;;; Return the most specific integer type that can be quickly checked that
 ;;; includes the given type.
 (defun containing-integer-type (subtype)
-  (dolist (type '(fixnum
-                  (signed-byte 32)
-                  (unsigned-byte 32)
+  (dolist (type `(fixnum
+                  (signed-byte ,sb!vm:n-word-bits)
+                  (unsigned-byte ,sb!vm:n-word-bits)
                   integer)
                 (error "~S isn't an integer type?" subtype))
     (when (csubtypep subtype (specifier-type type))