From 9aeac75db6dd11e270113256ef99c32f6293af54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ben=20Gr=C3=A4f?= Date: Sun, 18 Nov 2018 15:50:03 +0100 Subject: [PATCH] Fix for ARM build --- src/crypto/CryptoNight.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/crypto/CryptoNight.cpp b/src/crypto/CryptoNight.cpp index 78131548..67e7ac5c 100644 --- a/src/crypto/CryptoNight.cpp +++ b/src/crypto/CryptoNight.cpp @@ -71,11 +71,15 @@ static void cryptonight_aesni(AsmOptimization asmOptimization, PowVariant powVer } #endif } else if (powVersion == PowVariant::POW_MSR) { +#if defined(XMRIG_ARM) + CryptoNightMultiHash<0x40000, POW_DEFAULT_INDEX_SHIFT, MEMORY, 0x1FFFF0, false, NUM_HASH_BLOCKS>::hashPowV2(input, size, output, scratchPad); +#else if (asmOptimization == AsmOptimization::ASM_INTEL && NUM_HASH_BLOCKS == 1) { CryptoNightMultiHash<0x40000, POW_DEFAULT_INDEX_SHIFT, MEMORY, 0x1FFFF0, false, NUM_HASH_BLOCKS>::hashPowV2_asm(input, size, output, scratchPad, asmOptimization); } else { CryptoNightMultiHash<0x40000, POW_DEFAULT_INDEX_SHIFT, MEMORY, 0x1FFFF0, false, NUM_HASH_BLOCKS>::hashPowV2(input, size, output, scratchPad); } +#endif } else if (powVersion == PowVariant::POW_RTO) { CryptoNightMultiHash<0x80000, POW_DEFAULT_INDEX_SHIFT, MEMORY, 0x1FFFF0, false, NUM_HASH_BLOCKS>::hashLiteTube(input, size, output, scratchPad); } else if (powVersion == PowVariant::POW_XFH) { @@ -121,11 +125,15 @@ static void cryptonight_softaes(AsmOptimization asmOptimization, PowVariant powV } #endif } else if (powVersion == PowVariant::POW_MSR) { +#if defined(XMRIG_ARM) + CryptoNightMultiHash<0x40000, POW_DEFAULT_INDEX_SHIFT, MEMORY, 0x1FFFF0, true, NUM_HASH_BLOCKS>::hashPowV2(input, size, output, scratchPad); +#else if (asmOptimization == AsmOptimization::ASM_INTEL && NUM_HASH_BLOCKS == 1) { CryptoNightMultiHash<0x40000, POW_DEFAULT_INDEX_SHIFT, MEMORY, 0x1FFFF0, true, NUM_HASH_BLOCKS>::hashPowV2_asm(input, size, output, scratchPad, asmOptimization); } else { CryptoNightMultiHash<0x40000, POW_DEFAULT_INDEX_SHIFT, MEMORY, 0x1FFFF0, true, NUM_HASH_BLOCKS>::hashPowV2(input, size, output, scratchPad); } +#endif } else if (powVersion == PowVariant::POW_RTO) { CryptoNightMultiHash<0x80000, POW_DEFAULT_INDEX_SHIFT, MEMORY, 0x1FFFF0, true, NUM_HASH_BLOCKS>::hashLiteTube(input, size, output, scratchPad); } else if (powVersion == PowVariant::POW_XFH) {