* device/lib/pic16/Makefile.common.in: added MODELFLAGS again, it was erroneously...

[fw/sdcc] / src / regression / Makefile

diff --git a/src/regression/Makefile b/src/regression/Makefile
index 8cfaabf0e8edaa5153d6fe3fd968e9d8d2b01828..3e096e7817eac2e18f72b01a00c0107d738dc7ba 100644 (file)
--- a/src/regression/Makefile
+++ b/src/regression/Makefile
@@ -14,7 +14,7 @@
 # is unique to the PIC (as in Microchip PIC) port.
 # As such it requires the following software:
 #
-#  gpasm version 0.8.10 (or greater)
+#  gpasm version 0.11.1 (or greater)
 #  gpsim version 0.20.7 (or greater)
 #
 # Usage:
@@ -42,12 +42,15 @@
 # make cleancod
 # make cleanasm
 # make cleanstc
-#  - removes either the .stc, .asm, or .cod files
+# make cleano
+#  - removes either the .stc, .asm, .cod or .o files
 
 
 CC = ../../bin/sdcc
-
-HEADER=/usr/local/share/gpasm/header
+LINKER = gplink
+TARGETPIC = 16f873
+TARGETPIC2 = 16f877
+CFLAGS = -mpic14 -c -pp$(TARGETPIC)
 
 .SUFFIXES: .asm .c .cod .stc
 
@@ -66,6 +69,7 @@ SRC = b.c \
        add2.c \
        add3.c \
        and1.c \
+       and2.c \
        bool1.c \
        bool2.c \
        bool3.c \
@@ -77,36 +81,47 @@ SRC = b.c \
        compare5.c \
        compare6.c \
        for.c \
+       nestfor.c \
        or1.c \
        rotate1.c \
        rotate2.c \
        rotate3.c \
        rotate4.c \
        rotate5.c \
-       struct1.c \
        sub.c \
        sub2.c \
        switch1.c \
        while.c \
-       xor.c
+       xor.c \
+       ptrfunc.c
 
+#      struct1.c \
 #      mul1.c \
 
 COD := $(patsubst %.c, %.cod, $(SRC))
 ASM := $(patsubst %.c, %.asm, $(SRC))
+O := $(patsubst %.c, %.o, $(SRC))
 STC := $(patsubst %.c, %.stc, $(SRC))
+HEX := $(patsubst %.c, %.hex, $(SRC))
+LST := $(patsubst %.c, %.lst, $(SRC))
+MAP := $(patsubst %.c, %.map, $(SRC))
 
 all:   test
 
 
 # The asm files are generated by sdcc
-.c.asm:
-       $(CC) -mpic14 -S $*.c
+.c.o:
+       $(CC) $(CFLAGS)  $*.c
 
 # The .cod files are generated by gpasm
 # these get loaded by gpsim.
-.asm.cod:
-       gpasm -c -I $(HEADER) $*.asm
+.o.cod:
+       $(LINKER) --map -c -s $(TARGETPIC2).lkr -o $*.o $*.o
+
+#      gpasm $*.asm
+
+#      gpasm -c -I $(HEADER) $*.asm
+
 
 # The .stc files are script files for gpsim
 .cod.stc:
@@ -121,10 +136,12 @@ all:      test
 
 cod : $(COD)
 
+o : $(O)
 
 asm : $(ASM)
 
 stc : $(STC)
+       echo $(STC)
 
 test:  $(STC)
        echo "Done - Results are in $(LOGFILE)"
@@ -135,6 +152,12 @@ cleancod:
          if [ -f $$f ]; then rm $$f; fi \
        done ; \
 
+cleano:
+       files="$(O)" ; \
+       for f in $$files ; do \
+         if [ -f $$f ]; then rm $$f; fi \
+       done ; \
+
 cleanasm:
        files="$(ASM)" ; \
        for f in $$files ; do \
@@ -147,5 +170,17 @@ cleanstc:
          if [ -f $$f ]; then rm $$f; fi \
        done ; \
 
-clean: cleancod cleanasm cleanstc
+cleanhex:
+       files="$(HEX)" ; \
+       for f in $$files ; do \
+         if [ -f $$f ]; then rm $$f; fi \
+       done ; \
+
+cleanlst:
+       files="$(LST)" ; \
+       for f in $$files ; do \
+         if [ -f $$f ]; then rm $$f; fi \
+       done ; \
+
+clean: cleancod cleanasm cleanstc cleano cleanhex cleanlst
        if [ -f "$(LOGFILE)" ]; then rm $(LOGFILE); fi