From 1480ade278738abe797667b102a15a386c0bfb3e Mon Sep 17 00:00:00 2001 From: Con Kolivas Date: Fri, 2 Sep 2011 09:39:04 +1000 Subject: [PATCH] Cryptopp asm32 was not correctly updated to the incremental nonce code so the hash counter was bogus. --- sha256_cryptopp.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/sha256_cryptopp.c b/sha256_cryptopp.c index 5a9f00b8..c0c1b6fd 100644 --- a/sha256_cryptopp.c +++ b/sha256_cryptopp.c @@ -102,7 +102,6 @@ bool scanhash_cryptopp(int thr_id, const unsigned char *midstate, { uint32_t *hash32 = (uint32_t *) hash; uint32_t *nonce = (uint32_t *)(data + 12); - unsigned long stat_ctr = 0; work_restart[thr_id].restart = 0; @@ -113,8 +112,6 @@ bool scanhash_cryptopp(int thr_id, const unsigned char *midstate, runhash(hash1, data, midstate); runhash(hash, hash1, sha256_init_state); - stat_ctr++; - if (unlikely((hash32[7] == 0) && fulltest(hash, target))) { *hashes_done = n; return true; @@ -587,7 +584,6 @@ bool scanhash_asm32(int thr_id, const unsigned char *midstate, { uint32_t *hash32 = (uint32_t *) hash; uint32_t *nonce = (uint32_t *)(data + 12); - unsigned long stat_ctr = 0; work_restart[thr_id].restart = 0; @@ -598,17 +594,13 @@ bool scanhash_asm32(int thr_id, const unsigned char *midstate, runhash32(hash1, data, midstate); runhash32(hash, hash1, sha256_init_state); - stat_ctr++; - if (unlikely((hash32[7] == 0) && fulltest(hash, target))) { - fulltest(hash, target); - - *hashes_done = stat_ctr; + *hashes_done = n; return true; } if ((n >= max_nonce) || work_restart[thr_id].restart) { - *hashes_done = stat_ctr; + *hashes_done = n; return false; } }