Merge fix

This commit is contained in:
MoneroOcean 2021-05-31 15:37:30 +00:00
parent 28ad107de8
commit 36b38d88a1

View file

@ -233,12 +233,11 @@ void RandomX_ConfigurationBase::Apply()
#if defined(XMRIG_FEATURE_ASM) && (defined(_M_X64) || defined(__x86_64__)) #if defined(XMRIG_FEATURE_ASM) && (defined(_M_X64) || defined(__x86_64__))
*(uint32_t*)(codeShhPrefetchTweaked + 3) = ArgonMemory * 16 - 1; *(uint32_t*)(codeShhPrefetchTweaked + 3) = ArgonMemory * 16 - 1;
const uint32_t DatasetBaseMask = DatasetBaseSize - RANDOMX_DATASET_ITEM_SIZE; // Not needed right now because all variants use default dataset base size
*(uint32_t*)(codeReadDatasetRyzenTweaked + 9) = DatasetBaseMask; //const uint32_t DatasetBaseMask = DatasetBaseSize - RANDOMX_DATASET_ITEM_SIZE;
*(uint32_t*)(codeReadDatasetRyzenTweaked + 24) = DatasetBaseMask; //*(uint32_t*)(codeReadDatasetTweaked + 9) = DatasetBaseMask;
*(uint32_t*)(codeReadDatasetTweaked + 7) = DatasetBaseMask; //*(uint32_t*)(codeReadDatasetTweaked + 24) = DatasetBaseMask;
*(uint32_t*)(codeReadDatasetTweaked + 23) = DatasetBaseMask; //*(uint32_t*)(codeReadDatasetLightSshInitTweaked + 59) = DatasetBaseMask;
*(uint32_t*)(codeReadDatasetLightSshInitTweaked + 59) = DatasetBaseMask;
const bool hasBMI2 = xmrig::Cpu::info()->hasBMI2(); const bool hasBMI2 = xmrig::Cpu::info()->hasBMI2();