Changeset 1b55756

Timestamp:

Sep 7, 2020, 7:52:02 PM (4 years ago)

Author:

m3zulfiq <m3zulfiq@…>

Branches:

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

Children:

113d785

Parents:

943a079

Message:

heap.cfa: removed bug in resize with alignment by adding return before call to resize. alloc2.cfa: added debug prints.

Files:

• libcfa/src/heap.cfa (modified) (1 diff)
• tests/alloc2.cfa (modified) (9 diffs)

libcfa/src/heap.cfa

@@ -1257 +1257 @@
         } else if ( ! isFakeHeader                                                      // old real header (aligned on libAlign) ?
                                 && nalign == libAlign() ) {                             // new alignment also on libAlign => no fake header needed
-                resize( oaddr, size );                                                  // duplicate special case checks
+                return resize( oaddr, size );                                                   // duplicate special case checks
         } // if
 

tests/alloc2.cfa

@@ -13 +13 @@
 void test_base( void * ip, size_t size, size_t align) {
         tests_total += 1;
+//      printf("DEBUG: starting test %d\n", tests_total);
         bool passed = (malloc_size(ip) == size) && (malloc_usable_size(ip) >= size) && (malloc_alignment(ip) == align) && ((uintptr_t)ip % align  == 0);
         if (!passed) {
@@ -18 +19 @@
                 tests_failed += 1;
         }
+//      printf("DEBUG: done test %d\n", tests_total);
 }
 
 void test_fill( void * ip_, size_t start, size_t end, char fill) {
         tests_total += 1;
+//      printf("DEBUG: starting test %d\n", tests_total);
         bool passed = true;
         char * ip = (char *) ip_;
@@ -29 +32 @@
                 tests_failed += 1;
         }
+//      printf("DEBUG: done test %d\n", tests_total);
 }
 
 void test_fill( void * ip_, size_t start, size_t end, int fill) {
         tests_total += 1;
+//      printf("DEBUG: starting test %d\n", tests_total);
         bool passed = true;
         int * ip = (int *) ip_;
@@ -40 +45 @@
                 tests_failed += 1;
         }
+//      printf("DEBUG: done test %d\n", tests_total);
 }
 
 void test_fill( void * ip_, size_t start, size_t end, int * fill) {
         tests_total += 1;
+//      printf("DEBUG: starting test %d\n", tests_total);
         bool passed = (memcmp((void*)((uintptr_t)ip_ + start), (void*)fill, end) == 0);
         if (!passed) {
@@ -49 +56 @@
                 tests_failed += 1;
         }
+//      printf("DEBUG: done test %d\n", tests_total);
 }
 
 void test_fill( void * ip_, size_t start, size_t end, T1 fill) {
         tests_total += 1;
+//      printf("DEBUG: starting test %d\n", tests_total);
         bool passed = true;
         T1 * ip = (T1 *) ip_;
@@ -60 +69 @@
                 tests_failed += 1;
         }
+//      printf("DEBUG: done test %d\n", tests_total);
 }
 
 void test_fill( void * ip_, size_t start, size_t end, T1 * fill) {
         tests_total += 1;
+//      printf("DEBUG: starting test %d\n", tests_total);
         bool passed = (memcmp((void*)((uintptr_t)ip_ + start), (void*)fill, end) == 0);
         if (!passed) {
@@ -69 +80 @@
                 tests_failed += 1;
         }
+//      printf("DEBUG: done test %d\n", tests_total);
 }
 
 void test_use( int * ip, size_t dim) {
         tests_total += 1;
+//      printf("DEBUG: starting test %d\n", tests_total);
         bool passed = true;
         for (i; 0 ~ dim) ip[i] = 0xdeadbeef;
@@ -80 +93 @@
                 tests_failed += 1;
         }
+//      printf("DEBUG: done test %d\n", tests_total);
 }
 
 void test_use( T1 * ip, size_t dim) {
         tests_total += 1;
+//      printf("DEBUG: starting test %d\n", tests_total);
         bool passed = true;
         for (i; 0 ~ dim) ip[i].data = 0xdeadbeef;
@@ -91 +106 @@
                 tests_failed += 1;
         }
+//      printf("DEBUG: done test %d\n", tests_total);
 }