mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 11:40:18 +02:00
Code Activity

64-bit random fixes

Browse source 
* libguile/random.c (scm_random): Fix generation of inum randoms with
  more than 32 bits.

* libguile/random.h (scm_t_rstate): Fix a comment.
This commit is contained in:
Andy Wingo 2010-07-27 11:32:31 +02:00
parent 17fc9efecb
commit 9defb64118
2 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

23
libguile/random.c
View file

@ -371,9 +371,26 @@ SCM_DEFINE (scm_random, "random", 1, 1, 0,
SCM_VALIDATE_RSTATE (2, state);
if (SCM_I_INUMP (n))
{
scm_t_uint32 m = SCM_I_INUM (n);
SCM_ASSERT_RANGE (1, n, m > 0);
return scm_from_uint32 (scm_c_random (SCM_RSTATE (state), m));
unsigned long m = (unsigned long) SCM_I_INUM (n);
SCM_ASSERT_RANGE (1, n, SCM_I_INUM (n) > 0);
#if SCM_SIZEOF_UNSIGNED_LONG <= 4
return scm_from_uint32 (scm_c_random (SCM_RSTATE (state),
(scm_t_uint32) m));
#elif SCM_SIZEOF_UNSIGNED_LONG <= 8
if (m <= SCM_T_UINT32_MAX)
return scm_from_uint32 (scm_c_random (SCM_RSTATE (state),
(scm_t_uint32) m));
else
{
scm_t_uint64 upper, lower;
upper = scm_c_random (SCM_RSTATE (state), (scm_t_uint32) (m >> 32));
lower = scm_c_random (SCM_RSTATE (state), SCM_T_UINT32_MAX);
return scm_from_uint64 ((upper << 32) | lower);
}
#else
#error "Cannot deal with this platform's unsigned long size"
#endif
}
SCM_VALIDATE_NIM (1, n);
if (SCM_REALP (n))

2
libguile/random.h
View file

@ -40,7 +40,7 @@
typedef struct scm_t_rstate {
struct scm_t_rng *rng;
double normal_next; /* For scm_c_uniform01 */
double normal_next; /* For scm_c_normal01 */
/* Custom fields follow here */
} scm_t_rstate;