From 3aa470c6f1e6b130fd9bd88315c7a04303c6f16a Mon Sep 17 00:00:00 2001 From: Nikodemus Siivola Date: Sun, 8 Apr 2007 13:20:57 +0000 Subject: [PATCH] 1.0.4.48: ROOM patch by Lutz Euler * More correct reporting on x86-64. --- src/code/room.lisp | 8 ++++++-- version.lisp-expr | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/code/room.lisp b/src/code/room.lisp index 6e0ed5a..21bbfb9 100644 --- a/src/code/room.lisp +++ b/src/code/room.lisp @@ -88,8 +88,10 @@ (make-room-info :name 'closure :kind :closure)) +;; FIXME: This looks rather brittle. Can we get more of these numbers +;; from somewhere sensible? (dolist (stuff '((simple-bit-vector-widetag . -3) - (simple-vector-widetag . 2) + (simple-vector-widetag . #.sb!vm:word-shift) (simple-array-unsigned-byte-2-widetag . -2) (simple-array-unsigned-byte-4-widetag . -1) (simple-array-unsigned-byte-7-widetag . 0) @@ -179,7 +181,9 @@ (multiple-value-bind (start end) (space-bounds space) (- (sap-int end) (sap-int start)))) -;;; Round SIZE (in bytes) up to the next dualword (eight byte) boundary. +;;; Round SIZE (in bytes) up to the next dualword boundary. A dualword +;;; is eight bytes on platforms with 32-bit word size and 16 bytes on +;;; platforms with 64-bit word size. #!-sb-fluid (declaim (inline round-to-dualword)) (defun round-to-dualword (size) (declare (fixnum size)) diff --git a/version.lisp-expr b/version.lisp-expr index 98053bf..51cb8c7 100644 --- 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".) -"1.0.4.47" +"1.0.4.48" -- 1.7.10.4