* src/regression/Makefile: removed bool2.c test, added -q linker option

* src/regression/add2.c, src/regression/add3.c, src/regression/bool1.c,
  src/regression/bool3.c, src/regression/nestfor.c, src/regression/ptrfunc.c,
  src/regression/compare.c, src/regression/or1.c, src/regression/compare2.c,
  src/regression/while.c, src/regression/compare3.c, src/regression/compare4.c,
  src/regression/compare5.c, src/regression/sub2.c, src/regression/rotate1.c,
  src/regression/rotate2.c, src/regression/rotate3.c, src/regression/rotate4.c,
  src/regression/switch1.c, src/regression/rotate5.c, src/regression/for.c,
  src/regression/add.c, src/regression/sub.c, src/regression/call1.c:
  define SUPPORT_BIT_TYPES 0, removed unused bit variables

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

diff --git a/src/regression/Makefile b/src/regression/Makefile
index 0c9c69d17ae0382dd73dcffb5d0f944588f1904f..d2914e34fb86565e46e8bafb361f71cb6651392c 100644 (file)
--- a/src/regression/Makefile
+++ b/src/regression/Makefile
@@ -52,7 +52,7 @@ Q ?= @ # be quiet
 CC = sdcc
 LINKER = gplink
 TARGETPIC = 16f877
-CFLAGS = -Wl,--map -I ../../device/include/pic -mpic14 -pp$(TARGETPIC)
+CFLAGS = -Wl,--map -I ../../device/include/pic -mpic14 -pp$(TARGETPIC) -Wl,-q
 
 .SUFFIXES: .asm .c .cod .stc
 
@@ -74,7 +74,6 @@ SRC = b.c \
        and2.c \
        b.c \
        bool1.c \
-       bool2.c \
        bool3.c \
        call1.c \
        compare.c \
@@ -113,6 +112,7 @@ SRC = b.c \
 #      rotate7.c \
 #      string1.c \
 #      struct1.c \
+#      bool2.c \
 
 COD := $(patsubst %.c, %.cod, $(SRC))
 ASM := $(patsubst %.c, %.asm, $(SRC))

diff --git a/src/regression/add.c b/src/regression/add.c
index d3e1406bd0cf2731ae40c2a60b37e9f91854e7f8..118d5c96626de2d29bc21af3c9f944e0e12767bb 100644 (file)
--- a/src/regression/add.c
+++ b/src/regression/add.c
@@ -4,7 +4,7 @@
 
 /* bit types are not ANSI - so provide a way of disabling bit types
  * if this file is used to test other compilers besides SDCC */
-#define SUPPORT_BIT_TYPES 1
+#define SUPPORT_BIT_TYPES 0
 
 /* Some compilers that support bit types do not support bit arithmetic 
  * (like bitx = bity + bitz;) */

diff --git a/src/regression/add2.c b/src/regression/add2.c
index f802f03e4dc32d930d9dadacb26c608b29ab9d86..f9536e4db1fe584e4cd3b032246de6bd5e4bb23f 100644 (file)
--- a/src/regression/add2.c
+++ b/src/regression/add2.c
@@ -4,7 +4,7 @@
 
 /* bit types are not ANSI - so provide a way of disabling bit types
  * if this file is used to test other compilers besides SDCC */
-#define SUPPORT_BIT_TYPES 1
+#define SUPPORT_BIT_TYPES 0
 
 
 unsigned char failures=0;

diff --git a/src/regression/add3.c b/src/regression/add3.c
index 69597acf8c7807ac908a56c90cc1441d09bdd059..a1990af0c18d2e7cbd7e05938dd16270e8a61c9d 100644 (file)
--- a/src/regression/add3.c
+++ b/src/regression/add3.c
@@ -4,7 +4,7 @@
 
 /* bit types are not ANSI - so provide a way of disabling bit types
  * if this file is used to test other compilers besides SDCC */
-#define SUPPORT_BIT_TYPES 1
+#define SUPPORT_BIT_TYPES 0
 
 
 unsigned char failures=0;

diff --git a/src/regression/bool1.c b/src/regression/bool1.c
index bc7c602cf0691ad2fed0e0d175e0d3e0c170f0fa..46857bfdac3fb6ebd25ef9eb7643afd5935e4a3b 100644 (file)
--- a/src/regression/bool1.c
+++ b/src/regression/bool1.c
@@ -2,7 +2,6 @@
 
 unsigned char failures=0;
 
-bit bit0 = 0;
 unsigned int aint0 = 0;
 unsigned int aint1 = 0;
 unsigned char achar0 = 0;

diff --git a/src/regression/bool3.c b/src/regression/bool3.c
index 2bbbea4fbe8ba622687f3cfb43ba13530515833f..d3092da2b4c0c4f9d6d51d1b96e270a9af7c60fa 100644 (file)
--- a/src/regression/bool3.c
+++ b/src/regression/bool3.c
@@ -6,8 +6,6 @@
 
 unsigned char failures=0;
 
-bit bit0 = 0;
-bit bit1 = 0;
 unsigned int ui0 = 0;
 unsigned int ui1 = 0;
 unsigned char uc0 = 0;

diff --git a/src/regression/call1.c b/src/regression/call1.c
index 76d6278b82b2153c7cbd11b28e61fa1481325e61..f64a0260e0342fff168fcb10b167861799bdb010 100644 (file)
--- a/src/regression/call1.c
+++ b/src/regression/call1.c
@@ -2,7 +2,6 @@
 
 unsigned char failures = 0;
 
-bit bit0 = 0;
 unsigned int uint0 = 0;
 unsigned int uint1 = 0;
 unsigned char uchar0 = 0;

diff --git a/src/regression/compare.c b/src/regression/compare.c
index bba72f6a1f1bb3ade5152658e8633603f91761fb..29843f4e86a87f3a59e768c4c98e3b6e31f147ae 100644 (file)
--- a/src/regression/compare.c
+++ b/src/regression/compare.c
@@ -10,9 +10,6 @@
 
  */
 
-bit bit0 = 0;
-bit bit1 = 0;
-
 unsigned char failures = 0;
 
 unsigned char achar0 = 0;

diff --git a/src/regression/compare2.c b/src/regression/compare2.c
index 4f9bc4ca4f5aa8a01d690b2569daa22558b640e8..d14aeb0622b99e9cd01fba3aae1bb4db7d0c397e 100644 (file)
--- a/src/regression/compare2.c
+++ b/src/regression/compare2.c
@@ -3,7 +3,6 @@
 unsigned char failures = 0;
 unsigned char dummy = 0;
 
-bit bit0 = 0;
 unsigned int aint0 = 0;
 unsigned int aint1 = 0;
 unsigned char achar0 = 0;

diff --git a/src/regression/compare3.c b/src/regression/compare3.c
index 1423dd03d1f2d10fa3a8c5bc56a8d093a45d743f..480eceb0e394956d4b47fbee54cc0268a5d22477 100644 (file)
--- a/src/regression/compare3.c
+++ b/src/regression/compare3.c
@@ -7,7 +7,6 @@
 
 unsigned char failures = 0;
 
-bit bit0 = 0;
 unsigned int aint0 = 0;
 unsigned int aint1 = 0;
 unsigned char achar0 = 0;

diff --git a/src/regression/compare4.c b/src/regression/compare4.c
index 1c38aa132a4cfd3902b0796403ce38ef2fe8e770..4af453adcced45c243aeb38e11efc3904be01560 100644 (file)
--- a/src/regression/compare4.c
+++ b/src/regression/compare4.c
@@ -8,7 +8,6 @@
 
 unsigned char failures = 0;
 
-bit bit0 = 0;
 int int0 = 0;
 int int1 = 0;
 char char0 = 0;

diff --git a/src/regression/compare5.c b/src/regression/compare5.c
index b6219e68ec652a8ed368481af82f69b8bb510829..238755a224e9fac4fb318bc5fe22f3cfe33929dd 100644 (file)
--- a/src/regression/compare5.c
+++ b/src/regression/compare5.c
@@ -8,7 +8,6 @@
 
 unsigned char failures = 0;
 
-bit bit0 = 0;
 int int0 = 0;
 int int1 = 0;
 char char0 = 0;

diff --git a/src/regression/for.c b/src/regression/for.c
index 70c8ae2068434b8e0760f7c6a6ed9edb30d01fa5..a22a098199fcf70c39651f939b61417a9ba06cff 100644 (file)
--- a/src/regression/for.c
+++ b/src/regression/for.c
@@ -2,7 +2,6 @@
 
 unsigned char failures=0;
 
-bit bit0 = 0;
 unsigned int uint0 = 0;
 unsigned int uint1 = 0;
 unsigned char uchar0 = 0;

diff --git a/src/regression/nestfor.c b/src/regression/nestfor.c
index 52a348e32587c2308d0be0b3f5ad8897b5511b51..77bfff26ffc8461c0379f515fe934300480863aa 100644 (file)
--- a/src/regression/nestfor.c
+++ b/src/regression/nestfor.c
@@ -3,7 +3,6 @@
 
 unsigned char failures=0;
 
-bit bit0 = 0;
 unsigned int uint0 = 0;
 unsigned int uint1 = 0;
 unsigned char uchar0 = 0;

diff --git a/src/regression/or1.c b/src/regression/or1.c
index 27aeeacefd4fa50c9d1de2512c05edef36ec81f0..b828eb0032ef9a21e73b27d0202d14e05ae977b6 100644 (file)
--- a/src/regression/or1.c
+++ b/src/regression/or1.c
@@ -1,10 +1,16 @@
 #include "gpsim_assert.h"
 
+/* bit types are not ANSI - so provide a way of disabling bit types
+ * if this file is used to test other compilers besides SDCC */
+#define SUPPORT_BIT_TYPES 0
+
 unsigned char failures=0;
 
+#if SUPPORT_BIT_TYPES
 bit bit0 = 0;
 bit bit1 = 0;
 bit bit2 = 0;
+#endif
 
 unsigned int uint0 = 0;
 unsigned int uint1 = 0;
@@ -138,6 +144,7 @@ void or_uint2uint(void)
 
 }
 
+#if SUPPORT_BIT_TYPES
 void or_bits1(void)
 {
 
@@ -151,6 +158,7 @@ void or_bits2(void)
   bit0 = bit1 | bit2;
 
 }
+#endif
 
 void main(void)
 {
@@ -167,6 +175,7 @@ void main(void)
   uint1=1;
   or_uint2uint();
 
+#if SUPPORT_BIT_TYPES
   or_bits1();
   if(bit0)
     failures++;
@@ -183,7 +192,7 @@ void main(void)
   or_bits2();
   if(!bit0)
     failures++;
-
+#endif
 
   done();
 }

diff --git a/src/regression/ptrfunc.c b/src/regression/ptrfunc.c
index 7fb42b1737e3fb326db9596fe7fbeb0d4570d403..317b19fa2560f7b21a9bfa576da7eb2d18e92eaf 100644 (file)
--- a/src/regression/ptrfunc.c
+++ b/src/regression/ptrfunc.c
@@ -2,7 +2,6 @@
 
 unsigned char failures=0;
 
-bit bit0 = 0;
 unsigned int uint0 = 0;
 unsigned int uint1 = 0;
 

diff --git a/src/regression/rotate1.c b/src/regression/rotate1.c
index a889ec69c2c8474a5427215a274ab81f435562f1..6d909d4b4c96f55498c5a53d4139c93b8019adca 100644 (file)
--- a/src/regression/rotate1.c
+++ b/src/regression/rotate1.c
@@ -2,7 +2,6 @@
 
 unsigned char failures=0;
 
-bit bit0 = 0;
 unsigned int aint0 = 0;
 unsigned int aint1 = 0;
 unsigned char achar0 = 0;

diff --git a/src/regression/rotate2.c b/src/regression/rotate2.c
index 16635bc68a402851e6a3395fdcda0dea03b53b52..1d251100ec6f83cc53626a5ce67e3d9c59cfc980 100644 (file)
--- a/src/regression/rotate2.c
+++ b/src/regression/rotate2.c
@@ -3,7 +3,6 @@
 
 unsigned char failures=0;
 
-bit bit0 = 0;
 unsigned int aint0 = 0;
 unsigned int aint1 = 0;
 unsigned char achar0 = 0;

diff --git a/src/regression/rotate3.c b/src/regression/rotate3.c
index 1acae273ab13313ceac25126af6dca34a3e3c0ed..70aab0916789b092e3e41705965136dc15351b61 100644 (file)
--- a/src/regression/rotate3.c
+++ b/src/regression/rotate3.c
@@ -3,7 +3,6 @@
 
 unsigned char failures=0;
 
-bit bit0 = 0;
 unsigned int aint0 = 0;
 unsigned int aint1 = 0;
 unsigned char achar0 = 0;

diff --git a/src/regression/rotate4.c b/src/regression/rotate4.c
index 9f0a282dd074ddce4835a9e953804f158123ea9e..8d8f6f5247d03fd2ffe2c4e829cba7f51c808cef 100644 (file)
--- a/src/regression/rotate4.c
+++ b/src/regression/rotate4.c
@@ -3,7 +3,6 @@
 
 unsigned char failures=0;
 
-bit bit0 = 0;
 unsigned int uint0 = 0;
 unsigned int uint1 = 0;
 unsigned char uchar0 = 0;

diff --git a/src/regression/rotate5.c b/src/regression/rotate5.c
index 00b9451dc2db8a301a4d53025031ad802d710ada..dc5d0b2c401e1118fc9cfd57b35b5d1d9cfb76d0 100644 (file)
--- a/src/regression/rotate5.c
+++ b/src/regression/rotate5.c
@@ -3,7 +3,6 @@
 
 unsigned char failures=0;
 
-bit bit0 = 0;
 signed int aint0 = 0;
 signed int aint1 = 0;
 signed char achar0 = 0;

diff --git a/src/regression/sub.c b/src/regression/sub.c
index fb0f1d6b5db5619b1ad63e8f8f83566b506de66a..db28d2091c94afde4e16003523e5ab2872ed93ec 100644 (file)
--- a/src/regression/sub.c
+++ b/src/regression/sub.c
@@ -3,7 +3,7 @@
 
 /* bit types are not ANSI - so provide a way of disabling bit types
  * if this file is used to test other compilers besides SDCC */
-#define SUPPORT_BIT_TYPES 1
+#define SUPPORT_BIT_TYPES 0
 
 /* Some compilers that support bit types do not support bit arithmetic 
  * (like bitx = bity + bitz;) */
@@ -149,7 +149,6 @@ void sub_bits(void)
     failures++;
 #endif
 }
-#endif
 
 /* sub_bit2uchar(void) - assumes bit0 = 1, achar0 = 7  */
 
@@ -177,6 +176,7 @@ void sub_bit2uint(void)
     failures++;
 
 }
+#endif
 
 void sub_ucharFromLit(void)
 {

diff --git a/src/regression/sub2.c b/src/regression/sub2.c
index 60c1c9096f5964f8ce125ea6156ee62b96c72caa..44b54d5e66aab72511161bac6baf09ac8090cd30 100644 (file)
--- a/src/regression/sub2.c
+++ b/src/regression/sub2.c
@@ -3,7 +3,7 @@
 
 /* bit types are not ANSI - so provide a way of disabling bit types
  * if this file is used to test other compilers besides SDCC */
-#define SUPPORT_BIT_TYPES 1
+#define SUPPORT_BIT_TYPES 0
 
 /* Some compilers that support bit types do not support bit arithmetic 
  * (like bitx = bity + bitz;) */

diff --git a/src/regression/switch1.c b/src/regression/switch1.c
index 412a8768471ccc3d38ac8cabe767ca6e5d0d91a6..71730ea4391c656dbd1f5f3ae4cbbab0ea310200 100644 (file)
--- a/src/regression/switch1.c
+++ b/src/regression/switch1.c
@@ -1,7 +1,6 @@
 #include "gpsim_assert.h"
 unsigned char failures=0;
 
-bit bit0 = 0;
 unsigned int aint0 = 0;
 unsigned int aint1 = 0;
 unsigned char achar0 = 0;
@@ -56,7 +55,7 @@ void switch2(void)
 
 }
 
-main(void)
+void main(void)
 {
 
   achar0 = 0;

diff --git a/src/regression/while.c b/src/regression/while.c
index 714c1053b9e086b8739e7017d7f52c19139032d5..4429b8859f0346cdc84cbabd2fdb3b47b5a2e682 100644 (file)
--- a/src/regression/while.c
+++ b/src/regression/while.c
@@ -2,7 +2,6 @@
 
 unsigned char failures = 0;
 
-bit bit0 = 0;
 unsigned int aint0 = 0;
 unsigned int aint1 = 0;
 unsigned char achar0 = 0;