Fixed compile warning and updated build.uv.sh.

This commit is contained in:
XMRig 2020-08-16 16:03:27 +07:00
parent 8d5ea745bb
commit 00b4ae9c36
No known key found for this signature in database
GPG key ID: 446A53638BE94409
2 changed files with 5 additions and 5 deletions

View file

@ -1,6 +1,6 @@
#!/bin/bash -e #!/bin/bash -e
UV_VERSION="1.38.0" UV_VERSION="1.38.1"
mkdir -p deps mkdir -p deps
mkdir -p deps/include mkdir -p deps/include

View file

@ -165,18 +165,18 @@ RandomX_ConfigurationBase::RandomX_ConfigurationBase()
fillAes4Rx4_Key[6] = rx_set_int_vec_i128(0xf63befa7, 0x2ba9660a, 0xf765a38b, 0xf273c9e7); fillAes4Rx4_Key[6] = rx_set_int_vec_i128(0xf63befa7, 0x2ba9660a, 0xf765a38b, 0xf273c9e7);
fillAes4Rx4_Key[7] = rx_set_int_vec_i128(0xc0b0762d, 0x0c06d1fd, 0x915839de, 0x7a7cd609); fillAes4Rx4_Key[7] = rx_set_int_vec_i128(0xc0b0762d, 0x0c06d1fd, 0x915839de, 0x7a7cd609);
# if defined(_M_X64) || defined(__x86_64__)
// Workaround for Visual Studio placing trampoline in debug builds. // Workaround for Visual Studio placing trampoline in debug builds.
auto addr = [](void (*func)()) { auto addr = [](void (*func)()) {
const uint8_t* p = reinterpret_cast<const uint8_t*>(func); const uint8_t* p = reinterpret_cast<const uint8_t*>(func);
# if defined(_MSC_VER) # if defined(_MSC_VER)
if (p[0] == 0xE9) { if (p[0] == 0xE9) {
p += *(const int32_t*)(p + 1) + 5; p += *(const int32_t*)(p + 1) + 5;
} }
# endif # endif
return p; return p;
}; };
#if defined(_M_X64) || defined(__x86_64__)
{ {
const uint8_t* a = addr(randomx_sshash_prefetch); const uint8_t* a = addr(randomx_sshash_prefetch);
const uint8_t* b = addr(randomx_sshash_end); const uint8_t* b = addr(randomx_sshash_end);
@ -204,7 +204,7 @@ RandomX_ConfigurationBase::RandomX_ConfigurationBase()
const uint8_t* b = addr(randomx_prefetch_scratchpad_end); const uint8_t* b = addr(randomx_prefetch_scratchpad_end);
memcpy(codePrefetchScratchpadTweaked, a, b - a); memcpy(codePrefetchScratchpadTweaked, a, b - a);
} }
#endif # endif
} }
static uint32_t Log2(size_t value) { return (value > 1) ? (Log2(value / 2) + 1) : 0; } static uint32_t Log2(size_t value) { return (value > 1) ? (Log2(value / 2) + 1) : 0; }