1
0
mirror of https://github.com/GOSTSec/sgminer synced 2025-02-07 12:34:16 +00:00

Fix x14 algo code style

This commit is contained in:
Elbandi 2014-07-04 19:22:05 +02:00
parent e64291e9b4
commit 0a66d49a0e

View File

@ -65,7 +65,7 @@ typedef struct {
sph_echo512_context echo1; sph_echo512_context echo1;
sph_hamsi512_context hamsi1; sph_hamsi512_context hamsi1;
sph_fugue512_context fugue1; sph_fugue512_context fugue1;
sph_shabal512_context shabal1; sph_shabal512_context shabal1;
} Xhash_context_holder; } Xhash_context_holder;
static Xhash_context_holder base_contexts; static Xhash_context_holder base_contexts;
@ -94,10 +94,10 @@ void init_X14hash_contexts()
*/ */
static inline void be32enc_vect(uint32_t *dst, const uint32_t *src, uint32_t len) static inline void be32enc_vect(uint32_t *dst, const uint32_t *src, uint32_t len)
{ {
uint32_t i; uint32_t i;
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
dst[i] = htobe32(src[i]); dst[i] = htobe32(src[i]);
} }
@ -108,7 +108,7 @@ inline void x14hash(void *state, const void *input)
Xhash_context_holder ctx; Xhash_context_holder ctx;
uint32_t hashA[16], hashB[16]; uint32_t hashA[16], hashB[16];
//blake-bmw-groestl-sken-jh-meccak-luffa-cubehash-shivite-simd-echo
memcpy(&ctx, &base_contexts, sizeof(base_contexts)); memcpy(&ctx, &base_contexts, sizeof(base_contexts));
sph_blake512 (&ctx.blake1, input, 80); sph_blake512 (&ctx.blake1, input, 80);
@ -161,26 +161,26 @@ static const uint32_t diff1targ = 0x0000ffff;
/* Used externally as confirmation of correct OCL code */ /* Used externally as confirmation of correct OCL code */
int x14_test(unsigned char *pdata, const unsigned char *ptarget, uint32_t nonce) int x14_test(unsigned char *pdata, const unsigned char *ptarget, uint32_t nonce)
{ {
uint32_t tmp_hash7, Htarg = le32toh(((const uint32_t *)ptarget)[7]); uint32_t tmp_hash7, Htarg = le32toh(((const uint32_t *)ptarget)[7]);
uint32_t data[20], ohash[8]; uint32_t data[20], ohash[8];
be32enc_vect(data, (const uint32_t *)pdata, 19); be32enc_vect(data, (const uint32_t *)pdata, 19);
data[19] = htobe32(nonce); data[19] = htobe32(nonce);
x14hash(ohash, data); x14hash(ohash, data);
tmp_hash7 = be32toh(ohash[7]); tmp_hash7 = be32toh(ohash[7]);
applog(LOG_DEBUG, "htarget %08lx diff1 %08lx hash %08lx", applog(LOG_DEBUG, "htarget %08lx diff1 %08lx hash %08lx",
(long unsigned int)Htarg, (long unsigned int)Htarg,
(long unsigned int)diff1targ, (long unsigned int)diff1targ,
(long unsigned int)tmp_hash7); (long unsigned int)tmp_hash7);
if (tmp_hash7 > diff1targ) if (tmp_hash7 > diff1targ)
return -1; return -1;
if (tmp_hash7 > Htarg) if (tmp_hash7 > Htarg)
return 0; return 0;
return 1; return 1;
} }
void x14_regenhash(struct work *work) void x14_regenhash(struct work *work)
@ -194,54 +194,43 @@ void x14_regenhash(struct work *work)
x14hash(ohash, data); x14hash(ohash, data);
} }
static inline void be32enc(void *pp, uint32_t x)
{
uint8_t *p = (uint8_t *)pp;
p[3] = x & 0xff;
p[2] = (x >> 8) & 0xff;
p[1] = (x >> 16) & 0xff;
p[0] = (x >> 24) & 0xff;
}
bool scanhash_x14(struct thr_info *thr, const unsigned char __maybe_unused *pmidstate, bool scanhash_x14(struct thr_info *thr, const unsigned char __maybe_unused *pmidstate,
unsigned char *pdata, unsigned char __maybe_unused *phash1, unsigned char *pdata, unsigned char __maybe_unused *phash1,
unsigned char __maybe_unused *phash, const unsigned char *ptarget, unsigned char __maybe_unused *phash, const unsigned char *ptarget,
uint32_t max_nonce, uint32_t *last_nonce, uint32_t n) uint32_t max_nonce, uint32_t *last_nonce, uint32_t n)
{ {
uint32_t *nonce = (uint32_t *)(pdata + 76); uint32_t *nonce = (uint32_t *)(pdata + 76);
uint32_t data[20]; uint32_t data[20];
uint32_t tmp_hash7; uint32_t tmp_hash7;
uint32_t Htarg = le32toh(((const uint32_t *)ptarget)[7]); uint32_t Htarg = le32toh(((const uint32_t *)ptarget)[7]);
bool ret = false; bool ret = false;
be32enc_vect(data, (const uint32_t *)pdata, 19); be32enc_vect(data, (const uint32_t *)pdata, 19);
while(1) while(1)
{ {
uint32_t ostate[8]; uint32_t ostate[8];
*nonce = ++n; *nonce = ++n;
data[19] = (n); data[19] = (n);
x14hash(ostate, data); x14hash(ostate, data);
tmp_hash7 = (ostate[7]); tmp_hash7 = (ostate[7]);
applog(LOG_INFO, "data7 %08lx", (long unsigned int)data[7]); applog(LOG_INFO, "data7 %08lx", (long unsigned int)data[7]);
if(unlikely(tmp_hash7 <= Htarg)) if(unlikely(tmp_hash7 <= Htarg))
{ {
((uint32_t *)pdata)[19] = htobe32(n); ((uint32_t *)pdata)[19] = htobe32(n);
*last_nonce = n; *last_nonce = n;
ret = true; ret = true;
break; break;
} }
if (unlikely((n >= max_nonce) || thr->work_restart)) if (unlikely((n >= max_nonce) || thr->work_restart))
{ {
*last_nonce = n; *last_nonce = n;
break; break;
} }
} }
return ret; return ret;
} }