Changeset 25a1cb0 for libcfa/src/heap.cfa

Timestamp:

Sep 1, 2020, 1:18:10 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

86c1f1c3, a77496cb

Parents:

8d8ac3b (diff), d3aa64f (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

File:

• libcfa/src/heap.cfa (modified) (3 diffs)

libcfa/src/heap.cfa

@@ -10 +10 @@
 // Created On       : Tue Dec 19 21:58:35 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Aug 12 16:43:38 2020
-// Update Count     : 902
+// Last Modified On : Mon Aug 24 20:29:24 2020
+// Update Count     : 926
 //
 
@@ -27 +27 @@
 #include "bits/locks.hfa"                                                               // __spinlock_t
 #include "startup.hfa"                                                                  // STARTUP_PRIORITY_MEMORY
-//#include "stdlib.hfa"                                                                 // bsearchl
-#include "bitmanip.hfa"                                                                 // ceiling
+#include "math.hfa"                                                                             // ceiling
+#include "bitmanip.hfa"                                                                 // is_pow2, ceiling2
 
 #define MIN(x, y) (y > x ? x : y)
@@ -651 +651 @@
                 #else
                 // for ( HeapManager.Storage * p = top( freeLists[i].freeList ); p != 0p; p = (p)`next->top ) {
-                for ( HeapManager.Storage * p = top( freeLists[i].freeList ); p != 0p; /* p = getNext( p )->top */) {
-                        typeof(p) temp = (( p )`next)->top;                     // FIX ME: direct assignent fails, initialization works
-                        p = temp;
+//              for ( HeapManager.Storage * p = top( freeLists[i].freeList ); p != 0p; /* p = getNext( p )->top */) {
+                for ( HeapManager.Storage * p ;; /* p = getNext( p )->top */) {
+                        HeapManager.Storage * temp = p->header.kind.real.next.top; // FIX ME: direct assignent fails, initialization works`
+//                      typeof(p) temp = (( p )`next)->top;                     // FIX ME: direct assignent fails, initialization works`
+//                      p = temp;
                 #endif // BUCKETLOCK
                         total += size;