Changeset 2fa5bd2 for libcfa/src/stdlib.cfa

Timestamp:

Dec 12, 2019, 10:04:15 AM (4 years ago)

Author:

Dmitry Kobets <dkobets@…>

Branches:

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

Children:

e752e4e

Parents:

aca6a54c (diff), 2cd949b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into vector-generic

File:

• libcfa/src/stdlib.cfa (modified) (2 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 Oct 22 08:57:52 2019
-// Update Count     : 478
+// Last Modified On : Wed Nov 20 17:22:47 2019
+// Update Count     : 485
 //
 
@@ -30 +30 @@
         T * alloc_set( T ptr[], size_t dim, char fill ) {       // realloc array with fill
                 size_t olen = malloc_usable_size( ptr );                // current allocation
-                char * nptr = (char *)realloc( (void *)ptr, dim * sizeof(T) ); // C realloc
+                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( nptr + olen, (int)fill, nlen - olen ); // initialize added storage
+                        memset( (char *)nptr + olen, (int)fill, nlen - olen ); // initialize added storage
                 } // if
                 return (T *)nptr;
         } // alloc_set
 
-        T * alloc_align( T ptr[], size_t align ) {                      // aligned realloc array
-                char * nptr;
-                size_t alignment = malloc_alignment( ptr );
-                if ( align != alignment && (uintptr_t)ptr % align != 0 ) {
-                        size_t olen = malloc_usable_size( ptr );        // current allocation
-                        nptr = (char *)memalign( align, olen );
-                        size_t nlen = malloc_usable_size( nptr );       // new allocation
-                        size_t lnth = olen < nlen ? olen : nlen;        // min
-                        memcpy( nptr, ptr, lnth );                                      // initialize storage
-                        free( ptr );
-                } else {
-                        nptr = (char *)ptr;
-                } // if
-                return (T *)nptr;
-        } // alloc_align
-
-        T * alloc_align( T ptr[], size_t align, size_t dim ) { // aligned realloc array
-                char * nptr;
-                size_t alignment = malloc_alignment( ptr );
-                if ( align != alignment ) {
-                        size_t olen = malloc_usable_size( ptr );        // current allocation
-                        nptr = (char *)memalign( align, dim * sizeof(T) );
-                        size_t nlen = malloc_usable_size( nptr );       // new allocation
-                        size_t lnth = olen < nlen ? olen : nlen;        // min
-                        memcpy( nptr, ptr, lnth );                                      // initialize storage
-                        free( ptr );
-                } else {
-                        nptr = (char *)realloc( (void *)ptr, dim * sizeof(T) ); // C realloc
-                } // if
-                return (T *)nptr;
-        } // alloc_align
-
         T * alloc_align_set( T ptr[], size_t align, char fill ) { // aligned realloc with fill
                 size_t olen = malloc_usable_size( ptr );                // current allocation
-                char * nptr = alloc_align( ptr, align );
+                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( nptr + olen, (int)fill, nlen - olen ); // initialize added storage
+                        memset( (char *)nptr + olen, (int)fill, nlen - olen ); // initialize added storage
                 } // if
                 return (T *)nptr;