diff options
author | Andrea Mattavelli <andreamattavelli@users.noreply.github.com> | 2017-02-22 21:09:03 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-22 21:09:03 +0000 |
commit | 013962e6bbd5606e3020407721b6e8347e408ced (patch) | |
tree | 52f4345c2c8fa5e0bdeba5df97f505c05ce0fc9b | |
parent | d88cec521019e39854c5a0926efb8919313c6e3a (diff) | |
parent | 8cc3b11b853fb8a1870bb5945a042653f0c7f49f (diff) | |
download | klee-013962e6bbd5606e3020407721b6e8347e408ced.tar.gz |
Merge pull request #599 from jirislaby/de_register
klee: remove use of deprecated 'register'
-rw-r--r-- | lib/Solver/ConstantDivision.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/Solver/ConstantDivision.cpp b/lib/Solver/ConstantDivision.cpp index c8f8f3d5..e62e1354 100644 --- a/lib/Solver/ConstantDivision.cpp +++ b/lib/Solver/ConstantDivision.cpp @@ -40,7 +40,7 @@ namespace klee { #define LOG2_CEIL(x) ( 32 - ldz(x - 1) ) /* ones(x) -- counts the number of bits in x with the value 1 */ -static uint32_t ones( register uint32_t x ) { +static uint32_t ones(uint32_t x) { x -= ((x >> 1) & 0x55555555); x = (((x >> 2) & 0x33333333) + (x & 0x33333333)); x = (((x >> 4) + x) & 0x0f0f0f0f); @@ -51,7 +51,7 @@ static uint32_t ones( register uint32_t x ) { } /* ldz(x) -- counts the number of leading zeroes in a 32-bit word */ -static uint32_t ldz( register uint32_t x ) { +static uint32_t ldz(uint32_t x) { x |= (x >> 1); x |= (x >> 2); x |= (x >> 4); @@ -62,8 +62,8 @@ static uint32_t ldz( register uint32_t x ) { } /* exp_base_2(n) -- 2^n computed as an integer */ -static uint32_t exp_base_2( register int32_t n ) { - register uint32_t x = ~n & (n - 32); +static uint32_t exp_base_2(int32_t n) { + uint32_t x = ~n & (n - 32); x = x >> 31; return( x << n ); } |