static unsigned short rbank = -1;
+#define SYM_BP(sym) (SPEC_OCLS (sym->etype)->paged ? "_bpx" : "_bp")
+
+#define R0INB _G.bu.bs.r0InB
+#define R1INB _G.bu.bs.r1InB
+#define OPINB _G.bu.bs.OpInB
+#define BINUSE _G.bu.BInUse
+
static struct
{
short r0Pushed;
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
- } ;
+ } bs;
short BInUse;
- } ;
+ } bu;
short accInUse;
short inLine;
short debugLine;
{
bool pushedB = FALSE;
- if (_G.BInUse)
+ if (BINUSE)
{
emitcode ("push", "b");
// printf("B was in use !\n");
}
else
{
- _G.OpInB++;
+ OPINB++;
}
return pushedB;
}
}
else
{
- _G.OpInB--;
+ OPINB--;
}
}
{
emitcode ("mov", "b,%s",
mcs51_regWithIdx (R0_IDX)->dname);
- _G.r0InB++;
+ R0INB++;
}
else if (!_G.r0Pushed)
{
{
emitcode ("mov", "b,%s",
mcs51_regWithIdx (R1_IDX)->dname);
- _G.r1InB++;
+ R1INB++;
}
else if (!_G.r1Pushed)
{
if (sym->onStack)
{
+ char offset = ((sym->stack < 0) ?
+ ((char) (sym->stack - _G.nRegsSaved)) :
+ ((char) sym->stack)) & 0xff;
if (_G.accInUse || leftRightUseAcc (ic))
emitcode ("push", "acc");
- emitcode ("mov", "a,_bp");
- emitcode ("add", "a,#0x%02x",
- ((sym->stack < 0) ?
- ((char) (sym->stack - _G.nRegsSaved)) :
- ((char) sym->stack)) & 0xff);
- emitcode ("mov", "%s,a",
- aop->aopu.aop_ptr->name);
-
+ if ((offset >= -3) && (offset <= 3))
+ {
+ emitcode ("mov", "%s,%s",
+ aop->aopu.aop_ptr->name, SYM_BP (sym));
+ while (offset < 0)
+ {
+ emitcode ("dec", aop->aopu.aop_ptr->name);
+ offset++;
+ }
+ while (offset > 0)
+ {
+ emitcode ("inc", aop->aopu.aop_ptr->name);
+ offset--;
+ }
+ }
+ else
+ {
+ emitcode ("mov", "a,%s", SYM_BP (sym));
+ emitcode ("add", "a,#0x%02x", offset);
+ emitcode ("mov", "%s,a",
+ aop->aopu.aop_ptr->name);
+ }
if (_G.accInUse || leftRightUseAcc (ic))
emitcode ("pop", "acc");
}
}
/* this is a temporary : this has
- only four choices :
+ only five choices :
a) register
b) spillocation
c) rematerialize
switch (aop->type)
{
case AOP_R0:
- if (_G.r0InB)
+ if (R0INB)
{
emitcode ("mov", "r0,b");
- _G.r0InB--;
+ R0INB--;
}
else if (_G.r0Pushed)
{
break;
case AOP_R1:
- if (_G.r1InB)
+ if (R1INB)
{
emitcode ("mov", "r1,b");
- _G.r1InB--;
+ R1INB--;
}
if (_G.r1Pushed)
{
switch (aop->type)
{
case AOP_R0:
- if (_G.r0InB)
+ if (R0INB)
{
emitcode ("mov", "r0,b");
}
break;
case AOP_R1:
- if (_G.r1InB)
+ if (R1INB)
{
emitcode ("mov", "r1,b");
}
exit (1);
}
/*-----------------------------------------------------------------*/
-/* aopPut - puts a string for a aop */
+/* aopPut - puts a string for a aop and indicates if acc is in use */
/*-----------------------------------------------------------------*/
-static void
+static bool
aopPut (asmop * aop, const char *s, int offset, bool bvolatile)
{
char *d = buffer;
+ bool accuse = FALSE;
if (aop->size && offset > (aop->size - 1))
{
{
case AOP_DUMMY:
MOVA (s); /* read s in case it was volatile */
+ accuse = TRUE;
break;
case AOP_DIR:
if (strcmp (d, s) ||
bvolatile)
emitcode ("mov", "%s,%s", d, s);
+ if (!strcmp (d, "acc"))
+ accuse = TRUE;
break;
aop->coff = offset;
- /* if not in accumulater */
+ /* if not in accumulator */
MOVA (s);
emitcode ("movx", "@dptr,a");
break;
case AOP_CRY:
- /* if bit variable */
+ /* if not bit variable */
if (!aop->aopu.aop_dir)
{
+ /* inefficient: move carry into A and use jz/jnz */
emitcode ("clr", "a");
emitcode ("rlc", "a");
+ accuse = TRUE;
}
else
{
emitcode ("mov", "%s,c", aop->aopu.aop_dir);
else
{
- if (strcmp (s, "a"))
- {
- MOVA (s);
- }
- {
- /* set C, if a >= 1 */
- emitcode ("add", "a,#0xff");
- emitcode ("mov", "%s,c", aop->aopu.aop_dir);
- }
+ MOVA (s);
+ /* set C, if a >= 1 */
+ emitcode ("add", "a,#0xff");
+ emitcode ("mov", "%s,c", aop->aopu.aop_dir);
}
}
break;
break;
case AOP_ACC:
+ accuse = TRUE;
aop->coff = offset;
if (!offset && (strcmp (s, "acc") == 0) &&
!bvolatile)
exit (1);
}
+ return accuse;
}
{
pushedB = pushB ();
emitcode("mov", "b,a");
- while (size--)
+ 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
int offset = 0;
int size;
symbol *tlbl;
+ sym_link *letype = getSpec (operandType (IC_LEFT (ic)));
- D(emitcode ("; genCpl",""));
+ D(emitcode (";", "genCpl"));
/* assign asmOps to operand & result */
aopOp (IC_LEFT (ic), ic, FALSE);
/* special case if in bit space */
if (AOP_TYPE (IC_RESULT (ic)) == AOP_CRY)
{
- if (AOP_TYPE (IC_LEFT (ic)) == AOP_CRY)
+ char *l;
+
+ if (AOP_TYPE (IC_LEFT (ic)) == AOP_CRY ||
+ (SPEC_USIGN (letype) && IS_CHAR (letype)))
{
- /* promotion rules are responsible for this strange result: */
+ /* promotion rules are responsible for this strange result:
+ bit -> int -> ~int -> bit
+ uchar -> int -> ~int -> bit
+ */
+ werror(W_COMPLEMENT);
emitcode ("setb", "%s", IC_RESULT (ic)->aop->aopu.aop_dir);
goto release;
}
tlbl=newiTempLabel(NULL);
+ l = aopGet (AOP (IC_LEFT (ic)), offset++, FALSE, FALSE);
if (AOP_TYPE (IC_LEFT (ic)) == AOP_ACC ||
AOP_TYPE (IC_LEFT (ic)) == AOP_REG ||
IS_AOP_PREG (IC_LEFT (ic)))
{
- emitcode ("cjne", "%s,#0x01,%05d$",
- aopGet (AOP (IC_LEFT (ic)), 0, FALSE, FALSE),
- tlbl->key + 100);
+ emitcode ("cjne", "%s,#0xFF,%05d$", l, tlbl->key + 100);
}
else
{
- char *l = aopGet (AOP (IC_LEFT (ic)), 0, FALSE, FALSE);
MOVA (l);
- emitcode ("cjne", "a,#0x01,%05d$", tlbl->key + 100);
+ emitcode ("cjne", "a,#0xFF,%05d$", tlbl->key + 100);
}
emitcode ("", "%05d$:", tlbl->key + 100);
outBitC (IC_RESULT(ic));
emitcode ("mov", "%s,a", mcs51_regWithIdx (i)->name);
emitcode ("dec", "%s", spname);
}
- else
+ else if (count != 0)
{
emitcode ("mov", "r0,%s", spname);
for (i = mcs51_nRegs; i >= 0; i--)
emitcode ("movx", "a,@r0");
if (i != R0_IDX)
emitcode ("mov", "%s,a", mcs51_regWithIdx (i)->name);
+ else
+ emitcode ("push", "acc");
}
}
emitcode ("mov", "%s,r0", spname);
if (bitVectBitValue (rsave, R0_IDX))
{
- emitcode ("mov", "r0,a");
+ emitcode ("pop", "ar0");
}
}
}
}
/*-----------------------------------------------------------------*/
-/* assignResultValue - */
+/* assignResultValue - also indicates if acc is in use afterwards */
/*-----------------------------------------------------------------*/
-static void
+static bool
assignResultValue (operand * oper)
{
int offset = 0;
int size = AOP_SIZE (oper);
+ bool accuse = FALSE;
+
while (size--)
{
- aopPut (AOP (oper), fReturn[offset], offset, isOperandVolatile (oper, FALSE));
+ accuse |= aopPut (AOP (oper), fReturn[offset], offset, isOperandVolatile (oper, FALSE));
offset++;
}
+ return accuse;
}
}
/*-----------------------------------------------------------------*/
-/* genIpush - genrate code for pushing this gets a little complex */
+/* genIpush - generate code for pushing this gets a little complex */
/*-----------------------------------------------------------------*/
static void
genIpush (iCode * ic)
sym_link *dtype;
// bool restoreBank = FALSE;
bool swapBanks = FALSE;
+ bool accuse = FALSE;
+ bool accPushed = FALSE;
D(emitcode("; genCall",""));
aopOp (IC_RESULT (ic), ic, FALSE);
_G.accInUse--;
- assignResultValue (IC_RESULT (ic));
+ accuse = assignResultValue (IC_RESULT (ic));
freeAsmop (IC_RESULT (ic), NULL, ic, TRUE);
}
int i;
if (ic->parmBytes > 3)
{
+ if (accuse)
+ {
+ emitcode ("push", "acc");
+ accPushed = TRUE;
+ }
emitcode ("mov", "a,%s", spname);
emitcode ("add", "a,#0x%02x", (-ic->parmBytes) & 0xff);
emitcode ("mov", "%s,a", spname);
/* if we hade saved some registers then unsave them */
if (ic->regsSaved && !IFFUNC_CALLEESAVES(dtype))
- unsaveRegisters (ic);
+ {
+ if (accuse && !accPushed && options.useXstack)
+ {
+ emitcode ("push", "acc");
+ accPushed = TRUE;
+ }
+ unsaveRegisters (ic);
+ }
// /* if register bank was saved then pop them */
// if (restoreBank)
// unsaveRBank (FUNC_REGBANK (dtype), ic, FALSE);
+
+ if (accPushed)
+ emitcode ("pop", "acc");
}
/*-----------------------------------------------------------------*/
{
emitcode ("mov", "r0,%s", spname);
emitcode ("inc", "%s", spname);
- emitcode ("xch", "a,_bp");
+ emitcode ("xch", "a,_bpx");
emitcode ("movx", "@r0,a");
emitcode ("inc", "r0");
emitcode ("mov", "a,r0");
- emitcode ("xch", "a,_bp");
+ emitcode ("xch", "a,_bpx");
+ emitcode ("push", "_bp"); /* save the callers stack */
+ emitcode ("mov", "_bp,sp");
}
else
{
/* set up the stack */
emitcode ("push", "_bp"); /* save the callers stack */
- emitcode ("mov", "_bp,%s", spname);
+ emitcode ("mov", "_bp,sp");
}
}
emitcode ("mov", "ea,c");
}
- if ((IFFUNC_ISREENT (sym->type) || options.stackAuto) && !options.useXstack)
+ if ((IFFUNC_ISREENT (sym->type) || options.stackAuto))// && !options.useXstack)
{
- emitcode ("mov", "%s,_bp", spname);
+ emitcode ("mov", "sp,_bp");
}
-
- /* if use external stack but some variables were
- added to the local stack then decrement the
- local stack */
- if (options.useXstack && sym->stack)
- {
- char count = sym->stack;
-
- if ((count>3) && accIsFree)
- {
- emitcode ("mov", "a,sp");
- emitcode ("add", "a,#0x%02x", ((char) -count) & 0xff);
- emitcode ("mov", "sp,a");
- }
- else
- {
- while (count--)
- emitcode ("dec", "sp");
- }
- }
-
if ((IFFUNC_ISREENT (sym->type) || options.stackAuto))
{
if (options.useXstack)
{
- emitcode ("xch", "a,_bp");
+ emitcode ("pop", "_bp");
+ emitcode ("xch", "a,_bpx");
emitcode ("mov", "r0,a");
emitcode ("dec", "r0");
emitcode ("movx", "a,@r0");
- emitcode ("xch", "a,_bp");
+ emitcode ("xch", "a,_bpx");
emitcode ("mov", "%s,r0", spname); //read before freeing stack space (interrupts)
}
else
/* if right is a literal, check it for 2^n */
if (AOP_TYPE(right) == AOP_LIT)
{
- unsigned char val = abs(operandLitValue(right));
+ unsigned char val = abs((int) operandLitValue(right));
symbol *lbl2 = NULL;
switch (val)
{
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");
+ wassertl(!BINUSE, "B was in use");
l = aopGet (AOP (left), offset, FALSE, FALSE);
if (strcmp (l, "b"))
emitcode ("mov", "b,%s", l);
MOVA (aopGet (AOP (left), posbit >> 3, FALSE, FALSE));
// bit = left & 2^n
if (size)
- emitcode ("mov", "c,acc.%d", posbit & 0x07);
+ {
+ switch (posbit & 0x07)
+ {
+ case 0: emitcode ("rrc", "a");
+ break;
+ case 7: emitcode ("rlc", "a");
+ break;
+ default: emitcode ("mov", "c,acc.%d", posbit & 0x07);
+ break;
+ }
+ }
// if(left & 2^n)
else
{
}
else if (IS_AOP_PREG (result))
{
- MOVA (aopGet (AOP (right), offset, FALSE, FALSE));
- emitcode ("anl", "a,%s", aopGet (AOP (left), offset, FALSE, TRUE));
+ MOVA (aopGet (AOP (left), offset, FALSE, TRUE));
+ emitcode ("anl", "a,%s", aopGet (AOP (right), offset, FALSE, FALSE));
aopPut (AOP (result), "a", offset, isOperandVolatile (result, FALSE));
}
else
}
else if (IS_AOP_PREG (left))
{
- MOVA (aopGet (AOP (right), offset, FALSE, FALSE));
- emitcode ("orl", "a,%s", aopGet (AOP (left), offset, FALSE, TRUE));
+ MOVA (aopGet (AOP (left), offset, FALSE, TRUE));
+ emitcode ("orl", "a,%s", aopGet (AOP (right), offset, FALSE, FALSE));
aopPut (AOP (result), "a", offset, isOperandVolatile (result, FALSE));
}
else
}
else if (IS_AOP_PREG (left))
{
- MOVA (aopGet (AOP (right), offset, FALSE, FALSE));
- emitcode ("xrl", "a,%s", aopGet (AOP (left), offset, FALSE, TRUE));
+ MOVA (aopGet (AOP (left), offset, FALSE, TRUE));
+ emitcode ("xrl", "a,%s", aopGet (AOP (right), offset, FALSE, FALSE));
aopPut (AOP (result), "a", offset, isOperandVolatile (result, FALSE));
}
else
genIpop (popIc);
/* if the condition is a bit variable */
- if (isbit && IS_ITEMP (cond) &&
- SPIL_LOC (cond))
+ if (isbit && IS_ITEMP (cond) && SPIL_LOC (cond))
genIfxJump (ic, SPIL_LOC (cond)->rname, NULL, NULL, NULL);
else if (isbit && !IS_ITEMP (cond))
genIfxJump (ic, OP_SYMBOL (cond)->rname, NULL, NULL, NULL);
it */
if (sym->stack)
{
- emitcode ("mov", "a,_bp");
+ emitcode ("mov", "a,%s", SYM_BP (sym));
emitcode ("add", "a,#0x%02x", ((sym->stack < 0) ?
((char) (sym->stack - _G.nRegsSaved)) :
((char) sym->stack)) & 0xff);
else
{
/* we can just move _bp */
- aopPut (AOP (IC_RESULT (ic)), "_bp", 0, isOperandVolatile (IC_RESULT (ic), FALSE));
+ aopPut (AOP (IC_RESULT (ic)), SYM_BP (sym), 0, isOperandVolatile (IC_RESULT (ic), FALSE));
}
/* fill the result with zero */
size = AOP_SIZE (IC_RESULT (ic)) - 1;
}
/*-----------------------------------------------------------------*/
-/* genJumpTab - genrates code for jump table */
+/* genJumpTab - generates code for jump table */
/*-----------------------------------------------------------------*/
static void
genJumpTab (iCode * ic)
(AOP_TYPE (IC_JTCOND (ic)) == AOP_R1 && _G.r1Pushed))
{
// (MB) what if B is in use???
- wassertl(!_G.BInUse, "B was in use");
+ wassertl(!BINUSE, "B was in use");
emitcode ("mov", "b,%s", l);
l = "b";
}
projects / fw / sdcc / blobdiff