Fix integer multiplication in --model-flat24

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

diff --git a/device/lib/_muluint.c b/device/lib/_muluint.c
index 143183e611b023d0a2af921efe99474e42015299..b50583f1d0674ffdca42dbebf74edb8a1ef0d455 100644 (file)
--- a/device/lib/_muluint.c
+++ b/device/lib/_muluint.c
@@ -31,7 +31,7 @@ union uu {
 
 unsigned int _muluint (unsigned int a, unsigned int b) 
 {
-#ifdef SDCC_MODEL_LARGE    
+#if defined(SDCC_MODEL_LARGE) || defined (SDCC_MODEL_FLAT24)
        union uu _xdata *x;
        union uu _xdata *y; 
        union uu t;

diff --git a/device/lib/_mululong.c b/device/lib/_mululong.c
index 56820874be71a52d655befebc213714241f4facf..b98138c0af28e652e1175cec9c2a16f13bbd906d 100644 (file)
--- a/device/lib/_mululong.c
+++ b/device/lib/_mululong.c
@@ -32,7 +32,7 @@ union bil {
         unsigned long l;
         struct { unsigned char b0; unsigned int i12; unsigned char b3;} bi;
 } ;
-#ifdef SDCC_MODEL_LARGE
+#if defined(SDCC_MODEL_LARGE) || defined (SDCC_MODEL_FLAT24)
 #define bcast(x) ((union bil _xdata  *)&(x))
 #else
 #define bcast(x) ((union bil _near *)&(x))

diff --git a/device/lib/_strtok.c b/device/lib/_strtok.c
index b3193d4ed33eb9d9135f2a74525fce4cebb36fad..1285e460c07605032cdb3a24133031008edb2cac 100644 (file)
--- a/device/lib/_strtok.c
+++ b/device/lib/_strtok.c
@@ -24,7 +24,7 @@
 #include "string.h" 
 #define NULL (void *)0
 
-#ifdef SDCC_MODEL_LARGE
+#if defined(SDCC_MODEL_LARGE) || defined (SDCC_MODEL_FLAT24)
 #pragma NOINDUCTION
 #pragma NOINVARIANT
 #endif