* src/regression/Makefile: suppress parallel builds, allow easy

  switching between pic14/pic16 ports
* src/regression/picregs.h: added pic14/16 header file switch
* src/regression/{compare7.c,compare8.c,compare9.c,compare10.c,
  inline.c,nestfor.c,string1.c}: include "picregs.h"

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4840 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/ChangeLog b/ChangeLog
index f9fb2401da38f166ef3507ad6fa4a35589943ae3..52ac49adb84fec6c581920984f55d87ceab1a95b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-06-08 Raphael Neider <rneider AT web.de>
+
+       * src/regression/Makefile: suppress parallel builds, allow easy
+         switching between pic14/pic16 ports
+       * src/regression/picregs.h: added pic14/16 header file switch
+       * src/regression/{compare7.c,compare8.c,compare9.c,compare10.c,
+         inline.c,nestfor.c,string1.c}: include "picregs.h"
+
 2007-06-07 Borut Razem <borut.razem AT siol.net>
 
        * sim/ucsim/*.[ch], sim/ucsim/configure, sim/ucsim/configure.in:

diff --git a/src/regression/Makefile b/src/regression/Makefile
index e44fb394bea51581398faeed512c88117cc42546..641c99754d90328e5bf7a0599c143b2d1859958e 100644 (file)
--- a/src/regression/Makefile
+++ b/src/regression/Makefile
@@ -51,15 +51,26 @@ Q ?= @ # be quiet
 
 CC = sdcc
 LINKER = gplink
+USE_PIC16 ?= 1
+ifeq ($(strip $(filter 1 yes,$(USE_PIC16))),)
 TARGETPIC = 16f877
 TARGETPIC = 16f84
 CFLAGS = -mpic14 -p$(TARGETPIC)
+DIR = pic
+else
+TARGETPIC = 18f452
+CFLAGS = -mpic16 -p$(TARGETPIC)
+DIR = pic16
+endif
 CFLAGS += -Wl,-q
-CFLAGS += -Wl,--map -I ../../device/include/pic
-CFLAGS += -L ../../device/lib/pic/bin
+CFLAGS += -Wl,--map
+CFLAGS += -I ../../device/include/$(DIR)
+CFLAGS += -L ../../device/lib/$(DIR)/bin
 #CFLAGS += --no-pcode-opt
+#CFLAGS += -V
 
 .SUFFIXES: .asm .c .cod .stc
+.NOTPARALLEL:
 
 # Results of the test are placed here:
 LOGFILE = test.log

diff --git a/src/regression/compare10.c b/src/regression/compare10.c
index cc9ab9a73fdbbd03c4d417b159bd36340bd4ce92..b7178eb389832b155db5c2181bc2ee35f62d3f3b 100644 (file)
--- a/src/regression/compare10.c
+++ b/src/regression/compare10.c
@@ -1,5 +1,6 @@
 #include "gpsim_assert.h"
-#include "pic16f877.h"
+#include "picregs.h"
+
 // Signed comparisons of the form:  (variable>=LIT)
 //
 // This regression test exercises all of the boundary

diff --git a/src/regression/compare7.c b/src/regression/compare7.c
index ed07ed8d442e19db0b5df1dabff20a675c805f9c..5f0f6ad5aa29cce340ba28844fa00f3f5c9a65f3 100644 (file)
--- a/src/regression/compare7.c
+++ b/src/regression/compare7.c
@@ -1,5 +1,5 @@
 #include "gpsim_assert.h"
-#include "pic16f877.h"
+#include "picregs.h"
 // Signed comparisons of the form:  (variable<LIT)
 //
 // This regression test exercises all of the boundary

diff --git a/src/regression/compare8.c b/src/regression/compare8.c
index 1f67b707a9616d1d8356055d45d43c3d6bf1ed75..f7b1b4a83424c097cdd55ca63664d025b89c03a5 100644 (file)
--- a/src/regression/compare8.c
+++ b/src/regression/compare8.c
@@ -1,5 +1,5 @@
 #include "gpsim_assert.h"
-#include "pic16f877.h"
+#include "picregs.h"
 // Signed comparisons of the form:  (variable>LIT)
 //
 // This regression test exercises all of the boundary

diff --git a/src/regression/compare9.c b/src/regression/compare9.c
index 4fe81f873f59831feac0350c70acfcce456a5395..96e7682766b82463b1f28e8213137369af9f5ed1 100644 (file)
--- a/src/regression/compare9.c
+++ b/src/regression/compare9.c
@@ -1,5 +1,5 @@
 #include "gpsim_assert.h"
-#include "pic16f877.h"
+#include "picregs.h"
 // Signed comparisons of the form:  (variable<=LIT)
 //
 // This regression test exercises all of the boundary

diff --git a/src/regression/inline.c b/src/regression/inline.c
index 40b3785cab91765fd4e53533793a86a19815b2d1..bb86d661a2fa332eb7ed89a7c97ac34be60c8a84 100644 (file)
--- a/src/regression/inline.c
+++ b/src/regression/inline.c
@@ -1,5 +1,5 @@
 #include "gpsim_assert.h"
-#include "pic16f877.h"
+#include "picregs.h"
 
 #pragma preproc_asm -
 

diff --git a/src/regression/nestfor.c b/src/regression/nestfor.c
index 77bfff26ffc8461c0379f515fe934300480863aa..654efe80d5229e49fef24fb9c2d3dc3a1013dcda 100644 (file)
--- a/src/regression/nestfor.c
+++ b/src/regression/nestfor.c
@@ -1,5 +1,5 @@
 #include "gpsim_assert.h"
-#include "pic16f877.h"
+#include "picregs.h"
 
 unsigned char failures=0;
 

diff --git a/src/regression/picregs.h b/src/regression/picregs.h
new file mode 100644 (file)
index 0000000..92c20a9
--- /dev/null
+++ b/src/regression/picregs.h
@@ -0,0 +1,10 @@
+#ifndef PICREGS_H
+
+#if defined(__pic16)
+  #include <pic18fregs.h>
+#else
+  #include <pic14regs.h>
+#endif
+
+#endif
+

diff --git a/src/regression/string1.c b/src/regression/string1.c
index 4b80abcb0a368fc71ef3cb58d96fbd3777f7dc5d..e8721c96d2bc8cb3d7c86d98f57ba1ae127ca688 100644 (file)
--- a/src/regression/string1.c
+++ b/src/regression/string1.c
@@ -1,5 +1,5 @@
 #include "gpsim_assert.h"
-#include "pic16f877.h"
+#include "picregs.h"
 
 unsigned char failures=0;
 //unsigned bit bit1;