0.7.3.1:

[sbcl.git] / src / code / target-hash-table.lisp

diff --git a/src/code/target-hash-table.lisp b/src/code/target-hash-table.lisp
index 6d3f44c..52f01c3 100644 (file)
--- a/src/code/target-hash-table.lisp
+++ b/src/code/target-hash-table.lisp
@@ -140,7 +140,18 @@
           ;; boxing.
           (rehash-threshold (float rehash-threshold 1.0))
           (size+1 (1+ size))           ; The first element is not usable.
-          (scaled-size (round (/ (float size+1) rehash-threshold)))
+           ;; KLUDGE: The most natural way of expressing the below is
+           ;; (round (/ (float size+1) rehash-threshold)), and indeed
+           ;; it was expressed like that until 0.7.0. However,
+           ;; MAKE-HASH-TABLE is called very early in cold-init, and
+           ;; the SPARC has no primitive instructions for rounding,
+           ;; but only for truncating; therefore, we fudge this issue
+           ;; a little. The other uses of truncate, below, similarly
+           ;; used to be round. -- CSR, 2002-10-01
+          ;;
+          ;; Note that this has not yet been audited for
+          ;; correctness. It just seems to work. -- CSR, 2002-11-02
+          (scaled-size (truncate (/ (float size+1) rehash-threshold)))
           (length (almost-primify (max scaled-size
                                        (1+ +min-hash-table-size+))))
           (index-vector (make-array length
@@ -179,7 +190,7 @@
 
 (defun hash-table-count (hash-table)
   #!+sb-doc
-  "Returns the number of entries in the given HASH-TABLE."
+  "Return the number of entries in the given HASH-TABLE."
   (declare (type hash-table hash-table)
           (values index))
   (hash-table-number-entries hash-table))
@@ -224,7 +235,7 @@
              (fixnum
               (+ rehash-size old-size))
              (float
-              (the index (round (* rehash-size old-size)))))))
+              (the index (truncate (* rehash-size old-size)))))))
         (new-kv-vector (make-array (* 2 new-size)
                                    :initial-element +empty-ht-slot+))
         (new-next-vector (make-array new-size
@@ -236,7 +247,7 @@
                                        :initial-element #x80000000)))
         (old-index-vector (hash-table-index-vector table))
         (new-length (almost-primify
-                     (round (/ (float new-size)
+                     (truncate (/ (float new-size)
                                (hash-table-rehash-threshold table)))))
         (new-index-vector (make-array new-length
                                       :element-type '(unsigned-byte 32)
@@ -504,8 +515,8 @@
 
 (defun remhash (key hash-table)
   #!+sb-doc
-  "Remove the entry in HASH-TABLE associated with KEY. Returns T if there
-   was such an entry, and NIL if not."
+  "Remove the entry in HASH-TABLE associated with KEY. Return T if there
+   was such an entry, or NIL if not."
   (declare (type hash-table hash-table)
           (values (member t nil)))
   (without-gcing
@@ -642,15 +653,13 @@
 ;;;      not only parts of the system which are defined after DEFUN MAPHASH.
 ;;;   2. It could be conditional on compilation policy, so that
 ;;;      it could be compiled as a full call instead of an inline
-;;;      expansion when SPACE>SPEED. (Not only would this save space,
-;;;      it might actually be faster when a call is made from byte-compiled
-;;;      code.)
+;;;      expansion when SPACE>SPEED.
 (declaim (inline maphash))
 (defun maphash (function-designator hash-table)
   #!+sb-doc
   "For each entry in HASH-TABLE, call the designated two-argument function
    on the key and value of the entry. Return NIL."
-  (let ((fun (%coerce-callable-to-function function-designator))
+  (let ((fun (%coerce-callable-to-fun function-designator))
        (size (length (hash-table-next-vector hash-table))))
     (declare (type function fun))
     (do ((i 1 (1+ i)))