0.8alpha.0.28.alpha64.7:

STILL NON-FUNCTIONAL. ESURIENT AS A SHARK. for now, since hash tables are still implemented with (UNSIGNED-BYTE 32) vectors ... ensure that SXHASH returns an (UNSIGNED-BYTE 29) ... and GLOBALDB-SXHASHOID, too (at this point, the system gets about one quarter of the way through reversed-toplevel-forms-and-fixups before dying with a segmentation fault)
akovalenko · May 22, 2003 · 32622b7 · 32622b7
1 parent a73ea93
commit 32622b7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/src/code/target-hash-table.lisp b/src/code/target-hash-table.lisp
@@ -414,9 +414,15 @@
 	 ((not (zerop (hash-table-needing-rehash hash-table)))
 	  (flush-needing-rehash hash-table)))
    ;; Search for key in the hash table.
+;   (/show0 "in GETHASH, key=..")
+;   (/hexstr key)
+;   (/show0 "hash-table=..")
+;   (/hexstr hash-table)
    (multiple-value-bind (hashing eq-based)
        (funcall (hash-table-hash-fun hash-table) key)
      (declare (type hash hashing))
+;     (/show0 "hashing=..")
+;     (/hexstr hashing)
      (let* ((index-vector (hash-table-index-vector hash-table))
 	    (length (length index-vector))
 	    (index (rem hashing length))

diff --git a/src/code/target-sxhash.lisp b/src/code/target-sxhash.lisp
@@ -65,7 +65,7 @@
   (let* ((xy (+ (* x 3) y)))
     (declare (type (unsigned-byte 32) xy))
     (the (and fixnum unsigned-byte)
-	 (logand most-positive-fixnum
+	 (logand 536870911
 		 (logxor 441516657
 			 xy
 			 (the fixnum (ash xy -5)))))))

diff --git a/src/compiler/globaldb.lisp b/src/compiler/globaldb.lisp
@@ -67,8 +67,9 @@
 	      (let ((rest (rest x)))
 		(and (symbolp (car rest))
 		     (null (cdr rest)))))
-	 (logxor (symbol-hash (second x))
+	 (logand 536870911
-		 110680597))
+		 (logxor (symbol-hash (second x))
+			 110680597)))
 	(t (sxhash x))))
 
 ;;; Given any non-negative integer, return a prime number >= to it.

diff --git a/version.lisp-expr b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.8alpha.0.28.alpha64.6"
+"0.8alpha.0.28.alpha64.7"