{
short r0Pushed;
short r1Pushed;
- short r0InB;
- short r1InB;
+ union
+ {
+ struct
+ {
+ short r0InB : 2;//2 so we can see it overflow
+ short r1InB : 2;//2 so we can see it overflow
+ short OpInB : 2;//2 so we can see it overflow
+ } ;
+ short BInUse;
+ } ;
short accInUse;
short inLine;
short debugLine;
extern int mcs51_nRegs;
extern FILE *codeOutFile;
static void saveRBank (int, iCode *, bool);
+
#define RESULTONSTACK(x) \
(IC_RESULT(x) && IC_RESULT(x)->aop && \
IC_RESULT(x)->aop->type == AOP_STK )
-#define MOVA(x) mova(x) /* use function to avoid multiple eval */
-#define CLRC emitcode("clr","c")
-#define SETC emitcode("setb","c")
+#define MOVA(x) mova(x) /* use function to avoid multiple eval */
+#define CLRC emitcode("clr","c")
+#define SETC emitcode("setb","c")
static lineNode *lineHead = NULL;
static lineNode *lineCurr = NULL;
if (inst && *inst)
{
if (fmt && *fmt)
- SNPRINTF (lb, sizeof(lb), "%s\t", inst);
+ SNPRINTF (lb, sizeof(lb), "%s\t", inst);
else
- SNPRINTF (lb, sizeof(lb), "%s", inst);
+ SNPRINTF (lb, sizeof(lb), "%s", inst);
tvsprintf (lb + strlen(lb), sizeof(lb) - strlen(lb), fmt, ap);
}
else
- tvsprintf (lb, sizeof(lb), fmt, ap);
+ tvsprintf (lb, sizeof(lb), fmt, ap);
while (isspace (*lbp))
- lbp++;
-
- //printf ("%s\n", lb);
+ lbp++;
if (lbp && *lbp)
- lineCurr = (lineCurr ?
- connectLine (lineCurr, newLineNode (lb)) :
- (lineHead = newLineNode (lb)));
+ lineCurr = (lineCurr ?
+ connectLine (lineCurr, newLineNode (lb)) :
+ (lineHead = newLineNode (lb)));
lineCurr->isInline = _G.inLine;
lineCurr->isDebug = _G.debugLine;
lineCurr->ic = _G.current_iCode;
mova (const char *x)
{
/* do some early peephole optimization */
- if (!strcmp(x, "a") || !strcmp(x, "acc"))
+ if (!strncmp(x, "a", 2) || !strncmp(x, "acc", 4))
return;
emitcode("mov","a,%s", x);
}
+/*-----------------------------------------------------------------*/
+/* pushB - saves register B if necessary */
+/*-----------------------------------------------------------------*/
+static bool
+pushB (void)
+{
+ bool pushedB = FALSE;
+
+ if (_G.BInUse)
+ {
+ emitcode ("push", "b");
+// printf("B was in use !\n");
+ pushedB = TRUE;
+ }
+ else
+ {
+ _G.OpInB++;
+ }
+ return pushedB;
+}
+
+/*-----------------------------------------------------------------*/
+/* popB - restores value of register B if necessary */
+/*-----------------------------------------------------------------*/
+static void
+popB (bool pushedB)
+{
+ if (pushedB)
+ {
+ emitcode ("pop", "b");
+ }
+ else
+ {
+ _G.OpInB--;
+ }
+}
+
/*-----------------------------------------------------------------*/
/* getFreePtr - returns r0 or r1 whichever is free or can be pushed */
/*-----------------------------------------------------------------*/
static regs *
getFreePtr (iCode * ic, asmop ** aopp, bool result)
{
- bool r0iu = FALSE, r1iu = FALSE;
- bool r0ou = FALSE, r1ou = FALSE;
+ bool r0iu, r1iu;
+ bool r0ou, r1ou;
/* the logic: if r0 & r1 used in the instruction
then we are in trouble otherwise */
}
-
/*-----------------------------------------------------------------*/
/* leftRightUseAcc - returns size of accumulator use by operands */
/*-----------------------------------------------------------------*/
return accuse;
}
-
/*-----------------------------------------------------------------*/
/* aopForSym - for a true symbol */
/*-----------------------------------------------------------------*/
{
iCode *ic = sym->rematiCode;
asmop *aop = newAsmop (AOP_IMMD);
- int ptr_type=0;
+ int ptr_type = 0;
int val = 0;
for (;;)
{
symbol *sym1, *sym2;
- /* if they not symbols */
+ /* if they're not symbols */
if (!IS_SYMOP (op1) || !IS_SYMOP (op2))
return FALSE;
if (sym1 == sym2)
return TRUE;
+ /* if they have the same rname */
if (sym1->rname[0] && sym2->rname[0]
&& strcmp (sym1->rname, sym2->rname) == 0)
return TRUE;
if (strcmp (d, s) ||
bvolatile)
- emitcode ("mov", "%s,%s", d, s);
+ emitcode ("mov", "%s,%s", d, s);
break;
{
int size = AOP_SIZE (oper) - 1;
int offset = 1;
- MOVA (aopGet (AOP (oper), 0, FALSE, FALSE));
- while (size--)
- emitcode ("orl", "a,%s", aopGet (AOP (oper), offset++, FALSE, FALSE));
+ char *l = aopGet (AOP (oper), 0, FALSE, FALSE);
+ bool pushedB;
+
+ if (!strncmp (l, "a", 2) || !strncmp (l, "acc", 4))
+ {
+ if (size--)
+ {
+ pushedB = pushB ();
+ emitcode("mov", "b,a");
+ while (size--)
+ {
+ MOVA (aopGet (AOP (oper), offset++, FALSE, FALSE));
+ emitcode ("orl", "b,a");
+ }
+ MOVA (aopGet (AOP (oper), offset, FALSE, FALSE));
+ emitcode ("orl", "a,b");
+ popB (pushedB);
+ }
+ }
+ else
+ {
+ MOVA (l);
+ while (size--)
+ {
+ emitcode ("orl", "a,%s", aopGet (AOP (oper), offset++, FALSE, FALSE));
+ }
+ }
}
IFFUNC_ISNAKED(OP_SYM_TYPE(IC_LEFT (ic)))))
return;
- /* safe the registers in use at this time but skip the
+ /* save the registers in use at this time but skip the
ones for the result */
rsave = bitVectCplAnd (bitVectCopy (ic->rMask),
mcs51_rUmaskForOp (IC_RESULT(ic)));
if (options.useXstack)
{
if (bitVectBitValue (rsave, R0_IDX))
- emitcode ("mov", "b,r0");
+ {
+ emitcode ("mov", "a,r0");
+ emitcode ("push", "%s", mcs51_regWithIdx (R0_IDX)->dname);
+ }
emitcode ("mov", "r0,%s", spname);
for (i = 0; i < mcs51_nRegs; i++)
{
if (bitVectBitValue (rsave, i))
{
- if (i == R0_IDX)
- emitcode ("mov", "a,b");
- else
+ if (i != R0_IDX)
emitcode ("mov", "a,%s", mcs51_regWithIdx (i)->name);
emitcode ("movx", "@r0,a");
emitcode ("inc", "r0");
}
emitcode ("mov", "%s,r0", spname);
if (bitVectBitValue (rsave, R0_IDX))
- emitcode ("mov", "r0,b");
+ {
+ emitcode ("pop", "%s", mcs51_regWithIdx (R0_IDX)->dname);
+ }
}
else
for (i = 0; i < mcs51_nRegs; i++)
{
emitcode ("dec", "r0");
emitcode ("movx", "a,@r0");
- if (i == R0_IDX)
- emitcode ("mov", "b,a");
- else
+ if (i != R0_IDX)
emitcode ("mov", "%s,a", mcs51_regWithIdx (i)->name);
}
}
emitcode ("mov", "%s,r0", spname);
if (bitVectBitValue (rsave, R0_IDX))
- emitcode ("mov", "r0,b");
+ {
+ emitcode ("mov", "r0,a");
+ }
}
else
for (i = mcs51_nRegs; i >= 0; i--)
emitcode ("push", "acc");
}
else
- emitcode ("push", "%s", l);
+ emitcode ("push", "%s", l);
+ }
}
-}
/*-----------------------------------------------------------------*/
/* assignResultValue - */
emitcode ("push", "acc");
}
else
- emitcode ("push", "%s", l);
- }
+ emitcode ("push", "%s", l);
+ }
freeAsmop (IC_LEFT (ic), NULL, ic, TRUE);
}
emitcode ("mov", "psw,#0x%02x", (bank << 3) & 0x00ff);
}
- if (aop)
+ if (aop)
{
- freeAsmop (NULL, aop, ic, TRUE);
+ freeAsmop (NULL, aop, ic, TRUE);
}
if (ic)
{
- ic->bankSaved = 1;
+ ic->bankSaved = 1;
}
}
iCode *sic;
int rb1_count = 0 ;
- for (sic = setFirstItem (_G.sendSet); sic;
- sic = setNextItem (_G.sendSet)) {
+ for (sic = setFirstItem (sendSet); sic;
+ sic = setNextItem (sendSet)) {
int size, offset = 0;
aopOp (IC_LEFT (sic), sic, FALSE);
size = AOP_SIZE (IC_LEFT (sic));
D(emitcode("; genCall",""));
dtype = operandType (IC_LEFT (ic));
- /* if send set is not empty the assign */
+ /* if send set is not empty then assign */
if (_G.sendSet)
{
if (IFFUNC_ISREENT(dtype)) { /* need to reverse the send set */
{
if (aopGetUsesAcc (leftOp, offset) && aopGetUsesAcc (rightOp, offset))
{
- emitcode("mov", "b,a");
+ bool pushedB;
MOVA (aopGet (leftOp, offset, FALSE, TRUE));
+ pushedB = pushB ();
emitcode("xch", "a,b");
MOVA (aopGet (rightOp, offset, FALSE, TRUE));
emitcode (add, "a,b");
+ popB (pushedB);
}
else if (aopGetUsesAcc (leftOp, offset))
{
while (size--)
{
if (aopGetUsesAcc(rightOp, offset)) {
- wassertl(!aopGetUsesAcc(leftOp, offset), "accumulator clash");
- MOVA (aopGet(rightOp, offset, FALSE, TRUE));
- if (offset == 0) {
- emitcode( "setb", "c");
+ if (aopGetUsesAcc(leftOp, offset)) {
+ bool pushedB;
+
+ MOVA (aopGet (rightOp, offset, FALSE, FALSE));
+ pushedB = pushB ();
+ emitcode ("mov", "b,a");
+ if (offset == 0)
+ CLRC;
+ MOVA (aopGet (leftOp, offset, FALSE, FALSE));
+ emitcode ("subb", "a,b");
+ popB (pushedB);
+ } else {
+ wassertl(!aopGetUsesAcc(leftOp, offset), "accumulator clash");
+ MOVA (aopGet(rightOp, offset, FALSE, TRUE));
+ if (offset == 0) {
+ emitcode( "setb", "c");
+ }
+ emitcode("subb", "a,%s", aopGet(leftOp, offset, FALSE, TRUE));
+ emitcode("cpl", "a");
}
- emitcode("subb", "a,%s", aopGet(leftOp, offset, FALSE, TRUE));
- emitcode("cpl", "a");
} else {
MOVA (aopGet (leftOp, offset, FALSE, FALSE));
if (offset == 0)
symbol *lbl;
int size = AOP_SIZE (result);
bool runtimeSign, compiletimeSign;
- bool lUnsigned, rUnsigned;
+ bool lUnsigned, rUnsigned, pushedB;
D(emitcode ("; genMultOneByte",""));
lUnsigned = SPEC_USIGN (getSpec (operandType (left)));
rUnsigned = SPEC_USIGN (getSpec (operandType (right)));
+ pushedB = pushB ();
+
if (size == 1 /* no, this is not a bug; with a 1 byte result there's
no need to take care about the signedness! */
|| (lUnsigned && rUnsigned))
aopPut (AOP (result), "a", 0, isOperandVolatile (result, FALSE));
if (size == 2)
aopPut (AOP (result), "b", 1, isOperandVolatile (result, FALSE));
+
+ popB (pushedB);
return;
}
aopPut (AOP (result), "a", 0, isOperandVolatile (result, FALSE));
if (size == 2)
aopPut (AOP (result), "b", 1, isOperandVolatile (result, FALSE));
+
+ popB (pushedB);
}
/*-----------------------------------------------------------------*/
operand * right,
operand * result)
{
-
char *l;
+ bool pushedB;
D(emitcode ("; genDivbits",""));
+ pushedB = pushB ();
+
/* the result must be bit */
emitcode ("mov", "b,%s", aopGet (AOP (right), 0, FALSE, FALSE));
l = aopGet (AOP (left), 0, FALSE, FALSE);
emitcode ("div", "ab");
emitcode ("rrc", "a");
+
+ popB (pushedB);
+
aopPut (AOP (result), "c", 0, isOperandVolatile (result, FALSE));
}
operand * right,
operand * result)
{
- bool lUnsigned, rUnsigned;
+ bool lUnsigned, rUnsigned, pushedB;
bool runtimeSign, compiletimeSign;
symbol *lbl;
int size, offset;
lUnsigned = SPEC_USIGN (getSpec (operandType (left)));
rUnsigned = SPEC_USIGN (getSpec (operandType (right)));
+ pushedB = pushB ();
+
/* signed or unsigned */
if (lUnsigned && rUnsigned)
{
aopPut (AOP (result), "a", 0, isOperandVolatile (result, FALSE));
while (size--)
aopPut (AOP (result), zero, offset++, isOperandVolatile (result, FALSE));
+
+ popB (pushedB);
return;
}
while (size--)
aopPut (AOP (result), zero, offset++, isOperandVolatile (result, FALSE));
}
+
+ popB (pushedB);
}
/*-----------------------------------------------------------------*/
operand * right,
operand * result)
{
-
char *l;
+ bool pushedB;
D(emitcode ("; genModbits",""));
+ pushedB = pushB ();
+
/* the result must be bit */
emitcode ("mov", "b,%s", aopGet (AOP (right), 0, FALSE, FALSE));
l = aopGet (AOP (left), 0, FALSE, FALSE);
emitcode ("div", "ab");
emitcode ("mov", "a,b");
emitcode ("rrc", "a");
+
+ popB (pushedB);
+
aopPut (AOP (result), "c", 0, isOperandVolatile (result, FALSE));
}
operand * right,
operand * result)
{
- bool lUnsigned, rUnsigned;
+ bool lUnsigned, rUnsigned, pushedB;
bool runtimeSign, compiletimeSign;
symbol *lbl;
int size, offset;
lUnsigned = SPEC_USIGN (getSpec (operandType (left)));
rUnsigned = SPEC_USIGN (getSpec (operandType (right)));
+ pushedB = pushB ();
+
/* signed or unsigned */
if (lUnsigned && rUnsigned)
{
aopPut (AOP (result), "b", 0, isOperandVolatile (result, FALSE));
while (size--)
aopPut (AOP (result), zero, offset++, isOperandVolatile (result, FALSE));
+
+ popB (pushedB);
return;
}
while (size--)
aopPut (AOP (result), zero, offset++, isOperandVolatile (result, FALSE));
}
+
+ popB (pushedB);
}
/*-----------------------------------------------------------------*/
CLRC;
while (size--)
{
+ bool pushedB = FALSE;
rightInB = aopGetUsesAcc(AOP (right), offset);
if (rightInB)
- emitcode ("mov", "b,%s", aopGet (AOP (right), offset, FALSE, FALSE));
+ {
+ pushedB = pushB ();
+ emitcode ("mov", "b,%s", aopGet (AOP (right), offset, FALSE, FALSE));
+ }
MOVA (aopGet (AOP (left), offset, FALSE, FALSE));
if (sign && size == 0)
{
else
{
if (!rightInB)
- emitcode ("mov", "b,%s", aopGet (AOP (right), offset, FALSE, FALSE));
+ {
+ pushedB = pushB ();
+ rightInB++;
+ emitcode ("mov", "b,%s", aopGet (AOP (right), offset, FALSE, FALSE));
+ }
emitcode ("xrl", "b,#0x80");
emitcode ("subb", "a,b");
}
else
emitcode ("subb", "a,%s", aopGet (AOP (right), offset, FALSE, FALSE));
}
+ if (rightInB)
+ popB (pushedB);
offset++;
}
}
/* right is a pointer reg need both a & b */
while (size--)
{
- char *l = aopGet (AOP (left), offset, FALSE, FALSE);
+ char *l;
+ //if B in use: push B; mov B,left; mov A,right; clrc; subb A,B; pop B; jnz
+ wassertl(!_G.BInUse, "B was in use");
+ l = aopGet (AOP (left), offset, FALSE, FALSE);
if (strcmp (l, "b"))
emitcode ("mov", "b,%s", l);
MOVA (aopGet (AOP (right), offset, FALSE, FALSE));
return lic;
}
/* if the operand used or deffed */
- if (bitVectBitValue(OP_USES(op),lic->key) || (unsigned) lic->defKey == op->key) {
+ if (bitVectBitValue(OP_USES(op),lic->key) || lic->defKey == op->key) {
return NULL;
}
/* if GOTO or IFX */
"acc.%d", posbit & 0x07);
genIfxJump (ifx, buffer, left, right, result);
}
- else
+ else
{// what is this case? just found it in ds390/gen.c
emitcode ("anl","a,#!constbyte",1 << (posbit & 0x07));
}
if (isOperandVolatile (left, FALSE))
MOVA (aopGet (AOP (left), offset, FALSE, FALSE));
else
- continue;
+ continue;
}
else if (bytelit == 0)
{
aopGet (AOP (right), offset, FALSE, FALSE));
} else {
if (AOP_TYPE(left)==AOP_ACC) {
+ bool pushedB = pushB ();
emitcode("mov", "b,a");
MOVA (aopGet (AOP (right), offset, FALSE, FALSE));
emitcode("anl", "a,b");
+ popB (pushedB);
}else {
MOVA (aopGet (AOP (right), offset, FALSE, FALSE));
emitcode ("anl", "a,%s",
if (isOperandVolatile (left, FALSE))
MOVA (aopGet (AOP (left), offset, FALSE, FALSE));
else
- continue;
+ continue;
}
else if (IS_AOP_PREG (left))
{
else if (operandsEqu (left, result))
{
char * reg = "a";
+ bool pushedB = FALSE, leftInB = FALSE;
+
MOVA (aopGet (AOP (left), 0, FALSE, FALSE));
if (aopGetUsesAcc(AOP (left), 1) || aopGetUsesAcc(AOP (result), 0))
{
+ pushedB = pushB ();
emitcode ("mov", "b,a");
reg = "b";
+ leftInB = TRUE;
}
aopPut (AOP (result), aopGet (AOP (left), 1, FALSE, FALSE),
0, isOperandVolatile (result, FALSE));
aopPut (AOP (result), reg, 1, isOperandVolatile (result, FALSE));
+
+ if (leftInB)
+ popB (pushedB);
}
else
{
int size, offset;
char *l;
symbol *tlbl, *tlbl1;
+ bool pushedB;
D(emitcode ("; genLeftShift",""));
more that 32 bits make no sense anyway, ( the
largest size of an object can be only 32 bits ) */
+ pushedB = pushB ();
emitcode ("mov", "b,%s", aopGet (AOP (right), 0, FALSE, FALSE));
emitcode ("inc", "b");
freeAsmop (right, NULL, ic, TRUE);
aopOp (left, ic, FALSE);
aopOp (result, ic, FALSE);
- /* now move the left to the result if they are not the
- same */
+ /* now move the left to the result if they are not the same */
if (!sameRegs (AOP (left), AOP (result)) &&
AOP_SIZE (result) > 1)
{
emitcode ("add", "a,acc");
emitcode ("", "%05d$:", tlbl1->key + 100);
emitcode ("djnz", "b,%05d$", tlbl->key + 100);
+ popB (pushedB);
aopPut (AOP (result), "a", 0, isOperandVolatile (result, FALSE));
goto release;
}
emitcode ("", "%05d$:", tlbl1->key + 100);
emitcode ("djnz", "b,%05d$", tlbl->key + 100);
+ popB (pushedB);
release:
freeAsmop (left, NULL, ic, TRUE);
freeAsmop (result, NULL, ic, TRUE);
int size, offset;
char *l;
symbol *tlbl, *tlbl1;
+ bool pushedB;
D(emitcode ("; genSignedRightShift",""));
more that 32 bits make no sense anyway, ( the
largest size of an object can be only 32 bits ) */
+ pushedB = pushB ();
emitcode ("mov", "b,%s", aopGet (AOP (right), 0, FALSE, FALSE));
emitcode ("inc", "b");
freeAsmop (right, NULL, ic, TRUE);
emitcode ("rrc", "a");
emitcode ("", "%05d$:", tlbl1->key + 100);
emitcode ("djnz", "b,%05d$", tlbl->key + 100);
+ popB (pushedB);
aopPut (AOP (result), "a", 0, isOperandVolatile (result, FALSE));
goto release;
}
reAdjustPreg (AOP (result));
emitcode ("", "%05d$:", tlbl1->key + 100);
emitcode ("djnz", "b,%05d$", tlbl->key + 100);
+ popB (pushedB);
release:
freeAsmop (left, NULL, ic, TRUE);
int size, offset;
char *l;
symbol *tlbl, *tlbl1;
+ bool pushedB;
D(emitcode ("; genRightShift",""));
more that 32 bits make no sense anyway, ( the
largest size of an object can be only 32 bits ) */
+ pushedB = pushB ();
emitcode ("mov", "b,%s", aopGet (AOP (right), 0, FALSE, FALSE));
emitcode ("inc", "b");
freeAsmop (right, NULL, ic, TRUE);
emitcode ("rrc", "a");
emitcode ("", "%05d$:", tlbl1->key + 100);
emitcode ("djnz", "b,%05d$", tlbl->key + 100);
+ popB (pushedB);
aopPut (AOP (result), "a", 0, isOperandVolatile (result, FALSE));
goto release;
}
emitcode ("", "%05d$:", tlbl1->key + 100);
emitcode ("djnz", "b,%05d$", tlbl->key + 100);
+ popB (pushedB);
release:
freeAsmop (left, NULL, ic, TRUE);
/* genUnpackBits - generates code for unpacking bits */
/*-----------------------------------------------------------------*/
static void
-genUnpackBits (operand * result, char *rname, int ptype)
+genUnpackBits (operand * result, char *rname, int ptype, iCode *ifx)
{
int offset = 0; /* result byte offset */
int rsize; /* result size */
sym_link *etype; /* bitfield type information */
int blen; /* bitfield length */
int bstr; /* bitfield starting bit within byte */
+ char buffer[10];
D(emitcode ("; genUnpackBits",""));
blen = SPEC_BLEN (etype);
bstr = SPEC_BSTR (etype);
+ if (ifx && blen <= 8)
+ {
+ emitPtrByteGet (rname, ptype, FALSE);
+ if (blen == 1)
+ {
+ SNPRINTF (buffer, sizeof(buffer),
+ "acc.%d", bstr);
+ genIfxJump (ifx, buffer, NULL, NULL, NULL);
+ }
+ else
+ {
+ if (blen < 8)
+ emitcode ("anl", "a,#0x%02x",
+ (((unsigned char) -1) >> (8 - blen)) << bstr);
+ genIfxJump (ifx, "a", NULL, NULL, NULL);
+ }
+ return;
+ }
+ wassert (!ifx);
+
/* If the bitfield length is less than a byte */
if (blen < 8)
{
genNearPointerGet (operand * left,
operand * result,
iCode * ic,
- iCode * pi)
+ iCode * pi,
+ iCode * ifx)
{
asmop *aop = NULL;
regs *preg = NULL;
/* if bitfield then unpack the bits */
if (IS_BITFIELD (retype))
- genUnpackBits (result, rname, POINTER);
+ genUnpackBits (result, rname, POINTER, ifx);
else
{
/* we have can just get the values */
while (size--)
{
- if (IS_AOP_PREG (result) || AOP_TYPE (result) == AOP_STK)
+ if (ifx || IS_AOP_PREG (result) || AOP_TYPE (result) == AOP_STK)
{
emitcode ("mov", "a,@%s", rname);
+ if (!ifx)
aopPut (AOP (result), "a", offset, isOperandVolatile (result, FALSE));
}
else
}
}
+ if (ifx && !ifx->generated)
+ {
+ genIfxJump (ifx, "a", left, NULL, result);
+ }
+
/* done */
freeAsmop (result, NULL, ic, RESULTONSTACK (ic) ? FALSE : TRUE);
freeAsmop (left, NULL, ic, TRUE);
genPagedPointerGet (operand * left,
operand * result,
iCode * ic,
- iCode *pi)
+ iCode *pi,
+ iCode *ifx)
{
asmop *aop = NULL;
regs *preg = NULL;
/* if bitfield then unpack the bits */
if (IS_BITFIELD (retype))
- genUnpackBits (result, rname, PPOINTER);
+ genUnpackBits (result, rname, PPOINTER, ifx);
else
{
/* we have can just get the values */
{
emitcode ("movx", "a,@%s", rname);
+ if (!ifx)
aopPut (AOP (result), "a", offset, isOperandVolatile (result, FALSE));
offset++;
}
}
+ if (ifx && !ifx->generated)
+ {
+ genIfxJump (ifx, "a", left, NULL, result);
+ }
+
/* done */
freeAsmop (left, NULL, ic, TRUE);
freeAsmop (result, NULL, ic, TRUE);
{
if (AOP_TYPE (op) != AOP_STR)
{
- /* if this is remateriazable */
+ /* if this is rematerializable */
if (AOP_TYPE (op) == AOP_IMMD)
{
emitcode ("mov", "dptr,%s", aopGet (AOP (op), 0, TRUE, FALSE));
/*-----------------------------------------------------------------*/
static void
genFarPointerGet (operand * left,
- operand * result, iCode * ic, iCode * pi)
+ operand * result, iCode * ic, iCode * pi, iCode * ifx)
{
int size, offset;
sym_link *retype = getSpec (operandType (result));
/* if bit then unpack */
if (IS_BITFIELD (retype))
- genUnpackBits (result, "dptr", FPOINTER);
+ genUnpackBits (result, "dptr", FPOINTER, ifx);
else
{
size = AOP_SIZE (result);
while (size--)
{
emitcode ("movx", "a,@dptr");
- aopPut (AOP (result), "a", offset++, isOperandVolatile (result, FALSE));
+ if (!ifx)
+ aopPut (AOP (result), "a", offset++, isOperandVolatile (result, FALSE));
if (size || pi)
emitcode ("inc", "dptr");
}
}
- if (pi && AOP_TYPE (left) != AOP_IMMD && AOP_TYPE (left) != AOP_STR) {
+ if (pi && AOP_TYPE (left) != AOP_IMMD && AOP_TYPE (left) != AOP_STR)
+ {
aopPut ( AOP (left), "dpl", 0, isOperandVolatile (left, FALSE));
aopPut ( AOP (left), "dph", 1, isOperandVolatile (left, FALSE));
pi->generated = 1;
}
+
+ if (ifx && !ifx->generated)
+ {
+ genIfxJump (ifx, "a", left, NULL, result);
+ }
+
freeAsmop (left, NULL, ic, TRUE);
freeAsmop (result, NULL, ic, TRUE);
}
/*-----------------------------------------------------------------*/
static void
genCodePointerGet (operand * left,
- operand * result, iCode * ic, iCode *pi)
+ operand * result, iCode * ic, iCode *pi, iCode *ifx)
{
int size, offset;
sym_link *retype = getSpec (operandType (result));
/* if bit then unpack */
if (IS_BITFIELD (retype))
- genUnpackBits (result, "dptr", CPOINTER);
+ genUnpackBits (result, "dptr", CPOINTER, ifx);
else
{
size = AOP_SIZE (result);
{
emitcode ("clr", "a");
emitcode ("movc", "a,@a+dptr");
+ if (!ifx)
aopPut (AOP (result), "a", offset++, isOperandVolatile (result, FALSE));
emitcode ("inc", "dptr");
}
{
emitcode ("mov", "a,#0x%02x", offset);
emitcode ("movc", "a,@a+dptr");
+ if (!ifx)
aopPut (AOP (result), "a", offset++, isOperandVolatile (result, FALSE));
}
}
}
- if (pi && AOP_TYPE (left) != AOP_IMMD && AOP_TYPE (left) != AOP_STR) {
+ if (pi && AOP_TYPE (left) != AOP_IMMD && AOP_TYPE (left) != AOP_STR)
+ {
aopPut ( AOP (left), "dpl", 0, isOperandVolatile (left, FALSE));
aopPut ( AOP (left), "dph", 1, isOperandVolatile (left, FALSE));
pi->generated = 1;
}
+
+ if (ifx && !ifx->generated)
+ {
+ genIfxJump (ifx, "a", left, NULL, result);
+ }
+
freeAsmop (left, NULL, ic, TRUE);
freeAsmop (result, NULL, ic, TRUE);
}
/*-----------------------------------------------------------------*/
static void
genGenPointerGet (operand * left,
- operand * result, iCode * ic, iCode *pi)
+ operand * result, iCode * ic, iCode *pi, iCode *ifx)
{
int size, offset;
sym_link *retype = getSpec (operandType (result));
/* if bit then unpack */
if (IS_BITFIELD (retype))
- genUnpackBits (result, "dptr", GPOINTER);
+ genUnpackBits (result, "dptr", GPOINTER, ifx);
else
{
size = AOP_SIZE (result);
while (size--)
{
emitcode ("lcall", "__gptrget");
+ if (!ifx)
aopPut (AOP (result), "a", offset++, isOperandVolatile (result, FALSE));
if (size || pi)
emitcode ("inc", "dptr");
}
}
- if (pi && AOP_TYPE (left) != AOP_IMMD && AOP_TYPE (left) != AOP_STR) {
+ if (pi && AOP_TYPE (left) != AOP_IMMD && AOP_TYPE (left) != AOP_STR)
+ {
aopPut ( AOP (left), "dpl", 0, isOperandVolatile (left, FALSE));
aopPut ( AOP (left), "dph", 1, isOperandVolatile (left, FALSE));
pi->generated = 1;
}
+
+ if (ifx && !ifx->generated)
+ {
+ genIfxJump (ifx, "a", left, NULL, result);
+ }
+
+
freeAsmop (left, NULL, ic, TRUE);
freeAsmop (result, NULL, ic, TRUE);
}
/* genPointerGet - generate code for pointer get */
/*-----------------------------------------------------------------*/
static void
-genPointerGet (iCode * ic, iCode *pi)
+genPointerGet (iCode * ic, iCode *pi, iCode *ifx)
{
operand *left, *result;
sym_link *type, *etype;
left = IC_LEFT (ic);
result = IC_RESULT (ic);
+ if (getSize (operandType (result))>1)
+ ifx = NULL;
+
/* depending on the type of pointer we need to
move it to the correct pointer register */
type = operandType (left);
case POINTER:
case IPOINTER:
- genNearPointerGet (left, result, ic, pi);
+ genNearPointerGet (left, result, ic, pi, ifx);
break;
case PPOINTER:
- genPagedPointerGet (left, result, ic, pi);
+ genPagedPointerGet (left, result, ic, pi, ifx);
break;
case FPOINTER:
- genFarPointerGet (left, result, ic, pi);
+ genFarPointerGet (left, result, ic, pi, ifx);
break;
case CPOINTER:
- genCodePointerGet (left, result, ic, pi);
+ genCodePointerGet (left, result, ic, pi, ifx);
break;
case GPOINTER:
- genGenPointerGet (left, result, ic, pi);
+ genGenPointerGet (left, result, ic, pi, ifx);
break;
}
}
else
{
+ bool pushedB;
/* Case with a bitfield length < 8 and arbitrary source
*/
MOVA (aopGet (AOP (right), 0, FALSE, FALSE));
AccLsh (bstr);
emitcode ("anl", "a,#0x%02x", (~mask) & 0xff);
+ pushedB = pushB ();
/* transfer A to B and get next byte */
emitPtrByteGet (rname, p_type, TRUE);
emitcode ("orl", "a,b");
if (p_type == GPOINTER)
emitcode ("pop", "b");
+
+ popB (pushedB);
}
}
}
else
{
+ bool pushedB;
/* Case with partial byte and arbitrary source
*/
MOVA (aopGet (AOP (right), offset++, FALSE, FALSE));
emitcode ("anl", "a,#0x%02x", (~mask) & 0xff);
+ pushedB = pushB ();
/* transfer A to B and get next byte */
emitPtrByteGet (rname, p_type, TRUE);
emitcode ("orl", "a,b");
if (p_type == GPOINTER)
emitcode ("pop", "b");
+
+ popB (pushedB);
}
emitPtrByteSet (rname, p_type, "a");
}
if (popIc)
genIpop (popIc);
- /* if the condition is a bit variable */
+ /* if the condition is a bit variable */
if (isbit && IS_ITEMP (cond) &&
SPIL_LOC (cond))
genIfxJump (ic, SPIL_LOC (cond)->rname, NULL, NULL, NULL);
static void
genJumpTab (iCode * ic)
{
- symbol *jtab;
+ symbol *jtab,*jtablo,*jtabhi;
char *l;
+ unsigned int count;
D(emitcode ("; genJumpTab",""));
- aopOp (IC_JTCOND (ic), ic, FALSE);
- /* get the condition into accumulator */
- l = aopGet (AOP (IC_JTCOND (ic)), 0, FALSE, FALSE);
- MOVA (l);
- /* multiply by three */
- emitcode ("add", "a,acc");
- emitcode ("add", "a,%s", aopGet (AOP (IC_JTCOND (ic)), 0, FALSE, FALSE));
- freeAsmop (IC_JTCOND (ic), NULL, ic, TRUE);
+ count = elementsInSet( IC_JTLABELS (ic) );
+
+ if( count <= 16 )
+ {
+ /* this algorithm needs 9 cycles and 7 + 3*n bytes
+ if the switch argument is in a register.
+ (8 cycles and 6+2*n bytes if peepholes can change ljmp to sjmp) */
+ /* (MB) What if peephole converts ljmp to sjmp or ret ???
+ How will multiply by three be updated ???*/
+ aopOp (IC_JTCOND (ic), ic, FALSE);
+ /* get the condition into accumulator */
+ l = aopGet (AOP (IC_JTCOND (ic)), 0, FALSE, FALSE);
+ MOVA (l);
+ /* multiply by three */
+ emitcode ("add", "a,acc");
+ emitcode ("add", "a,%s", aopGet (AOP (IC_JTCOND (ic)), 0, FALSE, FALSE));
+ freeAsmop (IC_JTCOND (ic), NULL, ic, TRUE);
+
+ jtab = newiTempLabel (NULL);
+ emitcode ("mov", "dptr,#%05d$", jtab->key + 100);
+ emitcode ("jmp", "@a+dptr");
+ emitcode ("", "%05d$:", jtab->key + 100);
+ /* now generate the jump labels */
+ for (jtab = setFirstItem (IC_JTLABELS (ic)); jtab;
+ jtab = setNextItem (IC_JTLABELS (ic)))
+ emitcode ("ljmp", "%05d$", jtab->key + 100);
+ }
+ else
+ {
+ /* this algorithm needs 14 cycles and 13 + 2*n bytes
+ if the switch argument is in a register.
+ For n>6 this algorithm may be more compact */
+ jtablo = newiTempLabel (NULL);
+ jtabhi = newiTempLabel (NULL);
+
+ /* get the condition into accumulator.
+ Using b as temporary storage, if register push/pop is needed */
+ aopOp (IC_JTCOND (ic), ic, FALSE);
+ l = aopGet (AOP (IC_JTCOND (ic)), 0, FALSE, FALSE);
+ if ((AOP_TYPE (IC_JTCOND (ic)) == AOP_R0 && _G.r0Pushed) ||
+ (AOP_TYPE (IC_JTCOND (ic)) == AOP_R1 && _G.r1Pushed))
+ {
+ // (MB) what if B is in use???
+ wassertl(!_G.BInUse, "B was in use");
+ emitcode ("mov", "b,%s", l);
+ l = "b";
+ }
+ freeAsmop (IC_JTCOND (ic), NULL, ic, TRUE);
+ MOVA (l);
+ if( count <= 112 )
+ {
+ emitcode ("add", "a,#(%05d$-3-.)", jtablo->key + 100);
+ emitcode ("movc", "a,@a+pc");
+ emitcode ("push", "acc");
- jtab = newiTempLabel (NULL);
- emitcode ("mov", "dptr,#%05d$", jtab->key + 100);
- emitcode ("jmp", "@a+dptr");
- emitcode ("", "%05d$:", jtab->key + 100);
- /* now generate the jump labels */
- for (jtab = setFirstItem (IC_JTLABELS (ic)); jtab;
- jtab = setNextItem (IC_JTLABELS (ic)))
- emitcode ("ljmp", "%05d$", jtab->key + 100);
+ MOVA (l);
+ emitcode ("add", "a,#(%05d$-3-.)", jtabhi->key + 100);
+ emitcode ("movc", "a,@a+pc");
+ emitcode ("push", "acc");
+ }
+ else
+ {
+ /* this scales up to n<=255, but needs two more bytes
+ and changes dptr */
+ emitcode ("mov", "dptr,#%05d$", jtablo->key + 100);
+ emitcode ("movc", "a,@a+dptr");
+ emitcode ("push", "acc");
+
+ MOVA (l);
+ emitcode ("mov", "dptr,#%05d$", jtabhi->key + 100);
+ emitcode ("movc", "a,@a+dptr");
+ emitcode ("push", "acc");
+ }
+
+ emitcode ("ret", "");
+ /* now generate jump table, LSB */
+ emitcode ("", "%05d$:", jtablo->key + 100);
+ for (jtab = setFirstItem (IC_JTLABELS (ic)); jtab;
+ jtab = setNextItem (IC_JTLABELS (ic)))
+ emitcode (".db", "%05d$", jtab->key + 100);
+
+ /* now generate jump table, MSB */
+ emitcode ("", "%05d$:", jtabhi->key + 100);
+ for (jtab = setFirstItem (IC_JTLABELS (ic)); jtab;
+ jtab = setNextItem (IC_JTLABELS (ic)))
+ emitcode (".db", "%05d$>>8", jtab->key + 100);
+ }
}
/*-----------------------------------------------------------------*/
{
if (options.debug)
{
- debugFile->writeCLine(ic);
+ debugFile->writeCLine (ic);
}
if (!options.noCcodeInAsm) {
emitcode ("", ";%s:%d: %s", ic->filename, ic->lineno,
break;
case GET_VALUE_AT_ADDRESS:
- genPointerGet (ic, hasInc(IC_LEFT(ic),ic,getSize(operandType(IC_RESULT(ic)))));
+ genPointerGet (ic,
+ hasInc (IC_LEFT (ic), ic,
+ getSize (operandType (IC_RESULT (ic)))),
+ ifxForOp (IC_RESULT (ic), ic) );
break;
case '=':
projects / fw / sdcc / blobdiff