#include "common.h"
#include "newalloc.h"
+#include "dbuf_string.h"
/*-----------------------------------------------------------------*/
{
cseDef *cdp = item;
iCodeTable *icTab;
+ struct dbuf_s dbuf;
(void) ap;
fprintf (stdout, "**null op**");
printOperand (cdp->sym, stdout);
icTab = getTableEntry (cdp->diCode->op);
- icTab->iCodePrint (stdout, cdp->diCode, icTab->printName);
+ dbuf_init (&dbuf, 1024);
+ icTab->iCodePrint (&dbuf, cdp->diCode, icTab->printName);
+ dbuf_write_and_destroy (&dbuf, stdout);
return 1;
}
void ReplaceOpWithCheaperOp(operand **op, operand *cop) {
#ifdef RANGEHUNT
- printf ("ReplaceOpWithCheaperOp %s with %s: ",
- IS_SYMOP((*op)) ? OP_SYMBOL((*op))->name : "!SYM",
- IS_SYMOP(cop) ? OP_SYMBOL(cop)->name : "!SYM");
+ printf ("ReplaceOpWithCheaperOp\n\t");
+ printOperand (*op, stdout);
+ printf ("\nwith\t");
+ printOperand (cop, stdout);
+
// if op is a register equivalent
if (IS_ITEMP(cop) && IS_SYMOP((*op)) && OP_SYMBOL((*op))->isreqv) {
operand **rop = &OP_SYMBOL((*op))->usl.spillLoc->reqv;
{
iCode *lic;
+#ifdef RANGEHUNT
+ printf ("replaceAllSymBySym\n\t");
+ printOperand (from, stdout);
+ printf ("\nwith\t");
+ printOperand (to, stdout);
+ printf ("\n");
+#endif
for (lic = ic; lic; lic = lic->next)
{
- int siaddr;
+ int isaddr;
/* do the special cases first */
if (lic->op == IFX)
bitVectUnSetBit (OP_USES (from), lic->key);
OP_USES(to)=bitVectSetBit (OP_USES (to), lic->key);
- siaddr = IC_COND (lic)->isaddr;
+ isaddr = IC_COND (lic)->isaddr;
IC_COND (lic) = operandFromOperand (to);
- IC_COND (lic)->isaddr = siaddr;
+ IC_COND (lic)->isaddr = isaddr;
}
continue;
bitVectUnSetBit (OP_USES (from), lic->key);
OP_USES(to)=bitVectSetBit (OP_USES (to), lic->key);
- siaddr = IC_COND (lic)->isaddr;
+ isaddr = IC_COND (lic)->isaddr;
IC_JTCOND (lic) = operandFromOperand (to);
- IC_JTCOND (lic)->isaddr = siaddr;
+ IC_JTCOND (lic)->isaddr = isaddr;
}
continue;
bitVectUnSetBit (OP_DEFS (from), lic->key);
OP_DEFS(to)=bitVectSetBit (OP_DEFS (to), lic->key);
}
- siaddr = IC_RESULT (lic)->isaddr;
+ isaddr = IC_RESULT (lic)->isaddr;
IC_RESULT (lic) = operandFromOperand (to);
- IC_RESULT (lic)->isaddr = siaddr;
+ IC_RESULT (lic)->isaddr = isaddr;
}
if (IS_SYMOP (to) &&
{
bitVectUnSetBit (OP_USES (from), lic->key);
OP_USES(to)=bitVectSetBit (OP_USES (to), lic->key);
- siaddr = IC_RIGHT (lic)->isaddr;
+ isaddr = IC_RIGHT (lic)->isaddr;
IC_RIGHT (lic) = operandFromOperand (to);
- IC_RIGHT (lic)->isaddr = siaddr;
+ IC_RIGHT (lic)->isaddr = isaddr;
}
if (IS_SYMOP (to) &&
{
bitVectUnSetBit (OP_USES (from), lic->key);
OP_USES(to)=bitVectSetBit (OP_USES (to), lic->key);
- siaddr = IC_LEFT (lic)->isaddr;
+ isaddr = IC_LEFT (lic)->isaddr;
IC_LEFT (lic) = operandFromOperand (to);
- IC_LEFT (lic)->isaddr = siaddr;
+ IC_LEFT (lic)->isaddr = isaddr;
}
}
}
(*opp)->isaddr = cop->isaddr;
}
+ /* copy signedness to literal operands */
+ if (IS_SPEC(operandType (cop)) && IS_SPEC(operandType (*opp))
+ && isOperandLiteral(*opp)
+ && SPEC_NOUN(operandType(*opp)) == SPEC_NOUN(operandType(cop))
+ && SPEC_USIGN(operandType(*opp)) != SPEC_USIGN(operandType(cop)))
+ {
+ SPEC_USIGN(operandType(*opp)) = SPEC_USIGN(operandType(cop));
+ }
+
if (IS_SPEC(operandType (cop)) && IS_SPEC(operandType (*opp)) &&
SPEC_NOUN(operandType(cop)) != SPEC_NOUN(operandType(*opp)))
{
getSize (operandType (IC_RIGHT (cdp->diCode))) ==
getSize (operandType (rop)))
{
+ if (IS_SPEC (operandType (IC_RIGHT (cdp->diCode))) &&
+ SPEC_USIGN (operandType (IC_RIGHT (cdp->diCode))) !=
+ SPEC_USIGN (operandType (rop)))
+ {
+ /* bug #1493710
+ Reminder for Bernhard: check of signedness
+ could be unnecessary together with 'checkSign', if
+ signedness of operation is stored in ic */
+ return 0;
+ }
*opp = IC_RIGHT (cdp->diCode);
return 1;
}
default:
return;
}
- if (((unsigned) operandLitValue (IC_RIGHT (ic)) & val) == val)
+ if (((unsigned) double2ul (operandLitValue (IC_RIGHT (ic))) & val) == val)
{
ic->op = '=';
IC_RIGHT (ic) = IC_LEFT (ic);
default:
return;
}
- if (((unsigned) operandLitValue (IC_RIGHT (ic)) & val) == val)
+ if (((unsigned) double2ul (operandLitValue (IC_RIGHT (ic))) & val) == val)
{
if (IS_OP_VOLATILE (IC_LEFT (ic)))
{
/* and also iTemps derived from globals */
deleteItemIf (&cseSet, ifFromGlobal);
-
+
/* Delete iTemps derived from symbols whose address */
/* has been taken */
deleteItemIf (&cseSet, ifFromAddrTaken);
IC_LEFT (ic)->aggr2ptr = 0;
fixUpTypes (ic);
}
- else if (IC_LEFT (ic)->aggr2ptr)
+ else if (IC_LEFT (ic)->aggr2ptr == 1)
{/* band aid for kludge */
setOperandType (IC_LEFT (ic),
aggrToPtr (operandType (IC_LEFT (ic)), TRUE));
- IC_LEFT (ic)->aggr2ptr = 0;
+ IC_LEFT (ic)->aggr2ptr++;
fixUpTypes (ic);
}
}
aggrToPtr (operandType (IC_RESULT (ic)), FALSE));
IC_RESULT (ic)->aggr2ptr = 0;
}
- else if (IC_RESULT (ic)->aggr2ptr)
+ else if (IC_RESULT (ic)->aggr2ptr == 1)
{/* band aid for kludge */
setOperandType (IC_RESULT (ic),
aggrToPtr (operandType (IC_RESULT (ic)), TRUE));
- IC_RESULT (ic)->aggr2ptr = 0;
+ IC_RESULT (ic)->aggr2ptr++;
}
}
/* update the spill location for this */
updateSpillLocation (ic,0);
- if (POINTER_SET (ic) &&
+ if (POINTER_SET (ic) && IS_SYMOP (IC_RESULT (ic)) &&
!(IS_BITFIELD (OP_SYMBOL (IC_RESULT (ic))->etype)))
{
pdop = NULL;
}
}
- /*right operand */
+ /* right operand */
if (IS_SYMOP (IC_RIGHT (ic)) && !computeOnly)
{
IS_ITEMP (IC_RESULT (ic)) &&
!computeOnly)
{
- applyToSet (cseSet, findPrevIc, ic, &pdic);
+ applyToSet (cseSet, findPrevIc, ic, &pdic);
if (pdic && compareType (operandType (IC_RESULT (pdic)),
operandType (IC_RESULT (ic))) != 1)
pdic = NULL;
mine and type is a pointer then delete
pointerGets to take care of aliasing */
if (ASSIGNMENT (ic) &&
+ IS_SYMOP (IC_RESULT (ic)) &&
OTHERS_PARM (OP_SYMBOL (IC_RESULT (ic))) &&
IS_PTR (operandType (IC_RESULT (ic))))
{
/* delete from the cseSet anything that has */
/* operands matching the result of this */
/* except in case of pointer access */
- if (!(POINTER_SET (ic)) && IC_RESULT (ic))
+ if (!(POINTER_SET (ic)) && IS_SYMOP (IC_RESULT (ic)))
{
deleteItemIf (&cseSet, ifOperandsHave, IC_RESULT (ic));
/* delete any previous definitions */
ebb->defSet = bitVectCplAnd (ebb->defSet, OP_DEFS (IC_RESULT (ic)));
-
}
/* add the left & right to the defUse set */
OP_USES(IC_LEFT (ic))=
bitVectSetBit (OP_USES (IC_LEFT (ic)), ic->key);
setUsesDefs (IC_LEFT (ic), ebb->defSet, ebb->outDefs, &ebb->usesDefs);
-
}
if (IC_RIGHT (ic) && IS_SYMOP (IC_RIGHT (ic)))
OP_USES(IC_RIGHT (ic))=
bitVectSetBit (OP_USES (IC_RIGHT (ic)), ic->key);
setUsesDefs (IC_RIGHT (ic), ebb->defSet, ebb->outDefs, &ebb->usesDefs);
-
}
/* for the result it is special case, put the result */
/* in the defuseSet if it a pointer or array access */
- if (POINTER_SET (defic))
+ if (POINTER_SET (defic) && IS_SYMOP (IC_RESULT (ic)))
{
OP_USES(IC_RESULT (ic))=
bitVectSetBit (OP_USES (IC_RESULT (ic)), ic->key);
addSetHead (&ptrSetSet, newCseDef (IC_RESULT (ic), ic));
}
else
- /* add the result to defintion set */ if (IC_RESULT (ic))
{
- OP_DEFS(IC_RESULT (ic))=
- bitVectSetBit (OP_DEFS (IC_RESULT (ic)), ic->key);
- ebb->defSet = bitVectSetBit (ebb->defSet, ic->key);
- ebb->outDefs = bitVectCplAnd (ebb->outDefs, OP_DEFS (IC_RESULT (ic)));
- ebb->ldefs = bitVectSetBit (ebb->ldefs, ic->key);
+ /* add the result to definition set */
+ if (IS_SYMOP (IC_RESULT (ic)))
+ {
+ OP_DEFS(IC_RESULT (ic))=
+ bitVectSetBit (OP_DEFS (IC_RESULT (ic)), ic->key);
+ ebb->defSet = bitVectSetBit (ebb->defSet, ic->key);
+ ebb->outDefs = bitVectCplAnd (ebb->outDefs, OP_DEFS (IC_RESULT (ic)));
+ ebb->ldefs = bitVectSetBit (ebb->ldefs, ic->key);
+ }
}
-
/* if this is an addressof instruction then */
/* put the symbol in the address of list & */
/* delete it from the cseSet */
projects / fw / sdcc / blobdiff