Changeset cc7bbe6 for libcfa/src/stdlib.hfa

Timestamp:

Feb 23, 2022, 11:24:34 AM (4 years ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

08ed947

Parents:

f5a51db (diff), 3a038fa (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• libcfa/src/stdlib.hfa (modified) (5 diffs)

libcfa/src/stdlib.hfa

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:12:35 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jan 13 21:34:46 2022
-// Update Count     : 636
+// Last Modified On : Sat Feb 12 17:22:25 2022
+// Update Count     : 643
 //
 
@@ -18 +18 @@
 #include "bits/defs.hfa"                                                                // OPTIONAL_THREAD
 #include "bits/align.hfa"                                                               // libAlign
+#include "bits/random.hfa"                                                              // prng
 
 #include <stdlib.h>                                                                             // *alloc, strto*, ato*
@@ -208 +209 @@
 
         forall( TT... | { T * alloc_internal$( void *, T *, size_t, size_t, S_fill(T), TT ); } ) {
-                T * alloc_internal$( void *       , T * Realloc, size_t Align, size_t Dim, S_fill(T) Fill, T_resize Resize, TT rest) {
+                T * alloc_internal$( void *       , T *        , size_t Align, size_t Dim, S_fill(T) Fill, T_resize Resize, TT rest) {
                 return alloc_internal$( Resize, (T*)0p, Align, Dim, Fill, rest);
                 }
 
-                T * alloc_internal$( void * Resize, T *        , size_t Align, size_t Dim, S_fill(T) Fill, S_realloc(T) Realloc, TT rest) {
+                T * alloc_internal$( void *        , T *        , size_t Align, size_t Dim, S_fill(T) Fill, S_realloc(T) Realloc, TT rest) {
                 return alloc_internal$( (void*)0p, Realloc, Align, Dim, Fill, rest);
                 }
@@ -388 +389 @@
 // Declaration :
 //   PRNG sprng = { 1009 } - set starting seed versus random seed
-//   
+//
 // Interface :
 //   set_seed( sprng, 1009 ) - set starting seed for ALL kernel threads versus random seed
@@ -410 +411 @@
 
 void set_seed( PRNG & prng, uint32_t seed_ );
-uint32_t prng( PRNG & prng ) __attribute__(( warn_unused_result )); // [0,UINT_MAX]
 static inline {
-        void ?{}( PRNG & prng ) { set_seed( prng, rdtscl() ); } // random seed
-        void ?{}( PRNG & prng, uint32_t seed ) { set_seed( prng, seed ); } // fixed seed
+        void ?{}( PRNG & prng ) with( prng ) { callcnt = 0; set_seed( prng, rdtscl() ); } // random seed
+        void ?{}( PRNG & prng, uint32_t seed ) with( prng ) { callcnt = 0; set_seed( prng, seed ); } // fixed seed
         uint32_t get_seed( PRNG & prng ) __attribute__(( warn_unused_result )) with( prng ) { return seed; } // get seed
+        uint32_t prng( PRNG & prng ) __attribute__(( warn_unused_result )) with( prng ) { callcnt += 1; return LCG( state ); } // [0,UINT_MAX]
         uint32_t prng( PRNG & prng, uint32_t u ) __attribute__(( warn_unused_result )) { return prng( prng ) % u; } // [0,u)
         uint32_t prng( PRNG & prng, uint32_t l, uint32_t u ) __attribute__(( warn_unused_result )) { return prng( prng, u - l + 1 ) + l; } // [l,u]