Index: libcfa/src/bitmanip.hfa =================================================================== --- libcfa/src/bitmanip.hfa (revision c1f38e6cb761f0c262410a4cbc49bf127a2918c4) +++ libcfa/src/bitmanip.hfa (revision da3b790fb93e6fe436651b78aaef69fea5fb7df7) @@ -11,6 +11,6 @@ // Created On : Sat Mar 14 18:12:27 2020 // Last Modified By : Peter A. Buhr -// Last Modified On : Tue Jun 9 15:14:04 2020 -// Update Count : 123 +// Last Modified On : Mon Aug 10 09:21:02 2020 +// Update Count : 139 // @@ -21,5 +21,5 @@ // Bits are numbered 1-N. -//#include +#include #define __bitsizeof( n ) (sizeof(n) * __CHAR_BIT__) @@ -89,19 +89,19 @@ // Returns n aligned at the floor of align, clear bits above or equal to align, giving n % align. - signed char floor2( signed char n, 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, 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, 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, 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, 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; } + signed char floor2( signed char n, signed char align ) { verify( is_pow2( align ) ); return n & -align; } + unsigned char floor2( unsigned char n, unsigned char align ) { verify( is_pow2( align ) ); return n & -align; } + short int floor2( short int n, short int align ) { verify( is_pow2( align ) ); return n & -align; } + unsigned short int floor2( unsigned short int n, unsigned short int align ) { verify( is_pow2( align ) ); return n & -align; } + int floor2( int n, int align ) { verify( is_pow2( align ) ); return n & -align; } + unsigned int floor2( unsigned int n, unsigned int align ) { verify( is_pow2( align ) ); return n & -align; } + long int floor2( long int n, long int align ) { verify( is_pow2( align ) ); return n & -align; } + unsigned long int floor2( unsigned long int n, unsigned long int align ) { verify( is_pow2( align ) ); return n & -align; } + long long int floor2( long long int n, long long int align ) { verify( is_pow2( align ) ); return n & -align; } + unsigned long long int floor2( unsigned long long int n, unsigned long long int align ) { verify( is_pow2( align ) ); return n & -align; } // forall( otype T | { T ?&?( T, T ); T -?( T ); } ) - // T floor2( T n, T align ) { /* assert( is_pow2( align ) ); */ return n & -align; } + // T floor2( T n, T align ) { verify( is_pow2( align ) ); return n & -align; } - signed char floor( signed char n, char align ) { return n / align * align; } + signed char floor( signed char n, signed char align ) { return n / align * align; } unsigned char floor( unsigned char n, unsigned char align ) { return n / align * align; } short int floor( short int n, short int align ) { return n / align * align; } @@ -118,31 +118,46 @@ // Returns n aligned at the ceiling of align, negate, round down, negate is the same as round up. - signed char ceiling2( signed char n, char align ) { /*assert( is_pow2( align ) );*/ return -floor2( -n, align ); } - unsigned char ceiling2( unsigned char n, unsigned char align ) { /*assert( is_pow2( align ) );*/ return -floor2( -n, align ); } - short int ceiling2( short int n, short int align ) { /*assert( is_pow2( align ) );*/ return -floor2( -n, align ); } - unsigned short int ceiling2( unsigned short int n, unsigned short int align ) { /*assert( is_pow2( align ) );*/ return -floor2( -n, align ); } - int ceiling2( int n, int align ) { /*assert( is_pow2( align ) );*/ return -floor2( -n, align ); } - unsigned int ceiling2( unsigned int n, unsigned int align ) { /*assert( is_pow2( align ) );*/ return -floor2( -n, align ); } - long int ceiling2( long int n, long int align ) { /*assert( is_pow2( align ) );*/ return -floor2( -n, align ); } - unsigned long int ceiling2( unsigned long int n, unsigned long int align ) { /*assert( is_pow2( align ) );*/ return -floor2( -n, align ); } - long long int ceiling2( long long int n, long long int align ) { /*assert( is_pow2( align ) );*/ return -floor2( -n, align ); } - unsigned long long int ceiling2( unsigned long long int n, unsigned long long int align ) { /*assert( is_pow2( align ) );*/ return -floor2( -n, align ); } + signed char ceiling2( signed char n, signed char align ) { verify( is_pow2( align ) ); return -floor2( -n, align ); } + unsigned char ceiling2( unsigned char n, unsigned char align ) { verify( is_pow2( align ) ); return -floor2( -n, align ); } + short int ceiling2( short int n, short int align ) { verify( is_pow2( align ) ); return -floor2( -n, align ); } + unsigned short int ceiling2( unsigned short int n, unsigned short int align ) { verify( is_pow2( align ) ); return -floor2( -n, align ); } + int ceiling2( int n, int align ) { verify( is_pow2( align ) ); return -floor2( -n, align ); } + unsigned int ceiling2( unsigned int n, unsigned int align ) { verify( is_pow2( align ) ); return -floor2( -n, align ); } + long int ceiling2( long int n, long int align ) { verify( is_pow2( align ) ); return -floor2( -n, align ); } + unsigned long int ceiling2( unsigned long int n, unsigned long int align ) { verify( is_pow2( align ) ); return -floor2( -n, align ); } + long long int ceiling2( long long int n, long long int align ) { verify( is_pow2( align ) ); return -floor2( -n, align ); } + unsigned long long int ceiling2( unsigned long long int n, unsigned long long int align ) { verify( is_pow2( align ) ); return -floor2( -n, align ); } // forall( otype T | { T floor2( T, T ); T -?( T ); } ) - // T ceiling2( T n, T align ) { /* assert( is_pow2( align ) ); */ return -floor2( -n, align ); } + // T ceiling2( T n, T align ) { verify( is_pow2( align ) ); return -floor2( -n, align ); } - signed char ceiling( signed char n, char align ) { return (n + (align - 1)) / align; } - unsigned char ceiling( unsigned char n, unsigned char align ) { return (n + (align - 1)) / align; } - short int ceiling( short int n, short int align ) { return (n + (align - 1)) / align; } - unsigned short int ceiling( unsigned short int n, unsigned short int align ) { return (n + (align - 1)) / align; } - int ceiling( int n, int align ) { return (n + (align - 1)) / align; } - unsigned int ceiling( unsigned int n, unsigned int align ) { return (n + (align - 1)) / align; } - long int ceiling( long int n, long int align ) { return (n + (align - 1)) / align; } - unsigned long int ceiling( unsigned long int n, unsigned long int align ) { return (n + (align - 1)) / align; } - long long int ceiling( long long int n, long long int align ) { return (n + (align - 1)) / align; } - unsigned long long int ceiling( unsigned long long int n, unsigned long long int align ) { return (n + (align - 1)) / align; } + signed char ceiling_div( signed char n, char align ) { return (n + (align - 1)) / align; } + unsigned char ceiling_div( unsigned char n, unsigned char align ) { return (n + (align - 1)) / align; } + short int ceiling_div( short int n, short int align ) { return (n + (align - 1)) / align; } + unsigned short int ceiling_div( unsigned short int n, unsigned short int align ) { return (n + (align - 1)) / align; } + int ceiling_div( int n, int align ) { return (n + (align - 1)) / align; } + unsigned int ceiling_div( unsigned int n, unsigned int align ) { return (n + (align - 1)) / align; } + long int ceiling_div( long int n, long int align ) { return (n + (align - 1)) / align; } + unsigned long int ceiling_div( unsigned long int n, unsigned long int align ) { return (n + (align - 1)) / align; } + long long int ceiling_div( long long int n, long long int align ) { return (n + (align - 1)) / align; } + unsigned long long int ceiling_div( unsigned long long int n, unsigned long long int align ) { return (n + (align - 1)) / align; } + + // forall( otype T | { T ?+?( T, T ); T ?-?( T, T ); T ?%?( T, T ); } ) + // T ceiling_div( T n, T align ) { verify( is_pow2( align ) );return (n + (align - 1)) / align; } + + // gcc notices the div/mod pair and saves both so only one div. + signed char ceiling( signed char n, signed char align ) { return floor( n + (n % align != 0 ? align - 1 : 0), align ); } + unsigned char ceiling( unsigned char n, unsigned char align ) { return floor( n + (n % align != 0 ? align - 1 : 0), align ); } + short int ceiling( short int n, short int align ) { return floor( n + (n % align != 0 ? align - 1 : 0), align ); } + unsigned short int ceiling( unsigned short int n, unsigned short int align ) { return floor( n + (n % align != 0 ? align - 1 : 0), align ); } + int ceiling( int n, int align ) { return floor( n + (n % align != 0 ? align - 1 : 0), align ); } + unsigned int ceiling( unsigned int n, unsigned int align ) { return floor( n + (n % align != 0 ? align - 1 : 0), align ); } + long int ceiling( long int n, long int align ) { return floor( n + (n % align != 0 ? align - 1 : 0), align ); } + unsigned long int ceiling( unsigned long int n, unsigned long int align ) { return floor( n + (n % align != 0 ? align - 1 : 0) , align); } + long long int ceiling( long long int n, long long int align ) { return floor( n + (n % align != 0 ? align - 1 : 0), align ); } + unsigned long long int ceiling( unsigned long long int n, unsigned long long int align ) { return floor( n + (n % align != 0 ? align - 1 : 0), 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; } + // T ceiling( T n, T align ) { return return floor( n + (n % align != 0 ? align - 1 : 0), align ); *} } // distribution