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

Cleanup MoneroOcean patchset

Browse source
This commit is contained in:
Tony Butler 2020-06-08 15:02:38 -06:00 • committed by MoneroOcean
parent 42235a56da
commit 30fdc92884
28 changed files with 6138 additions and 6122 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/backend/cpu/CpuConfig_gen.h
View file

@ -138,8 +138,8 @@ size_t inline generate<Algorithm::RANDOM_X>(Threads<CpuThreads> &threads, uint32
count += threads.move("rx/wow", std::move(wow));
}
if (!threads.isExist(Algorithm::DEFYX)) {
count += generate("defyx", threads, Algorithm::DEFYX, limit);
if (!threads.isExist(Algorithm::RX_DEFYX)) {
count += generate("defyx", threads, Algorithm::RX_DEFYX, limit);
}
count += generate("rx", threads, Algorithm::RX_0, limit);

24
src/backend/cpu/CpuWorker.cpp
View file

@ -42,7 +42,6 @@
#ifdef XMRIG_ALGO_RANDOMX
# include "crypto/randomx/randomx.h"
# include "crypto/defyx/defyx.h"
#endif
@ -253,29 +252,24 @@ void xmrig::CpuWorker<N>::start()
# ifdef XMRIG_ALGO_RANDOMX
if (job.algorithm().family() == Algorithm::RANDOM_X) {
if (job.algorithm() == Algorithm::DEFYX) {
if (first) {
first = false;
defyx_calculate_hash_first(m_vm, tempHash, m_job.blob(), job.size());
if (job.algorithm() == Algorithm::RX_DEFYX) {
defyx_calculate_hash_first(m_vm, tempHash, m_job.blob(), job.size());
} else {
randomx_calculate_hash_first(m_vm, tempHash, m_job.blob(), job.size());
}
}
if (!nextRound(m_job)) {
break;
}
defyx_calculate_hash_next(m_vm, tempHash, m_job.blob(), job.size(), m_hash);
} else {
if (first) {
first = false;
randomx_calculate_hash_first(m_vm, tempHash, m_job.blob(), job.size());
if (job.algorithm() == Algorithm::RX_DEFYX) {
defyx_calculate_hash_next(m_vm, tempHash, m_job.blob(), job.size(), m_hash);
} else {
randomx_calculate_hash_next(m_vm, tempHash, m_job.blob(), job.size(), m_hash);
}
if (!nextRound(m_job)) {
break;
}
randomx_calculate_hash_next(m_vm, tempHash, m_job.blob(), job.size(), m_hash);
}
}
else
# endif