Changeset 13fece5

Timestamp:

Dec 16, 2020, 1:42:55 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:

3e5dd913

Parents:

54eb1bb3

Message:

modify location of mmapped storage to either side of the heap, and fix pattern for memory scrubbing

File:

• libcfa/src/heap.cfa (modified) (9 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 : Tue Dec 15 21:37:54 2020
-// Update Count     : 1013
+// Last Modified On : Wed Dec 16 12:28:25 2020
+// Update Count     : 1023
 //
 
@@ -438 +438 @@
         header = headerAddr( addr );
 
-  if ( unlikely( heapEnd < addr ) ) {                                   // mmapped ?
+  if ( unlikely( addr < heapBegin || heapEnd < addr ) ) { // mmapped ?
                 fakeHeader( header, alignment );
                 size = header->kind.real.blockSize & -3;                // mmap size
@@ -445 +445 @@
 
         #ifdef __CFA_DEBUG__
-        checkHeader( addr < heapBegin, name, addr );            // bad low address ?
+        checkHeader( header < (HeapManager.Storage.Header *)heapBegin, name, addr ); // bad low address ?
         #endif // __CFA_DEBUG__
 
@@ -484 +484 @@
 #endif // __CFA_DEBUG__
 
+
 #define NO_MEMORY_MSG "insufficient heap memory available for allocating %zd new bytes."
 
-#include <unistd.h>
 static inline void * extend( size_t size ) with( heapManager ) {
         lock( extlock __cfaabi_dbg_ctx2 );
@@ -511 +511 @@
                 #ifdef __CFA_DEBUG__
                 // Set new memory to garbage so subsequent uninitialized usages might fail.
-                memset( (char *)heapEnd + heapRemaining, '\hde', increase );
+                memset( (char *)heapEnd + heapRemaining, '\xde', increase );
                 //Memset( (char *)heapEnd + heapRemaining, increase );
                 #endif // __CFA_DEBUG__
@@ -586 +586 @@
                 #ifdef __CFA_DEBUG__
                 // Set new memory to garbage so subsequent uninitialized usages might fail.
-                memset( block, '\hde', tsize );
+                memset( block, '\xde', tsize );
                 //Memset( block, tsize );
                 #endif // __CFA_DEBUG__
@@ -634 +634 @@
                 #ifdef __CFA_DEBUG__
                 // Set free memory to garbage so subsequent usages might fail.
-                memset( ((HeapManager.Storage *)header)->data, '\hde', freeElem->blockSize - sizeof( HeapManager.Storage ) );
+                memset( ((HeapManager.Storage *)header)->data, '\xde', freeElem->blockSize - sizeof( HeapManager.Storage ) );
                 //Memset( ((HeapManager.Storage *)header)->data, freeElem->blockSize - sizeof( HeapManager.Storage ) );
                 #endif // __CFA_DEBUG__
@@ -1029 +1029 @@
         } // cmemalign
 
+
         // Same as memalign(), but ISO/IEC 2011 C11 Section 7.22.2 states: the value of size shall be an integral multiple
     // of alignment. This requirement is universally ignored.
@@ -1045 +1046 @@
                 return 0;
         } // posix_memalign
+
 
         // Allocates size bytes and returns a pointer to the allocated memory. The memory address shall be a multiple of the