Changes in libcfa/src/stdlib.hfa [856fe3e:aabb846]

File:

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

libcfa/src/stdlib.hfa

@@ -9 +9 @@
 // Author           : Peter A. Buhr
 // Created On       : Thu Jan 28 17:12:35 2016
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May 13 17:23:51 2020
-// Update Count     : 435
+// Last Modified By : Andrew Beach
+// Last Modified On : Tue Jun  2 16:47:00 2020
+// Update Count     : 451
 //
 
@@ -20 +20 @@
 
 #include <stdlib.h>                                                                             // *alloc, strto*, ato*
+#include <heap.hfa>
 
 // Reduce includes by explicitly defining these routines.
 extern "C" {
-        void * aalloc( size_t dim, size_t elemSize );           // CFA heap
-        void * resize( void * oaddr, size_t size );                     // CFA heap
-        void * memalign( size_t align, size_t size );           // malloc.h
-        void * amemalign( size_t align, size_t dim, size_t elemSize ); // CFA heap
-        void * cmemalign( size_t align, size_t noOfElems, size_t elemSize ); // CFA heap
-        size_t malloc_size( void * addr );                                      // CFA heap
-        size_t malloc_usable_size( void * ptr );                        // malloc.h
+        void * memalign( size_t alignment, size_t size );       // malloc.h
+        void * pvalloc( size_t size );                                          // malloc.h
         void * memset( void * dest, int fill, size_t size ); // string.h
         void * memcpy( void * dest, const void * src, size_t size ); // string.h
 } // extern "C"
-
-void * resize( void * oaddr, size_t nalign, size_t size ); // CFA heap
-void * realloc( void * oaddr, size_t nalign, size_t size ); // CFA heap
 
 //---------------------------------------
@@ -91 +84 @@
                 return posix_memalign( (void **)ptr, align, sizeof(T) ); // C posix_memalign
         } // posix_memalign
+
+        T * valloc( void ) {
+                return (T *)valloc( sizeof(T) );                                // C valloc
+        } // valloc
+
+        T * pvalloc( void ) {
+                return (T *)pvalloc( sizeof(T) );                               // C pvalloc
+        } // pvalloc
 } // distribution
 
@@ -228 +229 @@
 // Cforall allocation/deallocation and constructor/destructor, non-array types
 forall( dtype T | sized(T), ttype Params | { void ?{}( T &, Params ); } ) T * new( Params p );
-forall( dtype T | sized(T) | { void ^?{}( T & ); } ) void delete( T * ptr );
-forall( dtype T, ttype Params | sized(T) | { void ^?{}( T & ); void delete( Params ); } ) void delete( T * ptr, Params rest );
+forall( dtype T | { void ^?{}( T & ); } ) void delete( T * ptr );
+forall( dtype T, ttype Params | { void ^?{}( T & ); void delete( Params ); } ) void delete( T * ptr, Params rest );
 
 // Cforall allocation/deallocation and constructor/destructor, array types
@@ -300 +301 @@
 extern "C" {                                                                                    // override C version
         void srandom( unsigned int seed );
-        long int random( void );
+        long int random( void );                                                        // GENERATES POSITIVE AND NEGATIVE VALUES
+        // For positive values, use unsigned int, e.g., unsigned int r = random() % 100U;
 } // extern "C"
 
@@ -307 +309 @@
         long int random( long int u ) { if ( u < 0 ) return random( u, 0 ); else return random( 0, u ); } // [0,u)
         unsigned long int random( void ) { return lrand48(); }
+        unsigned long int random( unsigned long int u ) { return lrand48() % u; } // [0,u)
         unsigned long int random( unsigned long int l, unsigned long int u ) { if ( u < l ) [u, l] = [l, u]; return lrand48() % (u - l) + l; } // [l,u)
-        unsigned long int random( unsigned long int u ) { return lrand48() % u; } // [0,u)
 
         char random( void ) { return (unsigned long int)random(); }