Changes in libcfa/src/heap.cfa [e4b6b7d3:113d785]

File:

• libcfa/src/heap.cfa (modified) (8 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 : Fri Dec 11 07:36:34 2020
-// Update Count     : 970
+// Last Modified On : Mon Sep  7 22:17:46 2020
+// Update Count     : 957
 //
 
@@ -464 +464 @@
 } // headers
 
-#ifdef __CFA_DEBUG__
-#if __SIZEOF_POINTER__ == 4
-#define MASK 0xdeadbeef
-#else
-#define MASK 0xdeadbeefdeadbeef
-#endif
-#define STRIDE size_t
-
-static void * Memset( void * addr, STRIDE size ) {              // debug only
-        if ( size % sizeof(STRIDE) != 0 ) abort( "Memset() : internal error, size %zd not multiple of %zd.", size, sizeof(STRIDE) );
-        if ( (STRIDE)addr % sizeof(STRIDE) != 0 ) abort( "Memset() : internal error, addr %p not multiple of %zd.", addr, sizeof(STRIDE) );
-
-        STRIDE * end = (STRIDE *)addr + size / sizeof(STRIDE);
-        for ( STRIDE * p = (STRIDE *)addr; p < end; p += 1 ) *p = MASK;
-        return addr;
-} // Memset
-#endif // __CFA_DEBUG__
-
 #define NO_MEMORY_MSG "insufficient heap memory available for allocating %zd new bytes."
 
@@ -501 +483 @@
                 #ifdef __CFA_DEBUG__
                 // Set new memory to garbage so subsequent uninitialized usages might fail.
-                //memset( (char *)heapEnd + heapRemaining, '\377', increase );
-                Memset( (char *)heapEnd + heapRemaining, increase );
+                memset( (char *)heapEnd + heapRemaining, '\377', increase );
                 #endif // __CFA_DEBUG__
                 rem = heapRemaining + increase - size;
@@ -576 +557 @@
                 #ifdef __CFA_DEBUG__
                 // Set new memory to garbage so subsequent uninitialized usages might fail.
-                //memset( block, '\377', tsize );
-                Memset( block, tsize );
+                memset( block, '\377', tsize );
                 #endif // __CFA_DEBUG__
                 block->header.kind.real.blockSize = tsize;              // storage size for munmap
@@ -626 +606 @@
                 #ifdef __CFA_DEBUG__
                 // Set free memory to garbage so subsequent usages might fail.
-                //memset( ((HeapManager.Storage *)header)->data, '\377', freeElem->blockSize - sizeof( HeapManager.Storage ) );
-                Memset( ((HeapManager.Storage *)header)->data, freeElem->blockSize - sizeof( HeapManager.Storage ) );
+                memset( ((HeapManager.Storage *)header)->data, '\377', freeElem->blockSize - sizeof( HeapManager.Storage ) );
                 #endif // __CFA_DEBUG__
 
@@ -956 +935 @@
                         header->kind.real.size = size;                          // reset allocation size
                         if ( unlikely( ozfill ) && size > osize ) {     // previous request zero fill and larger ?
-                                memset( (char *)oaddr + osize, '\0', size - osize ); // initialize added storage
+                                memset( (char *)oaddr + osize, (int)'\0', size - osize ); // initialize added storage
                         } // if
                         return oaddr;
@@ -981 +960 @@
                         header->kind.real.blockSize |= 2;                       // mark new request as zero filled
                         if ( size > osize ) {                                           // previous request larger ?
-                                memset( (char *)naddr + osize, '\0', size - osize ); // initialize added storage
+                                memset( (char *)naddr + osize, (int)'\0', size - osize ); // initialize added storage
                         } // if
                 } // if
@@ -1348 +1327 @@
                 header->kind.real.blockSize |= 2;                               // mark new request as zero filled
                 if ( size > osize ) {                                                   // previous request larger ?
-                        memset( (char *)naddr + osize, '\0', size - osize ); // initialize added storage
+                        memset( (char *)naddr + osize, (int)'\0', size - osize ); // initialize added storage
                 } // if
         } // if