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

Cleanup and build fixes

Browse source
This commit is contained in:
BenDr0id 2019-03-06 12:20:23 +01:00
parent f26b9a5a10
commit d7508ba9f7
4 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Mem_win.cpp
View file

@ -159,7 +159,7 @@ void Mem::allocate(ScratchPadMem& scratchPadMem, bool useHugePages)
return; return;
} }
scratchPadMem.size = std::max(scratchPadMem.size, static_cast<size_t>(MEMORY)); scratchPadMem.size = std::max(scratchPadMem.size + scratchPadMem.size % MEMORY, static_cast<size_t>(MEMORY));
scratchPadMem.memory = static_cast<uint8_t*>(VirtualAlloc(nullptr, scratchPadMem.size, MEM_COMMIT | MEM_RESERVE | MEM_LARGE_PAGES, PAGE_READWRITE)); scratchPadMem.memory = static_cast<uint8_t*>(VirtualAlloc(nullptr, scratchPadMem.size, MEM_COMMIT | MEM_RESERVE | MEM_LARGE_PAGES, PAGE_READWRITE));
if (scratchPadMem.memory) { if (scratchPadMem.memory) {

12
src/crypto/CryptoNight_arm.h
View file

@ -1159,7 +1159,7 @@ public:
((int64_t*) &l[idx & MASK])[0] = n ^ q; ((int64_t*) &l[idx & MASK])[0] = n ^ q;
if (VARIANT == POW_XHV) { if (VARIANT == POW_XHV || VARIANT == POW_XFH) {
idx = (~d) ^ q; idx = (~d) ^ q;
} else { } else {
idx = d ^ q; idx = d ^ q;
@ -1913,7 +1913,7 @@ public:
((int64_t*) &l0[idx0 & MASK])[0] = n0 ^ q0; ((int64_t*) &l0[idx0 & MASK])[0] = n0 ^ q0;
if (VARIANT == POW_XHV) { if (VARIANT == POW_XHV || VARIANT == POW_XFH) {
idx0 = (~d0) ^ q0; idx0 = (~d0) ^ q0;
} else { } else {
idx0 = d0 ^ q0; idx0 = d0 ^ q0;
@ -1940,7 +1940,7 @@ public:
((int64_t*) &l1[idx1 & MASK])[0] = n1 ^ q1; ((int64_t*) &l1[idx1 & MASK])[0] = n1 ^ q1;
if (VARIANT == POW_XHV) { if (VARIANT == POW_XHV || VARIANT == POW_XFH) {
idx1 = (~d1) ^ q1; idx1 = (~d1) ^ q1;
} else { } else {
idx1 = d1 ^ q1; idx1 = d1 ^ q1;
@ -2997,7 +2997,7 @@ public:
((int64_t*) &l0[idx0 & MASK])[0] = n0 ^ q0; ((int64_t*) &l0[idx0 & MASK])[0] = n0 ^ q0;
if (VARIANT == POW_XHV) { if (VARIANT == POW_XHV || VARIANT == POW_XFH) {
idx0 = (~d0) ^ q0; idx0 = (~d0) ^ q0;
} else { } else {
idx0 = d0 ^ q0; idx0 = d0 ^ q0;
@ -3024,7 +3024,7 @@ public:
((int64_t*) &l1[idx1 & MASK])[0] = n1 ^ q1; ((int64_t*) &l1[idx1 & MASK])[0] = n1 ^ q1;
if (VARIANT == POW_XHV) { if (VARIANT == POW_XHV || VARIANT == POW_XFH) {
idx1 = (~d1) ^ q1; idx1 = (~d1) ^ q1;
} else { } else {
idx1 = d1 ^ q1; idx1 = d1 ^ q1;
@ -3052,7 +3052,7 @@ public:
((int64_t*) &l2[idx2 & MASK])[0] = n2 ^ q2; ((int64_t*) &l2[idx2 & MASK])[0] = n2 ^ q2;
if (VARIANT == POW_XHV) { if (VARIANT == POW_XHV || VARIANT == POW_XFH) {
idx2 = (~d2) ^ q2; idx2 = (~d2) ^ q2;
} else { } else {
idx2 = d2 ^ q2; idx2 = d2 ^ q2;

12
src/crypto/CryptoNight_x86.h
View file

@ -1399,7 +1399,7 @@ public:
((int64_t*)&l[idx & MASK])[0] = n ^ q; ((int64_t*)&l[idx & MASK])[0] = n ^ q;
if (VARIANT == POW_XHV) { if (VARIANT == POW_XHV || VARIANT == POW_XFH) {
idx = (~d) ^ q; idx = (~d) ^ q;
} else { } else {
idx = d ^ q; idx = d ^ q;
@ -2312,7 +2312,7 @@ public:
((int64_t*)&l0[idx[0] & MASK])[0] = n ^ q; ((int64_t*)&l0[idx[0] & MASK])[0] = n ^ q;
if (VARIANT == POW_XHV) { if (VARIANT == POW_XHV || VARIANT == POW_XFH) {
idx[0] = (~d) ^ q; idx[0] = (~d) ^ q;
} else { } else {
idx[0] = d ^ q; idx[0] = d ^ q;
@ -2340,7 +2340,7 @@ public:
((int64_t*)&l1[idx[1] & MASK])[0] = n ^ q; ((int64_t*)&l1[idx[1] & MASK])[0] = n ^ q;
if (VARIANT == POW_XHV) { if (VARIANT == POW_XHV || VARIANT == POW_XFH) {
idx[1] = (~d) ^ q; idx[1] = (~d) ^ q;
} else { } else {
idx[1] = d ^ q; idx[1] = d ^ q;
@ -3418,7 +3418,7 @@ public:
((int64_t*)&l0[idx[0] & MASK])[0] = n ^ q; ((int64_t*)&l0[idx[0] & MASK])[0] = n ^ q;
if (VARIANT == POW_XHV) { if (VARIANT == POW_XHV || VARIANT == POW_XFH) {
idx[0] = (~d) ^ q; idx[0] = (~d) ^ q;
} else { } else {
idx[0] = d ^ q; idx[0] = d ^ q;
@ -3444,7 +3444,7 @@ public:
((int64_t*)&l1[idx[1] & MASK])[0] = n ^ q; ((int64_t*)&l1[idx[1] & MASK])[0] = n ^ q;
if (VARIANT == POW_XHV) { if (VARIANT == POW_XHV || VARIANT == POW_XFH) {
idx[1] = (~d) ^ q; idx[1] = (~d) ^ q;
} else { } else {
idx[1] = d ^ q; idx[1] = d ^ q;
@ -3470,7 +3470,7 @@ public:
((int64_t*)&l2[idx[2] & MASK])[0] = n ^ q; ((int64_t*)&l2[idx[2] & MASK])[0] = n ^ q;
if (VARIANT == POW_XHV) { if (VARIANT == POW_XHV || VARIANT == POW_XFH) {
idx[2] = (~d) ^ q; idx[2] = (~d) ^ q;
} else { } else {
idx[2] = d ^ q; idx[2] = d ^ q;

6
src/crypto/asm/win/cn_main_loop_win_gcc.S
View file

@ -34,7 +34,7 @@
.global FN_PREFIX(cnv2_main_loop_zelerius_bulldozer_asm) .global FN_PREFIX(cnv2_main_loop_zelerius_bulldozer_asm)
.global FN_PREFIX(cnv2_double_main_loop_zelerius_sandybridge_asm) .global FN_PREFIX(cnv2_double_main_loop_zelerius_sandybridge_asm)
.global FN_PREFIX(cnv2_main_loop_rwz_allr_asm) .global FN_PREFIX(cnv2_main_loop_rwz_all_asm)
.global FN_PREFIX(cnv2_double_main_loop_rwz_all_asm) .global FN_PREFIX(cnv2_double_main_loop_rwz_all_asm)
.global FN_PREFIX(cnv1_main_loop_soft_aes_sandybridge_asm) .global FN_PREFIX(cnv1_main_loop_soft_aes_sandybridge_asm)
@ -175,8 +175,8 @@ FN_PREFIX(cnv2_double_main_loop_zelerius_sandybridge_asm):
ret 0 ret 0
ALIGN 64 ALIGN 64
FN_PREFIX(cnv2_main_loop_rwz_allr_asm): FN_PREFIX(cnv2_main_loop_rwz_all_asm):
#include "../cnv2_main_loop_rwz_allr.inc" #include "../cnv2_main_loop_rwz_all.inc"
ret 0 ret 0
ALIGN 64 ALIGN 64