X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=hfal-performance.c;h=70f2ef15eb37ed2736669bcef2c5f69b37370db2;hb=aa060d30f8600acb9cc5bcf9fa3d97a2fbe5ccda;hp=391fac8508a0b857bb3f02f76a66119518ec4a9a;hpb=7605b81a4b6f8b2bf7065e9b51116443a1ce64c4;p=avr-crypto-lib.git

diff --git a/hfal-performance.c b/hfal-performance.c
index 391fac8..70f2ef1 100644
--- a/hfal-performance.c
+++ b/hfal-performance.c
@@ -22,7 +22,7 @@
  * \email   daniel.otte@rub.de
  * \date    2009-05-10
  * \license GPLv3 or later
- * 
+ *
  */
 
 #include "hfal-performance.h"
@@ -53,42 +53,52 @@ void hfal_performance(const hfdesc_t* hd){
 	uint8_t data[(hf.blocksize_b+7)/8];
 	uint8_t digest[(hf.hashsize_b+7)/8];
 	uint64_t t;
-	
+
 	if(hf.type!=HFDESC_TYPE_HASHFUNCTION)
 		return;
 	calibrateTimer();
+	print_overhead();
 	cli_putstr_P(PSTR("\r\n\r\n === "));
 	cli_putstr_P(hf.name);
 	cli_putstr_P(PSTR(" performance === "
+	                  "\r\n    type:             hashfunction"
 	                  "\r\n    hashsize (bits):    "));
 	printvalue(hf.hashsize_b);
-	
+
 	cli_putstr_P(PSTR("\r\n    ctxsize (bytes):    "));
 	printvalue(hf.ctxsize_B);
-	
+
 	cli_putstr_P(PSTR("\r\n    blocksize (bits):   "));
 	printvalue(hf.blocksize_b);
-	
-	startTimer(1);
+
+	startTimer(0);
+	START_TIMER;
 	hf.init(&ctx);
+	STOP_TIMER;
 	t = stopTimer();
 	cli_putstr_P(PSTR("\r\n    init (cycles):      "));
 	printvalue(t);
-	
-	startTimer(1);
+
+	startTimer(0);
+	START_TIMER;
 	hf.nextBlock(&ctx, data);
+	STOP_TIMER;
 	t = stopTimer();
 	cli_putstr_P(PSTR("\r\n    nextBlock (cycles): "));
 	printvalue(t);
-	
-	startTimer(1);
+
+	startTimer(0);
+	START_TIMER;
 	hf.lastBlock(&ctx, data, 0);
+	STOP_TIMER;
 	t = stopTimer();
 	cli_putstr_P(PSTR("\r\n    lastBlock (cycles): "));
 	printvalue(t);
-	
-	startTimer(1);
+
+	startTimer(0);
+	START_TIMER;
 	hf.ctx2hash(digest, &ctx);
+	STOP_TIMER;
 	t = stopTimer();
 	cli_putstr_P(PSTR("\r\n    ctx2hash (cycles):  "));
 	printvalue(t);
@@ -99,8 +109,10 @@ void hfal_performance_multiple(const hfdesc_t** hd_list){
 	const hfdesc_t* hd;
 	for(;;){
 		hd = (void*)pgm_read_word(hd_list);
-		if(!hd)
+		if(!hd){
+			cli_putstr_P(PSTR("\r\n\r\n End of performance figures\r\n"));
 			return;
+		}
 		hfal_performance(hd);
 		hd_list = (void*)((uint8_t*)hd_list + 2);
 	}