[Sbcl-commits] CVS: sbcl/src/code target-hash-table.lisp,1.15,1.15.2.1 target-sxhash.lisp,1.14,1.14.2.1

[Christophe R. <cr...@us...>]

Update of /cvsroot/sbcl/sbcl/src/code
In directory sc8-pr-cvs1:/tmp/cvs-serv27099/src/code

Modified Files:
      Tag: alpha64_branch
	target-hash-table.lisp target-sxhash.lisp 
Log Message:
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)


Index: target-hash-table.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/target-hash-table.lisp,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -d -r1.15 -r1.15.2.1
--- target-hash-table.lisp	5 May 2003 14:09:09 -0000	1.15
+++ target-hash-table.lisp	22 May 2003 14:40:47 -0000	1.15.2.1
@@ -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))

Index: target-sxhash.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/target-sxhash.lisp,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -d -r1.14 -r1.14.2.1
--- target-sxhash.lisp	7 May 2003 11:19:00 -0000	1.14
+++ target-sxhash.lisp	22 May 2003 14:40:47 -0000	1.14.2.1
@@ -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)))))))