Changeset e172f42 for libcfa

Timestamp:

Jun 16, 2023, 9:10:46 AM (13 months ago)

Author:

caparsons <caparson@…>

Branches:

master

Children:

5dbb9f3

Parents:

a0bd9a2 (diff), 62d62db (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 'ast-experimental'

Location:

libcfa

Files:

• prelude/builtins.c (modified) (2 diffs)
• src/common.hfa (modified) (2 diffs)
• src/concurrency/kernel/cluster.hfa (modified) (1 diff)
• src/stdlib.hfa (modified) (1 diff)

libcfa/prelude/builtins.c

@@ -149 +149 @@
 
 static inline {
-        long int ?\?( int x, unsigned int y ) { __CFA_EXP__(); }
+        int ?\?( int x, unsigned int y ) { __CFA_EXP__(); }
         long int ?\?( long int x, unsigned long int y ) { __CFA_EXP__(); }
         long long int ?\?( long long int x, unsigned long long int y ) { __CFA_EXP__(); }
         // unsigned computation may be faster and larger
-        unsigned long int ?\?( unsigned int x, unsigned int y ) { __CFA_EXP__(); }
+        unsigned int ?\?( unsigned int x, unsigned int y ) { __CFA_EXP__(); }
         unsigned long int ?\?( unsigned long int x, unsigned long int y ) { __CFA_EXP__(); }
         unsigned long long int ?\?( unsigned long long int x, unsigned long long int y ) { __CFA_EXP__(); }
@@ -176 +176 @@
 
 static inline {
-        long int ?\=?( int & x, unsigned int y ) { x = x \ y; return x; }
+        int ?\=?( int & x, unsigned int y ) { x = x \ y; return x; }
         long int ?\=?( long int & x, unsigned long int y ) { x = x \ y; return x; }
         long long int ?\=?( long long int & x, unsigned long long int y ) { x = x \ y; return x; }
-        unsigned long int ?\=?( unsigned int & x, unsigned int y ) { x = x \ y; return x; }
+        unsigned int ?\=?( unsigned int & x, unsigned int y ) { x = x \ y; return x; }
         unsigned long int ?\=?( unsigned long int & x, unsigned long int y ) { x = x \ y; return x; }
         unsigned long long int ?\=?( unsigned long long int & x, unsigned long long int y ) { x = x \ y; return x; }

libcfa/src/common.hfa

@@ -32 +32 @@
 } // extern "C"
 static inline __attribute__((always_inline)) {
-        unsigned char abs( signed char v ) { return abs( (int)v ); }
+        unsigned char abs( signed char v ) { return (int)abs( (int)v ); }
         // use default C routine for int
         unsigned long int abs( long int v ) { return labs( v ); }
@@ -70 +70 @@
         unsigned int min( unsigned int v1, unsigned int v2 ) { return v1 < v2 ? v1 : v2; }
         long int min( long int v1, long int v2 ) { return v1 < v2 ? v1 : v2; }
-        unsigned long int min( unsigned long int v1, unsigned int v2 ) { return v1 < v2 ? v1 : v2; }
+        unsigned long int min( unsigned long int v1, unsigned long int v2 ) { return v1 < v2 ? v1 : v2; }
         long long int min( long long int v1, long long int v2 ) { return v1 < v2 ? v1 : v2; }
-        unsigned long long int min( unsigned long long int v1, unsigned int v2 ) { return v1 < v2 ? v1 : v2; }
+        unsigned long long int min( unsigned long long int v1, unsigned long long int v2 ) { return v1 < v2 ? v1 : v2; }
         forall( T | { int ?<?( T, T ); } )                                      // generic
         T min( T v1, T v2 ) { return v1 < v2 ? v1 : v2; }

libcfa/src/concurrency/kernel/cluster.hfa

@@ -40 +40 @@
 
 // convert to log2 scale but using double
-static inline __readyQ_avg_t __to_readyQ_avg(unsigned long long intsc) { if(unlikely(0 == intsc)) return 0.0; else return log2(intsc); }
+static inline __readyQ_avg_t __to_readyQ_avg(unsigned long long intsc) { if(unlikely(0 == intsc)) return 0.0; else return log2((__readyQ_avg_t)intsc); }
 
 #define warn_large_before warnf( !strict || old_avg < 35.0, "Suspiciously large previous average: %'lf, %'" PRId64 "ms \n", old_avg, program()`ms )

libcfa/src/stdlib.hfa

@@ -367 +367 @@
 
         char random( void ) { return (unsigned long int)random(); }
-        char random( char u ) { return random( (unsigned long int)u ); } // [0,u)
+        char random( char u ) { return (unsigned long int)random( (unsigned long int)u ); } // [0,u)
         char random( char l, char u ) { return random( (unsigned long int)l, (unsigned long int)u ); } // [l,u)
         int random( void ) { return (long int)random(); }
-        int random( int u ) { return random( (long int)u ); } // [0,u]
+        int random( int u ) { return (long int)random( (long int)u ); } // [0,u]
         int random( int l, int u ) { return random( (long int)l, (long int)u ); } // [l,u)
         unsigned int random( void ) { return (unsigned long int)random(); }
-        unsigned int random( unsigned int u ) { return random( (unsigned long int)u ); } // [0,u]
+        unsigned int random( unsigned int u ) { return (unsigned long int)random( (unsigned long int)u ); } // [0,u]
         unsigned int random( unsigned int l, unsigned int u ) { return random( (unsigned long int)l, (unsigned long int)u ); } // [l,u)
 } // distribution