X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fregression%2Fb.c;h=dd45f6cc61e3fc3b5aa825f54f108921a41ca00f;hb=5de45d4b5fa61802d1d5ae5ed8ab186655837468;hp=d082a4e14c6f7a6a277f32af285645a847b23b7c;hpb=778f1b919b8f1bc96249966828c4b7b209d1b212;p=fw%2Fsdcc

diff --git a/src/regression/b.c b/src/regression/b.c
index d082a4e1..dd45f6cc 100644
--- a/src/regression/b.c
+++ b/src/regression/b.c
@@ -1,162 +1,64 @@
-//#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()
-{
-
-  dummy++;
-
-}
+unsigned char uchar0=0;
+unsigned char uchar1=0;
+unsigned char uchar2=0;
 
 
-
-void char_lt_char(void)
+void
+done()
 {
-  if(achar0 < achar1)
-    failures++;
+  ASSERT(MANGLE(failures) == 0);
+  PASSED();
 }
 
-void char_gt_char(void)
+/*
+void incptr(unsigned char *ucP)
 {
-  if(achar1 > achar0)
-    failures++;
+  *ucP = *ucP + 1;
 }
+*/
 
-void char_lte_char(void)
+void inc(unsigned char k)
 {
-  if(achar0 <= achar1)
-    failures++;
+  uchar0 = uchar0 + k;
 }
 
-void char_gte_char(void)
+void f1(void)
 {
-  if(achar1 >= achar0)
-    failures++;
-}
 
-void char_lt_lit(void)
-{
-  if(achar1 < 0x10)
-    failures++;
+  uchar2++;
 }
 
-void char_gt_lit(void)
+void nested_call(unsigned char u)
 {
-  if(achar1 > 0x10)
-    failures++;
-}
 
-void char_lte_lit(void)
-{
-  if(achar1 <= 0x0f)
-    failures++;
-}
-
-void char_gte_lit(void)
-{
-  if(achar1 >= 0x11)
-    failures++;
-}
-
-
-/* ints */
-
-void int_lt_int(void)
-{
-  if(aint0 < aint1)
-    failures++;
-}
+  f1();
+  uchar1 = uchar1 + u;
+  inc(uchar1);
 
-void int_gt_int(void)
-{
-  if(aint1 > aint0)
-    failures++;
 }
+  //  uchar1 = uchar1 + uchar0;
+  //  uchar2 = uchar1 + k;
 
-void int_lte_int(void)
-{
-  if(aint0 <= aint1)
-    failures++;
-}
-
-void int_gte_int(void)
-{
-  if(aint1 >= aint0)
-    failures++;
-}
-
-void int_lt_lit(void)
+void main(void)
 {
-  if(aint1 < 0x10)
-    failures++;
-}
 
-void int_gt_lit(void)
-{
-  if(aint1 > 0x10)
+  uchar0=1;
+  //incptr(&uchar0);
+  inc(uchar0);
+  if(uchar0 !=2)
     failures++;
-}
 
-void int_lte_lit(void)
-{
-  if(aint1 <= 0x0f)
-    failures++;
-}
+  uchar0 = 2;
+  uchar1 = 1;
+  uchar2 = 1;
+  nested_call(uchar2);
 
-void int_gte_lit(void)
-{
-  if(aint1 >= 0x11)
+  if(uchar0 !=4)
     failures++;
-}
-
-
-
-
-
-
-
-void main(void)
-{
-
-  char_lt_char();
-  char_gt_char();
-
-  achar0++;
-  char_lt_char();
-  char_gt_char();
-  char_gte_char();
-  char_lte_char();
-
-  achar1 = 0x10;
-  char_lt_lit();
-  char_gt_lit();
-  char_lte_lit();
-  char_gte_lit();
-
-
-
-  int_lt_int();
-  int_gt_int();
-
-  aint0++;
-  int_lt_int();
-  int_gt_int();
-  int_gte_int();
-  int_lte_int();
-
-  aint1 = 0x10;
-  int_lt_lit();
-  int_gt_lit();
 
-  success = failures;
   done();
 }