* src/SDCCicode.c (geniCodeLogic),

* src/SDCCast.c (decorateType): applied patch by Bernhard for rfe 1422617

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

diff --git a/ChangeLog b/ChangeLog
index 540e2ce49bd4f3205f31057f6ab57cf0f05136c2..bd70636419253b70850781fa33bb5426752ae5db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-13 Maarten Brock <sourceforge.brock AT dse.nl>
+
+       * src/SDCCicode.c (geniCodeLogic),
+       * src/SDCCast.c (decorateType): applied patch by Bernhard for rfe 1422617
+
 2006-03-10 Maarten Brock <sourceforge.brock AT dse.nl>
 
        * src/mcs51/gen.c (sameReg): new, checks if two aop regs are the same,

diff --git a/src/SDCCast.c b/src/SDCCast.c
index f27842ea4970e7cfd6cab1294595879fc0e9aef7..f240fc9734732895ba3356ea7cfbace397ead992 100644 (file)
--- a/src/SDCCast.c
+++ b/src/SDCCast.c
@@ -3992,7 +3992,7 @@ decorateType (ast * tree, RESULT_TYPE resultType)
         }
 
       LRVAL (tree) = RRVAL (tree) = 1;
-      TTYPE (tree) = TETYPE (tree) = newCharLink ();
+      TTYPE (tree) = TETYPE (tree) = newBoolLink ();
       return tree;
 
       /*------------------------------------------------------------------*/

diff --git a/src/SDCCicode.c b/src/SDCCicode.c
index 30503b61f5a8c5dee33bc785ad3044f7186cd730..d53bd25f065e98c73d480417c2550f0222dfd3cc 100644 (file)
--- a/src/SDCCicode.c
+++ b/src/SDCCicode.c
@@ -3057,7 +3057,7 @@ geniCodeLogic (operand * left, operand * right, int op)
         }
     }
 
-  ctype = usualBinaryConversions (&left, &right, RESULT_TYPE_NONE, 0);
+  ctype = usualBinaryConversions (&left, &right, RESULT_TYPE_BIT, 0);
 
   ic = newiCode (op, left, right);
   IC_RESULT (ic) = newiTempOperand (newCharLink (), 1);