[Sbcl-commits] CVS: sbcl/src/compiler/generic genesis.lisp,1.118.2.1,1.118.2.2

[Cyrus H. <sl...@us...>]

Update of /cvsroot/sbcl/sbcl/src/compiler/generic
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv28442/src/compiler/generic

Modified Files:
      Tag: lutex-branch
	genesis.lisp 
Log Message:
0.9.12.26.lutex-branch.33
   * merging 0.9.12.26 changes onto the lutex branch


Index: genesis.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/generic/genesis.lisp,v
retrieving revision 1.118.2.1
retrieving revision 1.118.2.2
diff -u -d -r1.118.2.1 -r1.118.2.2
--- genesis.lisp	21 Mar 2006 19:27:58 -0000	1.118.2.1
+++ genesis.lisp	15 May 2006 17:07:51 -0000	1.118.2.2
@@ -1747,8 +1747,7 @@
           (setf (bvref-32 gspace-bytes gspace-byte-offset)
                 (logior (mask-field (byte 16 16)
                                     (bvref-32 gspace-bytes gspace-byte-offset))
-                        (+ (ash value -16)
-                           (if (logbitp 15 value) 1 0)))))
+                        (ash (1+ (ldb (byte 17 15) value)) -1))))
          (:addi
           (setf (bvref-32 gspace-bytes gspace-byte-offset)
                 (logior (mask-field (byte 16 16)