* support/regression/Makefile: inter-port-clean adjusted for mcs51

* support/regression/testfwk.c: removed workaround for bug #436344

* support/regression/tests/bp.c: use less memory with mcs51

* support/regression/tests/bug-441448.c: use less memory

* support/regression/tests/ports/mcs51/spec.mk: cleanup, use --stack-after-data

* support/regression/collate-results.py: typo

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@1246 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/ChangeLog b/ChangeLog
index 12b0ac993bc6cd2b895365f5e09dfa4668f69c5d..01ee29ab70fc8f652b24c25839290e0dee698ae1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2001-09-09  Bernhard Held <bernhard@bernhardheld.de>
+
+       * support/regression/Makefile: inter-port-clean adjusted for mcs51
+
+       * support/regression/testfwk.c: removed workaround for bug #436344
+
+       * support/regression/tests/bp.c: use less memory with mcs51
+
+       * support/regression/tests/bug-441448.c: use less memory
+
+       * support/regression/tests/ports/mcs51/spec.mk: cleanup, use --stack-after-data
+
+       * support/regression/collate-results.py: typo
+
 2001-09-08  Michael Hope  <michaelh@juju.net.nz>
 
        * support/regression/tests/fetchoverlap.c: Added new test case.

diff --git a/support/regression/Makefile b/support/regression/Makefile
index b20a27ef6c8e9b2892d8399de22a9db4763882ab..d3c7be0ef7f72826e034ee2e49a7070892f9b5ab 100644 (file)
--- a/support/regression/Makefile
+++ b/support/regression/Makefile
@@ -182,4 +182,4 @@ clean:
        rm -rf $(CASES_DIR) $(RESULTS_DIR) *.pyc
 
 inter-port-clean:
-       rm -f  fwk/lib/*.o fwk/lib/*.asm
+       rm -f  fwk/lib/*.o fwk/lib/*.asm fwk/lib/*.rst fwk/lib/*.lst fwk/lib/*.rel

diff --git a/support/regression/collate-results.py b/support/regression/collate-results.py
index 4f0ce64c06616a18332edb04a5e12dadc5aba81d..ea6b1999fa20cf24c95d85bb9073a1bb1325d1a0 100644 (file)
--- a/support/regression/collate-results.py
+++ b/support/regression/collate-results.py
@@ -23,4 +23,4 @@ for line in lines:
         tests = tests + string.atof(ntests)
         cases = cases + string.atof(ncases)
 
-print "%.0f failues, %.0f tests, %.0f test cases" % (failures, tests, cases)
+print "%.0f failures, %.0f tests, %.0f test cases" % (failures, tests, cases)

diff --git a/support/regression/fwk/lib/testfwk.c b/support/regression/fwk/lib/testfwk.c
index ed6a6143db9adcdce3d4400be573dd4e6be3c7cf..8a46780e6fb1c9f1a5f4f205c7ca15c576ecd0bf 100644 (file)
--- a/support/regression/fwk/lib/testfwk.c
+++ b/support/regression/fwk/lib/testfwk.c
@@ -57,18 +57,6 @@ static void _printn(int n)
     _putchar('0' + rem);
 }
 
-#ifdef SDCC_mcs51
-union
-{
-    struct
-    {
-      int  offset;
-      char data_space;
-    } part;
-    char *p;
-} generic_p_u;
-#endif
-
 void __printf(const char *szFormat, ...) REENTRANT
 {
     va_list ap;
@@ -78,16 +66,7 @@ void __printf(const char *szFormat, ...) REENTRANT
         if (*szFormat == '%') {
             switch (*++szFormat) {
             case 's': {
-#ifdef SDCC_mcs51
-#warning Workaround bug #436344
-                char GENERIC *sz;
-
-                generic_p_u.part.data_space = va_arg (ap, char);
-                generic_p_u.part.offset     = va_arg (ap, int);
-                sz = generic_p_u.p;
-#else
                 char GENERIC *sz = va_arg(ap, char GENERIC *);
-#endif
                 while (*sz) {
                     _putchar(*sz++);
                 }

diff --git a/support/regression/ports/mcs51/spec.mk b/support/regression/ports/mcs51/spec.mk
index 591317b70f0a9ec7aa0eda5caa90c235a1dfbdd3..491eea28376cc6be1c424291c45120e7586db723 100644 (file)
--- a/support/regression/ports/mcs51/spec.mk
+++ b/support/regression/ports/mcs51/spec.mk
@@ -2,7 +2,7 @@
 
 S51 = ../../sim/ucsim/s51.src/s51
 
-SDCCFLAGS += --lesspedantic -DREENTRANT=reentrant -DGENERIC=_generic
+SDCCFLAGS += --lesspedantic -DREENTRANT=reentrant -DGENERIC=_generic --stack-after-data
 
 OBJEXT = .rel
 EXEEXT = .ihx
@@ -16,12 +16,6 @@ EXTRAS = fwk/lib/testfwk$(OBJEXT) ports/$(PORT)/support$(OBJEXT)
        mv fwk/lib/testfwk.ihx $@
        mv fwk/lib/testfwk.map $(@:.ihx=.map)
 
-# %$(OBJEXT): %.asm
-#      ../../bin/as-z80 -plosgff $@ $<
-
-# %$(OBJEXT): %.s
-#      ../../bin/as-z80 -plosgff $@ $<
-
 %$(OBJEXT): %.c
        $(SDCC) $(SDCCFLAGS) -c $<
 

diff --git a/support/regression/tests/bp.c b/support/regression/tests/bp.c
index bd768a49a10faa2356ddaa45a55319fafe2b8778..f534c98e4dd1c011ef14ea5d9bb0d151330282ed 100644 (file)
--- a/support/regression/tests/bp.c
+++ b/support/regression/tests/bp.c
@@ -21,23 +21,39 @@ spoil(char a)
   return a;
 }
 
+#ifndef SDCC_mcs51
+
+#define ABOVE_MEM_SIZE      400
+#define ABOVE_MEM_TEST_SIZE  17
+#define BELOW_MEM_SIZE      200
+#define BELOW_MEM_TEST_SIZE  74
+
+#else
+
+// test mcs51 with much less memory
+#define ABOVE_MEM_SIZE       35
+#define ABOVE_MEM_TEST_SIZE  17
+#define BELOW_MEM_SIZE       20
+#define BELOW_MEM_TEST_SIZE   7
+
+#endif
+
 void
 testBP(void)
 {
-  char above[400];
+  char above[ABOVE_MEM_SIZE];
   char f;
-  char below[200];
+  char below[BELOW_MEM_SIZE];
 
-  memset(above, 17, sizeof(above));
-  memset(below, 74, sizeof(below));
+  memset(above, ABOVE_MEM_TEST_SIZE, sizeof(above));
+  memset(below, BELOW_MEM_TEST_SIZE, sizeof(below));
 
-  ASSERT(verifyBlock(above, 17, sizeof(above)));
-  ASSERT(verifyBlock(below, 74, sizeof(below)));
+  ASSERT(verifyBlock(above, ABOVE_MEM_TEST_SIZE, sizeof(above)));
+  ASSERT(verifyBlock(below, BELOW_MEM_TEST_SIZE, sizeof(below)));
 
   f = spoil(-5);
   spoil(f);
 
-  ASSERT(verifyBlock(above, 17, sizeof(above)));
-  ASSERT(verifyBlock(below, 74, sizeof(below)));
+  ASSERT(verifyBlock(above, ABOVE_MEM_TEST_SIZE, sizeof(above)));
+  ASSERT(verifyBlock(below, BELOW_MEM_TEST_SIZE, sizeof(below)));
 }
-

diff --git a/support/regression/tests/bug-441448.c b/support/regression/tests/bug-441448.c
index 5ab0ac23f1042746cc3d2e0b9b726eaec74648de..bbbffc12d6e7f1d48dcaf301d382836516e49797 100644 (file)
--- a/support/regression/tests/bug-441448.c
+++ b/support/regression/tests/bug-441448.c
@@ -7,7 +7,7 @@
 
 typedef struct 
 { 
-    unsigned char buffer[0x20]; 
+    unsigned char buffer[0x18];
     unsigned char OutPtr, InPtr; 
     unsigned char Count; 
 } Fifo;