Changeset 998c106

Timestamp:

Apr 21, 2020, 1:12:48 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

1bcdeff, 65583e2

Parents:

5847d35 (diff), e045590 (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

Location:

libcfa/src

Files:

• exception.c (modified) (2 diffs)
• heap.cfa (modified) (7 diffs)

libcfa/src/exception.c

@@ -445 +445 @@
 
 #pragma GCC push_options
-#if __GNUC__ < 7
-#pragma GCC optimize("no-toplevel-reorder")
-#elif __GNUC__ == 7
 #pragma GCC optimize(0)
-#endif
 
 // Try statements are hoisted out see comments for details. While this could probably be unique
@@ -546 +542 @@
         "       .quad __gcfa_personality_v0\n"
 #else // then __i386
-        "   .long __gcfa_personality_v0\n"
+        "       .long __gcfa_personality_v0\n"
 #endif
 );

libcfa/src/heap.cfa

@@ -10 +10 @@
 // Created On       : Tue Dec 19 21:58:35 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Apr 18 08:17:53 2020
-// Update Count     : 716
+// Last Modified On : Sat Apr 18 17:43:15 2020
+// Update Count     : 718
 //
 
@@ -844 +844 @@
 
 extern "C" {
-        // Allocates size bytes and returns a pointer to the allocated memory. The memory is not initialized. If size is 0,
-        // then malloc() returns either 0p, or a unique pointer value that can later be successfully passed to free().
+        // Allocates size bytes and returns a pointer to the allocated memory.  The contents are undefined. If size is 0,
+        // then malloc() returns a unique pointer value that can later be successfully passed to free().
         void * malloc( size_t size ) {
                 #ifdef __STATISTICS__
@@ -856 +856 @@
 
 
-        // Allocate memory for an array of dim elements of size bytes each and returns a pointer to the allocated memory. If
-        // dim or size is 0, then calloc() returns either 0p, or a unique pointer value that can later be successfully
-        // passed to free().
+        // Same as malloc() except size bytes is an array of dim elements each of elemSize bytes.
         void * aalloc( size_t dim, size_t elemSize ) {
                 #ifdef __STATISTICS__
@@ -879 +877 @@
 
 
-        // Same as aalloc() with memory is set to zero.
+        // Same as aalloc() with memory set to zero.
         void * calloc( size_t dim, size_t elemSize ) {
                 #ifdef __STATISTICS__
@@ -889 +887 @@
         } // calloc
 
-        // Change the size of the memory block pointed to by ptr to size bytes. The contents are undefined.  If ptr is 0p,
-        // then the call is equivalent to malloc(size), for all values of size; if size is equal to zero, and ptr is not 0p,
-        // then the call is equivalent to free(ptr). Unless ptr is 0p, it must have been returned by an earlier call to
-        // malloc(), calloc() or realloc(). If the area pointed to was moved, a free(ptr) is done.
-
+        // Change the size of the memory block pointed to by oaddr to size bytes. The contents are undefined.  If oaddr is
+        // 0p, then the call is equivalent to malloc(size), for all values of size; if size is equal to zero, and oaddr is
+        // not 0p, then the call is equivalent to free(oaddr). Unless oaddr is 0p, it must have been returned by an earlier
+        // call to malloc(), alloc(), calloc() or realloc(). If the area pointed to was moved, a free(oaddr) is done.
         void * resize( void * oaddr, size_t size ) {
                 #ifdef __STATISTICS__
@@ -923 +920 @@
 
 
-        // Same as resize but the contents shall be unchanged in the range from the start of the region up to the minimum of
+        // Same as resize() but the contents are unchanged in the range from the start of the region up to the minimum of
         // the old and new sizes.
         void * realloc( void * oaddr, size_t size ) {
@@ -973 +970 @@
         } // realloc
 
-        // Allocates size bytes and returns a pointer to the allocated memory. The memory address shall be a multiple of
-        // alignment, which must be a power of two. (obsolete)
+        // Same as malloc() except the memory address is a multiple of alignment, which must be a power of two. (obsolete)
         void * memalign( size_t alignment, size_t size ) {
                 #ifdef __STATISTICS__