X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fregression%2Fadd.c;h=99fce7a90dfa53a35c9bc53bbab69a469c9aaa30;hb=5a1d5e778e85664f4e6657019348b4756b16eacb;hp=15ac6c174c1ced62a3d19e20427d3015100b1e4a;hpb=16f76cd3859f1674d2296a9600a2b662bb3b30ab;p=fw%2Fsdcc

diff --git a/src/regression/add.c b/src/regression/add.c
index 15ac6c17..99fce7a9 100644
--- a/src/regression/add.c
+++ b/src/regression/add.c
@@ -1,17 +1,16 @@
-//#include "p16c84.h"
+#include "gpsim_assert.h"
+
 // Addition tests
 
 /* 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;) */
 #define SUPPORT_BIT_ARITHMETIC 1
 
-unsigned char success=0;
 unsigned char failures=0;
-unsigned char dummy=0;
 
 #if SUPPORT_BIT_TYPES
 
@@ -38,11 +37,11 @@ unsigned char achar2 = 0;
 unsigned char achar3 = 0;
 unsigned char *acharP = 0;
 
-void done()
+void
+done()
 {
-
-  dummy++;
-
+  ASSERT(MANGLE(failures) == 0);
+  PASSED();
 }
 
 void add_lit2uchar(void)
@@ -93,8 +92,6 @@ void add_uchar2uchar(void)
 
 void add_uchar2uchar2(void)
 {
-
-
   achar0++;
   achar0 = achar0 + 1;
   achar0 = achar0 + 2;
@@ -113,13 +110,11 @@ void add_uchar2uchar2(void)
   achar3 = achar2 + achar1 + achar0;
   if(achar3 != 92)
     failures++;
-
 }
 
 #if SUPPORT_BIT_TYPES
 void add_bits(void)
 {
-
   bit1 = bit0;
 
   bit0 = 1;
@@ -133,7 +128,7 @@ void add_bits(void)
 
 #if SUPPORT_BIT_ARITHMETIC
   bit2 = bit1+bit3;
-  if(bit2)
+  if(!bit2)
     failures++;
 
   bit3 = bit4+bit5+bit6+bit7+bit0;
@@ -145,9 +140,9 @@ void add_bits(void)
 
 /* add_bit2uchar(void) - assumes bit0 = 1, achar0 = 7  */
 
+#if SUPPORT_BIT_TYPES
 void add_bit2uchar(void)
 {
-
   achar0 += bit0;
 
   if(achar0 != 8)
@@ -155,33 +150,34 @@ void add_bit2uchar(void)
 
   if(achar0 == bit0)
     failures++;
-
 }
 
 void add_bit2uint(void)
 {
-
   if(aint0 != bit11)
     failures++;
 
   aint0 += bit0;
   if(aint0!=1)
     failures++;
-
 }
+#endif
+
 void main(void)
 {
-
   add_lit2uchar();
+  ASSERT(MANGLE(failures) == 0);
 
   achar0=16;
   achar1=0;
   add_uchar2uchar();
+  ASSERT(MANGLE(failures) == 0);
 
 
   achar0 = 0;
   achar1 = 32;
   add_uchar2uchar2();
+  ASSERT(MANGLE(failures) == 0);
 
 #if SUPPORT_BIT_TYPES
   add_bits();
@@ -189,8 +185,7 @@ void main(void)
   add_bit2uchar();
   add_bit2uint();
 #endif
+  ASSERT(MANGLE(failures) == 0);
 
-
-  success = failures;
   done();
 }