X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fregression%2Fbool1.c;h=46857bfdac3fb6ebd25ef9eb7643afd5935e4a3b;hb=5de45d4b5fa61802d1d5ae5ed8ab186655837468;hp=803e38b4a8001cdb4c0156787801dc2615758020;hpb=b4d69dfd516f175255aa87b18b59dcf309d98b46;p=fw%2Fsdcc

diff --git a/src/regression/bool1.c b/src/regression/bool1.c
index 803e38b4..46857bfd 100644
--- a/src/regression/bool1.c
+++ b/src/regression/bool1.c
@@ -1,150 +1,133 @@
-//#include "p16c84.h"
+#include "gpsim_assert.h"
 
-unsigned char success = 0;
-unsigned char failures = 0;
-unsigned char dummy = 0;
+unsigned char failures=0;
 
-bit bit0 = 0;
 unsigned int aint0 = 0;
 unsigned int aint1 = 0;
 unsigned char achar0 = 0;
 unsigned char achar1 = 0;
 
 void
-done ()
+done()
 {
-
-  dummy++;
-
+  ASSERT(MANGLE(failures) == 0);
+  PASSED();
 }
 
-void
-bool_or1 (void)
+void bool_or1(void)
 {
 
-  if ((achar0 > 0) || (achar1 > 0))
+  if( (achar0 >0) || (achar1 >0 ))
     failures++;
 }
 
-void
-bool_or2 (void)
+void bool_or2(void)
 {
 
-  if (achar0 || achar1)
+  if( achar0 || achar1)
     failures++;
 }
 
-void
-bool_test1 (void)
+void bool_test1(void)
 {
 
-  if ((achar0 == 0) || achar1)
+  if( (achar0==0) || achar1)
     failures++;
 }
 
 
-void
-bool_test2 (void)
+void bool_test2(void)
 {
 
-  if ((achar0 == 0) || aint0)
+  if( (achar0==0) || aint0)
     failures++;
 }
 
-void
-bool_and1 (void)
+void bool_and1(void)
 {
 
-  if (achar0 && achar1)
+  if( achar0 && achar1)
     failures++;
 }
 
-void
-bin_or1 (void)
+void bin_or1(void)
 {
 
   char t;
 
   t = achar0 | achar1;
-  if (t)
+  if(t)
     failures++;
 }
 
-void
-bin_xor1 (void)
+void bin_xor1(void)
 {
 
-  if (achar0 ^ achar1)
+  if(achar0 ^ achar1)
     failures++;
 }
 
 
-void
-bool_test3 (void)
+void bool_test3(void)
 {
 
-  if ((achar0 == 0x42) || (achar1 == 42))
+  if((achar0 == 0x42) || (achar1 == 42))
     failures++;
 }
 
 
-void
-bool_or_lit1 (void)
+void bool_or_lit1(void)
 {
 
   achar0 |= 0x0f;
 
-  if (achar0 > 0x10)
+  if(achar0 > 0x10)
     failures++;
 
-  if ((achar0 | 0x10) > 0xf0)
+  if( (achar0 | 0x10) > 0xf0)
     failures++;
 
 }
 
-void
-bool_and_lit1 (void)
+void bool_and_lit1(void)
 {
 
   achar0 &= 0xf0;
 
-  if (achar0 > 0x10)
+  if(achar0 > 0x10)
     failures++;
 
-  if ((achar0 & 0x10) > 0xf0)
+  if( (achar0 & 0x10) > 0xf0)
     failures++;
 
   achar0 &= 0xef;
 
 }
 
-void
-main (void)
+void main(void)
 {
 
-  bool_or1 ();
-  bool_or2 ();
-  bool_and1 ();
-  bin_or1 ();
-  bin_xor1 ();
+  bool_or1();
+  bool_or2();
+  bool_and1();
+  bin_or1();
+  bin_xor1();
 
   achar0++;
-  bool_and1 ();
-  bool_test1 ();
-  bool_test2 ();
-  bool_test3 ();
+  bool_and1();
+  bool_test1();
+  bool_test2();
+  bool_test3();
 
 
-  achar0--;
-  achar1++;
-  bool_and1 ();
+  achar0--; achar1++;
+  bool_and1();
 
-  achar0 = 0;
-  achar1 = 0;
+  achar0=0;
+  achar1=0;
 
-  bool_or_lit1 ();
-  bool_and_lit1 ();
+  bool_or_lit1();
+  bool_and_lit1();
 
-  success = failures;
-  done ();
+  done();
 }