* src/z80/gen.c: Fixed up generator to pass the regresion tests, specifically fixing...

[fw/sdcc] / support / tests / dhrystone / dhry.c

diff --git a/support/tests/dhrystone/dhry.c b/support/tests/dhrystone/dhry.c
index a893a2022109a638f17074f3c06e9970ec4ca904..52cdb647b2335ecafc98ccf7e4cab59906b8eaa9 100644 (file)
--- a/support/tests/dhrystone/dhry.c
+++ b/support/tests/dhrystone/dhry.c
@@ -39,27 +39,39 @@
     ...!uunet!pcrat!dry2       (results only)
 */
 
+#define NOENUM         1
+#define NOSTRUCTASSIGN 1
+#define REG
+
 #include "dhry.h"
 #include <string.h>
 /** For printf */
 #include <stdio.h>
 
-/** Returns the current device time in ticks.  Check HZ in the Makefile
-    as well - HZ ticks = 1 second.
-*/
-unsigned _clock(void);
+#if defined(SDCC_ds390)
+#include <tinibios.h>
+#define clock() ClockTicks()
+#define CLOCKS_PER_SEC 1000
+#define memcpy(d,s,l) memcpyx(d,s,l)
 
-/** Print the number of t-states this program has been executing for.
-    Optional :)
-*/
-void _printTStates(void);
+#elif defined(__z80) || defined(__gbz80)
+unsigned int _clock(void);
+
+#define clock _clock
+#define CLOCKS_PER_SEC 100
+
+#else
+/** For clock() */
+#include <time.h>
+#include <types.h>
+#endif
 
 /** Set to one to print more messages about expected values etc. 
  */
 #define DEBUG  0
 
 #if DEBUG
-#define DPRINTF(_a)  printf _a
+#define DPRINTF(_a) printf _a
 #else
 #define DPRINTF(_a)
 #endif
@@ -76,6 +88,10 @@ int             Arr_2_Glob [50] [50];
 /* Used instead of malloc() */
 static Rec_Type _r[2];
 
+void mark(void)
+{
+}
+
 void Proc_1 (REG Rec_Pointer Ptr_Val_Par);
 void Proc_2 (One_Fifty *Int_Par_Ref);
 void Proc_5 (void);
@@ -89,11 +105,9 @@ Enumeration Func_1 (Capital_Letter Ch_1_Par_Val, Capital_Letter Ch_2_Par_Val);
 Boolean Func_2 (char *Str_1_Par_Ref, char *Str_2_Par_Ref);
 Boolean Func_3 (Enumeration Enum_Par_Val);
 
-#if SDCC
-int _main(void) 
-#else
+unsigned getsp(void);
+
 int main(void)
-#endif
 {
     One_Fifty       Int_1_Loc;
     REG   One_Fifty       Int_2_Loc;
@@ -104,20 +118,19 @@ int main(void)
     Str_30          Str_2_Loc;
     REG   int             Run_Index;
     REG   int             Number_Of_Runs;
-    unsigned runTime;
+    unsigned  long runTime;
 
-    //    printf("[dhry]\n");
+    printf("[dhry]\n");
 
     Next_Ptr_Glob = &_r[0];
     Ptr_Glob = &_r[1];
 
-
     Ptr_Glob->Ptr_Comp                    = Next_Ptr_Glob;
     Ptr_Glob->Discr                       = Ident_1;
     Ptr_Glob->variant.var_1.Enum_Comp     = Ident_3;
     Ptr_Glob->variant.var_1.Int_Comp      = 40;
 
-    strcpy (Ptr_Glob->variant.var_1.Str_Comp, 
+    strcpy(Ptr_Glob->variant.var_1.Str_Comp, 
            "DHRYSTONE PROGRAM, SOME STRING");
     strcpy (Str_1_Loc, "DHRYSTONE PROGRAM, 1'ST STRING");
 
@@ -129,13 +142,19 @@ int main(void)
     /* overflow may occur for this array element.                   */
 
     /* 32766 is the highest value for a 16 bitter */
+#if DEBUG
+    Number_Of_Runs = 3000;
+#else
     Number_Of_Runs = 32766;
+#endif    
 
-    runTime = _clock();
+    runTime = clock();
 
     /* Main test loop */
     for (Run_Index = 1; Run_Index <= Number_Of_Runs; ++Run_Index) {
        DPRINTF(("Run_Index = %d\n", Run_Index));
+       if (!(Run_Index & 1023))
+           printf("Loops: %u\r\n", Run_Index);
        Proc_5();
        Proc_4();
        /* Ch_1_Glob == 'A', Ch_2_Glob == 'B', Bool_Glob == true */
@@ -201,12 +220,11 @@ int main(void)
        DPRINTF(("Looping.\n"));
     } /* loop "for Run_Index" */
 
-    _printTStates();
-
     printf("Run_Index = %d\n", Run_Index);
 
-    runTime = _clock() - runTime;
+    runTime = clock() - runTime;
 
+#if 1
     printf ("Execution ends\n");
     printf ("\n");
     printf ("Final values of the variables used in the benchmark:\n");
@@ -221,7 +239,9 @@ int main(void)
     printf ("        should be:   %c\n", 'B');
     printf ("Arr_1_Glob[8]:       %d\n", Arr_1_Glob[8]);
     printf ("        should be:   %d\n", (int)7);
+#if 1
     printf ("Arr_2_Glob[8][7]:    %d\n", Arr_2_Glob[8][7]);
+#endif
     printf ("        should be:   Number_Of_Runs + 10\n");
     printf ("Ptr_Glob->\n");
     printf ("  Ptr_Comp:          %d\n", (int) Ptr_Glob->Ptr_Comp);
@@ -254,16 +274,24 @@ int main(void)
     printf ("        should be:   %d\n", (int)7);
     printf ("Enum_Loc:            %d\n", Enum_Loc);
     printf ("        should be:   %d\n", (int)1);
-    printf ("Str_1_Loc:           %s\n", Str_1_Loc);
+    printf ("Str_1_Loc:           %s\n", (char _generic *)Str_1_Loc);
     printf ("        should be:   DHRYSTONE PROGRAM, 1'ST STRING\n");
-    printf ("Str_2_Loc:           %s\n", Str_2_Loc);
+    printf ("Str_2_Loc:           %s\n", (char _generic *)Str_2_Loc);
     printf ("        should be:   DHRYSTONE PROGRAM, 2'ND STRING\n");
     printf ("\n");
-
-    printf("Time: %u ticks\n", runTime);
-    printf("Dhrystones/s = %u\n", Number_Of_Runs / (runTime/HZ));
+#endif
+#if 1
+    printf("Number of runs: %u.  runTime: %u.\n", Number_Of_Runs, (unsigned)runTime);
+    mark();
+    printf("Dhrystones/s = %u\n", (unsigned)((unsigned long)Number_Of_Runs / (runTime/CLOCKS_PER_SEC)));
     printf("MIPS = d/s/1757 = (sigh, need floats...)\n");
+#endif
+#ifdef PRINT_T_STATES    
     _printTStates();
+#endif    
+#if 1
+    printf("Time: %lu ticks\n", runTime);
+#endif
 }
 
 void Proc_1 (REG Rec_Pointer Ptr_Val_Par)
@@ -309,17 +337,17 @@ void Proc_2 (One_Fifty *Int_Par_Ref)
 
     Int_Loc = *Int_Par_Ref + 10;
     do {
-       DPRINTF(("1\n"));
+       DPRINTF(("1"));
        /* executed once */
        if (Ch_1_Glob == 'A')
            /* then, executed */
            {
-               DPRINTF(("2\n"));
+               DPRINTF(("2"));
                Int_Loc -= 1;
                *Int_Par_Ref = Int_Loc - Int_Glob;
                Enum_Loc = Ident_1;
            } /* if */
-       DPRINTF(("3\n"));
+       DPRINTF(("3"));
     } while (Enum_Loc != Ident_1); /* true */
     DPRINTF(("Proc_2 done.\n"));
 } /* Proc_2 */
@@ -535,3 +563,4 @@ Boolean Func_2 (char *Str_1_Par_Ref, char *Str_2_Par_Ref)
            }
        } /* if Ch_Loc */
 } /* Func_2 */
+