github-jwinterm/xmr-stak
1
0
Fork 0
mirror of https://github.com/jwinterm/xmr-stak.git synced 2026-10-24 06:48:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Port the crash fix from xmr-stak-cpu

Browse Source
This commit is contained in:
fireice-uk
2017-10-05 15:08:00 +01:00
parent 9c3a71ef09
commit cb65ae3f78
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xmrstak/backend/cpu/minethd.cpp
+15 -4
View File
@@ -419,6 +419,13 @@ minethd::cn_hash_fun_dbl minethd::func_dbl_selector(bool bHaveAes, bool bNoPrefe
return func_table[digit.to_ulong()];
}
uint32_t* minethd::prep_double_work(uint8_t bDoubleWorkBlob[sizeof(miner_work::bWorkBlob) * 2])
{
memcpy(bDoubleWorkBlob, oWork.bWorkBlob, oWork.iWorkSize);
memcpy(bDoubleWorkBlob + oWork.iWorkSize, oWork.bWorkBlob, oWork.iWorkSize);
return (uint32_t*)(bDoubleWorkBlob + oWork.iWorkSize + 39);
}
void minethd::double_work_main()
{
if(affinity >= 0) //-1 means no affinity
@@ -431,7 +438,7 @@ void minethd::double_work_main()
uint64_t *piHashVal0, *piHashVal1;
uint32_t *piNonce0, *piNonce1;
uint8_t bDoubleHashOut[64];
uint8_t bDoubleWorkBlob[sizeof(miner_work::bWorkBlob) * 2];
uint8_t bDoubleWorkBlob[sizeof(miner_work::bWorkBlob) * 2];
uint32_t iNonce;
job_result res;
@@ -442,7 +449,11 @@ void minethd::double_work_main()
piHashVal0 = (uint64_t*)(bDoubleHashOut + 24);
piHashVal1 = (uint64_t*)(bDoubleHashOut + 32 + 24);
piNonce0 = (uint32_t*)(bDoubleWorkBlob + 39);
piNonce1 = nullptr;
if(!oWork.bStall)
piNonce1 = prep_double_work(bDoubleWorkBlob);
else
piNonce1 = nullptr;
globalStates::inst().inst().iConsumeCnt++;
@@ -460,7 +471,7 @@ void minethd::double_work_main()
consume_work();
memcpy(bDoubleWorkBlob, oWork.bWorkBlob, oWork.iWorkSize);
memcpy(bDoubleWorkBlob + oWork.iWorkSize, oWork.bWorkBlob, oWork.iWorkSize);
piNonce1 = (uint32_t*)(bDoubleWorkBlob + oWork.iWorkSize + 39);
piNonce1 = prep_double_work(bDoubleWorkBlob);
continue;
}
@@ -500,7 +511,7 @@ void minethd::double_work_main()
consume_work();
memcpy(bDoubleWorkBlob, oWork.bWorkBlob, oWork.iWorkSize);
memcpy(bDoubleWorkBlob + oWork.iWorkSize, oWork.bWorkBlob, oWork.iWorkSize);
piNonce1 = (uint32_t*)(bDoubleWorkBlob + oWork.iWorkSize + 39);
piNonce1 = prep_double_work(bDoubleWorkBlob);
}
cryptonight_free_ctx(ctx0);
xmrstak/backend/cpu/minethd.hpp
+1
View File
@@ -38,6 +38,7 @@ private:
void work_main();
void double_work_main();
void consume_work();
uint32_t* prep_double_work(uint8_t bDoubleWorkBlob[sizeof(miner_work::bWorkBlob) * 2]);
uint64_t iJobNo;