Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updates from BitShares FC #22

Closed
nathanielhourt wants to merge 693 commits from dapp-support into latest-fc
pull from: dapp-support
merge into: Peerplays_Blockchain:latest-fc
Conversation 4 Commits 693 Files changed 313 +8 -7
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit d5fb99b41f - Show all commits

11
src/crypto/city.cpp
View file

@ -38,9 +38,10 @@
#include <boost/endian/buffers.hpp>
#if defined(__SSE4_2__) && defined(__x86_64__)
#include <nmmintrin.h>
#include <nmmintrin.h>
#define _mm_crc32_u64_impl _mm_crc32_u64
#else
uint64_t _mm_crc32_u64(uint64_t a, uint64_t b );
uint64_t _mm_crc32_u64_impl(uint64_t a, uint64_t b );
#endif
namespace fc {
@ -563,9 +564,9 @@ static void CityHashCrc256Long(const char *s, size_t len,
g += e; \
e += z; \
g += x; \
z = _mm_crc32_u64(z, b + g); \
y = _mm_crc32_u64(y, e + h); \
x = _mm_crc32_u64(x, f + a); \
z = _mm_crc32_u64_impl(z, b + g); \
y = _mm_crc32_u64_impl(y, e + h); \
x = _mm_crc32_u64_impl(x, f + a); \
e = Rotate(e, r); \
c += e; \
s += 40

4
src/crypto/crc.cpp
View file

@ -604,7 +604,7 @@ static const uint32_t crc_c[256] = {
#if !defined __SSE4_2__ || (defined __SSE4_2__ && !defined __x86_64__)
uint64_t _mm_crc32_u64(uint64_t a, uint64_t b )
uint64_t _mm_crc32_u64_impl(uint64_t a, uint64_t b )
{
// Squelch warning about unusued variable crc_c
(void)(crc_c);
@ -619,7 +619,7 @@ int main( int argc, char** argv )
{
uint64_t f = 0x1234;
uint64_t a = 0x5678;
uint32_t f1 = _mm_crc32_u64(f, a);
uint32_t f1 = _mm_crc32_u64_impl(f, a);
uint32_t f4 = crc32cSlicingBy8(f, (unsigned char*)&a, sizeof(a));
std::cout<<std::hex<<f1<<"\n"<<f2<<"\n"<<f3<<"\n"<<f4<<"\n";
return 0;