1.0.25.14: comments

[sbcl.git] / src / code / target-sxhash.lisp

diff --git a/src/code/target-sxhash.lisp b/src/code/target-sxhash.lisp
index 5ddbd21..28bbf84 100644 (file)
--- a/src/code/target-sxhash.lisp
+++ b/src/code/target-sxhash.lisp
@@ -11,6 +11,9 @@
 
 (in-package "SB!IMPL")
 
 
 (in-package "SB!IMPL")
 

+(defun pointer-hash (key)
+  (pointer-hash key))
+

 ;;; the depthoid explored when calculating hash values
 ;;;
 ;;; "Depthoid" here is a sort of mixture of what Common Lisp ordinarily calls
 ;;; the depthoid explored when calculating hash values
 ;;;
 ;;; "Depthoid" here is a sort of mixture of what Common Lisp ordinarily calls

@@ -80,7 +83,7 @@
 ;;;; <http://burtleburtle.net/bob/hash/doobs.html> for some more
 ;;;; information).
 
 ;;;; <http://burtleburtle.net/bob/hash/doobs.html> for some more
 ;;;; information).
 

-#!-sb-fluid (declaim (inline %sxhash-substring))
+(declaim (inline %sxhash-substring))

 (defun %sxhash-substring (string &optional (count (length string)))
   ;; FIXME: As in MIX above, we wouldn't need (SAFETY 0) here if the
   ;; cross-compiler were smarter about ASH, but we need it for
 (defun %sxhash-substring (string &optional (count (length string)))
   ;; FIXME: As in MIX above, we wouldn't need (SAFETY 0) here if the
   ;; cross-compiler were smarter about ASH, but we need it for

@@ -139,10 +142,8 @@
 ;;;; the SXHASH function
 
 ;; simple cases
 ;;;; the SXHASH function
 
 ;; simple cases

-(declaim (ftype (sfunction (integer) (integer 0 #.sb!xc:most-positive-fixnum))
-                sxhash-bignum))
-(declaim (ftype (sfunction (t) (integer 0 #.sb!xc:most-positive-fixnum))
-                sxhash-instance))
+(declaim (ftype (sfunction (integer) hash) sxhash-bignum))
+(declaim (ftype (sfunction (t) hash) sxhash-instance))

 
 (defun sxhash (x)
   ;; profiling SXHASH is hard, but we might as well try to make it go
 
 (defun sxhash (x)
   ;; profiling SXHASH is hard, but we might as well try to make it go

@@ -250,12 +251,13 @@
                   '(let ((result 572539))
                      (declare (type fixnum result))
                      (mixf result (length key))
                   '(let ((result 572539))
                      (declare (type fixnum result))
                      (mixf result (length key))

-                     (dotimes (i (length key))
+                    (when (plusp depthoid)
+                      (decf depthoid)
+                      (dotimes (i (length key))

                        (declare (type fixnum i))
                        (mixf result
                        (declare (type fixnum i))
                        (mixf result

-                             (psxhash (aref key i)
-                                      (- depthoid 1 i))))
-                     result))
+                             (psxhash (aref key i) depthoid))))
+                    result))

                 (make-dispatch (types)
                   `(typecase key
                      ,@(loop for type in types
                 (make-dispatch (types)
                   `(typecase key
                      ,@(loop for type in types

@@ -274,10 +276,11 @@
        (declare (type fixnum result))
        (dotimes (i (array-rank key))
          (mixf result (array-dimension key i)))
        (declare (type fixnum result))
        (dotimes (i (array-rank key))
          (mixf result (array-dimension key i)))

-       (dotimes (i (array-total-size key))
-         (mixf result
-               (psxhash (row-major-aref key i)
-                        (- depthoid 1 i))))
+       (when (plusp depthoid)
+         (decf depthoid)
+         (dotimes (i (array-total-size key))
+          (mixf result
+                (psxhash (row-major-aref key i) depthoid))))

        result))))
 
 (defun structure-object-psxhash (key depthoid)
        result))))
 
 (defun structure-object-psxhash (key depthoid)