X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-random.lisp;h=3e353829bc960415ee9d6351d5776f49fca8ec80;hb=5e4205cf17c3a04d4a8f6aed55c28b5a338caf47;hp=aa87cadb9f68624ea0f2a45aad71b4fe814750b5;hpb=7646aefa188758e2892fea2ad02be4f29b3938f2;p=sbcl.git

diff --git a/src/code/target-random.lisp b/src/code/target-random.lisp
index aa87cad..3e35382 100644
--- a/src/code/target-random.lisp
+++ b/src/code/target-random.lisp
@@ -21,6 +21,18 @@
 (def!method make-load-form ((random-state random-state) &optional environment) 
   (make-load-form-saving-slots random-state :environment environment))
 
+(def!method print-object ((state random-state) stream)
+  (if (and *print-readably* (not *read-eval*))
+      (error 'print-not-readable :object state)
+      (format stream "#S(~S ~S #.~S)"
+	      'random-state
+	      ':state
+	      `(make-array 627 
+		:element-type 
+		'(unsigned-byte 32)
+		:initial-contents 
+		',(coerce (random-state-state state) 'list)))))
+
 ;;; The state is stored in a (simple-array (unsigned-byte 32) (627))
 ;;; wrapped in a random-state structure:
 ;;;
@@ -152,6 +164,13 @@
 (defun random-chunk (state)
   (declare (type random-state state))
   (sb!vm::random-mt19937 (random-state-state state)))
+
+#!-sb-fluid (declaim (inline big-random-chunk))
+(defun big-random-chunk (state)
+  (declare (type random-state state))
+  (logand (1- (expt 2 64))
+	  (logior (ash (random-chunk state) 32)
+		  (random-chunk state))))
 
 ;;; Handle the single or double float case of RANDOM. We generate a
 ;;; float between 0.0 and 1.0 by clobbering the significand of 1.0
@@ -190,8 +209,7 @@
   (* arg
      (- (sb!impl::make-double-float
 	 (dpb (ash (random-chunk state)
-		   (- sb!vm:double-float-digits random-chunk-length
-		      sb!vm:n-word-bits))
+	 	   (- sb!vm:double-float-digits random-chunk-length 32))
 	      sb!vm:double-float-significand-byte
 	      (sb!impl::double-float-high-bits 1d0))
 	 (random-chunk state))