* device/include/pic16/pic18f*.h: add bit aliases in INTCONbits_t

[fw/sdcc] / src / regression / arrays.c

diff --git a/src/regression/arrays.c b/src/regression/arrays.c
index dc0a7f3cec6aba6cdc6afac0669aef700211ab3d..8877692dbcf4b4690c86dd2b2316e3ef76922466 100644 (file)
--- a/src/regression/arrays.c
+++ b/src/regression/arrays.c
@@ -1,137 +1,145 @@
-//#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()
+void
+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 ();
 }