oldAsmOp = sym->usl.spillLoc->aop;
sym->usl.spillLoc->aop = NULL;
}
- sym->aop = op->aop = aop =
- aopForSym (ic, sym->usl.spillLoc, result);
+ sym->aop = op->aop = aop = aopForSym (ic, sym->usl.spillLoc, result);
if (getSize(sym->type) != getSize(sym->usl.spillLoc->type))
{
/* Don't reuse the new aop, go with the last one */
/*-----------------------------------------------------------------*/
/* freeAsmop - free up the asmop given to an operand */
-/*----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
static void
freeAsmop (operand * op, asmop * aaop, iCode * ic, bool pop)
{
}
/*-----------------------------------------------------------------*/
-/* opIsGptr: returns non-zero if the passed operand is */
-/* a generic pointer type. */
+/* opIsGptr: returns non-zero if the passed operand is */
+/* a generic pointer type. */
/*-----------------------------------------------------------------*/
static int
opIsGptr (operand * op)
{
- sym_link *type = operandType (op);
-
- if ((AOP_SIZE (op) == GPTRSIZE) && IS_GENPTR (type))
+ if (op && IS_GENPTR (operandType (op)) && (AOP_SIZE (op) == GPTRSIZE))
{
return 1;
}
static int
getDataSize (operand * op)
{
- int size;
- size = AOP_SIZE (op);
+ int size = AOP_SIZE (op);
+
if (size == GPTRSIZE)
{
sym_link *type = operandType (op);
if (offset == 0)
SETC;
emitcode ("cpl", "a");
- emitcode ("addc", "a,#0");
+ emitcode ("addc", "a,#0x00");
}
else
{
}
emitcode ("mov", "r0,%s", spname);
MOVA ("r0");
- emitcode ("add", "a,#%d", count);
+ emitcode ("add", "a,#0x%02x", count);
emitcode ("mov", "%s,a", spname);
for (i = 0; i < mcs51_nRegs; i++)
{
/* pushSide - */
/*-----------------------------------------------------------------*/
static void
-pushSide (operand * oper, int size)
+pushSide (operand * oper, int size, iCode * ic)
{
int offset = 0;
+ int nPushed = _G.r0Pushed + _G.r1Pushed;
+
+ aopOp (oper, ic, FALSE);
+
+ if (nPushed != _G.r0Pushed + _G.r1Pushed)
+ {
+ while (offset < size)
+ {
+ char *l = aopGet (oper, offset, FALSE, TRUE);
+ emitcode ("mov", "%s,%s", fReturn[offset++], l);
+ }
+ freeAsmop (oper, NULL, ic, TRUE);
+ offset = 0;
+ while (offset < size)
+ {
+ emitcode ("push", "%s", fReturn[offset++]);
+ }
+ return;
+ }
+
while (size--)
{
char *l = aopGet (oper, offset++, FALSE, TRUE);
emitcode ("push", "%s", l);
}
}
+
+ freeAsmop (oper, NULL, ic, TRUE);
}
/*-----------------------------------------------------------------*/
// allocate space first
emitcode ("mov", "%s,%s", r->name, spname);
MOVA (r->name);
- emitcode ("add", "a,#%d", size);
+ emitcode ("add", "a,#0x%02x", size);
emitcode ("mov", "%s,a", spname);
while (size--)
// allocate space first
emitcode ("mov", "%s,%s", r->name, spname);
MOVA (r->name);
- emitcode ("add", "a,#%d", count);
+ emitcode ("add", "a,#0x%02x", count);
emitcode ("mov", "%s,a", spname);
}
emitcode ("mov", "a,#(%05d$ >> 8)", (rlbl->key + 100));
emitcode ("push", "acc");
- /* now push the calling address */
- aopOp (IC_LEFT (ic), ic, FALSE);
-
- pushSide (IC_LEFT (ic), FPTRSIZE);
+ /* now push the function address */
+ pushSide (IC_LEFT (ic), FPTRSIZE, ic);
- freeAsmop (IC_LEFT (ic), NULL, ic, TRUE);
-
- /* if send set is not empty the assign */
+ /* if send set is not empty then assign */
if (_G.sendSet)
{
genSend(reverseSet(_G.sendSet));
static void
adjustArithmeticResult (iCode * ic)
{
- if (opIsGptr (IC_RESULT (ic)) &&
- opIsGptr (IC_LEFT (ic)) &&
- !sameRegs (AOP (IC_RESULT (ic)), AOP (IC_LEFT (ic))))
+ if (opIsGptr (IC_RESULT (ic)))
{
- aopPut (IC_RESULT (ic),
- aopGet (IC_LEFT (ic), GPTRSIZE - 1, FALSE, FALSE),
- GPTRSIZE - 1);
- }
+ char buffer[10];
- if (opIsGptr (IC_RESULT (ic)) &&
- opIsGptr (IC_RIGHT (ic)) &&
- !sameRegs (AOP (IC_RESULT (ic)), AOP (IC_RIGHT (ic))))
- {
- aopPut (IC_RESULT (ic),
- aopGet (IC_RIGHT (ic), GPTRSIZE - 1, FALSE, FALSE),
- GPTRSIZE - 1);
- }
+ if (opIsGptr (IC_LEFT (ic)))
+ {
+ if (!sameRegs (AOP (IC_RESULT (ic)), AOP (IC_LEFT (ic))))
+ {
+ aopPut (IC_RESULT (ic),
+ aopGet (IC_LEFT (ic), GPTRSIZE - 1, FALSE, FALSE),
+ GPTRSIZE - 1);
+ }
+ return;
+ }
- if (opIsGptr (IC_RESULT (ic)) &&
- AOP_SIZE (IC_LEFT (ic)) < GPTRSIZE &&
- AOP_SIZE (IC_RIGHT (ic)) < GPTRSIZE &&
- !sameRegs (AOP (IC_RESULT (ic)), AOP (IC_LEFT (ic))) &&
- !sameRegs (AOP (IC_RESULT (ic)), AOP (IC_RIGHT (ic))))
- {
- char buffer[5];
- SNPRINTF (buffer, sizeof(buffer),
- "#%d", pointerTypeToGPByte (pointerCode (getSpec (operandType (IC_LEFT (ic)))), NULL, NULL));
- aopPut (IC_RESULT (ic), buffer, GPTRSIZE - 1);
+ if (opIsGptr (IC_RIGHT (ic)))
+ {
+ if (!sameRegs (AOP (IC_RESULT (ic)), AOP (IC_RIGHT (ic))))
+ {
+ aopPut (IC_RESULT (ic),
+ aopGet (IC_RIGHT (ic), GPTRSIZE - 1, FALSE, FALSE),
+ GPTRSIZE - 1);
+ }
+ return;
+ }
+
+ if (IC_LEFT (ic) && AOP_SIZE (IC_LEFT (ic)) < GPTRSIZE &&
+ IC_RIGHT (ic) && AOP_SIZE (IC_RIGHT (ic)) < GPTRSIZE &&
+ !sameRegs (AOP (IC_RESULT (ic)), AOP (IC_LEFT (ic))) &&
+ !sameRegs (AOP (IC_RESULT (ic)), AOP (IC_RIGHT (ic))))
+ {
+ SNPRINTF (buffer, sizeof(buffer),
+ "#0x%02x", pointerTypeToGPByte (pointerCode (getSpec (operandType (IC_LEFT (ic)))), NULL, NULL));
+ aopPut (IC_RESULT (ic), buffer, GPTRSIZE - 1);
+ return;
+ }
+ if (IC_LEFT (ic) && AOP_SIZE (IC_LEFT (ic)) < GPTRSIZE &&
+ !sameRegs (AOP (IC_RESULT (ic)), AOP (IC_LEFT (ic))))
+ {
+ SNPRINTF (buffer, sizeof(buffer),
+ "#0x%02x", pointerTypeToGPByte (pointerCode (getSpec (operandType (IC_LEFT (ic)))), NULL, NULL));
+ aopPut (IC_RESULT (ic), buffer, GPTRSIZE - 1);
+ return;
+ }
+ if (IC_RIGHT (ic) && AOP_SIZE (IC_RIGHT (ic)) < GPTRSIZE &&
+ !sameRegs (AOP (IC_RESULT (ic)), AOP (IC_RIGHT (ic))))
+ {
+ SNPRINTF (buffer, sizeof(buffer),
+ "#0x%02x", pointerTypeToGPByte (pointerCode (getSpec (operandType (IC_RIGHT (ic)))), NULL, NULL));
+ aopPut (IC_RESULT (ic), buffer, GPTRSIZE - 1);
+ return;
+ }
}
}
#endif
emitcode ("inc", "a"); /* inc doesn't set carry flag */
else
{
- emitcode ("add", "a,#1"); /* this sets carry flag */
+ emitcode ("add", "a,#0x01"); /* this sets carry flag */
emitcode ("xch", "a,b");
emitcode ("cpl", "a"); /* msb 2's complement */
- emitcode ("addc", "a,#0");
+ emitcode ("addc", "a,#0x00");
emitcode ("xch", "a,b");
}
emitLabel (lbl);
}
else /* compiletimeSign */
{
- if (aopPutUsesAcc (result, "#0xFF", offset))
+ if (aopPutUsesAcc (result, "#0xff", offset))
{
emitcode ("push", "acc");
pushedA = TRUE;
}
else if (bytelit == 0x0FF)
{
- aopPut (result, "#0xFF", offset);
+ aopPut (result, "#0xff", offset);
}
else if (IS_AOP_PREG (left))
{
/* dummy read of volatile operand */
if (isOperandVolatile (left, FALSE))
MOVA (aopGet (left, offset, FALSE, FALSE));
- aopPut (result, "#0xFF", offset);
+ aopPut (result, "#0xff", offset);
continue;
}
}
/*-----------------------------------------------------------------*/
/* genUnpackBits - generates code for unpacking bits */
/*-----------------------------------------------------------------*/
-static void
+static char*
genUnpackBits (operand * result, char *rname, int ptype, iCode *ifx)
{
int offset = 0; /* result byte offset */
sym_link *etype; /* bitfield type information */
int blen; /* bitfield length */
int bstr; /* bitfield starting bit within byte */
- char buffer[10];
+ static char* const accBits[] = {"acc.0", "acc.1", "acc.2", "acc.3",
+ "acc.4", "acc.5", "acc.6", "acc.7"};
D(emitcode (";", "genUnpackBits"));
emitPtrByteGet (rname, ptype, FALSE);
if (blen == 1)
{
- SNPRINTF (buffer, sizeof(buffer),
- "acc.%d", bstr);
- genIfxJump (ifx, buffer, NULL, NULL, NULL);
+ return accBits[bstr];;
}
else
{
if (blen < 8)
emitcode ("anl", "a,#0x%02x",
(((unsigned char) -1) >> (8 - blen)) << bstr);
- genIfxJump (ifx, "a", NULL, NULL, NULL);
+ return "a";
}
- return;
}
wassert (!ifx);
while (rsize--)
aopPut (result, source, offset++);
}
+ return NULL;
}
asmop *aop = NULL;
regs *preg = NULL;
char *rname;
+ char *ifxCond = "a";
sym_link *rtype, *retype;
sym_link *ltype = operandType (left);
- char buffer[80];
D (emitcode (";", "genNearPointerGet"));
return;
}
+ //aopOp (result, ic, FALSE);
+ aopOp (result, ic, result?TRUE:FALSE);
+
/* if the value is already in a pointer register
then don't need anything more */
if (!AOP_INPREG (AOP (left)))
else
rname = aopGet (left, 0, FALSE, FALSE);
- //aopOp (result, ic, FALSE);
- aopOp (result, ic, result?TRUE:FALSE);
-
/* if bitfield then unpack the bits */
if (IS_BITFIELD (retype))
- genUnpackBits (result, rname, POINTER, ifx);
+ ifxCond = genUnpackBits (result, rname, POINTER, ifx);
else
{
/* we have can just get the values */
}
else
{
+ char buffer[80];
+
SNPRINTF (buffer, sizeof(buffer), "@%s", rname);
aopPut (result, buffer, offset);
}
if (ifx && !ifx->generated)
{
- genIfxJump (ifx, "a", left, NULL, result);
+ genIfxJump (ifx, ifxCond, left, NULL, result);
}
/* done */
asmop *aop = NULL;
regs *preg = NULL;
char *rname;
+ char *ifxCond = "a";
sym_link *rtype, *retype;
D (emitcode (";", "genPagedPointerGet"));
aopOp (left, ic, FALSE);
+ aopOp (result, ic, FALSE);
+
/* if the value is already in a pointer register
then don't need anything more */
if (!AOP_INPREG (AOP (left)))
else
rname = aopGet (left, 0, FALSE, FALSE);
- aopOp (result, ic, FALSE);
-
/* if bitfield then unpack the bits */
if (IS_BITFIELD (retype))
- genUnpackBits (result, rname, PPOINTER, ifx);
+ ifxCond = genUnpackBits (result, rname, PPOINTER, ifx);
else
{
/* we have can just get the values */
if (ifx && !ifx->generated)
{
- genIfxJump (ifx, "a", left, NULL, result);
+ genIfxJump (ifx, ifxCond, left, NULL, result);
}
/* done */
operand * result, iCode * ic, iCode * pi, iCode * ifx)
{
int size, offset;
+ char *ifxCond = "a";
sym_link *retype = getSpec (operandType (result));
D (emitcode (";", "genFarPointerGet"));
/* if bit then unpack */
if (IS_BITFIELD (retype))
- genUnpackBits (result, "dptr", FPOINTER, ifx);
+ ifxCond = genUnpackBits (result, "dptr", FPOINTER, ifx);
else
{
size = AOP_SIZE (result);
if (ifx && !ifx->generated)
{
- genIfxJump (ifx, "a", left, NULL, result);
+ genIfxJump (ifx, ifxCond, left, NULL, result);
}
freeAsmop (result, NULL, ic, TRUE);
operand * result, iCode * ic, iCode *pi, iCode *ifx)
{
int size, offset;
+ char *ifxCond = "a";
sym_link *retype = getSpec (operandType (result));
D (emitcode (";", "genCodePointerGet"));
/* if bit then unpack */
if (IS_BITFIELD (retype))
- genUnpackBits (result, "dptr", CPOINTER, ifx);
+ ifxCond = genUnpackBits (result, "dptr", CPOINTER, ifx);
else
{
size = AOP_SIZE (result);
if (ifx && !ifx->generated)
{
- genIfxJump (ifx, "a", left, NULL, result);
+ genIfxJump (ifx, ifxCond, left, NULL, result);
}
freeAsmop (result, NULL, ic, TRUE);
operand * result, iCode * ic, iCode *pi, iCode *ifx)
{
int size, offset;
+ char *ifxCond = "a";
sym_link *retype = getSpec (operandType (result));
D (emitcode (";", "genGenPointerGet"));
/* if bit then unpack */
if (IS_BITFIELD (retype))
{
- genUnpackBits (result, "dptr", GPOINTER, ifx);
+ ifxCond = genUnpackBits (result, "dptr", GPOINTER, ifx);
}
else
{
if (ifx && !ifx->generated)
{
- genIfxJump (ifx, "a", left, NULL, result);
+ genIfxJump (ifx, ifxCond, left, NULL, result);
}
freeAsmop (result, NULL, ic, TRUE);
then don't need anything more */
if (!AOP_INPREG (AOP (result)))
{
- if (
- //AOP_TYPE (result) == AOP_STK
- IS_AOP_PREG(result)
- )
+ if (IS_AOP_PREG (result))
{
- // Aha, it is a pointer, just in disguise.
- rname = aopGet (result, 0, FALSE, FALSE);
- if (*rname != '@')
+ // Aha, it is a pointer, just in disguise.
+ rname = aopGet (result, 0, FALSE, FALSE);
+ if (*rname != '@')
{
- fprintf(stderr, "probable internal error: unexpected rname @ %s:%d\n",
- __FILE__, __LINE__);
+ fprintf(stderr, "probable internal error: unexpected rname @ %s:%d\n",
+ __FILE__, __LINE__);
}
- else
+ else
{
- // Expected case.
- emitcode ("mov", "a%s,%s", rname + 1, rname);
- rname++; // skip the '@'.
+ // Expected case.
+ emitcode ("mov", "a%s,%s", rname + 1, rname);
+ rname++; // skip the '@'.
}
}
- else
+ else
{
- /* otherwise get a free pointer register */
- aop = newAsmop (0);
- preg = getFreePtr (ic, &aop, FALSE);
- emitcode ("mov", "%s,%s",
- preg->name,
- aopGet (result, 0, FALSE, TRUE));
- rname = preg->name;
+ /* otherwise get a free pointer register */
+ aop = newAsmop (0);
+ preg = getFreePtr (ic, &aop, FALSE);
+ emitcode ("mov", "%s,%s",
+ preg->name,
+ aopGet (result, 0, FALSE, TRUE));
+ rname = preg->name;
}
}
- else
+ else
{
- rname = aopGet (result, 0, FALSE, FALSE);
+ rname = aopGet (result, 0, FALSE, FALSE);
}
aopOp (right, ic, FALSE);
then don't need anything more */
if (!AOP_INPREG (AOP (result)))
{
- /* otherwise get a free pointer register */
- aop = newAsmop (0);
- preg = getFreePtr (ic, &aop, FALSE);
- emitcode ("mov", "%s,%s",
- preg->name,
- aopGet (result, 0, FALSE, TRUE));
- rname = preg->name;
+ if (IS_AOP_PREG (result))
+ {
+ // Aha, it is a pointer, just in disguise.
+ rname = aopGet (result, 0, FALSE, FALSE);
+ if (*rname != '@')
+ {
+ fprintf(stderr, "probable internal error: unexpected rname @ %s:%d\n",
+ __FILE__, __LINE__);
+ }
+ else
+ {
+ // Expected case.
+ emitcode ("mov", "a%s,%s", rname + 1, rname);
+ rname++; // skip the '@'.
+ }
+ }
+ else
+ {
+ /* otherwise get a free pointer register */
+ aop = newAsmop (0);
+ preg = getFreePtr (ic, &aop, FALSE);
+ emitcode ("mov", "%s,%s",
+ preg->name,
+ aopGet (result, 0, FALSE, TRUE));
+ rname = preg->name;
+ }
}
else
- rname = aopGet (result, 0, FALSE, FALSE);
+ {
+ rname = aopGet (result, 0, FALSE, FALSE);
+ }
aopOp (right, ic, FALSE);
genPackBits ((IS_BITFIELD (retype) ? retype : letype), right, rname, PPOINTER);
else
{
- /* we have can just get the values */
+ /* we can just get the values */
int size = AOP_SIZE (right);
int offset = 0;
l = aopGet (right, offset, FALSE, TRUE);
MOVA (l);
emitcode ("movx", "@%s,a", rname);
-
if (size || pi)
emitcode ("inc", "%s", rname);
-
offset++;
}
}
belongs */
if (AOP_SIZE (right) > 1 &&
!OP_SYMBOL (result)->remat &&
- (OP_SYMBOL (result)->liveTo > ic->seq ||
- ic->depth))
+ (OP_SYMBOL (result)->liveTo > ic->seq || ic->depth) &&
+ !pi)
{
int size = AOP_SIZE (right) - 1;
while (size--)
}
/* done */
- if (pi) pi->generated = 1;
- freeAsmop (result, NULL, ic, TRUE);
+ if (pi)
+ pi->generated = 1;
freeAsmop (right, NULL, ic, TRUE);
+ freeAsmop (result, NULL, ic, TRUE);
}
/*-----------------------------------------------------------------*/
/* if there was something to be popped then do it */
if (popIc)
- genIpop (popIc);
+ genIpop (popIc);
/* if the condition is a bit variable */
if (isbit && dup)
}
/* object not on stack then we need the name */
- size = AOP_SIZE (IC_RESULT (ic));
+ size = getDataSize (IC_RESULT (ic));
offset = 0;
while (size--)
SNPRINTF (s, sizeof(s), "#%s", sym->rname);
aopPut (IC_RESULT (ic), s, offset++);
}
+ if (opIsGptr (IC_RESULT (ic)))
+ {
+ char buffer[10];
+ SNPRINTF (buffer, sizeof(buffer),
+ "#0x%02x", pointerTypeToGPByte (pointerCode (getSpec (operandType (IC_LEFT (ic)))), NULL, NULL));
+ aopPut (IC_RESULT (ic), buffer, GPTRSIZE - 1);
+ }
release:
freeAsmop (IC_RESULT (ic), NULL, ic, TRUE);
/* bit variables done */
/* general case */
- size = AOP_SIZE (result);
+ size = getDataSize (result);
offset = 0;
if (AOP_TYPE (right) == AOP_LIT)
lit = ulFromVal (AOP (right)->aopu.aop_lit);
offset++;
}
}
+ adjustArithmeticResult (ic);
release:
freeAsmop (result, NULL, ic, TRUE);
/* multiply by three */
if (aopGetUsesAcc (IC_JTCOND (ic), 0))
{
- emitcode ("mov", "b,#3");
+ emitcode ("mov", "b,#0x03");
emitcode ("mul", "ab");
}
else
exit(1);
}
- sprintf(gpValStr, "#0x%x", gpVal);
+ sprintf(gpValStr, "#0x%02x", gpVal);
aopPut (result, gpValStr, GPTRSIZE - 1);
}
goto release;
if (options.iCodeInAsm) {
char regsInUse[80];
int i;
- char *iLine;
+ const char *iLine;
#if 0
for (i=0; i<8; i++) {
break;
case IPOP:
- /* IPOP happens only when trying to restore a
- spilt live range, if there is an ifx statement
+ /* IPOP happens only when trying to restore a
+ spilt live range, if there is an ifx statement
following this pop then the if statement might
- be using some of the registers being popped which
- would destory the contents of the register so
- we need to check for this condition and handle it */
+ be using some of the registers being popped which
+ would destory the contents of the register so
+ we need to check for this condition and handle it */
if (ic->next &&
ic->next->op == IFX &&
regsInCommon (IC_LEFT (ic), IC_COND (ic->next)))
genIfx (ic->next, ic);
- else
- genIpop (ic);
+ else
+ genIpop (ic);
break;
case CALL: