mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 20:00:19 +02:00
Code Activity

Fix the range of `random' on 64-bit platforms

Browse source 
For > 32 bit integers still in the fixnum range, scm_random() would
return random numbers with a lower range than specified.

* libguile/random.c (scm_i_mask32): New static inline function.
  (scm_c_random): Use `scm_i_mask32'.
  (scm_c_random64): New function, 64-bit variant of scm_c_random.
  (scm_random): Use `scm_c_random64' instead of forming the 64-bit random
  number in a bogus way.
* libguile/random.h: Added `scm_c_random64'.
This commit is contained in:
Andreas Rottmann 2010-08-01 21:53:29 +02:00 • committed by Andy Wingo
parent 7387c231ee
commit 2af6e1351d
2 changed files with 28 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

42
libguile/random.c
View file

@ -241,21 +241,42 @@ scm_c_exp1 (scm_t_rstate *state)
unsigned char scm_masktab[256]; unsigned char scm_masktab[256];
scm_t_uint32 static inline scm_t_uint32
scm_c_random (scm_t_rstate *state, scm_t_uint32 m) scm_i_mask32 (scm_t_uint32 m)
{ {
scm_t_uint32 r, mask; return (m < 0x100
mask = (m < 0x100
? scm_masktab[m] ? scm_masktab[m]
: (m < 0x10000 : (m < 0x10000
? scm_masktab[m >> 8] << 8 | 0xff ? scm_masktab[m >> 8] << 8 | 0xff
: (m < 0x1000000 : (m < 0x1000000
? scm_masktab[m >> 16] << 16 | 0xffff ? scm_masktab[m >> 16] << 16 | 0xffff
: scm_masktab[m >> 24] << 24 | 0xffffff))); : scm_masktab[m >> 24] << 24 | 0xffffff)));
}
scm_t_uint32
scm_c_random (scm_t_rstate *state, scm_t_uint32 m)
{
scm_t_uint32 r, mask = scm_i_mask32 (m);
while ((r = state->rng->random_bits (state) & mask) >= m); while ((r = state->rng->random_bits (state) & mask) >= m);
return r; return r;
} }
scm_t_uint64
scm_c_random64 (scm_t_rstate *state, scm_t_uint64 m)
{
scm_t_uint64 r;
scm_t_uint32 mask;
if (m <= SCM_T_UINT32_MAX)
return scm_c_random (state, (scm_t_uint32) m);
mask = scm_i_mask32 (m >> 32);
while ((r = ((scm_t_uint64) (state->rng->random_bits (state) & mask) << 32)
| state->rng->random_bits (state)) >= m)
;
return r;
}
/* /*
SCM scm_c_random_bignum (scm_t_rstate *state, SCM m) SCM scm_c_random_bignum (scm_t_rstate *state, SCM m)
@ -377,17 +398,8 @@ SCM_DEFINE (scm_random, "random", 1, 1, 0,
return scm_from_uint32 (scm_c_random (SCM_RSTATE (state), return scm_from_uint32 (scm_c_random (SCM_RSTATE (state),
(scm_t_uint32) m)); (scm_t_uint32) m));
#elif SCM_SIZEOF_UNSIGNED_LONG <= 8 #elif SCM_SIZEOF_UNSIGNED_LONG <= 8
if (m <= SCM_T_UINT32_MAX) return scm_from_uint64 (scm_c_random64 (SCM_RSTATE (state),
return scm_from_uint32 (scm_c_random (SCM_RSTATE (state), (scm_t_uint64) m));
(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 #else
#error "Cannot deal with this platform's unsigned long size" #error "Cannot deal with this platform's unsigned long size"
#endif #endif

1
libguile/random.h
View file

@ -67,6 +67,7 @@ SCM_API double scm_c_uniform01 (scm_t_rstate *);
SCM_API double scm_c_normal01 (scm_t_rstate *); SCM_API double scm_c_normal01 (scm_t_rstate *);
SCM_API double scm_c_exp1 (scm_t_rstate *); SCM_API double scm_c_exp1 (scm_t_rstate *);
SCM_API scm_t_uint32 scm_c_random (scm_t_rstate *, scm_t_uint32 m); SCM_API scm_t_uint32 scm_c_random (scm_t_rstate *, scm_t_uint32 m);
SCM_API scm_t_uint64 scm_c_random64 (scm_t_rstate *state, scm_t_uint64 m);
SCM_API SCM scm_c_random_bignum (scm_t_rstate *, SCM m); SCM_API SCM scm_c_random_bignum (scm_t_rstate *, SCM m);