Changeset 124c1b7

Timestamp:

Jul 20, 2020, 3:54:04 PM (4 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:

d9c2284

Parents:

28d73c1 (diff), 7d94bfe3 (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:

• iostream.cfa (modified) (3 diffs)
• stdlib.hfa (modified) (3 diffs)

libcfa/src/iostream.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 16 07:43:31 2020
-// Update Count     : 1102
+// Last Modified On : Mon Jul 20 15:00:37 2020
+// Update Count     : 1124
 //
 
@@ -167 +167 @@
         #define P10_UINT64 10_000_000_000_000_000_000_ULL       // 19 zeroes
 
-        static void base10_128( ostype & os, unsigned int128 val ) {
+        static inline void base10_128( ostype & os, unsigned int128 val ) {
+#if defined(__GNUC__) && __GNUC_PREREQ(7,0)                             // gcc version >= 7
                 if ( val > P10_UINT64 ) {
+#else
+                if ( (uint64_t)(val >> 64) != 0 || (uint64_t)val > P10_UINT64 ) { // patch gcc 5 & 6 -O3 bug
+#endif // __GNUC_PREREQ(7,0)
                         base10_128( os, val / P10_UINT64 );                     // recursive
                         fmt( os, "%.19lu", (uint64_t)(val % P10_UINT64) );
@@ -176 +180 @@
         } // base10_128
 
-        static void base10_128( ostype & os, int128 val ) {
+        static inline void base10_128( ostype & os, int128 val ) {
                 if ( val < 0 ) {
                         fmt( os, "-" );                                                         // leading negative sign

libcfa/src/stdlib.hfa

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:12:35 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jul 19 18:29:34 2020
-// Update Count     : 463
+// Last Modified On : Mon Jul 20 14:29:21 2020
+// Update Count     : 464
 //
 
@@ -60 +60 @@
                 if ( unlikely( size == 0 ) || unlikely( ptr == 0p ) ) { // special cases
                         if ( unlikely( size == 0 ) ) free( ptr );
-                        if ( _Alignof(T) <= libAlign() ) return (T *)(void *)malloc( (size_t)sizeof(T) ); // C malloc
-                        else return (T *)memalign( _Alignof(T), sizeof(T) );
+                        if ( _Alignof(T) <= libAlign() ) return (T *)(void *)malloc( size ); // C malloc
+                        else return (T *)memalign( _Alignof(T), size ); // C memalign
                 } // if
                 return (T *)(void *)resize( (void *)ptr, size ); // CFA resize
@@ -69 +69 @@
                 if ( unlikely( size == 0 ) || unlikely( ptr == 0p ) ) { // special cases
                         if ( unlikely( size == 0 ) ) free( ptr );
-                        if ( _Alignof(T) <= libAlign() ) return (T *)(void *)malloc( (size_t)sizeof(T) ); // C malloc
-                        else return (T *)memalign( _Alignof(T), sizeof(T) );
+                        if ( _Alignof(T) <= libAlign() ) return (T *)(void *)malloc( size ); // C malloc
+                        else return (T *)memalign( _Alignof(T), size ); // C memalign
                 } // if
                 return (T *)(void *)realloc( (void *)ptr, size ); // C realloc