Merge branch 'evo' of github.com:xmrig/xmrig into evo

This commit is contained in:
XMRig 2019-09-24 18:40:10 +07:00
commit 3ee3d13f0f
2 changed files with 3 additions and 2 deletions

View file

@ -485,12 +485,13 @@ randomx_calc_dataset_item_aarch64:
stp x10, x11, [sp, 80] stp x10, x11, [sp, 80]
stp x12, x13, [sp, 96] stp x12, x13, [sp, 96]
ldr x12, superscalarMul0
mov x8, x0 mov x8, x0
mov x9, x1 mov x9, x1
mov x10, x2 mov x10, x2
# rl[0] = (itemNumber + 1) * superscalarMul0; # rl[0] = (itemNumber + 1) * superscalarMul0;
ldr x12, superscalarMul0
madd x0, x2, x12, x12 madd x0, x2, x12, x12
# rl[1] = rl[0] ^ superscalarAdd1; # rl[1] = rl[0] ^ superscalarAdd1;

View file

@ -64,7 +64,7 @@ protected:
alignas(64) randomx::RegisterFile reg; alignas(64) randomx::RegisterFile reg;
alignas(16) randomx::ProgramConfiguration config; alignas(16) randomx::ProgramConfiguration config;
randomx::MemoryRegisters mem; randomx::MemoryRegisters mem;
uint8_t* scratchpad; uint8_t* scratchpad = nullptr;
union { union {
randomx_cache* cachePtr = nullptr; randomx_cache* cachePtr = nullptr;
randomx_dataset* datasetPtr; randomx_dataset* datasetPtr;