Changeset cfbc703d for libcfa/src/stdlib.cfa

Timestamp:

Apr 1, 2020, 9:32:21 PM (4 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:

6d43cdde

Parents:

5137f9f

Message:

add resize and more "alloc" routines

File:

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

libcfa/src/stdlib.cfa

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:10:29 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb  4 08:27:08 2020
-// Update Count     : 486
+// Last Modified On : Tue Mar 31 13:26:46 2020
+// Update Count     : 495
 //
 
@@ -20 +20 @@
 #define _XOPEN_SOURCE 600                                                               // posix_memalign, *rand48
 #include <string.h>                                                                             // memcpy, memset
-#include <malloc.h>                                                                             // malloc_usable_size
 //#include <math.h>                                                                             // fabsf, fabs, fabsl
 #include <complex.h>                                                                    // _Complex_I
@@ -38 +37 @@
         } // 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; dim ) { memcpy( &ptr[i], &fill, sizeof(T) ); } // initialize with fill value
+                } // 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
@@ -45 +54 @@
                 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;