Implemented Monero v1 pow changes
* Adds arm implementation and test code for single hash * Fixed build break for when APP_DEBUG is set * Applied new icons / design
This commit is contained in:
sebastianstolzenberg
Ben Gräf
parent
9098c4936a
commit
75952e0eb4
9 changed files with 317 additions and 19 deletions
|
|
@ -36,6 +36,7 @@
|
|||
|
||||
|
||||
#include "crypto/CryptoNight.h"
|
||||
#include "crypto/CryptoNight_monero.h"
|
||||
#include "crypto/soft_aes.h"
|
||||
|
||||
|
||||
|
|
@ -48,7 +49,6 @@ extern "C"
|
|||
#include "crypto/c_skein.h"
|
||||
}
|
||||
|
||||
|
||||
static inline void do_blake_hash(const void* input, size_t len, char* output)
|
||||
{
|
||||
blake256_hash(reinterpret_cast<uint8_t*>(output), static_cast<const uint8_t*>(input), len);
|
||||
|
|
@ -332,10 +332,18 @@ public:
|
|||
uint64_t ah[NUM_HASH_BLOCKS];
|
||||
__m128i bx[NUM_HASH_BLOCKS];
|
||||
uint64_t idx[NUM_HASH_BLOCKS];
|
||||
uint64_t tweak1_2[NUM_HASH_BLOCKS];
|
||||
uint64_t version[NUM_HASH_BLOCKS];
|
||||
|
||||
for (size_t hashBlock = 0; hashBlock < NUM_HASH_BLOCKS; ++hashBlock) {
|
||||
keccak(static_cast<const uint8_t*>(input) + hashBlock * size, (int) size,
|
||||
ctx->state[hashBlock], 200);
|
||||
keccak(static_cast<const uint8_t*>(input) + hashBlock * size, (int) size, ctx->state[hashBlock], 200);
|
||||
version[hashBlock] = static_cast<const uint8_t*>(input)[hashBlock * size];
|
||||
/*if (MONERO)*/ {
|
||||
if (version[hashBlock] > 6) {
|
||||
tweak1_2[hashBlock] = (*reinterpret_cast<const uint64_t*>(reinterpret_cast<const uint8_t*>(input) + 35 + hashBlock * size) ^
|
||||
*(reinterpret_cast<const uint64_t*>(ctx->state[hashBlock]) + 24));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (size_t hashBlock = 0; hashBlock < NUM_HASH_BLOCKS; ++hashBlock) {
|
||||
|
|
@ -363,6 +371,16 @@ public:
|
|||
|
||||
_mm_store_si128((__m128i*) &l[hashBlock][idx[hashBlock] & MASK],
|
||||
_mm_xor_si128(bx[hashBlock], cx));
|
||||
|
||||
/*if (MONERO)*/ {
|
||||
if (version[hashBlock] > 6) {
|
||||
const uint8_t tmp = reinterpret_cast<const uint8_t*>(&l[hashBlock][idx[hashBlock] & MASK])[11];
|
||||
static const uint32_t table = 0x75310;
|
||||
const uint8_t index = (((tmp >> 3) & 6) | (tmp & 1)) << 1;
|
||||
((uint8_t*)(&l[hashBlock][idx[hashBlock] & MASK]))[11] = tmp ^ ((table >> index) & 0x30);
|
||||
}
|
||||
}
|
||||
|
||||
idx[hashBlock] = EXTRACT64(cx);
|
||||
bx[hashBlock] = cx;
|
||||
|
||||
|
|
@ -374,9 +392,21 @@ public:
|
|||
al[hashBlock] += hi;
|
||||
ah[hashBlock] += lo;
|
||||
|
||||
/*if (MONERO)*/ {
|
||||
if (version[hashBlock] > 6) {
|
||||
ah[hashBlock] ^= tweak1_2[hashBlock];
|
||||
}
|
||||
}
|
||||
|
||||
((uint64_t*) &l[hashBlock][idx[hashBlock] & MASK])[0] = al[hashBlock];
|
||||
((uint64_t*) &l[hashBlock][idx[hashBlock] & MASK])[1] = ah[hashBlock];
|
||||
|
||||
/*if (MONERO)*/ {
|
||||
if (version[hashBlock] > 6) {
|
||||
ah[hashBlock] ^= tweak1_2[hashBlock];
|
||||
}
|
||||
}
|
||||
|
||||
ah[hashBlock] ^= ch;
|
||||
al[hashBlock] ^= cl;
|
||||
idx[hashBlock] = al[hashBlock];
|
||||
|
|
@ -410,6 +440,8 @@ public:
|
|||
|
||||
keccak(static_cast<const uint8_t*>(input), (int) size, ctx->state[0], 200);
|
||||
|
||||
VARIANT1_INIT(0);
|
||||
|
||||
l = ctx->memory;
|
||||
h = reinterpret_cast<uint64_t*>(ctx->state[0]);
|
||||
|
||||
|
|
@ -431,6 +463,7 @@ public:
|
|||
}
|
||||
|
||||
_mm_store_si128((__m128i*) &l[idx & MASK], _mm_xor_si128(bx, cx));
|
||||
VARIANT1_1(&l[idx & MASK], 0);
|
||||
idx = EXTRACT64(cx);
|
||||
bx = cx;
|
||||
|
||||
|
|
@ -442,8 +475,10 @@ public:
|
|||
al += hi;
|
||||
ah += lo;
|
||||
|
||||
VARIANT1_2(ah, 0);
|
||||
((uint64_t*) &l[idx & MASK])[0] = al;
|
||||
((uint64_t*) &l[idx & MASK])[1] = ah;
|
||||
VARIANT1_2(ah, 0);
|
||||
|
||||
ah ^= ch;
|
||||
al ^= cl;
|
||||
|
|
@ -468,6 +503,9 @@ public:
|
|||
keccak((const uint8_t*) input, (int) size, ctx->state[0], 200);
|
||||
keccak((const uint8_t*) input + size, (int) size, ctx->state[1], 200);
|
||||
|
||||
VARIANT1_INIT(0);
|
||||
VARIANT1_INIT(1);
|
||||
|
||||
const uint8_t* l0 = ctx->memory;
|
||||
const uint8_t* l1 = ctx->memory + MEM;
|
||||
uint64_t* h0 = reinterpret_cast<uint64_t*>(ctx->state[0]);
|
||||
|
|
@ -505,6 +543,9 @@ public:
|
|||
_mm_store_si128((__m128i*) &l0[idx0 & MASK], _mm_xor_si128(bx0, cx0));
|
||||
_mm_store_si128((__m128i*) &l1[idx1 & MASK], _mm_xor_si128(bx1, cx1));
|
||||
|
||||
VARIANT1_1(&l0[idx0 & MASK], 0);
|
||||
VARIANT1_1(&l1[idx1 & MASK], 1);
|
||||
|
||||
idx0 = EXTRACT64(cx0);
|
||||
idx1 = EXTRACT64(cx1);
|
||||
|
||||
|
|
@ -519,8 +560,10 @@ public:
|
|||
al0 += hi;
|
||||
ah0 += lo;
|
||||
|
||||
VARIANT1_2(ah0, 0);
|
||||
((uint64_t*) &l0[idx0 & MASK])[0] = al0;
|
||||
((uint64_t*) &l0[idx0 & MASK])[1] = ah0;
|
||||
VARIANT1_2(ah0, 0);
|
||||
|
||||
ah0 ^= ch;
|
||||
al0 ^= cl;
|
||||
|
|
@ -533,8 +576,10 @@ public:
|
|||
al1 += hi;
|
||||
ah1 += lo;
|
||||
|
||||
VARIANT1_2(ah1, 1);
|
||||
((uint64_t*) &l1[idx1 & MASK])[0] = al1;
|
||||
((uint64_t*) &l1[idx1 & MASK])[1] = ah1;
|
||||
VARIANT1_2(ah1, 1);
|
||||
|
||||
ah1 ^= ch;
|
||||
al1 ^= cl;
|
||||
|
|
@ -565,6 +610,10 @@ public:
|
|||
keccak((const uint8_t*) input + size, (int) size, ctx->state[1], 200);
|
||||
keccak((const uint8_t*) input + 2 * size, (int) size, ctx->state[2], 200);
|
||||
|
||||
VARIANT1_INIT(0);
|
||||
VARIANT1_INIT(1);
|
||||
VARIANT1_INIT(2);
|
||||
|
||||
const uint8_t* l0 = ctx->memory;
|
||||
const uint8_t* l1 = ctx->memory + MEM;
|
||||
const uint8_t* l2 = ctx->memory + 2 * MEM;
|
||||
|
|
@ -614,6 +663,10 @@ public:
|
|||
_mm_store_si128((__m128i*) &l1[idx1 & MASK], _mm_xor_si128(bx1, cx1));
|
||||
_mm_store_si128((__m128i*) &l2[idx2 & MASK], _mm_xor_si128(bx2, cx2));
|
||||
|
||||
VARIANT1_1(&l0[idx0 & MASK], 0);
|
||||
VARIANT1_1(&l1[idx1 & MASK], 1);
|
||||
VARIANT1_1(&l2[idx2 & MASK], 2);
|
||||
|
||||
idx0 = EXTRACT64(cx0);
|
||||
idx1 = EXTRACT64(cx1);
|
||||
idx2 = EXTRACT64(cx2);
|
||||
|
|
@ -631,8 +684,10 @@ public:
|
|||
al0 += hi;
|
||||
ah0 += lo;
|
||||
|
||||
VARIANT1_2(ah0, 0);
|
||||
((uint64_t*) &l0[idx0 & MASK])[0] = al0;
|
||||
((uint64_t*) &l0[idx0 & MASK])[1] = ah0;
|
||||
VARIANT1_2(ah0, 0);
|
||||
|
||||
ah0 ^= ch;
|
||||
al0 ^= cl;
|
||||
|
|
@ -646,8 +701,10 @@ public:
|
|||
al1 += hi;
|
||||
ah1 += lo;
|
||||
|
||||
VARIANT1_2(ah1, 1);
|
||||
((uint64_t*) &l1[idx1 & MASK])[0] = al1;
|
||||
((uint64_t*) &l1[idx1 & MASK])[1] = ah1;
|
||||
VARIANT1_2(ah1, 1);
|
||||
|
||||
ah1 ^= ch;
|
||||
al1 ^= cl;
|
||||
|
|
@ -661,8 +718,10 @@ public:
|
|||
al2 += hi;
|
||||
ah2 += lo;
|
||||
|
||||
VARIANT1_2(ah2, 2);
|
||||
((uint64_t*) &l2[idx2 & MASK])[0] = al2;
|
||||
((uint64_t*) &l2[idx2 & MASK])[1] = ah2;
|
||||
VARIANT1_2(ah2, 2);
|
||||
|
||||
ah2 ^= ch;
|
||||
al2 ^= cl;
|
||||
|
|
@ -697,6 +756,11 @@ public:
|
|||
keccak((const uint8_t*) input + 2 * size, (int) size, ctx->state[2], 200);
|
||||
keccak((const uint8_t*) input + 3 * size, (int) size, ctx->state[3], 200);
|
||||
|
||||
VARIANT1_INIT(0);
|
||||
VARIANT1_INIT(1);
|
||||
VARIANT1_INIT(2);
|
||||
VARIANT1_INIT(3);
|
||||
|
||||
const uint8_t* l0 = ctx->memory;
|
||||
const uint8_t* l1 = ctx->memory + MEM;
|
||||
const uint8_t* l2 = ctx->memory + 2 * MEM;
|
||||
|
|
@ -758,6 +822,11 @@ public:
|
|||
_mm_store_si128((__m128i*) &l2[idx2 & MASK], _mm_xor_si128(bx2, cx2));
|
||||
_mm_store_si128((__m128i*) &l3[idx3 & MASK], _mm_xor_si128(bx3, cx3));
|
||||
|
||||
VARIANT1_1(&l0[idx0 & MASK], 0);
|
||||
VARIANT1_1(&l1[idx1 & MASK], 1);
|
||||
VARIANT1_1(&l2[idx2 & MASK], 2);
|
||||
VARIANT1_1(&l3[idx3 & MASK], 3);
|
||||
|
||||
idx0 = EXTRACT64(cx0);
|
||||
idx1 = EXTRACT64(cx1);
|
||||
idx2 = EXTRACT64(cx2);
|
||||
|
|
@ -777,8 +846,10 @@ public:
|
|||
al0 += hi;
|
||||
ah0 += lo;
|
||||
|
||||
VARIANT1_2(ah0, 0);
|
||||
((uint64_t*) &l0[idx0 & MASK])[0] = al0;
|
||||
((uint64_t*) &l0[idx0 & MASK])[1] = ah0;
|
||||
VARIANT1_2(ah0, 0);
|
||||
|
||||
ah0 ^= ch;
|
||||
al0 ^= cl;
|
||||
|
|
@ -792,8 +863,10 @@ public:
|
|||
al1 += hi;
|
||||
ah1 += lo;
|
||||
|
||||
VARIANT1_2(ah1, 1);
|
||||
((uint64_t*) &l1[idx1 & MASK])[0] = al1;
|
||||
((uint64_t*) &l1[idx1 & MASK])[1] = ah1;
|
||||
VARIANT1_2(ah1, 1);
|
||||
|
||||
ah1 ^= ch;
|
||||
al1 ^= cl;
|
||||
|
|
@ -807,8 +880,10 @@ public:
|
|||
al2 += hi;
|
||||
ah2 += lo;
|
||||
|
||||
VARIANT1_2(ah2, 2);
|
||||
((uint64_t*) &l2[idx2 & MASK])[0] = al2;
|
||||
((uint64_t*) &l2[idx2 & MASK])[1] = ah2;
|
||||
VARIANT1_2(ah2, 2);
|
||||
|
||||
ah2 ^= ch;
|
||||
al2 ^= cl;
|
||||
|
|
@ -822,8 +897,10 @@ public:
|
|||
al3 += hi;
|
||||
ah3 += lo;
|
||||
|
||||
VARIANT1_2(ah3, 3);
|
||||
((uint64_t*) &l3[idx3 & MASK])[0] = al3;
|
||||
((uint64_t*) &l3[idx3 & MASK])[1] = ah3;
|
||||
VARIANT1_2(ah3, 3);
|
||||
|
||||
ah3 ^= ch;
|
||||
al3 ^= cl;
|
||||
|
|
@ -862,6 +939,12 @@ public:
|
|||
keccak((const uint8_t*) input + 3 * size, (int) size, ctx->state[3], 200);
|
||||
keccak((const uint8_t*) input + 4 * size, (int) size, ctx->state[4], 200);
|
||||
|
||||
VARIANT1_INIT(0);
|
||||
VARIANT1_INIT(1);
|
||||
VARIANT1_INIT(2);
|
||||
VARIANT1_INIT(3);
|
||||
VARIANT1_INIT(4);
|
||||
|
||||
const uint8_t* l0 = ctx->memory;
|
||||
const uint8_t* l1 = ctx->memory + MEM;
|
||||
const uint8_t* l2 = ctx->memory + 2 * MEM;
|
||||
|
|
@ -935,6 +1018,12 @@ public:
|
|||
_mm_store_si128((__m128i*) &l3[idx3 & MASK], _mm_xor_si128(bx3, cx3));
|
||||
_mm_store_si128((__m128i*) &l4[idx4 & MASK], _mm_xor_si128(bx4, cx4));
|
||||
|
||||
VARIANT1_1(&l0[idx0 & MASK], 0);
|
||||
VARIANT1_1(&l1[idx1 & MASK], 1);
|
||||
VARIANT1_1(&l2[idx2 & MASK], 2);
|
||||
VARIANT1_1(&l3[idx3 & MASK], 3);
|
||||
VARIANT1_1(&l4[idx4 & MASK], 4);
|
||||
|
||||
idx0 = EXTRACT64(cx0);
|
||||
idx1 = EXTRACT64(cx1);
|
||||
idx2 = EXTRACT64(cx2);
|
||||
|
|
@ -955,8 +1044,10 @@ public:
|
|||
al0 += hi;
|
||||
ah0 += lo;
|
||||
|
||||
VARIANT1_2(ah0, 0);
|
||||
((uint64_t*) &l0[idx0 & MASK])[0] = al0;
|
||||
((uint64_t*) &l0[idx0 & MASK])[1] = ah0;
|
||||
VARIANT1_2(ah0, 0);
|
||||
|
||||
ah0 ^= ch;
|
||||
al0 ^= cl;
|
||||
|
|
@ -970,8 +1061,10 @@ public:
|
|||
al1 += hi;
|
||||
ah1 += lo;
|
||||
|
||||
VARIANT1_2(ah1, 1);
|
||||
((uint64_t*) &l1[idx1 & MASK])[0] = al1;
|
||||
((uint64_t*) &l1[idx1 & MASK])[1] = ah1;
|
||||
VARIANT1_2(ah1, 1);
|
||||
|
||||
ah1 ^= ch;
|
||||
al1 ^= cl;
|
||||
|
|
@ -985,8 +1078,10 @@ public:
|
|||
al2 += hi;
|
||||
ah2 += lo;
|
||||
|
||||
VARIANT1_2(ah2, 2);
|
||||
((uint64_t*) &l2[idx2 & MASK])[0] = al2;
|
||||
((uint64_t*) &l2[idx2 & MASK])[1] = ah2;
|
||||
VARIANT1_2(ah2, 2);
|
||||
|
||||
ah2 ^= ch;
|
||||
al2 ^= cl;
|
||||
|
|
@ -1000,8 +1095,10 @@ public:
|
|||
al3 += hi;
|
||||
ah3 += lo;
|
||||
|
||||
VARIANT1_2(ah3, 3);
|
||||
((uint64_t*) &l3[idx3 & MASK])[0] = al3;
|
||||
((uint64_t*) &l3[idx3 & MASK])[1] = ah3;
|
||||
VARIANT1_2(ah3, 3);
|
||||
|
||||
ah3 ^= ch;
|
||||
al3 ^= cl;
|
||||
|
|
@ -1015,8 +1112,10 @@ public:
|
|||
al4 += hi;
|
||||
ah4 += lo;
|
||||
|
||||
VARIANT1_2(ah4, 4);
|
||||
((uint64_t*) &l4[idx4 & MASK])[0] = al4;
|
||||
((uint64_t*) &l4[idx4 & MASK])[1] = ah4;
|
||||
VARIANT1_2(ah4, 4);
|
||||
|
||||
ah4 ^= ch;
|
||||
al4 ^= cl;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue