From 9c5f50d6b3f4b30c087406b83bbd322e7e7185db Mon Sep 17 00:00:00 2001
From: tecodev <tecodev@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Fri, 8 Jun 2007 08:53:31 +0000
Subject: [PATCH] * 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
---
 ChangeLog                  |  8 ++++++++
 src/regression/Makefile    | 15 +++++++++++++--
 src/regression/compare10.c |  3 ++-
 src/regression/compare7.c  |  2 +-
 src/regression/compare8.c  |  2 +-
 src/regression/compare9.c  |  2 +-
 src/regression/inline.c    |  2 +-
 src/regression/nestfor.c   |  2 +-
 src/regression/picregs.h   | 10 ++++++++++
 src/regression/string1.c   |  2 +-
 10 files changed, 39 insertions(+), 9 deletions(-)
 create mode 100644 src/regression/picregs.h

diff --git a/ChangeLog b/ChangeLog
index f9fb2401..52ac49ad 100644
--- 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 e44fb394..641c9975 100644
--- 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 cc9ab9a7..b7178eb3 100644
--- 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 ed07ed8d..5f0f6ad5 100644
--- 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 1f67b707..f7b1b4a8 100644
--- 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 4fe81f87..96e76827 100644
--- 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 40b3785c..bb86d661 100644
--- 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 77bfff26..654efe80 100644
--- 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
index 00000000..92c20a92
--- /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 4b80abcb..e8721c96 100644
--- 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;
-- 
2.30.2