fixed Karl's "2 | (1<<8)"

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

diff --git a/ChangeLog b/ChangeLog
index d41eeb70f3f612a56b6f8bdf6070002b5f2950ee..b331c3d827e7766fa49bf9f8102e06a27c131ba3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-01    <johan@balder>
+
+       * src/SDCCval.c (valBitwise): fixed Karl's "2 | (1<<8)"
+
 2003-01-31    <johan@CP255758-A>
 
        * src/ds390/main.c (_ds390_genAssemblerPreamble): applied Jan Rejlek's >64K startup patch

diff --git a/src/SDCCast.c b/src/SDCCast.c
index 64dc380d458246d7f2b178962627d5213d1a9db7..58abdbbbcf1f78e5231db016a89749cc92e462b3 100644 (file)
--- a/src/SDCCast.c
+++ b/src/SDCCast.c
@@ -2284,6 +2284,7 @@ decorateType (ast * tree)
        ast *wtree = optimizeRRCRLC (tree);
        if (wtree != tree)
          return decorateType (wtree);
+       // fall through
       }
       /*------------------------------------------------------------------*/
       /*----------------------------*/

diff --git a/src/SDCCval.c b/src/SDCCval.c
index d893ccba608a3a902fbe64b934858e0cd78eb62e..ca06659834f6c6a070dff2a73a35fd1fef766f98 100644 (file)
--- a/src/SDCCval.c
+++ b/src/SDCCval.c
@@ -1309,7 +1309,8 @@ valBitwise (value * lval, value * rval, int op)
 
   /* create a new value */
   val = newValue ();
-  val->type = copyLinkChain (lval->type);
+  val->type = copyLinkChain (getSize(rval->type) > getSize(lval->type) ?
+                            rval->type : lval->type);
   val->etype = getSpec (val->type);
 
   switch (op)