fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix nonce mask

Browse source
This commit is contained in:
cohcho 2020-09-09 19:34:43 +00:00
parent b826985d05
commit 060c1af4c4
3 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/crypto/common/Nonce.cpp
View file

@ -50,9 +50,8 @@ xmrig::Nonce::Nonce()
}
bool xmrig::Nonce::next(uint8_t index, uint32_t *nonce, uint32_t reserveCount, bool nicehash, size_t nonceSize)
bool xmrig::Nonce::next(uint8_t index, uint32_t *nonce, uint32_t reserveCount, uint64_t mask)
{
const uint64_t mask = nicehash ? 0xFFFFFFULL : (nonceSize == sizeof(uint64_t) ? 0x7FFFFFFFFFFFFFFFULL : 0xFFFFFFFFULL);
if (reserveCount == 0 || mask < reserveCount - 1) {
return false;
}
@ -73,7 +72,7 @@ bool xmrig::Nonce::next(uint8_t index, uint32_t *nonce, uint32_t reserveCount, b
}
*nonce = (nonce[0] & ~mask) | counter;
if (mask > 0xFFFFFFFFULL) {
nonce[1] = (counter >> 32);
nonce[1] = (nonce[1] & (~mask >> 32)) | (counter >> 32);
}
return true;
}

3
src/crypto/common/Nonce.h
View file

@ -27,7 +27,6 @@
#include <atomic>
#include <cstddef>
namespace xmrig {
@ -54,7 +53,7 @@ public:
static inline void stop(Backend backend) { m_sequence[backend] = 0; }
static inline void touch(Backend backend) { m_sequence[backend]++; }
static bool next(uint8_t index, uint32_t *nonce, uint32_t reserveCount, bool nicehash, size_t nonceSize);
static bool next(uint8_t index, uint32_t *nonce, uint32_t reserveCount, uint64_t mask);
static void stop();
static void touch();