From c351f8d8d315b332d90f9cfc4f0fcecfbab19c8b Mon Sep 17 00:00:00 2001 From: Con Kolivas Date: Mon, 22 Apr 2013 09:23:13 +1000 Subject: [PATCH] Use flip helpers to simplify code for calculation of midstate. --- cgminer.c | 20 +++++++------------- miner.h | 10 ++++++++++ 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/cgminer.c b/cgminer.c index b7772a11..cf43719f 100644 --- a/cgminer.c +++ b/cgminer.c @@ -1473,22 +1473,16 @@ static bool jobj_binary(const json_t *obj, const char *key, static void calc_midstate(struct work *work) { - union { - unsigned char c[64]; - uint32_t i[16]; - } data; - int swapcounter; - - for (swapcounter = 0; swapcounter < 16; swapcounter++) - data.i[swapcounter] = swab32(((uint32_t*) (work->data))[swapcounter]); + unsigned char data[64]; + uint32_t *data32 = (uint32_t *)data; sha2_context ctx; + + flip64(data32, work->data); sha2_starts(&ctx); - sha2_update(&ctx, data.c, 64); - memcpy(work->midstate, ctx.state, sizeof(work->midstate)); + sha2_update(&ctx, data, 64); + memcpy(work->midstate, ctx.state, 32); #if defined(__BIG_ENDIAN__) || defined(MIPSEB) - int i; - for (i = 0; i < 8; i++) - (((uint32_t*) (work->midstate))[i]) = swab32(((uint32_t*) (work->midstate))[i]); + flip32(work->midstate, work->midstate); #endif } diff --git a/miner.h b/miner.h index c76e7257..2d2e7093 100644 --- a/miner.h +++ b/miner.h @@ -640,6 +640,16 @@ static inline void flip32(void *dest_p, const void *src_p) dest[i] = swab32(src[i]); } +static inline void flip64(void *dest_p, const void *src_p) +{ + uint32_t *dest = dest_p; + const uint32_t *src = src_p; + int i; + + for (i = 0; i < 16; i++) + dest[i] = swab32(src[i]); +} + static inline void flip80(void *dest_p, const void *src_p) { uint32_t *dest = dest_p;