X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCCcse.c;h=1bff79e102f6ea631e3ddd69921710a554bd9d27;hb=5ade3859d7f0e21b5eab227e088fb2c2017b07a3;hp=b02adc0e708917510a9424c6d523ec99fc410ac5;hpb=d322ac46b9630c789436f6bd33c5e0aa58b01905;p=fw%2Fsdcc

diff --git a/src/SDCCcse.c b/src/SDCCcse.c
index b02adc0e..1bff79e1 100644
--- a/src/SDCCcse.c
+++ b/src/SDCCcse.c
@@ -300,7 +300,9 @@ DEFSETFUNC (findCheaperOp)
       IS_ITEMP (IC_RESULT (cdp->diCode)))
     *opp = IC_RESULT (cdp->diCode);
 
-  if ((*opp)&&(SPEC_USIGN(operandType (cop))==SPEC_USIGN(operandType (*opp))))
+  if ((*opp) && 
+      (SPEC_USIGN(operandType (cop))==SPEC_USIGN(operandType (*opp))) &&
+      (SPEC_LONG(operandType (cop))==SPEC_LONG(operandType (*opp))))
     {
 
       if ((isGlobalInNearSpace (cop) &&
@@ -808,25 +810,28 @@ algebraicOpts (iCode * ic)
 	}
       break;
     case CAST:
-      /* if this is a cast of a literal value */
-      if (IS_OP_LITERAL (IC_RIGHT (ic)))
-	{
-	  ic->op = '=';
-	  IC_RIGHT (ic) =
-	    operandFromValue (valCastLiteral (operandType (IC_LEFT (ic)),
-					  operandLitValue (IC_RIGHT (ic))));
-	  IC_LEFT (ic) = NULL;
-	  SET_ISADDR (IC_RESULT (ic), 0);
-	}
-      /* if casting to the same */
-      if (checkType (operandType (IC_RESULT (ic)),
-		     operandType (IC_RIGHT (ic))) == 1)
-	{
-	  ic->op = '=';
-	  IC_LEFT (ic) = NULL;
-	  SET_ISADDR (IC_RESULT (ic), 0);
-	}
-      break;
+	    {
+		    sym_link *otype = operandType(IC_RIGHT(ic));
+		    sym_link *ctype = operandType(IC_LEFT(ic));
+		    /* if this is a cast of a literal value */
+		    if (IS_OP_LITERAL (IC_RIGHT (ic)) &&
+			!(IS_GENPTR(ctype) && (IS_PTR(otype) && !IS_GENPTR(otype)))) {
+			    ic->op = '=';
+			    IC_RIGHT (ic) =
+				    operandFromValue (valCastLiteral (operandType (IC_LEFT (ic)),
+								      operandLitValue (IC_RIGHT (ic))));
+			    IC_LEFT (ic) = NULL;
+			    SET_ISADDR (IC_RESULT (ic), 0);
+		    }
+		    /* if casting to the same */
+		    if (compareType (operandType (IC_RESULT (ic)),
+				     operandType (IC_RIGHT (ic))) == 1) {
+			    ic->op = '=';
+			    IC_LEFT (ic) = NULL;
+			    SET_ISADDR (IC_RESULT (ic), 0);
+		    }
+	    }
+	    break;
     case '!':
       if (IS_OP_LITERAL (IC_LEFT (ic)))
 	{
@@ -846,51 +851,57 @@ algebraicOpts (iCode * ic)
 /* updateSpillLocation - keeps track of register spill location    */
 /*-----------------------------------------------------------------*/
 void 
-updateSpillLocation (iCode * ic)
+updateSpillLocation (iCode * ic, int induction)
 {
 
-  sym_link *setype;
+	sym_link *setype;
 
-  if (POINTER_SET (ic))
-    return;
-
-  if (ic->nosupdate)
-    return;
-
-  /* for the form true_symbol := iTempNN */
-  if (ASSIGN_ITEMP_TO_SYM (ic)
-      && !SPIL_LOC (IC_RIGHT (ic)))
-    {
-
-      setype = getSpec (operandType (IC_RESULT (ic)));
+	if (POINTER_SET (ic))
+		return;
 
-      if (!IC_RIGHT (ic)->noSpilLoc &&
-	  !IS_VOLATILE (setype) &&
-	  !IN_FARSPACE (SPEC_OCLS (setype)) &&
-	  !OTHERS_PARM (OP_SYMBOL (IC_RESULT (ic))))
+	if (ic->nosupdate)
+		return;
 
-	SPIL_LOC (IC_RIGHT (ic)) =
-	  IC_RESULT (ic)->operand.symOperand;
-    }
+	/* for the form true_symbol := iTempNN */
+	if (ASSIGN_ITEMP_TO_SYM (ic) && 
+	    !SPIL_LOC (IC_RIGHT (ic))) {
 
-  if (ASSIGN_ITEMP_TO_ITEMP (ic) &&
-      !SPIL_LOC (IC_RIGHT (ic)) &&
-  !bitVectBitsInCommon (OP_DEFS (IC_RIGHT (ic)), OP_USES (IC_RESULT (ic))) &&
-      OP_SYMBOL (IC_RESULT (ic))->isreqv)
-    {
+		setype = getSpec (operandType (IC_RESULT (ic)));
 
-      setype = getSpec (operandType (IC_RESULT (ic)));
+		if (!OP_SYMBOL(IC_RIGHT (ic))->noSpilLoc &&
+		    !IS_VOLATILE (setype) &&
+		    !IN_FARSPACE (SPEC_OCLS (setype)) &&
+		    !OTHERS_PARM (OP_SYMBOL (IC_RESULT (ic))))
 
-      if (!IC_RIGHT (ic)->noSpilLoc &&
-	  !IS_VOLATILE (setype) &&
-	  !IN_FARSPACE (SPEC_OCLS (setype)) &&
-	  !OTHERS_PARM (OP_SYMBOL (IC_RESULT (ic))))
+			SPIL_LOC (IC_RIGHT (ic)) =
+				IC_RESULT (ic)->operand.symOperand;
+	}
 
-	SPIL_LOC (IC_RIGHT (ic)) =
-	  SPIL_LOC (IC_RESULT (ic));
-    }
+	if (ASSIGN_ITEMP_TO_ITEMP (ic)) {
+	  
+		if (!SPIL_LOC (IC_RIGHT (ic)) &&
+		    !bitVectBitsInCommon (OP_DEFS (IC_RIGHT (ic)), OP_USES (IC_RESULT (ic))) &&
+		    OP_SYMBOL (IC_RESULT (ic))->isreqv) {
+
+			setype = getSpec (operandType (IC_RESULT (ic)));
+	      
+			if (!OP_SYMBOL(IC_RIGHT (ic))->noSpilLoc &&
+			    !IS_VOLATILE (setype) &&
+			    !IN_FARSPACE (SPEC_OCLS (setype)) &&
+			    !OTHERS_PARM (OP_SYMBOL (IC_RESULT (ic))))
+
+				SPIL_LOC (IC_RIGHT (ic)) =
+					SPIL_LOC (IC_RESULT (ic));
+		}
+		/* special case for inductions */
+		if (induction && 
+		    OP_SYMBOL(IC_RIGHT(ic))->isreqv && 
+		    !OP_SYMBOL(IC_RESULT (ic))->noSpilLoc &&
+		    !SPIL_LOC(IC_RESULT(ic))) {
+			SPIL_LOC (IC_RESULT (ic)) = SPIL_LOC (IC_RIGHT (ic));
+		}
+	}
 }
-
 /*-----------------------------------------------------------------*/
 /* setUsesDef - sets the uses def bitvector for a given operand    */
 /*-----------------------------------------------------------------*/
@@ -1005,7 +1016,9 @@ ifxOptimize (iCode * ic, set * cseSet,
       /* too often, if it does happen then the user pays */
       /* the price */
       computeControlFlow (ebbs, count, 1);
-      werror (W_CONTROL_FLOW, ic->filename, ic->lineno);
+      if (!options.lessPedantic) {
+	werror (W_CONTROL_FLOW, ic->filename, ic->lineno);
+      }
       return;
     }
 
@@ -1019,7 +1032,9 @@ ifxOptimize (iCode * ic, set * cseSet,
 
       remiCodeFromeBBlock (ebb, ic);
       computeControlFlow (ebbs, count, 1);
-      werror (W_CONTROL_FLOW, ic->filename, ic->lineno);
+      if (!options.lessPedantic) {
+	werror (W_CONTROL_FLOW, ic->filename, ic->lineno);
+      }
       return;
     }
 
@@ -1117,7 +1132,7 @@ constFold (iCode * ic, set * cseSet)
   if (IS_ITEMP (IC_RESULT (ic)))
     {
       SPIL_LOC (IC_RESULT (ic)) = NULL;
-      IC_RESULT (ic)->noSpilLoc = 1;
+      OP_SYMBOL(IC_RESULT (ic))->noSpilLoc = 1;
     }
 
 
@@ -1159,9 +1174,9 @@ deleteGetPointers (set ** cseSet, set ** pss, operand * op, eBBlock * ebb)
 	     iTemp1 = iTemp0 + 8;
 	     iTemp2 = iTemp1 + 8; */
 	  if (isinSetWith (compItems, (void*)IC_LEFT (cdp->diCode), 
-			   (void*)isOperandEqual) ||
+			   (insetwithFunc)isOperandEqual) ||
 	      isinSetWith (compItems, (void*)IC_RIGHT (cdp->diCode), 
-			   (void*)isOperandEqual))
+			   (insetwithFunc)isOperandEqual))
 	    {
 	      addSet (&compItems, IC_RESULT (cdp->diCode));
 	    }
@@ -1213,7 +1228,8 @@ fixUpTypes (iCode * ic)
 {
   sym_link *t1 = operandType (IC_LEFT (ic)), *t2;
 
-  if (TARGET_IS_DS390)
+  /* if (TARGET_IS_DS390) */
+  if (options.model == MODEL_FLAT24)
     {
       /* hack-o-matic! */
       return;
@@ -1222,7 +1238,7 @@ fixUpTypes (iCode * ic)
   /* for pointer_gets if the types of result & left r the
      same then change it type of result to next */
   if (IS_PTR (t1) &&
-      checkType (t2 = operandType (IC_RESULT (ic)), t1) == 1)
+      compareType (t2 = operandType (IC_RESULT (ic)), t1) == 1)
     {
       setOperandType (IC_RESULT (ic), t2->next);
     }
@@ -1394,7 +1410,7 @@ cseBBlock (eBBlock * ebb, int computeOnly,
 	{
 
 	  /* update the spill location for this */
-	  updateSpillLocation (ic);
+	  updateSpillLocation (ic,0);
 
 	  if (POINTER_SET (ic) &&
 	      !(IS_BITFIELD (OP_SYMBOL (IC_RESULT (ic))->etype)))
@@ -1494,7 +1510,7 @@ cseBBlock (eBBlock * ebb, int computeOnly,
 	  !computeOnly)
 	{
 	  applyToSet (cseSet, findPrevIc, ic, &pdic);
-	  if (pdic && checkType (operandType (IC_RESULT (pdic)),
+	  if (pdic && compareType (operandType (IC_RESULT (pdic)),
 				 operandType (IC_RESULT (ic))) != 1)
 	    pdic = NULL;
 	}