Changeset 3d3d75e

Timestamp:

Jan 18, 2021, 2:55:08 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-unique-expr, pthread-emulation, qualifiedEnum

Children:

e35a32b

Parents:

978e5eb

Message:

fix memcpy calls in $alloc_internal and remove gcc warnings

File:

• libcfa/src/stdlib.hfa (modified) (4 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 : Sat Dec 12 13:52:34 2020
-// Update Count     : 536
+// Last Modified On : Sat Jan 16 09:07:10 2021
+// Update Count     : 568
 //
 
@@ -163 +163 @@
                 S_fill(T) ret = { 't' };
                 size_t size = sizeof(T);
-                if(size > sizeof(ret.t)) { printf("ERROR: const object of size greater than 50 bytes given for dynamic memory fill\n"); exit(1); }
+                if ( size > sizeof(ret.t) ) {
+                        abort( "ERROR: const object of size greater than 50 bytes given for dynamic memory fill\n" );
+                } // if
                 memcpy( &ret.t, &t, size );
                 return ret;
@@ -173 +175 @@
         S_realloc(T)    ?`realloc ( T * a )                             { return (S_realloc(T)){a}; }
 
-        T * $alloc_internal( void * Resize, T * Realloc, size_t Align, size_t Dim, S_fill(T) Fill) {
+        T * $alloc_internal( void * Resize, T * Realloc, size_t Align, size_t Dim, S_fill(T) Fill ) {
                 T * ptr = NULL;
                 size_t size = sizeof(T);
@@ -181 +183 @@
                         ptr = (T*) (void *) resize( (void *)Resize, Align, Dim * size );
                 } else if ( Realloc ) {
-                        if (Fill.tag != '0') copy_end = min(malloc_size( Realloc ), Dim * size);
-                        ptr = (T*) (void *) realloc( (void *)Realloc, Align, Dim * size );
+                        if ( Fill.tag != '0' ) copy_end = min(malloc_size( Realloc ), Dim * size );
+                        ptr = (T *) (void *) realloc( (void *)Realloc, Align, Dim * size );
                 } else {
-                        ptr = (T*) (void *) memalign( Align, Dim * size );
-                }
-
-                if(Fill.tag == 'c') {
+                        ptr = (T *) (void *) memalign( Align, Dim * size );
+                }
+
+                if ( Fill.tag == 'c' ) {
                         memset( (char *)ptr + copy_end, (int)Fill.c, Dim * size - copy_end );
-                } else if(Fill.tag == 't') {
+                } else if ( Fill.tag == 't' ) {
                         for ( int i = copy_end; i < Dim * size; i += size ) {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Warray-bounds"
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wstringop-overflow="
-                                memcpy( (char *)ptr + i, &Fill.t, size );
-#pragma GCC diagnostic pop
-#pragma GCC diagnostic pop
+                                #pragma GCC diagnostic push
+                                #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+                                memcpy( (char *)ptr + i, &Fill.t, sizeof(Fill.t) );
+                                #pragma GCC diagnostic pop
                         }
-                } else if(Fill.tag == 'a') {
+                } else if ( Fill.tag == 'a' ) {
                         memcpy( (char *)ptr + copy_end, Fill.at, min(Dim * size - copy_end, Fill.size) );
-                } else if(Fill.tag == 'T') {
-                        for ( int i = copy_end; i < Dim * size; i += size ) {
-                                memcpy( (char *)ptr + i, Fill.at, size );
-                        }
+                } else if ( Fill.tag == 'T' ) {
+                        memcpy( (char *)ptr + copy_end, Fill.at, Dim * size );
                 }