Changes in libcfa/src/stdlib.hfa [919a6b2:aa8e24c3]

File:

• libcfa/src/stdlib.hfa (modified) (8 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 : Wed Dec 29 15:30:58 2021
+// Update Count     : 591
 //
 
@@ -21 +21 @@
 #include <stdlib.h>                                                                             // *alloc, strto*, ato*
 #include <heap.hfa>
-
 
 // Reduce includes by explicitly defining these routines.
@@ -44 +43 @@
 //---------------------------------------
 
+// Macro because of returns
+#define ARRAY_ALLOC$( allocation, alignment, dim ) \
+        if ( _Alignof(T) <= libAlign() ) return (T *)(void *)allocation( dim, (size_t)sizeof(T) ); /* C allocation */ \
+        else return (T *)alignment( _Alignof(T), dim, sizeof(T) )
+
 static inline forall( T & | sized(T) ) {
         // CFA safe equivalents, i.e., implicit size specification
 
         T * malloc( void ) {
-                if ( _Alignof(T) <= libAlign() ) return (T *)malloc( sizeof(T) ); // C allocation
+                if ( _Alignof(T) <= libAlign() ) return (T *)(void *)malloc( (size_t)sizeof(T) ); // C allocation
                 else return (T *)memalign( _Alignof(T), sizeof(T) );
         } // malloc
 
         T * aalloc( size_t dim ) {
-                if ( _Alignof(T) <= libAlign() ) return (T *)aalloc( dim, sizeof(T) ); // C allocation
-                else return (T *)amemalign( _Alignof(T), dim, sizeof(T) );
+                ARRAY_ALLOC$( aalloc, amemalign, dim );
         } // aalloc
 
         T * calloc( size_t dim ) {
-                if ( _Alignof(T) <= libAlign() ) return (T *)calloc( dim, sizeof(T) ); // C allocation
-                else return (T *)cmemalign( _Alignof(T), dim, sizeof(T) );
+                ARRAY_ALLOC$( calloc, cmemalign, dim );
         } // calloc
 
         T * resize( T * ptr, size_t size ) {                            // CFA resize, eliminate return-type cast
-                if ( _Alignof(T) <= libAlign() ) return (T *)resize( (void *)ptr, size ); // CFA resize
-                else return (T *)resize( (void *)ptr, _Alignof(T), size ); // CFA resize
+                if ( _Alignof(T) <= libAlign() ) return (T *)(void *)resize( (void *)ptr, size ); // CFA resize
+                else return (T *)(void *)resize( (void *)ptr, _Alignof(T), size ); // CFA resize
         } // resize
 
         T * realloc( T * ptr, size_t size ) {                           // CFA realloc, eliminate return-type cast
-                if ( _Alignof(T) <= libAlign() ) return (T *)realloc( (void *)ptr, size ); // C realloc
-                else return (T *)realloc( (void *)ptr, _Alignof(T), size ); // CFA realloc
+                if ( _Alignof(T) <= libAlign() ) return (T *)(void *)realloc( (void *)ptr, size ); // C realloc
+                else return (T *)(void *)realloc( (void *)ptr, _Alignof(T), size ); // CFA realloc
         } // realloc
 
@@ -208 +210 @@
 
         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) {
                 return alloc_internal$( Resize, (T*)0p, Align, Dim, Fill, rest);
@@ -231 +234 @@
                 return alloc_internal$( (void*)0p, (T*)0p, (_Alignof(T) > libAlign() ? _Alignof(T) : libAlign()), dim, (S_fill(T)){'0'}, all);
             }
+
         } // distribution TT
 } // distribution T
@@ -384 +388 @@
 //---------------------------------------
 
-// Sequential Pseudo Random-Number Generator : generate repeatable sequence of values that appear random.
-//
-// 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
-//   get_seed( sprng ) - read seed
-//   prng( sprng ) - generate random value in range [0,UINT_MAX]
-//   prng( sprng, u ) - generate random value in range [0,u)
-//   prng( sprng, l, u ) - generate random value in range [l,u]
-//   calls( sprng ) - number of generated random value so far
-//
-// Examples : generate random number between 5-21
-//   prng( sprng ) % 17 + 5;    values 0-16 + 5 = 5-21
-//   prng( sprng, 16 + 1 ) + 5;
-//   prng( sprng, 5, 21 );
-//   calls( sprng );
-
 struct PRNG {
         uint32_t callcnt;                                                                       // call count
@@ -409 +394 @@
 }; // PRNG
 
-void set_seed( PRNG & prng, uint32_t seed_ );
-uint32_t prng( PRNG & prng ) __attribute__(( warn_unused_result )); // [0,UINT_MAX]
+extern uint32_t prng( PRNG & prng ) __attribute__(( warn_unused_result )); // [0,UINT_MAX]
 static inline {
+        void set_seed( PRNG & prng, uint32_t seed_ ) with( prng ) { state = seed = seed_; } // set seed
         void ?{}( PRNG & prng ) { set_seed( prng, rdtscl() ); } // random seed
         void ?{}( PRNG & prng, uint32_t seed ) { set_seed( prng, seed ); } // fixed seed
@@ -420 +405 @@
 } // distribution
 
-// Concurrent Pseudo Random-Number Generator : generate repeatable sequence of values that appear random.
-//
-// Interface :
-//   set_seed( 1009 ) - fixed seed for all kernel threads versus random seed
-//   get_seed() - read seed
-//   prng() - generate random value in range [0,UINT_MAX]
-//   prng( u ) - generate random value in range [0,u)
-//   prng( l, u ) - generate random value in range [l,u]
-//
-// Examples : generate random number between 5-21
-//   prng() % 17 + 5;   values 0-16 + 5 = 5-21
-//   prng( 16 + 1 ) + 5;
-//   prng( 5, 21 );
-
-void set_seed( uint32_t seed_ ) OPTIONAL_THREAD;
-uint32_t get_seed() __attribute__(( warn_unused_result ));
-uint32_t prng( void ) __attribute__(( warn_unused_result )) OPTIONAL_THREAD; // [0,UINT_MAX]
+extern void set_seed( uint32_t seed );                                  // set per thread seed
+extern uint32_t get_seed();                                                             // get seed
+extern uint32_t prng( void ) __attribute__(( warn_unused_result )); // [0,UINT_MAX]
 static inline {
-        uint32_t prng( uint32_t u ) __attribute__(( warn_unused_result )) { return prng() % u; } // [0,u)
-        uint32_t prng( uint32_t l, uint32_t u ) __attribute__(( warn_unused_result )) { return prng( u - l + 1 ) + l; } // [l,u]
+        uint32_t prng( uint32_t u ) __attribute__(( warn_unused_result ));
+        uint32_t prng( uint32_t u ) { return prng() % u; }      // [0,u)
+        uint32_t prng( uint32_t l, uint32_t u ) __attribute__(( warn_unused_result ));
+        uint32_t prng( uint32_t l, uint32_t u ) { return prng( u - l + 1 ) + l; } // [l,u]
 } // distribution