Changes in libcfa/src/stdlib.hfa [d6b03b7:2026bb6]

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 : Tue Jul 23 14:14:59 2019
-// Update Count     : 373
+// Last Modified On : Wed Apr 24 17:35:43 2019
+// Update Count     : 352
 //
 
@@ -17 +17 @@
 
 #include "bits/defs.hfa"
-#include "bits/align.hfa"
 
 #include <stdlib.h>                                                                             // *alloc, strto*, ato*
-
 extern "C" {
         void * memalign( size_t align, size_t size );           // malloc.h
@@ -41 +39 @@
 
         T * malloc( void ) {
-                if ( _Alignof(T) <= libAlign() ) return (T *)(void *)malloc( (size_t)sizeof(T) ); // C malloc
-                else return (T *)memalign( _Alignof(T), sizeof(T) );
+                return (T *)(void *)malloc( (size_t)sizeof(T) ); // C malloc
         } // malloc
 
         T * calloc( size_t dim ) {
-                if ( _Alignof(T) <= libAlign() )return (T *)(void *)calloc( dim, sizeof(T) ); // C calloc
-                else return (T *)cmemalign( _Alignof(T), dim, sizeof(T) );
+                return (T *)(void *)calloc( dim, sizeof(T) );   // C calloc
         } // calloc
 
         T * realloc( T * ptr, size_t size ) {
-                if ( unlikely( ptr == 0 ) ) return malloc();
                 return (T *)(void *)realloc( (void *)ptr, size );
         } // realloc
@@ -71 +66 @@
 
         T * alloc( void ) {
-                return malloc();
+                return (T *)(void *)malloc( (size_t)sizeof(T) ); // C malloc
         } // alloc
 
         T * alloc( char fill ) {
-                T * ptr;
-                if ( _Alignof(T) <= libAlign() ) ptr = (T *)(void *)malloc( (size_t)sizeof(T) ); // C malloc
-                else ptr = (T *)memalign( _Alignof(T), sizeof(T) );
+                T * ptr = (T *)(void *)malloc( (size_t)sizeof(T) );     // C malloc
                 return (T *)memset( ptr, (int)fill, sizeof(T) ); // initialize with fill value
         } // alloc
 
         T * alloc( size_t dim ) {
-                if ( _Alignof(T) <= libAlign() ) return (T *)(void *)malloc( dim * (size_t)sizeof(T) ); // C malloc
-                else return (T *)memalign( _Alignof(T), dim * sizeof(T) );
+                return (T *)(void *)malloc( dim * (size_t)sizeof(T) ); // C malloc
         } // alloc
 
         T * alloc( size_t dim, char fill ) {
-                return (T *)memset( (T *)alloc( dim ), (int)fill, dim * sizeof(T) ); // initialize with fill value
+                T * ptr = (T *)(void *)malloc( dim * (size_t)sizeof(T) ); // C calloc
+                return (T *)memset( ptr, (int)fill, dim * sizeof(T) ); // initialize with fill value
         } // alloc
 
         T * alloc( T ptr[], size_t dim ) {
-                return realloc( ptr, dim * sizeof(T) );
-        } // alloc
-} // distribution
+                return (T *)(void *)realloc( (void *)ptr, dim * (size_t)sizeof(T) ); // C realloc
+        } // alloc
+} // distribution
+
+
+forall( dtype T | sized(T) ) T * alloc( T ptr[], size_t dim, char fill );
 
 
@@ -111 +107 @@
 
         T * align_alloc( size_t align, size_t dim, char fill ) {
+                T * ptr;
                 if ( fill == '\0' ) {
-                        return (T *)cmemalign( align, dim, sizeof(T) );
+                        ptr = (T *)cmemalign( align, dim, sizeof(T) );
                 } else {
-                        return (T *)memset( (T *)memalign( align, dim * sizeof(T) ), (int)fill, dim * sizeof(T) );
+                        ptr = (T *)memalign( align, dim * sizeof(T) );
+                        return (T *)memset( ptr, (int)fill, dim * sizeof(T) );
                 } // if
-        } // align_alloc
-} // distribution
-
-forall( dtype T | sized(T) ) T * alloc( T ptr[], size_t dim, char fill );
+                return ptr;
+        } // align_alloc
+} // distribution