From ae445c0b0f3b26b8173d68b883a356d25a4276be Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Tue, 26 Dec 2017 11:48:11 -0500 Subject: [PATCH] Clear signed/unsigned warnings with GCC and -Wall -Wextra --- simon-simd.cpp | 16 ++++++++-------- speck-simd.cpp | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/simon-simd.cpp b/simon-simd.cpp index 23b65b92..8662acf7 100644 --- a/simon-simd.cpp +++ b/simon-simd.cpp @@ -657,7 +657,7 @@ inline void SIMON128_Enc_Block(__m128i &block0, __m128i &block1, const word64 *s x1 = _mm_shuffle_epi8(x1, mask); y1 = _mm_shuffle_epi8(y1, mask); - for (size_t i = 0; static_cast(i) < (rounds & ~1)-1; i += 2) + for (int i = 0; i < static_cast(rounds & ~1)-1; i += 2) { const __m128i rk1 = _mm_castpd_si128( _mm_loaddup_pd(reinterpret_cast(subkeys+i))); @@ -707,7 +707,7 @@ inline void SIMON128_Enc_6_Blocks(__m128i &block0, __m128i &block1, x3 = _mm_shuffle_epi8(x3, mask); y3 = _mm_shuffle_epi8(y3, mask); - for (size_t i = 0; static_cast(i) < (rounds & ~1) - 1; i += 2) + for (int i = 0; i < static_cast(rounds & ~1) - 1; i += 2) { const __m128i rk1 = _mm_castpd_si128( _mm_loaddup_pd(reinterpret_cast(subkeys + i))); @@ -771,7 +771,7 @@ inline void SIMON128_Dec_Block(__m128i &block0, __m128i &block1, const word64 *s rounds--; } - for (size_t i = rounds-2; static_cast(i) >= 0; i -= 2) + for (int i = static_cast(rounds-2); i >= 0; i -= 2) { const __m128i rk1 = _mm_castpd_si128( _mm_loaddup_pd(reinterpret_cast(subkeys+i+1))); @@ -824,7 +824,7 @@ inline void SIMON128_Dec_6_Blocks(__m128i &block0, __m128i &block1, rounds--; } - for (size_t i = rounds - 2; static_cast(i) >= 0; i -= 2) + for (int i = static_cast(rounds-2); i >= 0; i -= 2) { const __m128i rk1 = _mm_castpd_si128( _mm_loaddup_pd(reinterpret_cast(subkeys + i + 1))); @@ -912,7 +912,7 @@ inline void SIMON64_Enc_Block(__m128i &block0, __m128i &block1, x1 = _mm_shuffle_epi8(x1, mask); y1 = _mm_shuffle_epi8(y1, mask); - for (size_t i = 0; static_cast(i) < (rounds & ~1)-1; i += 2) + for (int i = 0; i < static_cast(rounds & ~1)-1; i += 2) { const __m128i rk1 = _mm_set1_epi32(subkeys[i]); y1 = _mm_xor_si128(_mm_xor_si128(y1, SIMON64_f(x1)), rk1); @@ -962,7 +962,7 @@ inline void SIMON64_Dec_Block(__m128i &block0, __m128i &block1, rounds--; } - for (size_t i = rounds-2; static_cast(i) >= 0; i -= 2) + for (int i = static_cast(rounds-2); i >= 0; i -= 2) { const __m128i rk1 = _mm_set1_epi32(subkeys[i+1]); x1 = _mm_xor_si128(_mm_xor_si128(x1, SIMON64_f(y1)), rk1); @@ -1012,7 +1012,7 @@ inline void SIMON64_Enc_6_Blocks(__m128i &block0, __m128i &block1, x3 = _mm_shuffle_epi8(x3, mask); y3 = _mm_shuffle_epi8(y3, mask); - for (size_t i = 0; static_cast(i) < (rounds & ~1)-1; i += 2) + for (int i = 0; i < static_cast(rounds & ~1)-1; i += 2) { const __m128i rk1 = _mm_set1_epi32(subkeys[i]); y1 = _mm_xor_si128(_mm_xor_si128(y1, SIMON64_f(x1)), rk1); @@ -1093,7 +1093,7 @@ inline void SIMON64_Dec_6_Blocks(__m128i &block0, __m128i &block1, rounds--; } - for (size_t i = rounds-2; static_cast(i) >= 0; i -= 2) + for (int i = static_cast(rounds-2); i >= 0; i -= 2) { const __m128i rk1 = _mm_set1_epi32(subkeys[i+1]); x1 = _mm_xor_si128(_mm_xor_si128(x1, SIMON64_f(y1)), rk1); diff --git a/speck-simd.cpp b/speck-simd.cpp index b901a96e..bcd49604 100644 --- a/speck-simd.cpp +++ b/speck-simd.cpp @@ -602,7 +602,7 @@ inline void SPECK128_Enc_Block(__m128i &block0, __m128i &block1, x1 = _mm_shuffle_epi8(x1, mask); y1 = _mm_shuffle_epi8(y1, mask); - for (size_t i=0; static_cast(i)(rounds); ++i) { const __m128i rk = _mm_castpd_si128( _mm_loaddup_pd(reinterpret_cast(subkeys+i))); @@ -645,7 +645,7 @@ inline void SPECK128_Enc_6_Blocks(__m128i &block0, __m128i &block1, x3 = _mm_shuffle_epi8(x3, mask); y3 = _mm_shuffle_epi8(y3, mask); - for (size_t i=0; static_cast(i)(rounds); ++i) { const __m128i rk = _mm_castpd_si128( _mm_loaddup_pd(reinterpret_cast(subkeys+i))); @@ -697,7 +697,7 @@ inline void SPECK128_Dec_Block(__m128i &block0, __m128i &block1, x1 = _mm_shuffle_epi8(x1, mask); y1 = _mm_shuffle_epi8(y1, mask); - for (size_t i=rounds-1; static_cast(i)>=0; --i) + for (int i = static_cast(rounds-1); i >=0 ; --i) { const __m128i rk = _mm_castpd_si128( _mm_loaddup_pd(reinterpret_cast(subkeys+i))); @@ -740,7 +740,7 @@ inline void SPECK128_Dec_6_Blocks(__m128i &block0, __m128i &block1, x3 = _mm_shuffle_epi8(x3, mask); y3 = _mm_shuffle_epi8(y3, mask); - for (size_t i=rounds-1; static_cast(i)>=0; --i) + for (int i = static_cast(rounds-1); i >= 0; --i) { const __m128i rk = _mm_castpd_si128( _mm_loaddup_pd(reinterpret_cast(subkeys+i))); @@ -829,7 +829,7 @@ inline void SPECK64_Enc_Block(__m128i &block0, __m128i &block1, x1 = _mm_shuffle_epi8(x1, mask); y1 = _mm_shuffle_epi8(y1, mask); - for (size_t i=0; static_cast(i)(rounds); ++i) { const __m128i rk = _mm_set1_epi32(subkeys[i]); @@ -866,7 +866,7 @@ inline void SPECK64_Dec_Block(__m128i &block0, __m128i &block1, x1 = _mm_shuffle_epi8(x1, mask); y1 = _mm_shuffle_epi8(y1, mask); - for (size_t i=rounds-1; static_cast(i)>=0; --i) + for (int i = static_cast(rounds-1); i >= 0; --i) { const __m128i rk = _mm_set1_epi32(subkeys[i]); @@ -918,7 +918,7 @@ inline void SPECK64_Enc_6_Blocks(__m128i &block0, __m128i &block1, x3 = _mm_shuffle_epi8(x3, mask); y3 = _mm_shuffle_epi8(y3, mask); - for (size_t i=0; static_cast(i)(rounds); ++i) { const __m128i rk = _mm_set1_epi32(subkeys[i]); @@ -988,7 +988,7 @@ inline void SPECK64_Dec_6_Blocks(__m128i &block0, __m128i &block1, x3 = _mm_shuffle_epi8(x3, mask); y3 = _mm_shuffle_epi8(y3, mask); - for (size_t i=rounds-1; static_cast(i)>=0; --i) + for (int i = static_cast(rounds-1); i >= 0; --i) { const __m128i rk = _mm_set1_epi32(subkeys[i]);