Browse Source

Cryptopp asm32 was not correctly updated to the incremental nonce code so the hash counter was bogus.

Con Kolivas 14 years ago
parent
commit
1480ade278
1 changed files with 2 additions and 10 deletions
  1. 2 10
      sha256_cryptopp.c

+ 2 - 10
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 *hash32 = (uint32_t *) hash;
 	uint32_t *nonce = (uint32_t *)(data + 12);
 	uint32_t *nonce = (uint32_t *)(data + 12);
-	unsigned long stat_ctr = 0;
 
 
 	work_restart[thr_id].restart = 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(hash1, data, midstate);
 		runhash(hash, hash1, sha256_init_state);
 		runhash(hash, hash1, sha256_init_state);
 
 
-		stat_ctr++;
-
 		if (unlikely((hash32[7] == 0) && fulltest(hash, target))) {
 		if (unlikely((hash32[7] == 0) && fulltest(hash, target))) {
 			*hashes_done = n;
 			*hashes_done = n;
 			return true;
 			return true;
@@ -587,7 +584,6 @@ bool scanhash_asm32(int thr_id, const unsigned char *midstate,
 {
 {
 	uint32_t *hash32 = (uint32_t *) hash;
 	uint32_t *hash32 = (uint32_t *) hash;
 	uint32_t *nonce = (uint32_t *)(data + 12);
 	uint32_t *nonce = (uint32_t *)(data + 12);
-	unsigned long stat_ctr = 0;
 
 
 	work_restart[thr_id].restart = 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(hash1, data, midstate);
 		runhash32(hash, hash1, sha256_init_state);
 		runhash32(hash, hash1, sha256_init_state);
 
 
-		stat_ctr++;
-
 		if (unlikely((hash32[7] == 0) && fulltest(hash, target))) {
 		if (unlikely((hash32[7] == 0) && fulltest(hash, target))) {
-			fulltest(hash, target);
-
-			*hashes_done = stat_ctr;
+			*hashes_done = n;
 			return true;
 			return true;
 		}
 		}
 
 
 		if ((n >= max_nonce) || work_restart[thr_id].restart) {
 		if ((n >= max_nonce) || work_restart[thr_id].restart) {
-			*hashes_done = stat_ctr;
+			*hashes_done = n;
 			return false;
 			return false;
 		}
 		}
 	}
 	}