Changeset e310238

Timestamp:

Jul 19, 2020, 8:53:19 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

b89c7c2

Parents:

849fb370

Message:

move alloc routine into stdlib.hfa to access _Alignof at call site

File:

• libcfa/src/stdlib.cfa (modified) (2 diffs)

libcfa/src/stdlib.cfa

@@ -9 +9 @@
 // Author           : Peter A. Buhr
 // Created On       : Thu Jan 28 17:10:29 2016
-// Last Modified By : Andrew Beach
-// Last Modified On : Tue Jun  2 16:46:00 2020
-// Update Count     : 500
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Jul 19 15:05:28 2020
+// Update Count     : 501
 //
 
@@ -25 +25 @@
 
 //---------------------------------------
-
-forall( dtype T | sized(T) ) {
-        T * alloc_set( T ptr[], size_t dim, char fill ) {       // realloc array with fill
-                size_t olen = malloc_usable_size( ptr );                // current allocation
-                void * nptr = (void *)realloc( (void *)ptr, dim * sizeof(T) ); // C realloc
-                size_t nlen = malloc_usable_size( nptr );               // new allocation
-                if ( nlen > olen ) {                                                    // larger ?
-                        memset( (char *)nptr + olen, (int)fill, nlen - olen ); // initialize added storage
-                } // if
-                return (T *)nptr;
-        } // alloc_set
-
-        T * alloc_set( T ptr[], size_t dim, T fill ) {          // realloc array with fill
-                size_t olen = malloc_usable_size( ptr );                // current allocation
-                void * nptr = (void *)realloc( (void *)ptr, dim * sizeof(T) ); // C realloc
-                size_t nlen = malloc_usable_size( nptr );               // new allocation
-                if ( nlen > olen ) {                                                    // larger ?
-                        for ( i; malloc_size( ptr ) / sizeof(T) ~ dim ) {
-                                memcpy( &ptr[i], &fill, sizeof(T) );    // initialize with fill value
-                        } // for
-                } // if
-                return (T *)nptr;
-        } // alloc_align_set
-
-        T * alloc_align_set( T ptr[], size_t align, char fill ) { // aligned realloc with fill
-                size_t olen = malloc_usable_size( ptr );                // current allocation
-                void * nptr = (void *)realloc( (void *)ptr, align, sizeof(T) ); // CFA realloc
-                // char * nptr = alloc_align( ptr, align );
-                size_t nlen = malloc_usable_size( nptr );               // new allocation
-                if ( nlen > olen ) {                                                    // larger ?
-                        memset( (char *)nptr + olen, (int)fill, nlen - olen ); // initialize added storage
-                } // if
-                return (T *)nptr;
-        } // alloc_align_set
-
-        T * alloc_align_set( T ptr[], size_t align, size_t dim, T fill ) { // aligned realloc with fill
-                size_t olen = malloc_usable_size( ptr );                // current allocation
-                void * nptr = (void *)realloc( (void *)ptr, align, sizeof(T) ); // CFA realloc
-                // char * nptr = alloc_align( ptr, align );
-                size_t nlen = malloc_usable_size( nptr );               // new allocation
-                if ( nlen > olen ) {                                                    // larger ?
-                        for ( i; dim ) { memcpy( &ptr[i], &fill, sizeof(T) ); } // initialize with fill value
-                } // if
-                return (T *)nptr;
-        } // alloc_align_set
-} // distribution
 
 // allocation/deallocation and constructor/destructor, non-array types