Changeset 7726839

Timestamp:

Mar 26, 2019, 10:29:25 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

697e484

Parents:

c274df2

Message:

exponential clean up and fix forall version

File:

• libcfa/prelude/builtins.c (modified) (5 diffs)

libcfa/prelude/builtins.c

@@ -10 +10 @@
 // Created On       : Fri Jul 21 16:21:03 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar 26 14:05:49 2019
-// Update Count     : 84
+// Last Modified On : Tue Mar 26 21:33:54 2019
+// Update Count     : 92
 //
 
@@ -18 +18 @@
 typedef unsigned long long __cfaabi_abi_exception_type_t;
 
+#include <limits.h>                                                                             // CHAR_BIT
 #include "../src/virtual.h"
 #include "../src/exception.h"
@@ -61 +62 @@
 static inline long double _Complex ?\?( long double _Complex x, _Complex long double y ) { return cpowl( x, y ); }
 
+#define __CFA_BASE_COMP_1__() if ( ep == 1 ) return 1
+#define __CFA_BASE_COMP_2__() if ( ep == 2 ) return ep << (y - 1)
+#define __CFA_EXP_OVERFLOW__() if ( y >= sizeof(y) * CHAR_BIT ) return 0
+
 #define __CFA_EXP__() \
         if ( y == 0 ) return 1;                                                         /* base case */ \
-        __CFA_BASE_COMP_1__()                                                           /* base case */ \
-        __CFA_BASE_COMP_2__()                                                           /* special case, positive shifting for integral types */ \
-        __CFA_EXP_OVERFLOW__()                                                          /* immediate overflow, negative exponent > 2^size-1 */ \
+        __CFA_BASE_COMP_1__();                                                          /* base case */ \
+        __CFA_BASE_COMP_2__();                                                          /* special case, positive shifting for integral types */ \
+        __CFA_EXP_OVERFLOW__();                                                         /* immediate overflow, negative exponent > 2^size-1 */ \
         typeof(ep) op = 1;                                                                      /* accumulate odd product */ \
         for ( ; y > 1; y >>= 1 ) {                                                      /* squaring exponentiation, O(log2 y) */ \
@@ -72 +77 @@
         } \
         return ep * op
-
-#define __CFA_BASE_COMP_1__() if ( ep == 1 ) return 1;
-#define __CFA_BASE_COMP_2__() if ( ep == 2 ) return ep << (y - 1);
-#define __CFA_EXP_OVERFLOW__() if ( y >= sizeof(y) * 8 ) return 0;
 
 static inline long int ?\?( int ep, unsigned int y ) {
@@ -106 +107 @@
 } // ?\?
 
-static inline forall( otype OT | { void ?{}( OT & this, zero_t ); void ?{}( OT & this, one_t ); int ?==?( OT, OT ); OT ?*?( OT, OT ); } )
+static inline forall( otype OT | { void ?{}( OT & this, one_t ); OT ?*?( OT, OT ); } )
 OT ?\?( OT ep, unsigned long int y ) {
         __CFA_EXP__();