From b722f6a177695defbfee3ffaa608b469c9309121 Mon Sep 17 00:00:00 2001 From: sdattalo Date: Sun, 18 Feb 2001 04:19:44 +0000 Subject: [PATCH] Enhancements for regression testing. git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@628 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- src/regression/add.c | 97 +++++++++++++++++++---------------------- src/regression/b.c | 31 ++++++------- src/regression/bool1.c | 99 ++++++++++++++++++------------------------ src/regression/for.c | 38 ++++++++-------- 4 files changed, 118 insertions(+), 147 deletions(-) diff --git a/src/regression/add.c b/src/regression/add.c index 3069ce63..15ac6c17 100644 --- a/src/regression/add.c +++ b/src/regression/add.c @@ -9,9 +9,9 @@ * (like bitx = bity + bitz;) */ #define SUPPORT_BIT_ARITHMETIC 1 -unsigned char success = 0; -unsigned char failures = 0; -unsigned char dummy = 0; +unsigned char success=0; +unsigned char failures=0; +unsigned char dummy=0; #if SUPPORT_BIT_TYPES @@ -38,54 +38,50 @@ unsigned char achar2 = 0; unsigned char achar3 = 0; unsigned char *acharP = 0; -void -done () +void done() { dummy++; } -void -add_lit2uchar (void) +void add_lit2uchar(void) { achar0 = achar0 + 5; - if (achar0 != 5) + if(achar0 != 5) failures++; achar0 += 10; - if (achar0 != 15) + if(achar0 != 15) failures++; - achar0 = achar0 + 1; // Should be an increment - - if (achar0 != 16) + achar0 = achar0 +1; // Should be an increment + if(achar0 != 16) failures++; - for (achar1 = 0; achar1 < 100; achar1++) + for(achar1 = 0; achar1 < 100; achar1++) achar0 += 2; - if (achar0 != 216) + if(achar0 != 216) failures++; } -void -add_uchar2uchar (void) +void add_uchar2uchar(void) { achar1 = achar1 + achar0; - if (achar1 != 16) + if(achar1 != 16) failures++; - for (achar2 = 0; achar2 < 7; achar2++) + for(achar2 = 0; achar2<7; achar2++) achar1 += achar0; - if (achar1 != 128) + if(achar1 != 128) failures++; } @@ -95,8 +91,7 @@ add_uchar2uchar (void) // achar1 = 32 // achar2, achar3 can be anything. -void -add_uchar2uchar2 (void) +void add_uchar2uchar2(void) { @@ -104,46 +99,45 @@ add_uchar2uchar2 (void) achar0 = achar0 + 1; achar0 = achar0 + 2; achar0 = achar0 + 3; - if (achar0 != 7) + if(achar0 != 7) failures++; achar1 += achar0; - if (achar1 != 39) + if(achar1 != 39) failures++; achar2 = achar1 + achar0; - if (achar2 != 46) + if(achar2 != 46) failures++; achar3 = achar2 + achar1 + achar0; - if (achar3 != 92) + if(achar3 != 92) failures++; } #if SUPPORT_BIT_TYPES -void -add_bits (void) +void add_bits(void) { bit1 = bit0; bit0 = 1; - if (bit1 != 0) + if(bit1 != 0) failures++; - bit1 = bit1 + bit0; - if (bit1 != 1) + bit1 = bit1+bit0; + if(bit1 != 1) failures++; #if SUPPORT_BIT_ARITHMETIC - bit2 = bit1 + bit3; - if (bit2) + bit2 = bit1+bit3; + if(bit2) failures++; - bit3 = bit4 + bit5 + bit6 + bit7 + bit0; - if (!bit3) + bit3 = bit4+bit5+bit6+bit7+bit0; + if(!bit3) failures++; #endif } @@ -151,55 +145,52 @@ add_bits (void) /* add_bit2uchar(void) - assumes bit0 = 1, achar0 = 7 */ -void -add_bit2uchar (void) +void add_bit2uchar(void) { achar0 += bit0; - if (achar0 != 8) + if(achar0 != 8) failures++; - if (achar0 == bit0) + if(achar0 == bit0) failures++; } -void -add_bit2uint (void) +void add_bit2uint(void) { - if (aint0 != bit11) + if(aint0 != bit11) failures++; aint0 += bit0; - if (aint0 != 1) + if(aint0!=1) failures++; } -void -main (void) +void main(void) { - add_lit2uchar (); + add_lit2uchar(); - achar0 = 16; - achar1 = 0; - add_uchar2uchar (); + achar0=16; + achar1=0; + add_uchar2uchar(); achar0 = 0; achar1 = 32; - add_uchar2uchar2 (); + add_uchar2uchar2(); #if SUPPORT_BIT_TYPES - add_bits (); + add_bits(); - add_bit2uchar (); - add_bit2uint (); + add_bit2uchar(); + add_bit2uint(); #endif success = failures; - done (); + done(); } diff --git a/src/regression/b.c b/src/regression/b.c index 4bd3077e..0b27b076 100644 --- a/src/regression/b.c +++ b/src/regression/b.c @@ -1,39 +1,36 @@ unsigned char success = 0; -unsigned char uchar0 = 0; -unsigned char uchar1 = 0; -unsigned char uchar2 = 0; +unsigned char uchar0=0; +unsigned char uchar1=0; +unsigned char uchar2=0; -void -done (void) +void done(void) { success++; } -void -incptr (unsigned char *ucP) +void incptr(unsigned char *ucP) { *ucP = *ucP + 1; } -void -inc (unsigned char k) +void inc(unsigned char k) { uchar0 = uchar0 + k; - uchar1 = uchar1 + uchar0; - uchar2 = uchar1 + k; } -void -main (void) + // uchar1 = uchar1 + uchar0; + // uchar2 = uchar1 + k; + +void main(void) { - uchar0 = 1; + uchar0=1; //incptr(&uchar0); - inc (uchar0); - if (uchar0 != 2) + inc(uchar0); + if(uchar0 !=2) success++; - done (); + done(); } diff --git a/src/regression/bool1.c b/src/regression/bool1.c index 803e38b4..dc0a7f3c 100644 --- a/src/regression/bool1.c +++ b/src/regression/bool1.c @@ -1,8 +1,8 @@ //#include "p16c84.h" -unsigned char success = 0; -unsigned char failures = 0; -unsigned char dummy = 0; +unsigned char success=0; +unsigned char failures=0; +unsigned char dummy=0; bit bit0 = 0; unsigned int aint0 = 0; @@ -10,141 +10,128 @@ unsigned int aint1 = 0; unsigned char achar0 = 0; unsigned char achar1 = 0; -void -done () +void done() { dummy++; } -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(); } diff --git a/src/regression/for.c b/src/regression/for.c index 2ccf5ae4..aed33a87 100644 --- a/src/regression/for.c +++ b/src/regression/for.c @@ -1,8 +1,8 @@ //#include "p16c84.h" -unsigned char success = 0; -unsigned char failures = 0; -unsigned char dummy = 0; +unsigned char success=0; +unsigned char failures=0; +unsigned char dummy=0; bit bit0 = 0; unsigned int aint0 = 0; @@ -10,48 +10,44 @@ unsigned int aint1 = 0; unsigned char achar0 = 0; unsigned char achar1 = 0; -unsigned char call3 (void); +unsigned char call3(void); -void -done () +void done() { dummy++; } -void -for1 (void) +void for1(void) { - unsigned char i = 0; + unsigned char i=0; - for (i = 0; i < 10; i++) + for(i=0; i<10; i++) achar0++; - if (achar0 != 10) + if(achar0 != 10) failures++; } -void -for2 (void) +void for2(void) { - unsigned char i = 0; + unsigned char i=0; - for (i = 0; i < 10; i++) + for(i=0; i<10; i++) achar0++; - if (i < 10) + if(i < 10) failures++; } -void -main (void) +void main(void) { - for1 (); - for2 (); + for1(); + for2(); success = failures; - done (); + done(); } -- 2.47.2