* support/regression/ports/host/spec.mk: Updated to compile with the new...

        * device/lib/Makefile.in (Z80SOURCES): Removed old _mululong, _mulslong, and unneeded _mulint$
        * device/lib/_mullong.c (_mulslong): Changed to actually return a value :)

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

diff --git a/ChangeLog b/ChangeLog
index 33e9a38bd189d0179ce901dba6add19e549bb995..47a402a6f18c27afac7e323ce002904c84a96146 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-09-01  Michael Hope  <michaelh@juju.net.nz>
+
+       * support/regression/ports/host/spec.mk: Updated to compile with the new type specifiers.
+
+       * device/lib/Makefile.in (Z80SOURCES): Removed old _mululong, _mulslong, and unneeded _mulint.
+
+       * device/lib/_mullong.c (_mulslong): Changed to actually return a value :)
+
 2001-08-30  Paul Stoffregen  <paul@pjrc.com>
 
        * added peepholes 223 to 231 to mcs51 port.  These improve code when using large model.

diff --git a/device/lib/Makefile.in b/device/lib/Makefile.in
index cc17588262bc857c821c275e76de4f07cbe2c115..7b7437591e5f7523d2283c98a7d0d78c123b93be 100644 (file)
--- a/device/lib/Makefile.in
+++ b/device/lib/Makefile.in
@@ -74,7 +74,7 @@ Z80SOURCES      = _atoi.c \
                  puts.c gets.c \
                  assert.c _strcat.c \
                  _modslong.c _modulong.c \
-                 _mulslong.c _mululong.c _mulint.c _mullong.c \
+                 _mullong.c \
                  _divslong.c _divulong.c
 
 Z80OBJECTS      = $(Z80SOURCES:%.c=$(PORTDIR)/%.o)

diff --git a/device/lib/_mullong.c b/device/lib/_mullong.c
index 1bc1f410afac32a0ca6c7d8ee884430ccad1674c..de42c9b0e252428e204c72fd8375a4630bc55781 100644 (file)
--- a/device/lib/_mullong.c
+++ b/device/lib/_mullong.c
@@ -536,7 +536,7 @@ _mululong (unsigned long a, unsigned long b)        // in future: _mullong
 long
 _mulslong (long a, long b)     // obsolete
 {
-  _mululong (a, b);
+  return _mululong (a, b);
 }
 
 #endif // _MULLONG_ASM

diff --git a/support/regression/fwk/lib/testfwk.c b/support/regression/fwk/lib/testfwk.c
index 8ba42960bc8ba66e0ca8bbaa528076e67f3c980c..ed6a6143db9adcdce3d4400be573dd4e6be3c7cf 100644 (file)
--- a/support/regression/fwk/lib/testfwk.c
+++ b/support/regression/fwk/lib/testfwk.c
@@ -146,4 +146,6 @@ main(void)
            );
 
     _exitEmu();
+
+    return 0;
 }

diff --git a/support/regression/ports/host/spec.mk b/support/regression/ports/host/spec.mk
index aa8f14cbaf29ae48c1558c106a86abd7b5d767cf..583f1ea7754a5ccf70c5b74bc0766e022becd397 100644 (file)
--- a/support/regression/ports/host/spec.mk
+++ b/support/regression/ports/host/spec.mk
@@ -1,6 +1,6 @@
 # Port specification for compiling on the host machines version of gcc
 SDCC = gcc
-SDCCFLAGS = -Wall -fsigned-char
+SDCCFLAGS = -Wall -fsigned-char -DREENTRANT= -DGENERIC=
 
 EXEEXT = .bin
 

diff --git a/support/regression/ports/host/support.c b/support/regression/ports/host/support.c
index 756a6235f43cd871c4d715dd078f9a2e287f059f..c98d4896dc811cc5b4b982bde278c5994f0256d0 100644 (file)
--- a/support/regression/ports/host/support.c
+++ b/support/regression/ports/host/support.c
@@ -6,3 +6,8 @@ void _putchar(char c)
 {
     putchar(c);
 }
+
+void _exitEmu(void)
+{
+    exit(0);
+}

diff --git a/support/regression/tests/bug-453196.c b/support/regression/tests/bug-453196.c
index 47a8490282834fd3d6470fd636b3986c269ac15f..3b246995c30794c95757cfbefeca3802a7ffba30 100644 (file)
--- a/support/regression/tests/bug-453196.c
+++ b/support/regression/tests/bug-453196.c
@@ -69,4 +69,6 @@ Enumeration Func_1 (Capital_Letter Ch_1_Par_Val, Capital_Letter Ch_2_Par_Val)
 {
     UNUSED(Ch_1_Par_Val);
     UNUSED(Ch_2_Par_Val);
+
+    return 0;
 }

diff --git a/support/regression/tests/muldiv.c b/support/regression/tests/muldiv.c
index 36e3ef11efc53eabe74b90496e877ac793eab130..474afd35394c502986859340acf2cb666b0af0c4 100644 (file)
--- a/support/regression/tests/muldiv.c
+++ b/support/regression/tests/muldiv.c
@@ -51,19 +51,17 @@ testMul(void)
 
     i = 5;
 
-    LOG(("i*5 == 25 = %u\n", (int)i*5));
+    LOG(("i*5 == 25 = %u\n", (int)(i*5)));
     result = i*5;
     ASSERT(result == 25);
-    LOG(("i*-4 == -20 = %u\n", (int)i*-4));
+    LOG(("i*-4 == -20 = %u\n", (int)(i*-4)));
     ASSERT(i*-4 == -20);
 
     i = -10;
-    LOG(("i*12 == -120 = %u\n", (int)i*12));
+    LOG(("i*12 == -120 = %u\n", (int)(i*12)));
     ASSERT(i*12 == -120);
-    LOG(("i*-3 == 30 = %u\n", (int)i*-3));
+    LOG(("i*-3 == 30 = %u\n", (int)(i*-3)));
     ASSERT(i*-3 == 30);
-
-    LOG(("30 == %u\n", (int)i*-3));
 }
 
 void

diff --git a/support/regression/tests/staticinit.c b/support/regression/tests/staticinit.c
index c9532b5515c2bdcb9ad15df5eea94cd760a6f557..e244d4978a855fd82db72f30ea50a902e5c8234c 100644 (file)
--- a/support/regression/tests/staticinit.c
+++ b/support/regression/tests/staticinit.c
@@ -64,6 +64,9 @@ testSmallSparseZero(void)
     ASSERT(smallSparseZero[6] == 0);
     ASSERT(smallSparseZero[7] == 0);
     ASSERT(smallSparseZero[8] == 0);
+
+    // Make the compiler happy
+    ASSERT(smallSparseZeroTail[0] == 1);
 }
 
 #ifdef __mcs51