X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-hash-table.lisp;h=26d751ebb83218c67ff90736c1a95c49e7819efd;hb=cd13034f9415f64cdaa05893a4ac5ff1e95c97bd;hp=cb9c502eb24c43219975aa99376a06e57b75dc2b;hpb=41ed816c7915806abca6b09ecd2136458f27adcc;p=sbcl.git

diff --git a/src/code/target-hash-table.lisp b/src/code/target-hash-table.lisp
index cb9c502..26d751e 100644
--- a/src/code/target-hash-table.lisp
+++ b/src/code/target-hash-table.lisp
@@ -15,7 +15,7 @@
 ;;;; utilities
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (defconstant max-hash most-positive-fixnum))
+  (defconstant max-hash sb!xc:most-positive-fixnum))
 
 (deftype hash ()
   `(integer 0 ,max-hash))
@@ -81,6 +81,7 @@
 ;;;; construction and simple accessors
 
 (defconstant +min-hash-table-size+ 16)
+(defconstant +min-hash-table-rehash-threshold+ (float 1/16 1.0))
 
 (defun make-hash-table (&key (test 'eql)
 			     (size +min-hash-table-size+)
@@ -130,15 +131,16 @@
 		      (min size
 			   ;; SIZE is just a hint, so if the user asks
 			   ;; for a SIZE which'd be too big for us to
-			   ;; easily implement, we bump it down.
-			   (floor array-dimension-limit 16))))
+ 			   ;; easily implement, we bump it down.
+			   (floor array-dimension-limit 1024))))
 	   (rehash-size (if (integerp rehash-size)
 			    rehash-size
 			    (float rehash-size 1.0)))
 	   ;; FIXME: Original REHASH-THRESHOLD default should be 1.0,
 	   ;; not 1, to make it easier for the compiler to avoid
 	   ;; boxing.
-	   (rehash-threshold (float rehash-threshold 1.0))
+	   (rehash-threshold (max +min-hash-table-rehash-threshold+
+				  (float rehash-threshold 1.0)))
 	   (size+1 (1+ size))		; The first element is not usable.
            ;; KLUDGE: The most natural way of expressing the below is
            ;; (round (/ (float size+1) rehash-threshold)), and indeed