From 6b9cd99cbdb8bd0a220fe9490fbcbed661870f32 Mon Sep 17 00:00:00 2001 From: maartenbrock Date: Mon, 13 Mar 2006 17:25:27 +0000 Subject: [PATCH] * 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 --- ChangeLog | 5 +++++ src/SDCCast.c | 2 +- src/SDCCicode.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 540e2ce4..bd706364 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-03-13 Maarten Brock + + * src/SDCCicode.c (geniCodeLogic), + * src/SDCCast.c (decorateType): applied patch by Bernhard for rfe 1422617 + 2006-03-10 Maarten Brock * 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 f27842ea..f240fc97 100644 --- 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 30503b61..d53bd25f 100644 --- 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); -- 2.30.2