* 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
+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.
2001-09-08 Michael Hope <michaelh@juju.net.nz>
* support/regression/tests/fetchoverlap.c: Added new test case.
rm -rf $(CASES_DIR) $(RESULTS_DIR) *.pyc
inter-port-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
tests = tests + string.atof(ntests)
cases = cases + string.atof(ncases)
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)
-#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;
void __printf(const char *szFormat, ...) REENTRANT
{
va_list ap;
if (*szFormat == '%') {
switch (*++szFormat) {
case 's': {
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 *);
char GENERIC *sz = va_arg(ap, char GENERIC *);
while (*sz) {
_putchar(*sz++);
}
while (*sz) {
_putchar(*sz++);
}
S51 = ../../sim/ucsim/s51.src/s51
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
OBJEXT = .rel
EXEEXT = .ihx
mv fwk/lib/testfwk.ihx $@
mv fwk/lib/testfwk.map $(@:.ihx=.map)
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 $<
%$(OBJEXT): %.c
$(SDCC) $(SDCCFLAGS) -c $<
+#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
+
+ char above[ABOVE_MEM_SIZE];
+ 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)));
- 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)));
- unsigned char buffer[0x20];
+ unsigned char buffer[0x18];
unsigned char OutPtr, InPtr;
unsigned char Count;
} Fifo;
unsigned char OutPtr, InPtr;
unsigned char Count;
} Fifo;