Changeset 533 for trunk/src/core/random.cc

Timestamp:

01/12/17 13:16:48 (8 years ago)

Author:

epyon

Message:

• getting rid of size_t
• datatypes now restricted to uint32 size
• 64-bit compatibility
• copyright updates where modified

File:

• trunk/src/core/random.cc (modified) (2 diffs)

trunk/src/core/random.cc

@@ -16 +16 @@
 static const uint32 mt_matrix_a   = 0x9908B0DFUL;
 
-#define NV_MT_MIXBITS(u, v) ( ( (u) & mt_upper_mask) | ( (v) & mt_lower_mask) )
-#define NV_MT_TWIST(u, v)  ( (NV_MT_MIXBITS(u, v) >> 1) ^ ( (v) & 1UL ? mt_matrix_a : 0UL) )
+#define NV_MT_MIXBITS(u, v) ( uint32( (u) & mt_upper_mask) | uint32( (v) & mt_lower_mask) )
+#define NV_MT_TWIST(u, v)  ( uint32(NV_MT_MIXBITS(u, v) >> uint32(1)) ^ uint32( (v) & uint32(1) ? mt_matrix_a : uint32(0)) )
 
 nv::random& random::get()
@@ -43 +43 @@
 {
         uint32 *p = m_state;
-
-        for ( int count = ( mersenne_n - mersenne_m + 1 ); --count; p++ )
+        constexpr int m = mersenne_m;
+        constexpr int n = mersenne_n;
+
+        for ( int count = ( n - m + 1 ); --count; p++ )
                 *p = p[mersenne_m] ^ NV_MT_TWIST( p[0], p[1] );
 
         for ( int count = mersenne_m; --count; p++ )
-                *p = p[mersenne_m - mersenne_n] ^ NV_MT_TWIST( p[0], p[1] );
-
-        *p = p[mersenne_m - mersenne_n] ^ NV_MT_TWIST( p[0], m_state[0] );
+        {
+                *p = p[m - n] ^ NV_MT_TWIST( p[0], p[1] );
+        }
+
+        *p = p[m - n] ^ NV_MT_TWIST( p[0], m_state[0] );
 
         m_remaining = mersenne_n;