sdcc-3.9.0 fork implementing GNU assembler syntax

This fork aims to provide better support for stm8-binutils

8 files changed, 1207 insertions, 0 deletions

diff --git a/support/tests/dhrystone/Makefile b/support/tests/dhrystone/Makefile
new file mode 100644
index 0000000..62d194f
--- /dev/null
+++ b/support/tests/dhrystone/Makefile
@@ -0,0 +1,30 @@
+# Simple Makefile for dhrystone and sdcc
+TOPDIR = ../../..
+
+PROC = z80
+
+CC = $(TOPDIR)/bin/sdcc
+
+# -DNOENUM is here to make the results more predictable
+CFLAGS += -DREG= -DNOSTRUCTASSIGN -DNOENUM -V -m$(PROC) --profile --dumpall --stack-auto
+
+OBJ = dhry.o
+
+all: dhry.bin
+
+dhry.ihx: dhry.c
+	$(CC) $(CFLAGS) dhry.c
+
+dhry.gb: dhry.c
+	$(CC) $(CFLAGS) dhry.c
+
+dhry.c: dhry.h
+
+dhry.bin: dhry.ihx
+	cat $< | $(TOPDIR)/bin/makebin > $@
+
+native:
+	gcc -g -O2 -DREG= -DNOSTRUCTASSIGN -DNOENUM -o dhry dhry.c
+
+clean:
+	rm -f *~ dhry *.o *.gb *.ihx *.rel *.dump* *.lst *.sym *.map *.asm *.bin *.gb
diff --git a/support/tests/dhrystone/dhry.c b/support/tests/dhrystone/dhry.c
new file mode 100644
index 0000000..bee9d40
--- /dev/null
+++ b/support/tests/dhrystone/dhry.c
@@ -0,0 +1,589 @@
+/** Sanatised version of the dhrystone-2.1 test.
+
+    Modifications Michael Hope <michaelh@earthling.net>
+
+    This is derrived from the dhrystone-2.1.tar.gz tarball available
+    all over the net.  I sourced it from the Red Hat src rpm.
+
+    Modifications:
+    * Made it more ANSI compliant.
+    * Changed any array function arguments to pointers to make my 
+      compiler work.
+    * Removed malloc's for a couple of static arrays.
+    * Into one file.
+    * Proc_8 is a bit messy.  It originally took a 2 dim array, but
+      sdcc doesn't support this.  So the offsets are hard coded...
+
+    Notes:
+    * The comment at the start of Func_1 about the input being
+      H, R on the first call is wrong - Func_1 is first called
+      from Func_2 where the input is R, Y.  The test still succeeds.
+
+    References:
+    * http://www.netlib.org/performance/html/dhry.intro.html
+    * http://www.netlib.org/performance/html/dhry.data.col0.html
+
+    I couldnt find a copyright in the original - the most relevent
+    part follows:
+
+    A SPECIAL THANKS
+    I didn't write the DHRYSTONE benchmark.  Rheinhold Weicker did. He has
+    certainly provided us with a useful tool for benchmarking, and is
+    to be congratulated.
+
+    Rick Richardson
+    PC Research, Inc.
+    (201) 389-8963 (9-17 EST)
+    (201) 542-3734 (7-9,17-24 EST)
+    ...!uunet!pcrat!rick	(normal mail)
+    ...!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
+#define memcpy(d,s,l) memcpyx(d,s,l)
+
+# if defined(SDCC_ds400)
+# include <ds400rom.h>
+# endif
+
+#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
+#else
+#define DPRINTF(_a)
+#endif
+
+Rec_Pointer     Ptr_Glob,
+                Next_Ptr_Glob;
+int             Int_Glob;
+Boolean         Bool_Glob;
+char            Ch_1_Glob,
+                Ch_2_Glob;
+int             Arr_1_Glob [50];
+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);
+void Proc_4 (void);
+void Proc_7 (One_Fifty Int_1_Par_Val, One_Fifty Int_2_Par_Val, One_Fifty *Int_Par_Ref);
+void Proc_8 (int *Arr_1_Par_Ref, int *Arr_2_Par_Ref,
+	     int Int_1_Par_Val, int Int_2_Par_Val);
+void Proc_6 (Enumeration Enum_Val_Par, Enumeration *Enum_Ref_Par);
+void Proc_3 (Rec_Pointer *Ptr_Ref_Par);
+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);
+
+unsigned getsp(void);
+
+void main(void)
+{
+    One_Fifty       Int_1_Loc;
+    REG   One_Fifty       Int_2_Loc;
+    One_Fifty       Int_3_Loc;
+    REG   Capital_Letter Ch_Index;
+    Enumeration     Enum_Loc;
+    Str_30          Str_1_Loc;
+    Str_30          Str_2_Loc;
+    REG   int             Run_Index;
+    REG   int             Number_Of_Runs;
+    unsigned  long runTime;
+
+#if defined(SDCC_ds400)
+    // Intialize the ROM.
+    if (romInit(1, SPEED_2X))
+    {
+        // We're hosed. romInit will have printed an error, nothing more to do.
+        return;
+    }
+#endif    
+    
+    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, 
+	    "DHRYSTONE PROGRAM, SOME STRING");
+    strcpy (Str_1_Loc, "DHRYSTONE PROGRAM, 1'ST STRING");
+
+    Arr_2_Glob [8][7] = 10;
+
+    /* Was missing in published program. Without this statement,    */
+    /* Arr_2_Glob [8][7] would have an undefined value.             */
+    /* Warning: With 16-Bit processors and Number_Of_Runs > 32000,  */
+    /* overflow may occur for this array element.                   */
+
+    /* 32766 is the highest value for a 16 bitter */
+#if DEBUG
+    Number_Of_Runs = 1;
+#else
+#if defined(SDCC_ds400)    
+    Number_Of_Runs = 10240;
+#else    
+    Number_Of_Runs = 32766;
+#endif    
+#endif    
+
+    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 */
+	DPRINTF(("Ch_1_Glob '%c' == 'A', Ch_2_Glob '%c' == 'B', Bool_Glob %d == 1\n", Ch_1_Glob, Ch_2_Glob, Bool_Glob));
+
+	Int_1_Loc = 2;
+	Int_2_Loc = 3;
+	strcpy (Str_2_Loc, "DHRYSTONE PROGRAM, 2'ND STRING");
+	Enum_Loc = Ident_2;
+	Bool_Glob = ! Func_2 (Str_1_Loc, Str_2_Loc);
+	/* Bool_Glob == 1 */
+	DPRINTF(("Bool_Glob %d == 1, Int_1_Loc %d == 2, Int_2_Loc %d == 3\n", Bool_Glob, Int_1_Loc, Int_2_Loc));
+	while (Int_1_Loc < Int_2_Loc)  /* loop body executed once */
+	    {
+		DPRINTF(("m.1 Executes once.\n"));
+		Int_3_Loc = 5 * Int_1_Loc - Int_2_Loc;
+		/* Int_3_Loc == 7 */
+		DPRINTF(("Int_3_Loc %d == 7\n", Int_3_Loc));
+		DPRINTF(("Proc_7\n"));
+		Proc_7 (Int_1_Loc, Int_2_Loc, &Int_3_Loc);
+		/* Int_3_Loc == 7 */
+		Int_1_Loc += 1;
+	    } /* while */
+	DPRINTF(("m.2 Check above executed once.\n"));
+	/* Int_1_Loc == 3, Int_2_Loc == 3, Int_3_Loc == 7 */
+	DPRINTF(("Int_1_Loc %d == 3, Int_2_Loc %d == 3, Int_3_Loc %d == 7\n",
+	       Int_1_Loc, Int_2_Loc, Int_3_Loc));
+
+	DPRINTF(("Proc_8\n"));
+	Proc_8 (Arr_1_Glob, (int *)Arr_2_Glob, Int_1_Loc, Int_3_Loc);
+	/* Int_Glob == 5 */
+	DPRINTF(("Int_Glob %d == 5\n", Int_Glob));
+	DPRINTF(("Proc_1\n"));
+	Proc_1 (Ptr_Glob);
+	for (Ch_Index = 'A'; Ch_Index <= Ch_2_Glob; ++Ch_Index)
+	    /* loop body executed twice */
+	    {
+		DPRINTF(("Func_1\n"));
+		if (Enum_Loc == Func_1 (Ch_Index, 'C'))
+		    /* then, not executed */
+		    {
+			DPRINTF(("Proc_6\n"));
+			Proc_6 (Ident_1, &Enum_Loc);
+			strcpy (Str_2_Loc, "DHRYSTONE PROGRAM, 3'RD STRING");
+			Int_2_Loc = Run_Index;
+			Int_Glob = Run_Index;
+		    }
+	    }
+	/* Int_1_Loc == 3, Int_2_Loc == 3, Int_3_Loc == 7 */
+	DPRINTF(("Int_1_Loc %d == 3, Int_2_Loc %d == 3, Int_3_Loc %d == 7\n",
+	       Int_1_Loc, Int_2_Loc, Int_3_Loc));
+
+	Int_2_Loc = Int_2_Loc * Int_1_Loc; /* i2 = 3 * 3 = 9 */
+	Int_1_Loc = Int_2_Loc / Int_3_Loc; /* i1 = 9 / 7 = 1 */
+	Int_2_Loc = 7 * (Int_2_Loc - Int_3_Loc) - Int_1_Loc; /* i2 = 7 * (9 - 7) - 1 */
+	/* Int_1_Loc == 1, Int_2_Loc == 13, Int_3_Loc == 7 */
+	DPRINTF(("Int_1_Loc %d == 1, Int_2_Loc %d == 13, Int_3_Loc %d == 7\n",
+	       Int_1_Loc, Int_2_Loc, Int_3_Loc));
+	DPRINTF(("Proc_2\n"));
+	Proc_2 (&Int_1_Loc);
+	/* Int_1_Loc == 5 */
+	DPRINTF(("Int_1_Loc %d == 5\n", Int_1_Loc));
+	DPRINTF(("Looping.\n"));
+    } /* loop "for Run_Index" */
+
+    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");
+    printf ("\n");
+    printf ("Int_Glob:            %d\n", Int_Glob);
+    printf ("        should be:   %d\n", (int)5);
+    printf ("Bool_Glob:           %d\n", Bool_Glob);
+    printf ("        should be:   %d\n", (int)1);
+    printf ("Ch_1_Glob:           %c\n", Ch_1_Glob);
+    printf ("        should be:   %c\n", 'A');
+    printf ("Ch_2_Glob:           %c\n", Ch_2_Glob);
+    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);
+    printf ("        should be:   (implementation-dependent)\n");
+    printf ("  Discr:             %d\n", (int)Ptr_Glob->Discr);
+    printf ("        should be:   %d\n", (int)0);
+    printf ("  Enum_Comp:         %d\n", (int)Ptr_Glob->variant.var_1.Enum_Comp);
+    printf ("        should be:   %d\n", (int)2);
+    printf ("  Int_Comp:          %d\n", (int)Ptr_Glob->variant.var_1.Int_Comp);
+    printf ("        should be:   %d\n", (int)17);
+    printf ("  Str_Comp:          %s\n", (char *)Ptr_Glob->variant.var_1.Str_Comp);
+    printf ("        should be:   DHRYSTONE PROGRAM, SOME STRING\n");
+    printf ("Next_Ptr_Glob->\n");
+    printf ("  Ptr_Comp:          %d\n", (int) Next_Ptr_Glob->Ptr_Comp);
+    printf ("        should be:   (implementation-dependent), same as above\n");
+    printf ("  Discr:             %d\n", Next_Ptr_Glob->Discr);
+    printf ("        should be:   %d\n", (int)0);
+    printf ("  Enum_Comp:         %d\n", Next_Ptr_Glob->variant.var_1.Enum_Comp);
+    printf ("        should be:   %d\n", (int)1);
+    printf ("  Int_Comp:          %d\n", Next_Ptr_Glob->variant.var_1.Int_Comp);
+    printf ("        should be:   %d\n", (int)18);
+    printf ("  Str_Comp:          %s\n",
+	    Next_Ptr_Glob->variant.var_1.Str_Comp);
+    printf ("        should be:   DHRYSTONE PROGRAM, SOME STRING\n");
+    printf ("Int_1_Loc:           %d\n", Int_1_Loc);
+    printf ("        should be:   %d\n", (int)5);
+    printf ("Int_2_Loc:           %d\n", Int_2_Loc);
+    printf ("        should be:   %d\n", (int)13);
+    printf ("Int_3_Loc:           %d\n", Int_3_Loc);
+    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", (char *)Str_1_Loc);
+    printf ("        should be:   DHRYSTONE PROGRAM, 1'ST STRING\n");
+    printf ("Str_2_Loc:           %s\n", (char *)Str_2_Loc);
+    printf ("        should be:   DHRYSTONE PROGRAM, 2'ND STRING\n");
+    printf ("\n");
+#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)
+/* executed once */
+{
+    REG Rec_Pointer Next_Record = Ptr_Val_Par->Ptr_Comp;  
+    /* == Ptr_Glob_Next */
+    /* Local variable, initialized with Ptr_Val_Par->Ptr_Comp,    */
+    /* corresponds to "rename" in Ada, "with" in Pascal           */
+  
+#if !defined(SDCC_ds390)    
+    structassign (*Ptr_Val_Par->Ptr_Comp, *Ptr_Glob);
+#else
+    /* I have no idea why this is necessary... */
+    memcpyx((void xdata *)*Ptr_Val_Par->Ptr_Comp, (void xdata *)*Ptr_Glob, 
+	   sizeof(Rec_Type));
+#endif
+    Ptr_Val_Par->variant.var_1.Int_Comp = 5;
+    Next_Record->variant.var_1.Int_Comp 
+        = Ptr_Val_Par->variant.var_1.Int_Comp;
+    Next_Record->Ptr_Comp = Ptr_Val_Par->Ptr_Comp;
+    Proc_3 (&Next_Record->Ptr_Comp);
+    /* Ptr_Val_Par->Ptr_Comp->Ptr_Comp 
+       == Ptr_Glob->Ptr_Comp */
+    if (Next_Record->Discr == Ident_1)
+	/* then, executed */
+	{
+	    Next_Record->variant.var_1.Int_Comp = 6;
+	    Proc_6 (Ptr_Val_Par->variant.var_1.Enum_Comp, 
+		    &Next_Record->variant.var_1.Enum_Comp);
+	    Next_Record->Ptr_Comp = Ptr_Glob->Ptr_Comp;
+	    Proc_7 (Next_Record->variant.var_1.Int_Comp, 10, 
+		    &Next_Record->variant.var_1.Int_Comp);
+	}
+    else /* not executed */
+	structassign (*Ptr_Val_Par, *Ptr_Val_Par->Ptr_Comp);
+} /* Proc_1 */
+
+
+void Proc_2 (One_Fifty *Int_Par_Ref)
+    /******************/
+    /* executed once */
+    /* *Int_Par_Ref == 1, becomes 4 */
+{
+    One_Fifty  Int_Loc;  
+    Enumeration   Enum_Loc;
+
+    DPRINTF(("-> Proc_2\n"));
+
+    Int_Loc = *Int_Par_Ref + 10;
+    do {
+	DPRINTF(("1"));
+	/* executed once */
+	if (Ch_1_Glob == 'A')
+	    /* then, executed */
+	    {
+		DPRINTF(("2"));
+		Int_Loc -= 1;
+		*Int_Par_Ref = Int_Loc - Int_Glob;
+		Enum_Loc = Ident_1;
+	    } /* if */
+	DPRINTF(("3"));
+    } while (Enum_Loc != Ident_1); /* true */
+    DPRINTF(("Proc_2 done.\n"));
+} /* Proc_2 */
+
+
+void Proc_3 (Rec_Pointer *Ptr_Ref_Par)
+    /******************/
+    /* executed once */
+    /* Ptr_Ref_Par becomes Ptr_Glob */
+{
+    if (Ptr_Glob != Null)
+	/* then, executed */
+	*Ptr_Ref_Par = Ptr_Glob->Ptr_Comp;
+    Proc_7 (10, Int_Glob, &Ptr_Glob->variant.var_1.Int_Comp);
+} /* Proc_3 */
+
+void Proc_4 (void) /* without parameters */
+    /*******/
+    /* executed once */
+{
+    Boolean Bool_Loc;
+
+    DPRINTF(("-> Proc_4\n"));
+    Bool_Loc = Ch_1_Glob == 'A';
+    Bool_Glob = Bool_Loc | Bool_Glob;
+    Ch_2_Glob = 'B';
+    DPRINTF(("Expect Ch_1_Glob '%c' == 'A'\n", (char)Ch_1_Glob));
+    DPRINTF(("       Ch_2_Glob '%c' == 'B'\n", (char)Ch_2_Glob));
+    DPRINTF(("       Bool_Loc %d == 1\n", (unsigned)Bool_Loc));
+    DPRINTF(("       Bool_Glob %d == 1\n", (unsigned)Bool_Glob));
+} /* Proc_4 */
+
+
+void Proc_5 () /* without parameters */
+    /*******/
+    /* executed once */
+{
+    Ch_1_Glob = 'A';
+    Bool_Glob = false;
+} /* Proc_5 */
+
+void Proc_6 (Enumeration Enum_Val_Par, Enumeration *Enum_Ref_Par)
+    /*********************************/
+    /* executed once */
+    /* Enum_Val_Par == Ident_3, Enum_Ref_Par becomes Ident_2 */
+
+{
+    *Enum_Ref_Par = Enum_Val_Par;
+    if (! Func_3 (Enum_Val_Par))
+	/* then, not executed */
+	*Enum_Ref_Par = Ident_4;
+    switch (Enum_Val_Par)
+	{
+	case Ident_1: 
+	    *Enum_Ref_Par = Ident_1;
+	    break;
+	case Ident_2: 
+	    if (Int_Glob > 100)
+		/* then */
+		*Enum_Ref_Par = Ident_1;
+	    else *Enum_Ref_Par = Ident_4;
+	    break;
+	case Ident_3: /* executed */
+	    *Enum_Ref_Par = Ident_2;
+	    break;
+	case Ident_4: break;
+	case Ident_5: 
+	    *Enum_Ref_Par = Ident_3;
+	    break;
+	} /* switch */
+} /* Proc_6 */
+
+
+/*************************************************/
+/* executed three times                                         */
+/* first call:      Ch_1_Par_Val == 'H', Ch_2_Par_Val == 'R'    */
+/* second call:     Ch_1_Par_Val == 'A', Ch_2_Par_Val == 'C'    */
+/* third call:      Ch_1_Par_Val == 'B', Ch_2_Par_Val == 'C'    */
+Enumeration Func_1 (Capital_Letter Ch_1_Par_Val, Capital_Letter Ch_2_Par_Val)
+{
+    Capital_Letter        Ch_1_Loc;
+    Capital_Letter        Ch_2_Loc;
+
+    DPRINTF(("-> Func_1\n"));
+    DPRINTF(("  Inputs: Ch_1_Par_Val '%c' == { R, A, B }\n", (char)Ch_1_Par_Val));
+    DPRINTF(("          Ch_2_Par_Val '%c' == { Y, C, C }\n", (char)Ch_2_Par_Val));
+
+    Ch_1_Loc = Ch_1_Par_Val;
+    Ch_2_Loc = Ch_1_Loc;
+    if (Ch_2_Loc != Ch_2_Par_Val) {
+	/* then, executed */
+	return (Ident_1);
+    }
+    else  /* not executed */
+	{
+	    Ch_1_Glob = Ch_1_Loc;
+	    return (Ident_2);
+	}
+} /* Func_1 */
+
+Boolean Func_3 (Enumeration Enum_Par_Val)
+    /***************************/
+    /* executed once        */
+    /* Enum_Par_Val == Ident_3 */
+{
+    Enumeration Enum_Loc;
+
+    Enum_Loc = Enum_Par_Val;
+    if (Enum_Loc == Ident_3)
+	/* then, executed */
+	return (true);
+    else /* not executed */
+	return (false);
+} /* Func_3 */
+
+void Proc_7 (One_Fifty Int_1_Par_Val, One_Fifty Int_2_Par_Val, One_Fifty *Int_Par_Ref)
+    /**********************************************/
+    /* executed three times                                      */ 
+    /* first call:      Int_1_Par_Val == 2, Int_2_Par_Val == 3,  */
+    /*                  Int_Par_Ref becomes 7                    */
+    /* second call:     Int_1_Par_Val == 10, Int_2_Par_Val == 5, */
+    /*                  Int_Par_Ref becomes 17                   */
+    /* third call:      Int_1_Par_Val == 6, Int_2_Par_Val == 10, */
+    /*                  Int_Par_Ref becomes 18                   */
+{
+    One_Fifty Int_Loc;
+
+    Int_Loc = Int_1_Par_Val + 2;
+    *Int_Par_Ref = Int_2_Par_Val + Int_Loc;
+} /* Proc_7 */
+
+/*void Proc_8 (Arr_1_Dim Arr_1_Par_Ref, Arr_2_Dim Arr_2_Par_Ref, 
+  int Int_1_Par_Val, int Int_2_Par_Val)*/
+void Proc_8 (int *Arr_1_Par_Ref, int *Arr_2_Par_Ref,
+	     int Int_1_Par_Val, int Int_2_Par_Val)
+{
+    REG One_Fifty Int_Index;
+    REG One_Fifty Int_Loc;
+
+    DPRINTF(("-> Proc_8\n"));
+    Int_Loc = Int_1_Par_Val + 5;
+    Arr_1_Par_Ref [Int_Loc] = Int_2_Par_Val;
+    DPRINTF(("Int_Loc %d == 8 Int_2_Par_Val %d == 7\n", Int_Loc, Int_2_Par_Val));
+
+    Arr_1_Par_Ref [Int_Loc+1] = Arr_1_Par_Ref [Int_Loc];
+    Arr_1_Par_Ref [Int_Loc+30] = Int_Loc;
+    for (Int_Index = Int_Loc; Int_Index <= Int_Loc+1; ++Int_Index)
+	Arr_2_Par_Ref [Int_Loc*50 + Int_Index] = Int_Loc;
+    Arr_2_Par_Ref [Int_Loc * 50 + Int_Loc-1] += 1;
+    Arr_2_Par_Ref [(Int_Loc+20 *50) + Int_Loc] = Arr_1_Par_Ref [Int_Loc];
+    Int_Glob = 5;
+    DPRINTF(("Arr_1_Glob[8] %d == 7\n", Arr_1_Par_Ref[8]));
+}
+
+/*********************************************************************/
+/* executed once      */
+/* Int_Par_Val_1 == 3 */
+/* Int_Par_Val_2 == 7 */
+Boolean Func_2 (char *Str_1_Par_Ref, char *Str_2_Par_Ref)
+    /*************************************************/
+    /* executed once */
+    /* Str_1_Par_Ref == "DHRYSTONE PROGRAM, 1'ST STRING" */
+    /* Str_2_Par_Ref == "DHRYSTONE PROGRAM, 2'ND STRING" */
+{
+    REG One_Thirty        Int_Loc;
+    Capital_Letter    Ch_Loc;
+
+    DPRINTF(("-> Func_2\n"));
+    DPRINTF(("  Inputs Str_1_Par_Ref \"%s\" = \"DHRYSTONE PROGRAM, 1'ST STRING\"\n", Str_1_Par_Ref));
+    DPRINTF(("         Str_2_Par_Ref \"%s\" = \"DHRYSTONE PROGRAM, 2'ND STRING\"\n", Str_2_Par_Ref));
+
+    Int_Loc = 2;
+
+    while (Int_Loc <= 2) {
+	if (Func_1 (Str_1_Par_Ref[Int_Loc],
+		    Str_2_Par_Ref[Int_Loc+1]) == Ident_1)
+	    /* then, executed */
+	    {
+		DPRINTF(("  2.3 Then OK.\n"));
+		Ch_Loc = 'A';
+		Int_Loc += 1;
+	    } /* if, while */
+	else {
+	    DPRINTF(("  2.2 Error.\n"));
+	}
+    }
+    if (Ch_Loc >= 'W' && Ch_Loc < 'Z') {
+	/* then, not executed */
+	DPRINTF((" 2.4 Error\n"));
+	Int_Loc = 7;
+    }
+    if (Ch_Loc == 'R') {
+	/* then, not executed */
+	DPRINTF((" 2.5 Error\n"));
+	return (true);
+    }
+    else /* executed */
+	{
+	    DPRINTF(("Str_1_Par_Ref = \"%s\", Str_2_Par_Ref = \"%s\"\n",
+		   Str_1_Par_Ref, Str_2_Par_Ref));
+	    if (strcmp (Str_1_Par_Ref, Str_2_Par_Ref) > 0)
+		/* then, not executed */
+		{
+		    DPRINTF((" 2.5 Error diff=%d\n", strcmp(Str_1_Par_Ref, Str_2_Par_Ref)));
+		    Int_Loc += 7;
+		    Int_Glob = Int_Loc;
+		    return (true);
+		}
+	    else {
+		/* executed */
+		DPRINTF((" 2.6 OK\n"));
+		return (false);
+	    }
+	} /* if Ch_Loc */
+} /* Func_2 */
+
diff --git a/support/tests/dhrystone/dhry.h b/support/tests/dhrystone/dhry.h
new file mode 100644
index 0000000..81477aa
--- /dev/null
+++ b/support/tests/dhrystone/dhry.h
@@ -0,0 +1,436 @@
+/*
+ ****************************************************************************
+ *
+ *                   "DHRYSTONE" Benchmark Program
+ *                   -----------------------------
+ *                                                                            
+ *  Version:    C, Version 2.1
+ *                                                                            
+ *  File:       dhry.h (part 1 of 3)
+ *
+ *  Date:       May 17, 1988
+ *
+ *  Author:     Reinhold P. Weicker
+ *                      Siemens AG, E STE 35
+ *                      Postfach 3240
+ *                      8520 Erlangen
+ *                      Germany (West)
+ *                              Phone:  [xxx-49]-9131-7-20330
+ *                                      (8-17 Central European Time)
+ *                              Usenet: ..!mcvax!unido!estevax!weicker
+ *
+ *              Original Version (in Ada) published in
+ *              "Communications of the ACM" vol. 27., no. 10 (Oct. 1984),
+ *              pp. 1013 - 1030, together with the statistics
+ *              on which the distribution of statements etc. is based.
+ *
+ *              In this C version, the following C library functions are used:
+ *              - strcpy, strcmp (inside the measurement loop)
+ *              - printf, scanf (outside the measurement loop)
+ *              In addition, Berkeley UNIX system calls "times ()" or "time ()"
+ *              are used for execution time measurement. For measurements
+ *              on other systems, these calls have to be changed.
+ *
+ *  Collection of Results:
+ *              Reinhold Weicker (address see above) and
+ *              
+ *              Rick Richardson
+ *              PC Research. Inc.
+ *              94 Apple Orchard Drive
+ *              Tinton Falls, NJ 07724
+ *                      Phone:  (201) 389-8963 (9-17 EST)               
+ *                      Usenet: ...!uunet!pcrat!rick
+ *
+ *      Please send results to Rick Richardson and/or Reinhold Weicker.
+ *      Complete information should be given on hardware and software used.
+ *      Hardware information includes: Machine type, CPU, type and size
+ *      of caches; for microprocessors: clock frequency, memory speed
+ *      (number of wait states).
+ *      Software information includes: Compiler (and runtime library)
+ *      manufacturer and version, compilation switches, OS version.
+ *      The Operating System version may give an indication about the
+ *      compiler; Dhrystone itself performs no OS calls in the measurement loop.
+ *
+ *      The complete output generated by the program should be mailed
+ *      such that at least some checks for correctness can be made.
+ *
+ ***************************************************************************
+ *
+ *  History:    This version C/2.1 has been made for two reasons:
+ *
+ *              1) There is an obvious need for a common C version of
+ *              Dhrystone, since C is at present the most popular system
+ *              programming language for the class of processors
+ *              (microcomputers, minicomputers) where Dhrystone is used most.
+ *              There should be, as far as possible, only one C version of
+ *              Dhrystone such that results can be compared without
+ *              restrictions. In the past, the C versions distributed
+ *              by Rick Richardson (Version 1.1) and by Reinhold Weicker
+ *              had small (though not significant) differences.
+ *
+ *              2) As far as it is possible without changes to the Dhrystone
+ *              statistics, optimizing compilers should be prevented from
+ *              removing significant statements.
+ *
+ *              This C version has been developed in cooperation with
+ *              Rick Richardson (Tinton Falls, NJ), it incorporates many
+ *              ideas from the "Version 1.1" distributed previously by
+ *              him over the UNIX network Usenet.
+ *              I also thank Chaim Benedelac (National Semiconductor),
+ *              David Ditzel (SUN), Earl Killian and John Mashey (MIPS),
+ *              Alan Smith and Rafael Saavedra-Barrera (UC at Berkeley)
+ *              for their help with comments on earlier versions of the
+ *              benchmark.
+ *
+ *  Changes:    In the initialization part, this version follows mostly
+ *              Rick Richardson's version distributed via Usenet, not the
+ *              version distributed earlier via floppy disk by Reinhold Weicker.
+ *              As a concession to older compilers, names have been made
+ *              unique within the first 8 characters.
+ *              Inside the measurement loop, this version follows the
+ *              version previously distributed by Reinhold Weicker.
+ *
+ *              At several places in the benchmark, code has been added,
+ *              but within the measurement loop only in branches that 
+ *              are not executed. The intention is that optimizing compilers
+ *              should be prevented from moving code out of the measurement
+ *              loop, or from removing code altogether. Since the statements
+ *              that are executed within the measurement loop have NOT been
+ *              changed, the numbers defining the "Dhrystone distribution"
+ *              (distribution of statements, operand types and locality)
+ *              still hold. Except for sophisticated optimizing compilers,
+ *              execution times for this version should be the same as
+ *              for previous versions.
+ *              
+ *              Since it has proven difficult to subtract the time for the
+ *              measurement loop overhead in a correct way, the loop check
+ *              has been made a part of the benchmark. This does have
+ *              an impact - though a very minor one - on the distribution
+ *              statistics which have been updated for this version.
+ *
+ *              All changes within the measurement loop are described
+ *              and discussed in the companion paper "Rationale for
+ *              Dhrystone version 2".
+ *
+ *              Because of the self-imposed limitation that the order and
+ *              distribution of the executed statements should not be
+ *              changed, there are still cases where optimizing compilers
+ *              may not generate code for some statements. To a certain
+ *              degree, this is unavoidable for small synthetic benchmarks.
+ *              Users of the benchmark are advised to check code listings
+ *              whether code is generated for all statements of Dhrystone.
+ *
+ *              Version 2.1 is identical to version 2.0 distributed via
+ *              the UNIX network Usenet in March 1988 except that it corrects
+ *              some minor deficiencies that were found by users of version 2.0.
+ *              The following corrections have been made in the C version:
+ *              - The assignment to Number_Of_Runs was changed
+ *              - The constant Too_Small_Time was changed
+ *              - An "else" part was added to the "if" statement in Func_3;
+ *                for compensation, an "else" part was removed in Proc_3
+ *              - Shorter file names are used
+ *
+ ***************************************************************************
+ *
+ * Defines:     The following "Defines" are possible:
+ *              -DREG=register          (default: Not defined)
+ *                      As an approximation to what an average C programmer
+ *                      might do, the "register" storage class is applied
+ *                      (if enabled by -DREG=register)
+ *                      - for local variables, if they are used (dynamically)
+ *                        five or more times
+ *                      - for parameters if they are used (dynamically)
+ *                        six or more times
+ *                      Note that an optimal "register" strategy is
+ *                      compiler-dependent, and that "register" declarations
+ *                      do not necessarily lead to faster execution.
+ *              -DNOSTRUCTASSIGN        (default: Not defined)
+ *                      Define if the C compiler does not support
+ *                      assignment of structures.
+ *              -DNOENUMS               (default: Not defined)
+ *                      Define if the C compiler does not support
+ *                      enumeration types.
+ *              -DTIMES                 (default)
+ *              -DTIME
+ *                      The "times" function of UNIX (returning process times)
+ *                      or the "time" function (returning wallclock time)
+ *                      is used for measurement. 
+ *                      For single user machines, "time ()" is adequate. For
+ *                      multi-user machines where you cannot get single-user
+ *                      access, use the "times ()" function. If you have
+ *                      neither, use a stopwatch in the dead of night.
+ *                      "printf"s are provided marking the points "Start Timer"
+ *                      and "Stop Timer". DO NOT use the UNIX "time(1)"
+ *                      command, as this will measure the total time to
+ *                      run this program, which will (erroneously) include
+ *                      the time to allocate storage (malloc) and to perform
+ *                      the initialization.
+ *              -DHZ=nnn
+ *                      In Berkeley UNIX, the function "times" returns process
+ *                      time in 1/HZ seconds, with HZ = 60 for most systems.
+ *                      CHECK YOUR SYSTEM DESCRIPTION BEFORE YOU JUST APPLY
+ *                      A VALUE.
+ *
+ ***************************************************************************
+ *
+ *  Compilation model and measurement (IMPORTANT):
+ *
+ *  This C version of Dhrystone consists of three files:
+ *  - dhry.h (this file, containing global definitions and comments)
+ *  - dhry_1.c (containing the code corresponding to Ada package Pack_1)
+ *  - dhry_2.c (containing the code corresponding to Ada package Pack_2)
+ *
+ *  The following "ground rules" apply for measurements:
+ *  - Separate compilation
+ *  - No procedure merging
+ *  - Otherwise, compiler optimizations are allowed but should be indicated
+ *  - Default results are those without register declarations
+ *  See the companion paper "Rationale for Dhrystone Version 2" for a more
+ *  detailed discussion of these ground rules.
+ *
+ *  For 16-Bit processors (e.g. 80186, 80286), times for all compilation
+ *  models ("small", "medium", "large" etc.) should be given if possible,
+ *  together with a definition of these models for the compiler system used.
+ *
+ **************************************************************************
+ *
+ *  Dhrystone (C version) statistics:
+ *
+ *  [Comment from the first distribution, updated for version 2.
+ *   Note that because of language differences, the numbers are slightly
+ *   different from the Ada version.]
+ *
+ *  The following program contains statements of a high level programming
+ *  language (here: C) in a distribution considered representative:           
+ *
+ *    assignments                  52 (51.0 %)
+ *    control statements           33 (32.4 %)
+ *    procedure, function calls    17 (16.7 %)
+ *
+ *  103 statements are dynamically executed. The program is balanced with
+ *  respect to the three aspects:                                             
+ *
+ *    - statement type
+ *    - operand type
+ *    - operand locality
+ *         operand global, local, parameter, or constant.                     
+ *
+ *  The combination of these three aspects is balanced only approximately.    
+ *
+ *  1. Statement Type:                                                        
+ *  -----------------             number
+ *
+ *     V1 = V2                     9
+ *       (incl. V1 = F(..)
+ *     V = Constant               12
+ *     Assignment,                 7
+ *       with array element
+ *     Assignment,                 6
+ *       with record component
+ *                                --
+ *                                34       34
+ *
+ *     X = Y +|-|"&&"|"|" Z        5
+ *     X = Y +|-|"==" Constant     6
+ *     X = X +|- 1                 3
+ *     X = Y *|/ Z                 2
+ *     X = Expression,             1
+ *           two operators
+ *     X = Expression,             1
+ *           three operators
+ *                                --
+ *                                18       18
+ *
+ *     if ....                    14
+ *       with "else"      7
+ *       without "else"   7
+ *           executed        3
+ *           not executed    4
+ *     for ...                     7  |  counted every time
+ *     while ...                   4  |  the loop condition
+ *     do ... while                1  |  is evaluated
+ *     switch ...                  1
+ *     break                       1
+ *     declaration with            1
+ *       initialization
+ *                                --
+ *                                34       34
+ *
+ *     P (...)  procedure call    11
+ *       user procedure      10
+ *       library procedure    1
+ *     X = F (...)
+ *             function  call      6
+ *       user function        5                                         
+ *       library function     1                                               
+ *                                --                                          
+ *                                17       17
+ *                                        ---
+ *                                        103
+ *
+ *    The average number of parameters in procedure or function calls
+ *    is 1.82 (not counting the function values as implicit parameters).
+ *
+ *
+ *  2. Operators
+ *  ------------
+ *                          number    approximate
+ *                                    percentage
+ *
+ *    Arithmetic             32          50.8                                 
+ *
+ *       +                     21          33.3                              
+ *       -                      7          11.1                              
+ *       *                      3           4.8
+ *       / (int div)            1           1.6
+ *
+ *    Comparison             27           42.8
+ *
+ *       ==                     9           14.3
+ *       /=                     4            6.3
+ *       >                      1            1.6
+ *       <                      3            4.8
+ *       >=                     1            1.6
+ *       <=                     9           14.3
+ *
+ *    Logic                   4            6.3
+ *
+ *       && (AND-THEN)          1            1.6
+ *       |  (OR)                1            1.6
+ *       !  (NOT)               2            3.2
+ * 
+ *                           --          -----
+ *                           63          100.1
+ *
+ *
+ *  3. Operand Type (counted once per operand reference):
+ *  ---------------
+ *                          number    approximate
+ *                                    percentage
+ *
+ *     Integer               175        72.3 %
+ *     Character              45        18.6 %
+ *     Pointer                12         5.0 %
+ *     String30                6         2.5 %
+ *     Array                   2         0.8 %
+ *     Record                  2         0.8 %
+ *                           ---       -------
+ *                           242       100.0 %
+ *
+ *  When there is an access path leading to the final operand (e.g. a record
+ *  component), only the final data type on the access path is counted.       
+ *
+ *
+ *  4. Operand Locality:                                                      
+ *  -------------------
+ *                                number    approximate
+ *                                          percentage
+ *
+ *     local variable              114        47.1 %
+ *     global variable              22         9.1 %
+ *     parameter                    45        18.6 %
+ *        value                        23         9.5 %
+ *        reference                    22         9.1 %
+ *     function result               6         2.5 %
+ *     constant                     55        22.7 %
+ *                                 ---       -------
+ *                                 242       100.0 %
+ *
+ *
+ *  The program does not compute anything meaningful, but it is syntactically
+ *  and semantically correct. All variables have a value assigned to them
+ *  before they are used as a source operand.
+ *
+ *  There has been no explicit effort to account for the effects of a
+ *  cache, or to balance the use of long or short displacements for code or
+ *  data.
+ *
+ ***************************************************************************
+ */
+
+/* Compiler and system dependent definitions: */
+
+#if !SDCC
+#ifndef TIME
+#ifndef TIMES
+#define TIMES
+#endif
+#endif
+                /* Use times(2) time function unless    */
+                /* explicitly defined otherwise         */
+
+#ifdef MSC_CLOCK
+#undef HZ
+#undef TIMES
+#include <time.h>
+#define HZ	CLK_TCK
+#endif
+		/* Use Microsoft C hi-res clock */
+
+#ifdef TIMES
+#include <sys/types.h>
+#include <sys/times.h>
+                /* for "times" */
+#endif
+
+#define Mic_secs_Per_Second     1000000.0
+                /* Berkeley UNIX C returns process times in seconds/HZ */
+#endif
+
+#ifdef  NOSTRUCTASSIGN
+#define structassign(d, s)      memcpy(&(d), &(s), sizeof(d))
+#else
+#define structassign(d, s)      d = s
+#endif
+
+#ifdef  NOENUM
+#define Ident_1 0
+#define Ident_2 1
+#define Ident_3 2
+#define Ident_4 3
+#define Ident_5 4
+  typedef int   Enumeration;
+#else
+  typedef       enum    {Ident_1, Ident_2, Ident_3, Ident_4, Ident_5}
+                Enumeration;
+#endif
+        /* for boolean and enumeration types in Ada, Pascal */
+
+/* General definitions: */
+
+
+#define Null 0 
+                /* Value of a Null pointer */
+#define true  1
+#define false 0
+
+typedef int     One_Thirty;
+typedef int     One_Fifty;
+typedef char    Capital_Letter;
+typedef int     Boolean;
+typedef char    Str_30 [31];
+typedef int     Arr_1_Dim [50];
+typedef int     Arr_2_Dim [50] [50];
+
+typedef struct record 
+{
+    struct record *Ptr_Comp;
+    Enumeration    Discr;
+    union {
+	struct {
+	    Enumeration Enum_Comp;
+	    int         Int_Comp;
+	    char        Str_Comp [31];
+	} var_1;
+	struct {
+	    Enumeration E_Comp_2;
+	    char        Str_2_Comp [31];
+	} var_2;
+	struct {
+	    char        Ch_1_Comp;
+	    char        Ch_2_Comp;
+	} var_3;
+    } variant;
+} Rec_Type, *Rec_Pointer;
+
+
diff --git a/support/tests/dhrystone/tini.mak b/support/tests/dhrystone/tini.mak
new file mode 100644
index 0000000..2a7eee0
--- /dev/null
+++ b/support/tests/dhrystone/tini.mak
@@ -0,0 +1,21 @@
+CC = sdcc
+
+MFLAGS = -mds390 --model-flat24 --stack-10bit
+MFLAGS += -DREG= -DNOSTRUCTASSIGN -DNOENUM
+LFLAGS = --xram-loc 0x100080 --code-loc 0x10000 -Wl-r
+
+OBJECTS = dhry.rel
+
+all: dhry.hex
+
+clean:
+	rm -f *~ \#* *.asm *.cdb *.rel *.hex *.ihx *.lst *.map *.rst *.sym *.lnk
+
+dhry.hex: dhry.ihx
+	packihx dhry.ihx >dhry.hex
+
+dhry.ihx: $(OBJECTS)
+	$(CC) $(MFLAGS) $(LFLAGS) $(OBJECTS)
+
+%.rel: %.c
+	$(CC) -c $(MFLAGS) $<
diff --git a/support/tests/dhrystone/tini400.mak b/support/tests/dhrystone/tini400.mak
new file mode 100644
index 0000000..47ba4a4
--- /dev/null
+++ b/support/tests/dhrystone/tini400.mak
@@ -0,0 +1,21 @@
+CC = ../../../bin/sdcc
+
+MFLAGS = -mds400 --model-flat24 --stack-10bit
+MFLAGS += -DREG= -DNOSTRUCTASSIGN -DNOENUM
+LFLAGS = --xram-loc 0x10000 --code-loc 0x400000 -Wl-r
+
+OBJECTS = dhry.rel
+
+all: dhry.hex
+
+clean:
+	rm -f *~ \#* *.asm *.cdb *.rel *.hex *.ihx *.lst *.map *.rst *.sym *.lnk
+
+dhry.hex: dhry.ihx
+	packihx dhry.ihx >dhry.hex
+
+dhry.ihx: $(OBJECTS)
+	$(CC) $(MFLAGS) $(LFLAGS) $(OBJECTS)
+
+%.rel: %.c
+	$(CC) -c $(MFLAGS) $<
diff --git a/support/tests/internal/Makefile b/support/tests/internal/Makefile
new file mode 100644
index 0000000..94c103a
--- /dev/null
+++ b/support/tests/internal/Makefile
@@ -0,0 +1,21 @@
+TOPDIR = ../../..
+
+LIBSOURCE = \
+	$(TOPDIR)/src/SDCCutil.c \
+	$(TOPDIR)/src/SDCChasht.c \
+	$(TOPDIR)/support/util/NewAlloc.c \
+	$(TOPDIR)/support/util/SDCCerr.c \
+	$(TOPDIR)/src/SDCCmacro.c \
+	stubs.c
+
+SOURCES = testpaths.c $(LIBSOURCE)
+
+include $(TOPDIR)/Makefile.common
+
+CFLAGS += -I$(TOPDIR)/src -I$(TOPDIR)/support/util -I$(TOPDIR)
+
+all: all-tests
+
+all-tests: $(OBJ)
+	$(CC) -o $@ $(OBJ)
+
diff --git a/support/tests/internal/stubs.c b/support/tests/internal/stubs.c
new file mode 100644
index 0000000..ee5e809
--- /dev/null
+++ b/support/tests/internal/stubs.c
@@ -0,0 +1,5 @@
+int fatalError;
+int lineno;
+char *filename = "tests";
+char buffer[4096];
+char scratchFileName[4096];
diff --git a/support/tests/internal/testmacro.c b/support/tests/internal/testmacro.c
new file mode 100644
index 0000000..d25eecf
--- /dev/null
+++ b/support/tests/internal/testmacro.c
@@ -0,0 +1,84 @@
+#include <SDCCmacro.h>
+#include <stdio.h>
+
+static const char *_maps[] = 
+  {
+    "immedzero", "#0",
+    "immedvala", "#0x%02X",
+    "stra", "%s",
+    "port", "z80",
+    "stdlibpath", "{basepath}/lib/{port}",
+    "stdlibname", "{port}.lib",
+    "portouttypeflag", "-i",
+    "srcfilename", "fish",
+    "portoutext", ".ihx",
+    "crt0name", "{stdlibpath}/crt0{portobjext}",
+    "portobjext", ".o",
+    "otherobjfiles", "none",
+    "basepath", "/home/michaelh/sdcc",
+    NULL
+  };
+
+static hTab *
+_populateHash(const char **pin)
+{
+  hTab *pret = NULL;
+
+  while (*pin)
+    {
+      printf("Adding %s -> %s\n", pin[0], pin[1]);
+      shash_add (&pret, pin[0], pin[1]);
+      pin += 2;
+
+    }
+
+  return pret;
+}
+
+static void
+_testEval(hTab *ph, const char *pin, const char *pexpect, ...)
+{
+  va_list ap;
+  char *pgot;
+
+  va_start(ap, pexpect);
+
+  pgot = mvsprintf(ph, pin, ap);
+
+  if (strcmp(pgot, pexpect) != 0)
+    {
+      printf("Fail: expected: %s, got %s\n", pexpect, pgot);
+    }
+  else
+    {
+      printf("%s -> %s\n", pin, pgot);
+    }
+
+  va_end(ap);
+}
+
+void
+testMacros(void)
+{
+  hTab *ph = _populateHash(_maps);
+
+  _testEval(ph, "{immedzero}", "#0");
+  _testEval(ph, "{immedvala}", "#0x23", 0x23);
+  _testEval(ph, "{stra}", "#0", "{immedzero}");
+
+  printf("Link command:\n%s\n", 
+         msprintf(ph, 
+                  "link-{port} -n -c -- -b_CODE=0x%04X -b_DATA=0x%04X"
+                  " -m -j -k{stdlibpath} -l{stdlibname} {portouttypeflag}"
+                  " {srcfilename}{portoutext} {crt0name} {srcfilename}{portobjext} {otherobjfiles}", 
+                  0x1234, 0x3456));
+  
+}
+
+int
+main(void)
+{
+  testMacros();
+
+  return 0; 
+}