-- Remove more useless defines

-- Make results member first in each struct


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

1 files changed, 10 insertions, 48 deletions

diff --git a/nmglobal.h b/nmglobal.h
index 812a3ee..a87e61c 100644
--- a/nmglobal.h
+++ b/nmglobal.h
@@ -32,44 +32,8 @@
 #define TRUE 1
 #define FALSE 0
 
-/*
-** ERROR CODES
-*/
-#define ERROR_MEMORY    1
-#define ERROR_MEMARRAY_FULL 2
-#define ERROR_MEMARRAY_NFOUND 3
-#define ERROR_FILECREATE 10
-#define ERROR_FILEREAD 11
-#define ERROR_FILEWRITE 12
-#define ERROR_FILEOPEN 13
-#define ERROR_FILESEEK 14
-
-/*
-** MINIMUM_TICKS
-**
-** This sets the default number of minimum ticks.
-** It can, of course, be overridden by the input
-** command file.
-** This ultimately gets loaded into the variable
-** global_min_ticks, which specifies the minimum
-** number of ticks that must take place between
-** a StartStopwatch() and StopStopwatch() call.
-** The idea is to reduce error buildup.
-*/
 #define MINIMUM_TICKS 60
-
-/*
-** MINIMUM_SECONDS
-**
-** Minimum number of seconds to run each test.
-*/
-#define MINIMUM_SECONDS 5
-
-/*
-** Memory array size.  Used in SYSSPEC for keeping track
-** of re-aligned memory.
-*/
-#define MEM_ARRAY_SIZE 20
+#define MINIMUM_SECONDS 5 /* Minimum number of seconds to run each test */
 
 /*****************
 ** NUMERIC SORT **
@@ -101,8 +65,8 @@
 ** TYPEDEFS
 */
 typedef struct {
-        int adjust;             /* Set adjust code */
         double results;     /* # of sort iterations per sec */
+        int adjust;             /* Set adjust code */
         unsigned short numarrays;       /* # of arrays */
         unsigned long arraysize;        /* # of elements in array */
 } SortStruct;
@@ -148,8 +112,8 @@ typedef struct {
 ** TYPEDEFS
 */
 typedef struct {
-        int adjust;             /* Set adjust code */
         double results;    /* # of bitfield ops per sec */
+        int adjust;             /* Set adjust code */
         unsigned long bitoparraysize;           /* Total # of bitfield ops */
         unsigned long bitfieldarraysize;        /* Bit field array size */
 } BitOpStruct;
@@ -181,10 +145,10 @@ typedef struct {
 ** TYPEDEFS
 */
 typedef struct {
+        double results;         /* Results */
         int adjust;             /* Set adjust code */
         unsigned long arraysize;        /* Size of array */
         unsigned long loops;            /* Loops per iterations */
-        double results;         /* Results */
 } EmFloatStruct;
 
 /*************************
@@ -195,9 +159,9 @@ typedef struct {
 ** TYPEDEFS
 */
 typedef struct {
+        double results;          /* Results */
         int adjust;             /* Set adjust code */
         unsigned long arraysize;        /* Size of coeff. arrays */
-        double results;          /* Results */
 } FourierStruct;
 
 /*************************
@@ -208,9 +172,9 @@ typedef struct {
 ** TYPEDEFS
 */
 typedef struct {
+        double results;     /* Results */
         int adjust;             /* Set adjust code */
         unsigned long numarrays;        /* # of arrays */
-        double results;     /* Results */
 } AssignStruct;
 
 /********************
@@ -237,10 +201,10 @@ typedef struct {
 ** TYPEDEFS
 */
 typedef struct {
+        double results;     /* Results */
         int adjust;             /* Set adjust code */
         unsigned long arraysize;        /* Size of array */
         unsigned long loops;            /* # of times to convert */
-        double results;     /* Results */
 } IDEAStruct;
 
 
@@ -274,10 +238,10 @@ typedef struct {
 */
 
 typedef struct {
+        double results;     /* Results */
         int adjust;             /* Set adjust code */
         unsigned long arraysize;        /* Size of array */
         unsigned long loops;            /* # of times to compress/decompress */
-        double results;     /* Results */
 } HuffStruct;
 
 /********************************
@@ -299,9 +263,9 @@ typedef struct {
 ** TYPEDEFS
 */
 typedef struct {
+        double results;     /* Results */
         int adjust;             /* Set adjust code */
         unsigned long loops;            /* # of times to learn */
-        double results;     /* Results */
 } NNetStruct;
 
 /***********************
@@ -324,13 +288,11 @@ typedef struct {
 ** TYPEDEFS
 */
 typedef struct {
+        double results;     /* Results */
         int adjust;             /* Set adjust code */
         unsigned long numarrays;        /* # of arrays */
-        double results;     /* Results */
 } LUStruct;
 
-extern unsigned long global_min_ticks;
-
 extern SortStruct global_numsortstruct;
 extern SortStruct global_strsortstruct;
 extern BitOpStruct global_bitopstruct;