Changeset 95789be for libcfa

Timestamp:

Aug 3, 2020, 2:23:17 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

1a39a5a

Parents:

3e2b9c9 (diff), 6dba8755 (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:

• bits/locks.hfa (modified) (1 diff)
• concurrency/kernel.cfa (modified) (1 diff)
• concurrency/preemption.cfa (modified) (1 diff)
• containers/list.hfa (modified) (5 diffs)
• heap.cfa (modified) (2 diffs)
• iostream.hfa (modified) (1 diff)
• stdlib.hfa (modified) (2 diffs)

libcfa/src/bits/locks.hfa

@@ -130 +130 @@
                 pthread_mutex_init(&lock, &mattr);
 
-                pthread_cond_init (&cond, 0p);
+                pthread_cond_init (&cond, (const pthread_condattr_t *)0p);  // workaround trac#208: cast should not be required
                 val = 0;
         }

libcfa/src/concurrency/kernel.cfa

@@ -519 +519 @@
 
 void kernel_abort_msg( void * kernel_data, char * abort_text, int abort_text_size ) {
-        $thread * thrd = kernel_data;
+        $thread * thrd = ( $thread * ) kernel_data;
 
         if(thrd) {

libcfa/src/concurrency/preemption.cfa

@@ -482 +482 @@
         sigset_t oldset;
         int ret;
-        ret = pthread_sigmask(0, 0p, &oldset);
+        ret = pthread_sigmask(0, ( const sigset_t * ) 0p, &oldset);  // workaround trac#208: cast should be unnecessary
         if(ret != 0) { abort("ERROR sigprocmask returned %d", ret); }
 

libcfa/src/containers/list.hfa

@@ -22 +22 @@
 \
 static inline NODE& $tempcv_e2n(ELEM &node) { \
-        return node; \
+        return ( NODE & ) node; \
 } \
 \
@@ -187 +187 @@
                 $next_link(singleton_to_insert) = $next_link(list_pos);
                 if ($next_link(list_pos).is_terminator) {
-                        dlist(Tnode, Telem) *list = $next_link(list_pos).terminator;
+                        dlist(Tnode, Telem) *list = ( dlist(Tnode, Telem) * ) $next_link(list_pos).terminator;
                         $dlinks(Telem) *list_links = & list->$links;
                         $mgd_link(Telem) *list_last = & list_links->prev;
@@ -210 +210 @@
                 $prev_link(singleton_to_insert) = $prev_link(list_pos);
                 if ($prev_link(list_pos).is_terminator) {
-                        dlist(Tnode, Telem) *list = $prev_link(list_pos).terminator;
+                        dlist(Tnode, Telem) *list = ( dlist(Tnode, Telem) * ) $prev_link(list_pos).terminator;
                         $dlinks(Telem) *list_links = & list->$links;
                         $mgd_link(Telem) *list_first = & list_links->next;
@@ -275 +275 @@
 
                 if ( $prev_link(list_pos).is_terminator ) {
-                        dlist(Tnode, Telem) * tgt_before = $prev_link(list_pos).terminator;
+                        dlist(Tnode, Telem) * tgt_before = ( dlist(Tnode, Telem) * ) $prev_link(list_pos).terminator;
                         $dlinks(Telem) * links_before = & tgt_before->$links;
                         &incoming_from_prev = & links_before->next;
@@ -285 +285 @@
 
                 if ( $next_link(list_pos).is_terminator ) {
-                        dlist(Tnode, Telem) * tgt_after = $next_link(list_pos).terminator;
+                        dlist(Tnode, Telem) * tgt_after = ( dlist(Tnode, Telem) * ) $next_link(list_pos).terminator;
                         $dlinks(Telem) * links_after = & tgt_after->$links;
                         &incoming_from_next = & links_after->prev;

libcfa/src/heap.cfa

@@ -10 +10 @@
 // Created On       : Tue Dec 19 21:58:35 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul 20 23:00:32 2020
-// Update Count     : 808
+// Last Modified On : Mon Jul 27 23:16:18 2020
+// Update Count     : 815
 //
 
@@ -805 +805 @@
         // address of header from malloc
         HeapManager.Storage.Header * realHeader = headerAddr( addr );
+        realHeader->kind.real.size = size;                                      // correct size to eliminate above alignment offset
         // address of fake header * before* the alignment location
         HeapManager.Storage.Header * fakeHeader = headerAddr( user );

libcfa/src/iostream.hfa

@@ -363 +363 @@
         _Istream_Cstr excl( const char scanset[], char * s ) { return (_Istream_Cstr){ s, scanset, -1, { .flags.inex : true } }; }
         _Istream_Cstr & excl( const char scanset[], _Istream_Cstr & fmt ) { fmt.scanset = scanset; fmt.flags.inex = true; return fmt; }
-        _Istream_Cstr ignore( const char s[] ) { return (_Istream_Cstr)@{ s, 0p, -1, { .flags.ignore : true } }; }
+        _Istream_Cstr ignore( char s[] ) { return (_Istream_Cstr)@{ s, 0p, -1, { .flags.ignore : true } }; }
         _Istream_Cstr & ignore( _Istream_Cstr & fmt ) { fmt.flags.ignore = true; return fmt; }
         _Istream_Cstr wdi( unsigned int w, char s[] ) { return (_Istream_Cstr)@{ s, 0p, w, { .all : 0 } }; }

libcfa/src/stdlib.hfa

@@ -232 +232 @@
                 size_t osize = malloc_size( ptr );                              // current allocation
                 size_t nsize = dim * sizeof(T);                                 // new allocation
-                T * nptr = realloc( ptr, align, nsize );                // CFA realloc
+                T * nptr = alloc_align( ptr, align, nsize );    // CFA alloc_align
                 if ( nsize > osize ) {                                                  // larger ?
                         memset( (char *)nptr + osize, (int)fill, nsize - osize ); // initialize added storage
@@ -243 +243 @@
                 size_t nsize = dim * sizeof(T);                                 // new allocation
                 size_t ndim = nsize / sizeof(T);                                // new dimension
-                T * nptr = realloc( ptr, align, nsize );                // CFA realloc
+                T * nptr = alloc_align( ptr, align, nsize );            // CFA alloc_align
                 if ( ndim > odim ) {                                                    // larger ?
                         for ( i; odim ~ ndim ) {