X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-hash-table.lisp;h=52f01c3917232b18c5be246b9b83bf301560e079;hb=86210c4e406c1b2ff10cc3bac0e71435867db48b;hp=02f354ec0fa4f0a7b065ce370a73acc4cc7a3bbb;hpb=667ec9d494530079bef28e8589dd0d3274b935ec;p=sbcl.git

diff --git a/src/code/target-hash-table.lisp b/src/code/target-hash-table.lisp
index 02f354e..52f01c3 100644
--- 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
@@ -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)
@@ -648,7 +659,7 @@
   #!+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)))