Ignore:
Timestamp:
Sep 2, 2020, 5:56:59 PM (15 months ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast-unique-expr
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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/stdlib.hfa

    rf8acfc0 r3a4834b3  
    179179
    180180                if ( Resize ) {
    181 //printf("1. $alloc_internal got: %p %p %lu %lu\n", Resize, Realloc, Align, Dim); // these prints are temporary
    182181                        ptr = (T*) (void *) resize( (void *)Resize, Align, Dim * size );
    183182                } else if ( Realloc ) {
    184183                        if (Fill.tag != '0') copy_end = min(malloc_size( Realloc ), Dim * size);
    185 //printf("2. $alloc_internal got: %p %p %lu %lu\n", Resize, Realloc, Align, Dim);
    186184                        ptr = (T*) (void *) realloc( (void *)Realloc, Align, Dim * size );
    187185                } else {
    188 //printf("3. $alloc_internal got: %p %p %lu %lu\n", Resize, Realloc, Align, Dim);
    189186                        ptr = (T*) (void *) memalign( Align, Dim * size );
    190187                }
Note: See TracChangeset for help on using the changeset viewer.