X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fsxhash.lisp;h=abe819914608f56f306eb9b8aca75add0e8ca4c1;hb=3f3033a6c0ddf0af8dd1b5a17c2a4b82ea59b94f;hp=dde2e15f1b1cfb2d4edea8b7600ea8d877e5f458;hpb=9109df608080457c2fb2437c7eb5b9af23fe6cf2;p=sbcl.git diff --git a/src/code/sxhash.lisp b/src/code/sxhash.lisp index dde2e15..abe8199 100644 --- a/src/code/sxhash.lisp +++ b/src/code/sxhash.lisp @@ -53,11 +53,10 @@ ((= length 0) (mix result (sxhash 0))) (t (mixf result (sxhash (length x))) - (do* ((i sb!vm:vector-data-offset (+ i 1)) + (do* ((i 0 (+ i 1)) ;; FIXME: should we respect DEPTHOID? SXHASH on ;; strings doesn't seem to... - (end-1 (+ sb!vm:vector-data-offset - (floor (1- length) sb!vm:n-word-bits)))) + (end-1 (floor (1- length) sb!vm:n-word-bits))) ((= i end-1) (let ((num (logand @@ -67,14 +66,14 @@ (:big-endian '(- sb!vm:n-word-bits (mod length sb!vm:n-word-bits))))) - (%raw-bits x i)))) + (%vector-raw-bits x i)))) (mix result ,(ecase sb!c:*backend-byte-order* (:little-endian '(logand num most-positive-fixnum)) (:big-endian '(ash num (- sb!vm:n-lowtag-bits))))))) (declare (type index i end-1)) - (let ((num (%raw-bits x i))) + (let ((num (%vector-raw-bits x i))) (mixf result ,(ecase sb!c:*backend-byte-order* (:little-endian '(logand num most-positive-fixnum))