Whitespace check-in

2 files changed, 29 insertions, 24 deletions

diff --git a/lsh256.cpp b/lsh256.cpp
index 2f2c9c19..ef340517 100644
--- a/lsh256.cpp
+++ b/lsh256.cpp
@@ -516,14 +516,14 @@ inline void word_perm(lsh_u32* cv_l, lsh_u32* cv_r)
 	CRYPTOPP_ASSERT(cv_r != NULLPTR);

 

 #if defined(__SSE2__)

-	_mm_storeu_si128(M128_CAST(cv_l+0),

-		_mm_shuffle_epi32(_mm_loadu_si128(CONST_M128_CAST(cv_l+0)), _MM_SHUFFLE(3,1,0,2)));

-	_mm_storeu_si128(M128_CAST(cv_l+4),

-		_mm_shuffle_epi32(_mm_loadu_si128(CONST_M128_CAST(cv_l+4)), _MM_SHUFFLE(3,1,0,2)));

-	_mm_storeu_si128(M128_CAST(cv_r+0),

-		_mm_shuffle_epi32(_mm_loadu_si128(CONST_M128_CAST(cv_r+0)), _MM_SHUFFLE(1,2,3,0)));

-	_mm_storeu_si128(M128_CAST(cv_r+4),

-		_mm_shuffle_epi32(_mm_loadu_si128(CONST_M128_CAST(cv_r+4)), _MM_SHUFFLE(1,2,3,0)));

+	_mm_storeu_si128(M128_CAST(cv_l+0), _mm_shuffle_epi32(

+		_mm_loadu_si128(CONST_M128_CAST(cv_l+0)), _MM_SHUFFLE(3,1,0,2)));

+	_mm_storeu_si128(M128_CAST(cv_l+4), _mm_shuffle_epi32(

+		_mm_loadu_si128(CONST_M128_CAST(cv_l+4)), _MM_SHUFFLE(3,1,0,2)));

+	_mm_storeu_si128(M128_CAST(cv_r+0), _mm_shuffle_epi32(

+		_mm_loadu_si128(CONST_M128_CAST(cv_r+0)), _MM_SHUFFLE(1,2,3,0)));

+	_mm_storeu_si128(M128_CAST(cv_r+4), _mm_shuffle_epi32(

+		_mm_loadu_si128(CONST_M128_CAST(cv_r+4)), _MM_SHUFFLE(1,2,3,0)));

 

 	__m128i cv_l_temp = _mm_loadu_si128(CONST_M128_CAST(cv_l+0));

 	_mm_storeu_si128(M128_CAST(cv_l+0), _mm_loadu_si128(CONST_M128_CAST(cv_l+4)));

@@ -814,6 +814,7 @@ lsh_err lsh256_update(LSH256_Context* ctx, const lsh_u8* data, size_t databitlen
 		ctx->last_block[databytelen] = data[databytelen] & ((0xff >> pos2) ^ 0xff);

 		ctx->remain_databitlen += pos2;

 	}

+

 	return LSH_SUCCESS;

 }

 

diff --git a/lsh512.cpp b/lsh512.cpp
index 9fc5aeac..35cd54b9 100644
--- a/lsh512.cpp
+++ b/lsh512.cpp
@@ -407,32 +407,36 @@ inline void msg_exp_odd(LSH512_Internal* i_state)
 

 #if defined(__SSE2__)

 	__m128i temp;

-	_mm_storeu_si128(M128_CAST(submsg_o_l+2),

-		_mm_shuffle_epi32(_mm_loadu_si128(CONST_M128_CAST(submsg_o_l+2)), _MM_SHUFFLE(1,0,3,2)));

+	_mm_storeu_si128(M128_CAST(submsg_o_l+2), _mm_shuffle_epi32(

+		_mm_loadu_si128(CONST_M128_CAST(submsg_o_l+2)), _MM_SHUFFLE(1,0,3,2)));

 

 	temp = _mm_loadu_si128(CONST_M128_CAST(submsg_o_l+0));

-	_mm_storeu_si128(M128_CAST(submsg_o_l+0), _mm_loadu_si128(CONST_M128_CAST(submsg_o_l+2)));

+	_mm_storeu_si128(M128_CAST(submsg_o_l+0),

+		_mm_loadu_si128(CONST_M128_CAST(submsg_o_l+2)));

 	_mm_storeu_si128(M128_CAST(submsg_o_l+2), temp);

-	_mm_storeu_si128(M128_CAST(submsg_o_l+6),

-		_mm_shuffle_epi32(_mm_loadu_si128(CONST_M128_CAST(submsg_o_l+6)), _MM_SHUFFLE(1,0,3,2)));

+	_mm_storeu_si128(M128_CAST(submsg_o_l+6), _mm_shuffle_epi32(

+		_mm_loadu_si128(CONST_M128_CAST(submsg_o_l+6)), _MM_SHUFFLE(1,0,3,2)));

 

 	temp = _mm_loadu_si128(CONST_M128_CAST(submsg_o_l+4));

 	_mm_storeu_si128(M128_CAST(submsg_o_l+4), _mm_unpacklo_epi64(

-		_mm_loadu_si128(CONST_M128_CAST(submsg_o_l+6)), _mm_loadu_si128(CONST_M128_CAST(submsg_o_l+4))));

+		_mm_loadu_si128(CONST_M128_CAST(submsg_o_l+6)),

+		_mm_loadu_si128(CONST_M128_CAST(submsg_o_l+4))));

 	_mm_storeu_si128(M128_CAST(submsg_o_l+6), _mm_unpackhi_epi64(

 		temp, _mm_loadu_si128(CONST_M128_CAST(submsg_o_l+6))));

-	_mm_storeu_si128(M128_CAST(submsg_o_r+2),

-		_mm_shuffle_epi32(_mm_loadu_si128(CONST_M128_CAST(submsg_o_r+2)), _MM_SHUFFLE(1,0,3,2)));

+	_mm_storeu_si128(M128_CAST(submsg_o_r+2), _mm_shuffle_epi32(

+		_mm_loadu_si128(CONST_M128_CAST(submsg_o_r+2)), _MM_SHUFFLE(1,0,3,2)));

 

 	temp = _mm_loadu_si128(CONST_M128_CAST(submsg_o_r+0));

-	_mm_storeu_si128(M128_CAST(submsg_o_r+0), _mm_loadu_si128(CONST_M128_CAST(submsg_o_r+2)));

+	_mm_storeu_si128(M128_CAST(submsg_o_r+0),

+		_mm_loadu_si128(CONST_M128_CAST(submsg_o_r+2)));

 	_mm_storeu_si128(M128_CAST(submsg_o_r+2), temp);

-	_mm_storeu_si128(M128_CAST(submsg_o_r+6),

-		_mm_shuffle_epi32(_mm_loadu_si128(CONST_M128_CAST(submsg_o_r+6)), _MM_SHUFFLE(1,0,3,2)));

+	_mm_storeu_si128(M128_CAST(submsg_o_r+6), _mm_shuffle_epi32(

+		_mm_loadu_si128(CONST_M128_CAST(submsg_o_r+6)), _MM_SHUFFLE(1,0,3,2)));

 

 	temp = _mm_loadu_si128(CONST_M128_CAST(submsg_o_r+4));

 	_mm_storeu_si128(M128_CAST(submsg_o_r+4), _mm_unpacklo_epi64(

-		_mm_loadu_si128(CONST_M128_CAST(submsg_o_r+6)), _mm_loadu_si128(CONST_M128_CAST(submsg_o_r+4))));

+		_mm_loadu_si128(CONST_M128_CAST(submsg_o_r+6)),

+		_mm_loadu_si128(CONST_M128_CAST(submsg_o_r+4))));

 	_mm_storeu_si128(M128_CAST(submsg_o_r+6), _mm_unpackhi_epi64(

 		temp, _mm_loadu_si128(CONST_M128_CAST(submsg_o_r+6))));

 

@@ -693,8 +697,8 @@ inline void word_perm(lsh_u64 cv_l[8], lsh_u64 cv_r[8])
 		_mm_loadu_si128(CONST_M128_CAST(cv_l+4))));

 	_mm_storeu_si128(M128_CAST(cv_l+6), _mm_unpackhi_epi64(

 		temp[0], _mm_loadu_si128(CONST_M128_CAST(cv_l+6))));

-	_mm_storeu_si128(M128_CAST(cv_r+2),

-		_mm_shuffle_epi32(_mm_loadu_si128(CONST_M128_CAST(cv_r+2)), _MM_SHUFFLE(1,0,3,2)));

+	_mm_storeu_si128(M128_CAST(cv_r+2), _mm_shuffle_epi32(

+		_mm_loadu_si128(CONST_M128_CAST(cv_r+2)), _MM_SHUFFLE(1,0,3,2)));

 

 	temp[0] = _mm_loadu_si128(CONST_M128_CAST(cv_r+0));

 	_mm_storeu_si128(M128_CAST(cv_r+0), _mm_unpacklo_epi64(

@@ -702,8 +706,8 @@ inline void word_perm(lsh_u64 cv_l[8], lsh_u64 cv_r[8])
 		_mm_loadu_si128(CONST_M128_CAST(cv_r+2))));

 	_mm_storeu_si128(M128_CAST(cv_r+2), _mm_unpackhi_epi64(

 		_mm_loadu_si128(CONST_M128_CAST(cv_r+2)), temp[0]));

-	_mm_storeu_si128(M128_CAST(cv_r+6),

-		_mm_shuffle_epi32(_mm_loadu_si128(CONST_M128_CAST(cv_r+6)), _MM_SHUFFLE(1,0,3,2)));

+	_mm_storeu_si128(M128_CAST(cv_r+6), _mm_shuffle_epi32(

+		_mm_loadu_si128(CONST_M128_CAST(cv_r+6)), _MM_SHUFFLE(1,0,3,2)));

 

 	temp[0] = _mm_loadu_si128(CONST_M128_CAST(cv_r+4));

 	_mm_storeu_si128(M128_CAST(cv_r+4), _mm_unpacklo_epi64(