mirror of
https://github.com/xmrig/xmrig.git
synced 2024-12-23 12:09:22 +00:00
reserve at most 1 bit for wrapping detection
This commit is contained in:
parent
fa0bb0e1bf
commit
30be1cd102
3 changed files with 7 additions and 4 deletions
|
@ -96,7 +96,7 @@ private:
|
|||
const size_t size = job.size();
|
||||
m_jobs[index()] = job;
|
||||
m_rounds[index()] = 0;
|
||||
m_nonce_mask[index()] = job.isNicehash() ? 0xFFFFFFULL : (nonceSize() == sizeof(uint64_t) ? (-1ull >> (job.extraNonce().size() * 4 + 1)): 0xFFFFFFFFULL);
|
||||
m_nonce_mask[index()] = job.nonceMask();
|
||||
|
||||
m_jobs[index()].setBackend(backend);
|
||||
|
||||
|
@ -152,7 +152,7 @@ inline void xmrig::WorkerJob<1>::save(const Job &job, uint32_t reserveCount, Non
|
|||
m_index = job.index();
|
||||
m_jobs[index()] = job;
|
||||
m_rounds[index()] = 0;
|
||||
m_nonce_mask[index()] = job.isNicehash() ? 0xFFFFFFULL : (nonceSize() == sizeof(uint64_t) ? (-1ull >> (job.extraNonce().size() * 4 + 1)): 0xFFFFFFFFULL);
|
||||
m_nonce_mask[index()] = job.nonceMask();
|
||||
|
||||
m_jobs[index()].setBackend(backend);
|
||||
|
||||
|
|
|
@ -82,6 +82,7 @@ public:
|
|||
inline uint32_t backend() const { return m_backend; }
|
||||
inline uint64_t diff() const { return m_diff; }
|
||||
inline uint64_t height() const { return m_height; }
|
||||
inline uint64_t nonceMask() const { return isNicehash() ? 0xFFFFFFULL : (nonceSize() == sizeof(uint64_t) ? (-1ull >> (extraNonce().size() * 4)): 0xFFFFFFFFULL); }
|
||||
inline uint64_t target() const { return m_target; }
|
||||
inline uint8_t *blob() { return m_blob; }
|
||||
inline uint8_t fixedByte() const { return *(m_blob + 42); }
|
||||
|
|
|
@ -52,6 +52,7 @@ xmrig::Nonce::Nonce()
|
|||
|
||||
bool xmrig::Nonce::next(uint8_t index, uint32_t *nonce, uint32_t reserveCount, uint64_t mask)
|
||||
{
|
||||
mask &= 0x7FFFFFFFFFFFFFFFULL;
|
||||
if (reserveCount == 0 || mask < reserveCount - 1) {
|
||||
return false;
|
||||
}
|
||||
|
@ -60,7 +61,8 @@ bool xmrig::Nonce::next(uint8_t index, uint32_t *nonce, uint32_t reserveCount, u
|
|||
while (true) {
|
||||
if (mask < counter) {
|
||||
return false;
|
||||
} else if (mask - counter <= reserveCount - 1) {
|
||||
}
|
||||
else if (mask - counter <= reserveCount - 1) {
|
||||
pause(true);
|
||||
if (mask - counter < reserveCount - 1) {
|
||||
return false;
|
||||
|
|
Loading…
Reference in a new issue