* Fixed va_args for the z80

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

diff --git a/support/tests/dhrystone/dhry.c b/support/tests/dhrystone/dhry.c
index 6cf80df36808ced4bd3453ad65050e50bd74bc80..0180c661d520043bc19ecb7856e9c4ab8ca638e4 100644 (file)
--- a/support/tests/dhrystone/dhry.c
+++ b/support/tests/dhrystone/dhry.c
@@ -39,25 +39,47 @@
     ...!uunet!pcrat!dry2       (results only)
 */
 
+#define NOENUM         1
+#define NOSTRUCTASSIGN 1
+#define REG
+
 #include "dhry.h"
 #include <string.h>
 /** For printf */
 #include <stdio.h>
+
+#if defined(SDCC_ds390)
+#include <tinibios.h>
+#define clock() ClockTicks()
+#define CLOCKS_PER_SEC 1000
+#undef PRINT_T_STATES
+#define memcpy(d,s,l) memcpyx(d,s,l)
+
+#elif defined(__z80)
+int _clock(void);
+#define clock _clock
+#define CLOCKS_PER_SEC 10
+
+#else
 /** For clock() */
 #include <time.h>
 #include <types.h>
+#define PRINT_T_STATES
+#endif
 
 /** Print the number of t-states this program has been executing for.
     Optional :)
 */
+#ifdef PRINT_T_STATES
 void _printTStates(void);
+#endif
 
 /** Set to one to print more messages about expected values etc. 
  */
-#define DEBUG  0
+#define DEBUG  1
 
 #if DEBUG
-#define DPRINTF(_a)  printf _a
+#define DPRINTF(_a) printf _a
 #else
 #define DPRINTF(_a)
 #endif
@@ -100,7 +122,7 @@ 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");
 
@@ -112,7 +134,7 @@ int main(void)
     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");
 
@@ -124,7 +146,11 @@ int main(void)
     /* overflow may occur for this array element.                   */
 
     /* 32766 is the highest value for a 16 bitter */
+#if DEBUG
+    Number_Of_Runs = 3;
+#else
     Number_Of_Runs = 10000;
+#endif    
 
     runTime = clock();
 
@@ -132,7 +158,7 @@ int main(void)
     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", Run_Index);
+           printf("Loops: %u\r\n", Run_Index);
        Proc_5();
        Proc_4();
        /* Ch_1_Glob == 'A', Ch_2_Glob == 'B', Bool_Glob == true */
@@ -198,13 +224,15 @@ int main(void)
        DPRINTF(("Looping.\n"));
     } /* loop "for Run_Index" */
 
-#if 1
+#ifdef PRINT_T_STATES    
     _printTStates();
+#endif    
 
     printf("Run_Index = %d\n", Run_Index);
 
     runTime = clock() - runTime;
 
+#if 1
     printf ("Execution ends\n");
     printf ("\n");
     printf ("Final values of the variables used in the benchmark:\n");
@@ -219,7 +247,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);
@@ -252,16 +282,18 @@ 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("Dhrystones/s = %u\n", Number_Of_Runs / (runTime/CLOCKS_PER_SEC));
+#endif
+    //    printf("Dhrystones/s = %lu\n", (unsigned long)Number_Of_Runs / (runTime/CLOCKS_PER_SEC));
     printf("MIPS = d/s/1757 = (sigh, need floats...)\n");
+#ifdef PRINT_T_STATES    
     _printTStates();
-#endif
-    printf("Time: %u ticks\n", runTime);
+#endif    
+    printf("Time: %lu ticks\n", runTime);
 }
 
 void Proc_1 (REG Rec_Pointer Ptr_Val_Par)
@@ -533,3 +565,4 @@ Boolean Func_2 (char *Str_1_Par_Ref, char *Str_2_Par_Ref)
            }
        } /* if Ch_Loc */
 } /* Func_2 */
+