CMUCL commit: amd64-dd-branch src/code (class.lisp hash-new.lisp)

[Raymond Toy]

    Date: Friday, November 6, 2009 @ 14:54:21
  Author: rtoy
    Path: /project/cmucl/cvsroot/src/code
     Tag: amd64-dd-branch

Modified: class.lisp hash-new.lisp

code/class.lisp:
o Make layout-hash-max the same size as used for 32-bit.

code/hash-new.lisp:
o Make max-hash be the same size as used for 32-bit.

These changes are needed because the index type is still a small
fixnum.  Have not yet figured out how to make that a big fixnum type
yet.


---------------+
 class.lisp    |    6 ++++--
 hash-new.lisp |    6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)


Index: src/code/class.lisp
diff -u src/code/class.lisp:1.62 src/code/class.lisp:1.62.10.1
--- src/code/class.lisp:1.62	Thu Jun 11 12:03:57 2009
+++ src/code/class.lisp	Fri Nov  6 14:54:20 2009
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /project/cmucl/cvsroot/src/code/class.lisp,v 1.62 2009-06-11 16:03:57 rtoy Rel $")
+  "$Header: /project/cmucl/cvsroot/src/code/class.lisp,v 1.62.10.1 2009-11-06 19:54:20 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -164,7 +164,9 @@
   (declare (type layout layout) (type index new-value i))
   (setf (%instance-ref layout (1+ i)) new-value))
 
-(defconstant layout-hash-max (ash most-positive-fixnum -3)
+(defconstant layout-hash-max
+  #-amd64 (ash most-positive-fixnum -3)
+  #+amd64 (ash (1- (ash 1 29)) -3)
   "The inclusive upper bound on LAYOUT-HASH values.")
 
 (defvar *layout-hash-seed* nil)
Index: src/code/hash-new.lisp
diff -u src/code/hash-new.lisp:1.51 src/code/hash-new.lisp:1.51.8.1
--- src/code/hash-new.lisp:1.51	Sat Aug  8 23:54:42 2009
+++ src/code/hash-new.lisp	Fri Nov  6 14:54:20 2009
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /project/cmucl/cvsroot/src/code/hash-new.lisp,v 1.51 2009-08-09 03:54:42 rtoy Rel $")
+  "$Header: /project/cmucl/cvsroot/src/code/hash-new.lisp,v 1.51.8.1 2009-11-06 19:54:20 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -129,7 +129,9 @@
 	    :count
 	    (hash-table-number-entries ht))))
 
-(defconstant max-hash most-positive-fixnum)
+(defconstant max-hash
+  #-amd64 most-positive-fixnum
+  #+amd64 (1- (ash 1 29)))
 
 (deftype hash ()
   `(integer 0 ,max-hash))