dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Get rid of __align stuff in Salsa20 -- not portable, does not seem to help much on newer chips.

Browse source
This commit is contained in:
Adam Ierymenko 2014-09-16 08:53:18 -07:00
parent 5c1c70a604
commit 8d2e20ede6
3 changed files with 7 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

13
node/Salsa20.hpp
View file

@ -13,14 +13,7 @@
#ifdef ZT_SALSA20_SSE
#include <emmintrin.h>
#ifdef __GCC__
#define ZT_SALSA20_SSE_ALIGN __attribute__((aligned (16)))
#else
#define ZT_SALSA20_SSE_ALIGN __declspec(align(16))
#endif
#else
#define ZT_SALSA20_SSE_ALIGN
#endif
#endif // ZT_SALSA20_SSE
namespace ZeroTier {
@ -79,10 +72,10 @@ public:
}
private:
volatile ZT_SALSA20_SSE_ALIGN union {
volatile union {
#ifdef ZT_SALSA20_SSE
__m128i v[4];
#endif
#endif // ZT_SALSA20_SSE
uint32_t i[16];
} _state;
unsigned int _roundsDiv2;