-- Remove structs completely

-- results is now a static variable in each benchmark
-- added get*Score routines
-- finally got rid of nmglobal.h completely
-- removed more useless stuff


git-svn-id: svn://mattst88.com/svn/cleanbench/trunk@53 0d43b9a7-5ab2-4d7b-af9d-f64450cef757

1 files changed, 10 insertions, 3 deletions

diff --git a/idea.c b/idea.c
index bd8d539..1fc0ac5 100644
--- a/idea.c
+++ b/idea.c
@@ -6,7 +6,7 @@
 #include <limits.h>
 #include <time.h>
 
-#include "nmglobal.h"
+#include "cleanbench.h"
 #include "randnum.h"
 
 
@@ -52,6 +52,8 @@ static void en_key_idea(uint16_t userkey[8], IDEAkey Z);
 static void de_key_idea(IDEAkey Z, IDEAkey DK);
 static void cipher_idea(uint16_t in[4], uint16_t out[4], IDEAkey Z);
 
+static double results;
+
 /***********
 ** DoIDEA **
 ************
@@ -62,7 +64,6 @@ void
 DoIDEA(void)
 {
         const char*     context = "CPU:IDEA";
-        IDEAStruct*     locideastruct=&global_ideastruct;      /* Loc pointer to global structure */
         unsigned char*  plain1 = NULL;               /* First plaintext buffer */
         unsigned char*  crypt1 = NULL;               /* Encryption buffer */
         unsigned char*  plain2 = NULL;               /* Second plaintext buffer */
@@ -157,7 +158,7 @@ DoIDEA(void)
         free(crypt1);
         free(plain2);
 
-        locideastruct->results = (double)(iterations * CLOCKS_PER_SEC) / (double)total_time;
+        results = (double)(iterations * CLOCKS_PER_SEC) / (double)total_time;
 }
 
 /********************
@@ -379,3 +380,9 @@ MUL(x4,*Z);
 *out=x4;
 return;
 }
+
+inline double
+getIDEAScore(void)
+{
+        return results;
+}