Changeset 4ea5308

Timestamp:

Apr 15, 2020, 11:05:32 AM (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:

21923bd, 912ccbcf

Parents:

5569a31 (diff), 391aa0e (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

Files:

• libcfa/src/bitmanip.hfa (modified) (2 diffs)
• libcfa/src/exception.c (modified) (2 diffs)
• tests/.expect/bitmanip3.x64.txt (added)
• tests/.expect/bitmanip3.x86.txt (added)
• tests/bitmanip1.cfa (modified) (1 diff)
• tests/bitmanip2.cfa (modified) (1 diff)
• tests/bitmanip3.cfa (added)

libcfa/src/bitmanip.hfa

@@ -11 +11 @@
 // Created On       : Sat Mar 14 18:12:27 2020
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Apr  6 22:17:19 2020
-// Update Count     : 78
+// Last Modified On : Mon Apr 13 22:37:03 2020
+// Update Count     : 110
 // 
 
@@ -67 +67 @@
 
     // Find most significiant zero bit.
-    unsigned int high0( unsigned char n ) { return n != (typeof(n))-1 ? __bitsizeof(unsigned int) - __builtin_clz( (typeof(n))~n ) : 0; }
-    unsigned int high0( unsigned short int n ) { return n != (typeof(n))-1 ? __bitsizeof(unsigned int) - __builtin_clz( (typeof(n))~n ) : 0; }
-    unsigned int high0( unsigned int n ) { return n != -1 ? __bitsizeof(n) - __builtin_clz( ~n ) : 0; }
-    unsigned int high0( unsigned long int n ) { return n != -1 ? __bitsizeof(n) - __builtin_clzl( ~n ) : 0; }
-    unsigned int high0( unsigned long long int n ) { return n != -1 ? __bitsizeof(n) - __builtin_clzll( ~n ) : 0; }
+    unsigned int high0( unsigned char n ) { return n == (typeof(n))-1 ? 0 : __bitsizeof(unsigned int) - __builtin_clz( (typeof(n))~n ); }
+    unsigned int high0( unsigned short int n ) { return n == (typeof(n))-1 ? 0 : __bitsizeof(unsigned int) - __builtin_clz( (typeof(n))~n ); }
+    unsigned int high0( unsigned int n ) { return n == -1 ? 0 : __bitsizeof(n) - __builtin_clz( ~n ); }
+    unsigned int high0( unsigned long int n ) { return n == -1 ? 0 : __bitsizeof(n) - __builtin_clzl( ~n ); }
+    unsigned int high0( unsigned long long int n ) { return n == -1 ? 0 : __bitsizeof(n) - __builtin_clzll( ~n ); }
 
     // Find most significiant one bit.
-    unsigned int high1( unsigned char n ) { return n != 0 ? __bitsizeof(unsigned int) - __builtin_clz( n ) : 0; }
-    unsigned int high1( unsigned short int n ) { return n != 0 ? __bitsizeof(unsigned int) - __builtin_clz( n ) : 0; }
-    unsigned int high1( unsigned int n ) { return n != 0 ? __bitsizeof(n) - __builtin_clz( n ) : 0; }
-    unsigned int high1( unsigned long int n ) { return n != 0 ? __bitsizeof(n) - __builtin_clzl( n ) : 0; }
-    unsigned int high1( unsigned long long int n ) { return n != 0 ? __bitsizeof(n) - __builtin_clzll( n ) : 0; }
+    unsigned int high1( unsigned char n ) { return n == 0 ? 0 : __bitsizeof(unsigned int) - __builtin_clz( n ); }
+    unsigned int high1( unsigned short int n ) { return n == 0 ? 0 : __bitsizeof(unsigned int) - __builtin_clz( n ); }
+    unsigned int high1( unsigned int n ) { return n == 0 ? 0 : __bitsizeof(n) - __builtin_clz( n ); }
+    unsigned int high1( unsigned long int n ) { return n == 0 ? 0 : __bitsizeof(n) - __builtin_clzl( n ); }
+    unsigned int high1( unsigned long long int n ) { return n == 0 ? 0 : __bitsizeof(n) - __builtin_clzll( n ); }
 
-    // Check for power of 2, clears bits below value, rounding down to the next lower multiple of value.
-    bool is_pow2( int value ) { return (value & (value - 1)) == 0; }
-    bool is_pow2( unsigned long long int value ) { return (value & (value - 1)) == 0; }
+    // Check for power of 2, clears bits below n, rounding down to the next lower multiple of n.
+    bool is_pow2( unsigned char n ) { return n == 0 ? false : (n & (n - 1)) == 0; }
+    bool is_pow2( unsigned short int n ) { return n == 0 ? false : (n & (n - 1)) == 0; }
+    bool is_pow2( unsigned int n ) { return n == 0 ? false : (n & (n - 1)) == 0; }
+    bool is_pow2( unsigned long int n ) { return n == 0 ? false : (n & (n - 1)) == 0; }
+    bool is_pow2( unsigned long long int n ) { return n == 0 ? false : (n & (n - 1)) == 0; }
 
-    // Returns value aligned at the floor of align, clear bits above or equal to align, giving value % align.
-    unsigned int floor2( unsigned int value, unsigned int align ) { assert( is_pow2( align ) ); return value & -align; }
-    unsigned long long int floor2( unsigned long long int value, unsigned long long int align ) { assert( is_pow2( align ) ); return value & -align; }
+    // Returns n aligned at the floor of align, clear bits above or equal to align, giving n % align.
+    // signed char floor2( signed char n, signed char align ) { /*assert( is_pow2( align ) );*/ return n & -align; }
+    // unsigned char floor2( unsigned char n, unsigned char align ) { /*assert( is_pow2( align ) );*/ return n & -align; }
+    // short int floor2( short int n, unsigned short int align ) { /*assert( is_pow2( align ) );*/ return n & -align; }
+    // unsigned short int floor2( unsigned short int n, unsigned short int align ) { /*assert( is_pow2( align ) );*/ return n & -align; }
+    // int floor2( int n, unsigned int align ) { /*assert( is_pow2( align ) );*/ return n & -align; }
+    // unsigned int floor2( unsigned int n, unsigned int align ) { /*assert( is_pow2( align ) );*/ return n & -align; }
+    // long int floor2( long int n, unsigned long int align ) { /*assert( is_pow2( align ) );*/ return n & -align; }
+    // unsigned long int floor2( unsigned long int n, unsigned long int align ) { /*assert( is_pow2( align ) );*/ return n & -align; }
+        // long long int floor2( long long int n, unsigned long long int align ) { /*assert( is_pow2( align ) );*/ return n & -align; }
+    // unsigned long long int floor2( unsigned long long int n, unsigned long long int align ) { /*assert( is_pow2( align ) );*/ return n & -align; }
 
-    unsigned int floor( unsigned int value, unsigned int align ) { return value / align * align; }
-    unsigned long long int floor( unsigned long long int value, unsigned long long int align ) { return value / align * align; }
+        forall( otype T | { T ?&?( T, T ); T -?( T ); } )
+        T floor2( T n, T align ) { /* assert( is_pow2( align ) ); */ return n & -align; }
 
-    // Returns value aligned at the ceiling of align, negate, round down, negate is the same as round up.
-    unsigned int ceiling2( unsigned int value, unsigned int align ) { assert( is_pow2( align ) ); return -floor2( -value, align ); }
-    unsigned long long int ceiling2( unsigned long long int value, unsigned long long int align ) { assert( is_pow2( align ) ); return -floor2( -value, align ); }
+        forall( otype T | { T ?/?( T, T ); T ?*?( T, T ); } )
+        T floor( T n, T align ) { return n / align * align; }
 
-    unsigned int ceiling( unsigned int value, unsigned int align ) { return (value + (align - 1)) / align; }
-    unsigned long long int ceiling( unsigned long long int value, unsigned long long int align ) { return (value + (align - 1)) / align; }
+    // Returns n aligned at the ceiling of align, negate, round down, negate is the same as round up.
+        forall( otype T | { T floor2( T, T ); T -?( T ); } )
+        T ceiling2( T n, T align ) { /* assert( is_pow2( align ) ); */ return -floor2( -n, align ); }
+
+        forall( otype T | { void ?{}( T &, one_t ); T ?+?( T, T ); T ?-?( T, T ); T ?/?( T, T ); } )
+        T ceiling( T n, T align ) { return (n + (align - (T){1})) / align; }
 } // distribution
 

libcfa/src/exception.c

@@ -10 +10 @@
 // Created On       : Mon Jun 26 15:13:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Thr Apr  9 12:20:00 2020
-// Update Count     : 17
+// Last Modified On : Tue Apr 14 12:01:00 2020
+// Update Count     : 18
 //
 
@@ -445 +445 @@
 
 #pragma GCC push_options
+#if __GNUC__ != 7
 #pragma GCC optimize("no-toplevel-reorder")
+#else
+#pragma GCC optimize("no-unit-at-a-time")
+#endif
 
 // Try statements are hoisted out see comments for details. While this could probably be unique

tests/bitmanip1.cfa

@@ +1 @@
+// 
+// Cforall Version 1.0.0 Copyright (C) 2020 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// bitmanip1.cfa<cfa-cc> -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Tue Apr  7 21:20:29 2020
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Apr  7 21:20:57 2020
+// Update Count     : 1
+// 
+
 #include <fstream.hfa>
 #include <bitmanip.hfa>

tests/bitmanip2.cfa

@@ +1 @@
+// 
+// Cforall Version 1.0.0 Copyright (C) 2020 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// bitmanip2.cfa -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Tue Apr  7 21:21:20 2020
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Apr  7 21:21:40 2020
+// Update Count     : 1
+// 
+
 #include <fstream.hfa>
 #include <bitmanip.hfa>