Changeset 3a4834b3 for libcfa

Timestamp:

Sep 2, 2020, 5:56:59 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-unique-expr, pthread-emulation, qualifiedEnum

Children:

406970b1

Parents:

f8acfc0 (diff), f76ff0b (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' of plg.uwaterloo.ca:software/cfa/cfa-cc into master

Location:

libcfa/src

Files:

• heap.cfa (modified) (2 diffs)
• stdlib.hfa (modified) (1 diff)

libcfa/src/heap.cfa

@@ -1239 +1239 @@
         size_t odsize = dataStorage( bsize, oaddr, header ); // data storage available in bucket
 
-        if ( oalign <= nalign && (uintptr_t)oaddr % nalign == 0 ) { // <= alignment and new alignment happens to match
-                if ( oalign > libAlign() ) {                                    // fake header ?
-                        headerAddr( oaddr )->kind.fake.alignment = nalign | 1; // update alignment (could be the same)
-                } // if
+        if ( oalign == nalign && size <= odsize && odsize <= size * 2 ) { // <= alignment and new alignment are same, allow 50% wasted storage for smaller size
+                header->kind.real.blockSize &= -2;                      // turn off 0 fill
+                header->kind.real.size = size;                          // reset allocation size
+                return oaddr;
+        } // if
+        if ( oalign < nalign && (uintptr_t)oaddr % nalign == 0 && oalign > libAlign() ) { // <= alignment and new alignment happens to match, and oaddr has a fake header
+                headerAddr( oaddr )->kind.fake.alignment = nalign | 1; // update alignment (could be the same)
                 if ( size <= odsize && odsize <= size * 2 ) {   // allow 50% wasted storage for smaller size
                         header->kind.real.blockSize &= -2;                      // turn off 0 fill
@@ -1282 +1285 @@
         headers( "realloc", oaddr, header, freeElem, bsize, oalign );
 
-        if ( oalign <= nalign && (uintptr_t)oaddr % nalign == 0 ) { // <= alignment and new alignment happens to match
-                if ( oalign > libAlign() ) {                                    // fake header ?
-                        headerAddr( oaddr )->kind.fake.alignment = nalign | 1; // update alignment (could be the same)
-                } // if
+        if ( oalign == nalign ) { // <= alignment and new alignment are same
+                return realloc( oaddr, size );
+        } // if
+        if ( oalign < nalign && (uintptr_t)oaddr % nalign == 0 && oalign > libAlign() ) { // <= alignment and new alignment happens to match, and oaddr has a fake header
+                headerAddr( oaddr )->kind.fake.alignment = nalign | 1; // update alignment (could be the same)
                 return realloc( oaddr, size );
         } // if

libcfa/src/stdlib.hfa

@@ -179 +179 @@
 
                 if ( Resize ) {
-//printf("1. $alloc_internal got: %p %p %lu %lu\n", Resize, Realloc, Align, Dim); // these prints are temporary
                         ptr = (T*) (void *) resize( (void *)Resize, Align, Dim * size );
                 } else if ( Realloc ) {
                         if (Fill.tag != '0') copy_end = min(malloc_size( Realloc ), Dim * size);
-//printf("2. $alloc_internal got: %p %p %lu %lu\n", Resize, Realloc, Align, Dim);
                         ptr = (T*) (void *) realloc( (void *)Realloc, Align, Dim * size );
                 } else {
-//printf("3. $alloc_internal got: %p %p %lu %lu\n", Resize, Realloc, Align, Dim);
                         ptr = (T*) (void *) memalign( Align, Dim * size );
                 }