X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fmcs51%2Fgen.c;h=649c643e5ea6f50e6b464777b546b4369137ce52;hb=67da89445478477cbda97171c16f8cc2666ce240;hp=ceaf3b50d69e961582265a68d18ddb483d83b2a6;hpb=12a291f30d83a482bfa8c8e464f89eecbe57a4bf;p=fw%2Fsdcc diff --git a/src/mcs51/gen.c b/src/mcs51/gen.c index ceaf3b50..649c643e 100644 --- a/src/mcs51/gen.c +++ b/src/mcs51/gen.c @@ -38,23 +38,6 @@ #include "SDCCglobl.h" #include "newalloc.h" -#ifdef HAVE_SYS_ISA_DEFS_H -#include -#else -#ifdef HAVE_MACHINE_ENDIAN_H -#include -#else -#ifdef HAVE_ENDIAN_H -#include -#else -#if !defined(__BORLANDC__) && !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(__CYGWIN__) -#warning "Cannot determine ENDIANESS of this machine assuming LITTLE_ENDIAN" -#warning "If you running sdcc on an INTEL 80x86 Platform you are okay" -#endif -#endif -#endif -#endif - #include "common.h" #include "SDCCpeeph.h" #include "ralloc.h" @@ -79,7 +62,7 @@ char **fReturn = fReturn8051; static char *accUse[] = {"a", "b"}; -static short rbank = -1; +static unsigned short rbank = -1; static struct { @@ -90,9 +73,14 @@ static struct short debugLine; short nRegsSaved; set *sendSet; + iCode *current_iCode; } _G; +static char *rb1regs[] = { + "b1_0","b1_1","b1_2","b1_3","b1_4","b1_5","b1_6","b1_7" +}; + extern int mcs51_ptrRegReq; extern int mcs51_nRegs; extern FILE *codeOutFile; @@ -101,7 +89,7 @@ static void saveRBank (int, iCode *, bool); (IC_RESULT(x) && IC_RESULT(x)->aop && \ IC_RESULT(x)->aop->type == AOP_STK ) -#define MOVA(x) if (strcmp(x,"a") && strcmp(x,"acc")) emitcode("mov","a,%s",x); +#define MOVA(x) mova(x) /* use function to avoid multiple eval */ #define CLRC emitcode("clr","c") #define SETC emitcode("setb","c") @@ -124,7 +112,7 @@ static unsigned char SRMask[] = /* emitcode - writes the code into a file : for now it is simple */ /*-----------------------------------------------------------------*/ static void -emitcode (char *inst, char *fmt,...) +emitcode (char *inst, const char *fmt,...) { va_list ap; char lb[INITIAL_INLINEASM]; @@ -152,9 +140,24 @@ emitcode (char *inst, char *fmt,...) (lineHead = newLineNode (lb))); lineCurr->isInline = _G.inLine; lineCurr->isDebug = _G.debugLine; + lineCurr->ic = _G.current_iCode; + lineCurr->isComment = (*lbp==';'); va_end (ap); } +/*-----------------------------------------------------------------*/ +/* mova - moves specified value into accumulator */ +/*-----------------------------------------------------------------*/ +static void +mova (const char *x) +{ + /* do some early peephole optimization */ + if (!strcmp(x, "a") || !strcmp(x, "acc")) + return; + + emitcode("mov","a,%s", x); +} + /*-----------------------------------------------------------------*/ /* getFreePtr - returns r0 or r1 whichever is free or can be pushed */ /*-----------------------------------------------------------------*/ @@ -230,17 +233,26 @@ getFreePtr (iCode * ic, asmop ** aopp, bool result) (*aopp)->type = AOP_R1; return mcs51_regWithIdx (R1_IDX); } - endOfWorld: - /* I said end of world but not quite end of world yet */ - /* if this is a result then we can push it on the stack */ - if (result) - { - (*aopp)->type = AOP_STK; - return NULL; + /* I said end of world, but not quite end of world yet */ + if (result) { + /* we can push it on the stack */ + (*aopp)->type = AOP_STK; + return NULL; + } else { + /* in the case that result AND left AND right needs a pointer reg + we can safely use the result's */ + if (bitVectBitValue (mcs51_rUmaskForOp(IC_RESULT(ic)), R0_IDX)) { + (*aopp)->type = AOP_R0; + return mcs51_regWithIdx (R0_IDX); + } + if (bitVectBitValue (mcs51_rUmaskForOp(IC_RESULT(ic)), R1_IDX)) { + (*aopp)->type = AOP_R1; + return mcs51_regWithIdx (R1_IDX); } + } - /* other wise this is true end of the world */ + /* now this is REALLY the end of the world */ werror (E_INTERNAL_ERROR, __FILE__, __LINE__, "getFreePtr should never reach here"); exit (1); @@ -270,6 +282,74 @@ pointerCode (sym_link * etype) } + +/*-----------------------------------------------------------------*/ +/* leftRightUseAcc - returns size of accumulator use by operands */ +/*-----------------------------------------------------------------*/ +static int +leftRightUseAcc(iCode *ic) +{ + operand *op; + int size; + int accuseSize = 0; + int accuse = 0; + + if (!ic) + { + werror (E_INTERNAL_ERROR, __FILE__, __LINE__, + "null iCode pointer"); + return 0; + } + + if (ic->op == IFX) + { + op = IC_COND (ic); + if (IS_SYMOP (op) && OP_SYMBOL (op) && OP_SYMBOL (op)->accuse) + { + accuse = 1; + size = getSize (OP_SYMBOL (op)->type); + if (size>accuseSize) + accuseSize = size; + } + } + else if (ic->op == JUMPTABLE) + { + op = IC_JTCOND (ic); + if (IS_SYMOP (op) && OP_SYMBOL (op) && OP_SYMBOL (op)->accuse) + { + accuse = 1; + size = getSize (OP_SYMBOL (op)->type); + if (size>accuseSize) + accuseSize = size; + } + } + else + { + op = IC_LEFT (ic); + if (IS_SYMOP (op) && OP_SYMBOL (op) && OP_SYMBOL (op)->accuse) + { + accuse = 1; + size = getSize (OP_SYMBOL (op)->type); + if (size>accuseSize) + accuseSize = size; + } + op = IC_RIGHT (ic); + if (IS_SYMOP (op) && OP_SYMBOL (op) && OP_SYMBOL (op)->accuse) + { + accuse = 1; + size = getSize (OP_SYMBOL (op)->type); + if (size>accuseSize) + accuseSize = size; + } + } + + if (accuseSize) + return accuseSize; + else + return accuse; +} + + /*-----------------------------------------------------------------*/ /* aopForSym - for a true symbol */ /*-----------------------------------------------------------------*/ @@ -304,7 +384,7 @@ aopForSym (iCode * ic, symbol * sym, bool result) if (sym->onStack) { - if (_G.accInUse) + if (_G.accInUse || leftRightUseAcc (ic)) emitcode ("push", "acc"); emitcode ("mov", "a,_bp"); @@ -315,7 +395,7 @@ aopForSym (iCode * ic, symbol * sym, bool result) emitcode ("mov", "%s,a", aop->aopu.aop_ptr->name); - if (_G.accInUse) + if (_G.accInUse || leftRightUseAcc (ic)) emitcode ("pop", "acc"); } else @@ -340,6 +420,9 @@ aopForSym (iCode * ic, symbol * sym, bool result) /* if it is in direct space */ if (IN_DIRSPACE (space)) { + //printf("aopForSym, using AOP_DIR for %s (%x)\n", sym->name, sym); + //printTypeChainRaw(sym->type, NULL); + //printf("space = %s\n", space ? space->sname : "NULL"); sym->aop = aop = newAsmop (AOP_DIR); aop->aopu.aop_dir = sym->rname; aop->size = getSize (sym->type); @@ -625,13 +708,21 @@ aopOp (operand * op, iCode * ic, bool result) return; } - /* else spill location */ - if (sym->usl.spillLoc && getSize(sym->type) != getSize(sym->usl.spillLoc->type)) { - /* force a new aop if sizes differ */ - sym->usl.spillLoc->aop = NULL; - } - sym->aop = op->aop = aop = - aopForSym (ic, sym->usl.spillLoc, result); + if (sym->usl.spillLoc) + { + if (getSize(sym->type) != getSize(sym->usl.spillLoc->type)) + { + /* force a new aop if sizes differ */ + sym->usl.spillLoc->aop = NULL; + } + sym->aop = op->aop = aop = + aopForSym (ic, sym->usl.spillLoc, result); + aop->size = getSize (sym->type); + return; + } + + /* else must be a dummy iTemp */ + sym->aop = op->aop = aop = newAsmop (AOP_DUMMY); aop->size = getSize (sym->type); return; } @@ -695,7 +786,7 @@ freeAsmop (operand * op, asmop * aaop, iCode * ic, bool pop) case AOP_STK: { int sz = aop->size; - int stk = aop->aopu.aop_stk + aop->size; + int stk = aop->aopu.aop_stk + aop->size - 1; bitVectUnSetBit (ic->rUsed, R0_IDX); bitVectUnSetBit (ic->rUsed, R1_IDX); @@ -722,17 +813,17 @@ freeAsmop (operand * op, asmop * aaop, iCode * ic, bool pop) } op->aop = aop; freeAsmop (op, NULL, ic, TRUE); - if (_G.r0Pushed) - { - emitcode ("pop", "ar0"); - _G.r0Pushed--; - } - if (_G.r1Pushed) { emitcode ("pop", "ar1"); _G.r1Pushed--; } + + if (_G.r0Pushed) + { + emitcode ("pop", "ar0"); + _G.r0Pushed--; + } } } @@ -751,6 +842,52 @@ dealloc: } } +/*-----------------------------------------------------------------*/ +/* aopGetUsesAcc - indicates ahead of time whether aopGet() will */ +/* clobber the accumulator */ +/*-----------------------------------------------------------------*/ +static bool +aopGetUsesAcc (asmop *aop, int offset) +{ + if (offset > (aop->size - 1)) + return FALSE; + + switch (aop->type) + { + + case AOP_R0: + case AOP_R1: + if (aop->paged) + return TRUE; + return FALSE; + case AOP_DPTR: + return TRUE; + case AOP_IMMD: + return FALSE; + case AOP_DIR: + return FALSE; + case AOP_REG: + wassert(strcmp(aop->aopu.aop_reg[offset]->name, "a")); + return FALSE; + case AOP_CRY: + return TRUE; + case AOP_ACC: + return TRUE; + case AOP_LIT: + return FALSE; + case AOP_STR: + if (strcmp (aop->aopu.aop_str[offset], "a") == 0) + return TRUE; + return FALSE; + case AOP_DUMMY: + return FALSE; + default: + /* Error case --- will have been caught already */ + wassert(0); + return FALSE; + } +} + /*-----------------------------------------------------------------*/ /* aopGet - for fetching value of the aop */ /*-----------------------------------------------------------------*/ @@ -769,7 +906,9 @@ aopGet (asmop * aop, int offset, bool bit16, bool dname) /* depending on type */ switch (aop->type) { - + case AOP_DUMMY: + return zero; + case AOP_R0: case AOP_R1: /* if we need to increment it */ @@ -797,6 +936,12 @@ aopGet (asmop * aop, int offset, bool bit16, bool dname) return rs; case AOP_DPTR: + if (aop->code && aop->coff==0 && offset>=1) { + emitcode ("mov", "a,#0x%02x", offset); + emitcode ("movc", "a,@a+dptr"); + return (dname ? "acc" : "a"); + } + while (offset > aop->coff) { emitcode ("inc", "dptr"); @@ -887,7 +1032,7 @@ aopGet (asmop * aop, int offset, bool bit16, bool dname) /* aopPut - puts a string for a aop */ /*-----------------------------------------------------------------*/ static void -aopPut (asmop * aop, char *s, int offset) +aopPut (asmop * aop, const char *s, int offset, bool bvolatile) { char *d = buffer; @@ -902,6 +1047,10 @@ aopPut (asmop * aop, char *s, int offset) /* depending on where it is ofcourse */ switch (aop->type) { + case AOP_DUMMY: + MOVA (s); /* read s in case it was volatile */ + break; + case AOP_DIR: if (offset) sprintf (d, "(%s + %d)", @@ -909,7 +1058,8 @@ aopPut (asmop * aop, char *s, int offset) else sprintf (d, "%s", aop->aopu.aop_dir); - if (strcmp (d, s)) + if (strcmp (d, s) || + bvolatile) emitcode ("mov", "%s,%s", d, s); break; @@ -939,7 +1089,7 @@ aopPut (asmop * aop, char *s, int offset) if (aop->code) { werror (E_INTERNAL_ERROR, __FILE__, __LINE__, - "aopPut writting to code space"); + "aopPut writing to code space"); exit (1); } @@ -1042,11 +1192,8 @@ aopPut (asmop * aop, char *s, int offset) MOVA (s); } { - symbol *lbl = newiTempLabel (NULL); - emitcode ("clr", "c"); - emitcode ("jz", "%05d$", lbl->key + 100); - emitcode ("cpl", "c"); - emitcode ("", "%05d$:", lbl->key + 100); + /* set C, if a >= 1 */ + emitcode ("add", "a,#0xff"); emitcode ("mov", "%s,c", aop->aopu.aop_dir); } } @@ -1055,16 +1202,19 @@ aopPut (asmop * aop, char *s, int offset) case AOP_STR: aop->coff = offset; - if (strcmp (aop->aopu.aop_str[offset], s)) + if (strcmp (aop->aopu.aop_str[offset], s) || + bvolatile) emitcode ("mov", "%s,%s", aop->aopu.aop_str[offset], s); break; case AOP_ACC: aop->coff = offset; - if (!offset && (strcmp (s, "acc") == 0)) + if (!offset && (strcmp (s, "acc") == 0) && + !bvolatile) break; - if (strcmp (aop->aopu.aop_str[offset], s)) + if (strcmp (aop->aopu.aop_str[offset], s) && + !bvolatile) emitcode ("mov", "%s,%s", aop->aopu.aop_str[offset], s); break; @@ -1144,46 +1294,6 @@ reAdjustPreg (asmop * aop) (x->aopu.aop_reg[0] == mcs51_regWithIdx(R0_IDX) || \ x->aopu.aop_reg[0] == mcs51_regWithIdx(R1_IDX) ))) -/*-----------------------------------------------------------------*/ -/* genNotFloat - generates not for float operations */ -/*-----------------------------------------------------------------*/ -static void -genNotFloat (operand * op, operand * res) -{ - int size, offset; - char *l; - symbol *tlbl; - - D(emitcode (";", "genNotFloat")); - - /* we will put 127 in the first byte of - the result */ - aopPut (AOP (res), "#127", 0); - size = AOP_SIZE (op) - 1; - offset = 1; - - l = aopGet (op->aop, offset++, FALSE, FALSE); - MOVA (l); - - while (size--) - { - emitcode ("orl", "a,%s", - aopGet (op->aop, - offset++, FALSE, FALSE)); - } - - tlbl = newiTempLabel (NULL); - aopPut (res->aop, one, 1); - emitcode ("jz", "%05d$", (tlbl->key + 100)); - aopPut (res->aop, zero, 1); - emitcode ("", "%05d$:", (tlbl->key + 100)); - - size = res->aop->size - 2; - offset = 2; - /* put zeros in the rest */ - while (size--) - aopPut (res->aop, zero, offset++); -} /*-----------------------------------------------------------------*/ /* opIsGptr: returns non-zero if the passed operand is */ @@ -1233,13 +1343,13 @@ outAcc (operand * result) size = getDataSize (result); if (size) { - aopPut (AOP (result), "a", 0); + aopPut (AOP (result), "a", 0, isOperandVolatile (result, FALSE)); size--; offset = 1; /* unsigned or positive */ while (size--) { - aopPut (AOP (result), zero, offset++); + aopPut (AOP (result), zero, offset++, isOperandVolatile (result, FALSE)); } } } @@ -1252,7 +1362,7 @@ outBitC (operand * result) { /* if the result is bit */ if (AOP_TYPE (result) == AOP_CRY) - aopPut (AOP (result), "c", 0); + aopPut (AOP (result), "c", 0, isOperandVolatile (result, FALSE)); else { emitcode ("clr", "a"); @@ -1282,9 +1392,8 @@ static void genNot (iCode * ic) { symbol *tlbl; - sym_link *optype = operandType (IC_LEFT (ic)); - D(emitcode (";", "genNot")); + D(emitcode ("; genNot","")); /* assign asmOps to operand & result */ aopOp (IC_LEFT (ic), ic, FALSE); @@ -1299,13 +1408,6 @@ genNot (iCode * ic) goto release; } - /* if type float then do float */ - if (IS_FLOAT (optype)) - { - genNotFloat (IC_LEFT (ic), IC_RESULT (ic)); - goto release; - } - toBoolean (IC_LEFT (ic)); tlbl = newiTempLabel (NULL); @@ -1330,27 +1432,42 @@ genCpl (iCode * ic) int size; symbol *tlbl; - D(emitcode (";", "genCpl")); + D(emitcode ("; genCpl","")); /* assign asmOps to operand & result */ aopOp (IC_LEFT (ic), ic, FALSE); aopOp (IC_RESULT (ic), ic, TRUE); /* special case if in bit space */ - if (AOP_TYPE (IC_RESULT (ic)) == AOP_CRY) { - if (AOP_TYPE (IC_LEFT (ic)) == AOP_CRY) { - emitcode ("mov", "c,%s", IC_LEFT (ic)->aop->aopu.aop_dir); - emitcode ("cpl", "c"); - emitcode ("mov", "%s,c", IC_RESULT (ic)->aop->aopu.aop_dir); + if (AOP_TYPE (IC_RESULT (ic)) == AOP_CRY) + { + if (AOP_TYPE (IC_LEFT (ic)) == AOP_CRY) + { + emitcode ("mov", "c,%s", IC_LEFT (ic)->aop->aopu.aop_dir); + emitcode ("cpl", "c"); + emitcode ("mov", "%s,c", IC_RESULT (ic)->aop->aopu.aop_dir); + goto release; + } + + tlbl=newiTempLabel(NULL); + 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); + } + else + { + char *l = aopGet (AOP (IC_LEFT (ic)), 0, FALSE, FALSE); + MOVA (l); + emitcode ("cjne", "a,#0x01,%05d$", tlbl->key + 100); + } + emitcode ("", "%05d$:", tlbl->key + 100); + outBitC (IC_RESULT(ic)); goto release; } - tlbl=newiTempLabel(NULL); - emitcode ("cjne", "%s,#0x01,%05d$", - aopGet(AOP(IC_LEFT(ic)), 0, FALSE,FALSE), tlbl->key+100); - emitcode ("", "%05d$:", tlbl->key+100); - outBitC (IC_RESULT(ic)); - goto release; - } size = AOP_SIZE (IC_RESULT (ic)); while (size--) @@ -1358,7 +1475,7 @@ genCpl (iCode * ic) char *l = aopGet (AOP (IC_LEFT (ic)), offset, FALSE, FALSE); MOVA (l); emitcode ("cpl", "a"); - aopPut (AOP (IC_RESULT (ic)), "a", offset++); + aopPut (AOP (IC_RESULT (ic)), "a", offset++, isOperandVolatile (IC_RESULT (ic), FALSE)); } @@ -1377,25 +1494,27 @@ genUminusFloat (operand * op, operand * result) int size, offset = 0; char *l; - D(emitcode (";", "genUminusFloat")); - - /* for this we just need to flip the - first it then copy the rest in place */ - size = AOP_SIZE (op) - 1; - l = aopGet (AOP (op), 3, FALSE, FALSE); + D(emitcode ("; genUminusFloat","")); - MOVA (l); + /* for this we just copy and then flip the bit */ - emitcode ("cpl", "acc.7"); - aopPut (AOP (result), "a", 3); + size = AOP_SIZE (op) - 1; while (size--) { aopPut (AOP (result), aopGet (AOP (op), offset, FALSE, FALSE), - offset); + offset, + isOperandVolatile (result, FALSE)); offset++; } + + l = aopGet (AOP (op), offset, FALSE, FALSE); + + MOVA (l); + + emitcode ("cpl", "acc.7"); + aopPut (AOP (result), "a", offset, isOperandVolatile (result, FALSE)); } /*-----------------------------------------------------------------*/ @@ -1408,7 +1527,7 @@ genUminus (iCode * ic) sym_link *optype, *rtype; - D(emitcode (";", "genUminus")); + D(emitcode ("; genUminus","")); /* assign asmops */ aopOp (IC_LEFT (ic), ic, FALSE); @@ -1457,7 +1576,7 @@ genUminus (iCode * ic) emitcode ("clr", "a"); emitcode ("subb", "a,%s", l); } - aopPut (AOP (IC_RESULT (ic)), "a", offset++); + aopPut (AOP (IC_RESULT (ic)), "a", offset++, isOperandVolatile (IC_RESULT (ic), FALSE)); } /* if any remaining bytes in the result */ @@ -1467,7 +1586,7 @@ genUminus (iCode * ic) emitcode ("rlc", "a"); emitcode ("subb", "a,acc"); while (size--) - aopPut (AOP (IC_RESULT (ic)), "a", offset++); + aopPut (AOP (IC_RESULT (ic)), "a", offset++, isOperandVolatile (IC_RESULT (ic), FALSE)); } release: @@ -1499,10 +1618,13 @@ saveRegisters (iCode * lic) /* if the registers have been saved already or don't need to be then do nothing */ - if (ic->regsSaved || IFFUNC_CALLEESAVES(OP_SYMBOL(IC_LEFT(ic))->type) || - IFFUNC_ISNAKED(OP_SYM_TYPE(IC_LEFT (ic)))) + if (ic->regsSaved) return; - + if (IS_SYMOP(IC_LEFT(ic)) && + (IFFUNC_CALLEESAVES(OP_SYMBOL(IC_LEFT(ic))->type) || + IFFUNC_ISNAKED(OP_SYM_TYPE(IC_LEFT (ic))))) + return; + /* safe the registers in use at this time but skip the ones for the result */ rsave = bitVectCplAnd (bitVectCopy (ic->rMask), @@ -1614,7 +1736,7 @@ assignResultValue (operand * oper) int size = AOP_SIZE (oper); while (size--) { - aopPut (AOP (oper), fReturn[offset], offset); + aopPut (AOP (oper), fReturn[offset], offset, isOperandVolatile (oper, FALSE)); offset++; } } @@ -1630,7 +1752,7 @@ genXpush (iCode * ic) regs *r; int size, offset = 0; - D(emitcode (";", "genXpush")); + D(emitcode ("; genXpush","")); aopOp (IC_LEFT (ic), ic, FALSE); r = getFreePtr (ic, &aop, FALSE); @@ -1666,7 +1788,7 @@ genIpush (iCode * ic) int size, offset = 0; char *l; - D(emitcode (";", "genIpush")); + D(emitcode ("; genIpush","")); /* if this is not a parm push : ie. it is spill push and spill push is always done on the local stack */ @@ -1738,7 +1860,7 @@ genIpop (iCode * ic) { int size, offset; - D(emitcode (";", "genIpop")); + D(emitcode ("; genIpop","")); /* if the temp was not pushed then */ if (OP_SYMBOL (IC_LEFT (ic))->isspilt) @@ -1887,6 +2009,39 @@ saveRBank (int bank, iCode * ic, bool pushPsw) } } +/*-----------------------------------------------------------------*/ +/* genSend - gen code for SEND */ +/*-----------------------------------------------------------------*/ +static void genSend(set *sendSet) +{ + iCode *sic; + int rb1_count = 0 ; + + for (sic = setFirstItem (_G.sendSet); sic; + sic = setNextItem (_G.sendSet)) { + int size, offset = 0; + aopOp (IC_LEFT (sic), sic, FALSE); + size = AOP_SIZE (IC_LEFT (sic)); + + if (sic->argreg == 1) { + while (size--) { + char *l = aopGet (AOP (IC_LEFT (sic)), offset, + FALSE, FALSE); + if (strcmp (l, fReturn[offset])) + emitcode ("mov", "%s,%s", fReturn[offset], l); + offset++; + } + rb1_count = 0; + } else { + while (size--) { + emitcode ("mov","b1_%d,%s",rb1_count++, + aopGet (AOP (IC_LEFT (sic)), offset++,FALSE, FALSE)); + } + } + freeAsmop (IC_LEFT (sic), NULL, sic, TRUE); + } +} + /*-----------------------------------------------------------------*/ /* genCall - generates a call statement */ /*-----------------------------------------------------------------*/ @@ -1897,31 +2052,18 @@ genCall (iCode * ic) // bool restoreBank = FALSE; bool swapBanks = FALSE; - D(emitcode(";", "genCall")); + D(emitcode("; genCall","")); + dtype = operandType (IC_LEFT (ic)); /* if send set is not empty the assign */ if (_G.sendSet) { - iCode *sic; - - for (sic = setFirstItem (_G.sendSet); sic; - sic = setNextItem (_G.sendSet)) - { - int size, offset = 0; - aopOp (IC_LEFT (sic), sic, FALSE); - size = AOP_SIZE (IC_LEFT (sic)); - while (size--) - { - char *l = aopGet (AOP (IC_LEFT (sic)), offset, - FALSE, FALSE); - if (strcmp (l, fReturn[offset])) - emitcode ("mov", "%s,%s", - fReturn[offset], - l); - offset++; - } - freeAsmop (IC_LEFT (sic), NULL, sic, TRUE); + if (IFFUNC_ISREENT(dtype)) { /* need to reverse the send set */ + genSend(reverseSet(_G.sendSet)); + } else { + genSend(_G.sendSet); } + _G.sendSet = NULL; } @@ -1933,25 +2075,16 @@ genCall (iCode * ic) (FUNC_REGBANK (currFunc->type) != FUNC_REGBANK (dtype)) && !IFFUNC_ISISR (dtype)) { -// if (!ic->bankSaved) -// { -// /* This is unexpected; the bank should have been saved in -// * genFunction. -// */ -// saveRBank (FUNC_REGBANK (dtype), ic, FALSE); -// restoreBank = TRUE; -// } - // need caution message to user here - swapBanks = TRUE; - } - + swapBanks = TRUE; + } + /* if caller saves & we have not saved then */ if (!ic->regsSaved) saveRegisters (ic); if (swapBanks) { - emitcode ("mov", "psw,#0x%02x", + emitcode ("mov", "psw,#0x%02x", ((FUNC_REGBANK(dtype)) << 3) & 0xff); } @@ -1962,14 +2095,14 @@ genCall (iCode * ic) if (swapBanks) { - emitcode ("mov", "psw,#0x%02x", + emitcode ("mov", "psw,#0x%02x", ((FUNC_REGBANK(currFunc->type)) << 3) & 0xff); } /* if we need assign a result value */ if ((IS_ITEMP (IC_RESULT (ic)) && (OP_SYMBOL (IC_RESULT (ic))->nRegs || - OP_SYMBOL (IC_RESULT (ic))->accuse || + OP_SYMBOL (IC_RESULT (ic))->accuse || OP_SYMBOL (IC_RESULT (ic))->spildir)) || IS_TRUE_SYMOP (IC_RESULT (ic))) { @@ -2019,7 +2152,7 @@ genPcall (iCode * ic) // bool restoreBank=FALSE; bool swapBanks = FALSE; - D(emitcode(";", "genPCall")); + D(emitcode("; genPCall","")); /* if caller saves & we have not saved then */ if (!ic->regsSaved) @@ -2055,27 +2188,8 @@ genPcall (iCode * ic) /* if send set is not empty the assign */ if (_G.sendSet) { - iCode *sic; - - for (sic = setFirstItem (_G.sendSet); sic; - sic = setNextItem (_G.sendSet)) - { - int size, offset = 0; - aopOp (IC_LEFT (sic), sic, FALSE); - size = AOP_SIZE (IC_LEFT (sic)); - while (size--) - { - char *l = aopGet (AOP (IC_LEFT (sic)), offset, - FALSE, FALSE); - if (strcmp (l, fReturn[offset])) - emitcode ("mov", "%s,%s", - fReturn[offset], - l); - offset++; - } - freeAsmop (IC_LEFT (sic), NULL, sic, TRUE); - } - _G.sendSet = NULL; + genSend(reverseSet(_G.sendSet)); + _G.sendSet = NULL; } if (swapBanks) @@ -2166,22 +2280,22 @@ resultRemat (iCode * ic) /*-----------------------------------------------------------------*/ /* inExcludeList - return 1 if the string is in exclude Reg list */ /*-----------------------------------------------------------------*/ +static int +regsCmp(void *p1, void *p2) +{ + return (STRCASECMP((char *)p1, (char *)(p2)) == 0); +} + static bool inExcludeList (char *s) { - int i = 0; + const char *p = setFirstItem(options.excludeRegsSet); - if (options.excludeRegs[i] && - STRCASECMP (options.excludeRegs[i], "none") == 0) + if (p == NULL || STRCASECMP(p, "none") == 0) return FALSE; - for (i = 0; options.excludeRegs[i]; i++) - { - if (options.excludeRegs[i] && - STRCASECMP (s, options.excludeRegs[i]) == 0) - return TRUE; - } - return FALSE; + + return isinSetWith(options.excludeRegsSet, s, regsCmp); } /*-----------------------------------------------------------------*/ @@ -2210,10 +2324,6 @@ genFunction (iCode * ic) return; } - /* if critical function then turn interrupts off */ - if (IFFUNC_ISCRITICAL (ftype)) - emitcode ("clr", "ea"); - /* here we need to generate the equates for the register bank if required */ if (FUNC_REGBANK (ftype) != rbank) @@ -2276,10 +2386,17 @@ genFunction (iCode * ic) } else { + /* this function has a function call cannot determines register usage so we will have to push the entire bank */ - saveRBank (0, ic, FALSE); + saveRBank (0, ic, FALSE); + if (options.parms_in_bank1) { + int i; + for (i=0; i < 8 ; i++ ) { + emitcode ("push","%s",rb1regs[i]); + } + } } } else @@ -2369,7 +2486,7 @@ genFunction (iCode * ic) } } } - // jwk: this needs a closer look + // TODO: this needs a closer look SPEC_ISR_SAVED_BANKS(currFunc->etype) = banksToSave; } } @@ -2463,12 +2580,12 @@ genFunction (iCode * ic) } else { - /* not callee-saves, we can clobber ar0 */ - emitcode ("mov", "ar0,a"); + /* not callee-saves, we can clobber r0 */ + emitcode ("mov", "r0,a"); emitcode ("mov", "a,sp"); emitcode ("add", "a,#0x%02x", ((char) sym->stack & 0xff)); emitcode ("mov", "sp,a"); - emitcode ("mov", "a,ar0"); + emitcode ("mov", "a,r0"); } } else @@ -2483,7 +2600,17 @@ genFunction (iCode * ic) emitcode ("add", "a,#0x%02x", ((char) sym->xstack & 0xff)); emitcode ("mov", "_spx,a"); } - + + /* if critical function then turn interrupts off */ + if (IFFUNC_ISCRITICAL (ftype)) + { + symbol *tlbl = newiTempLabel (NULL); + emitcode ("setb", "c"); + emitcode ("jbc", "ea,%05d$", (tlbl->key + 100)); /* atomic test & clear */ + emitcode ("clr", "c"); + emitcode ("", "%05d$:", (tlbl->key + 100)); + emitcode ("push", "psw"); /* save old ea via c in psw */ + } } /*-----------------------------------------------------------------*/ @@ -2499,6 +2626,12 @@ genEndFunction (iCode * ic) emitcode(";", "naked function: no epilogue."); return; } + + if (IFFUNC_ISCRITICAL (sym->type)) + { + emitcode ("pop", "psw"); /* restore ea via c in psw */ + emitcode ("mov", "ea,c"); + } if (IFFUNC_ISREENT (sym->type) || options.stackAuto) { @@ -2575,6 +2708,12 @@ genEndFunction (iCode * ic) } else { + if (options.parms_in_bank1) { + int i; + for (i = 7 ; i >= 0 ; i-- ) { + emitcode ("pop","%s",rb1regs[i]); + } + } /* this function has a function call cannot determines register usage so we will have to pop the entire bank */ @@ -2588,7 +2727,6 @@ genEndFunction (iCode * ic) * Restore any register banks saved by genFunction * in reverse order. */ - // jwk: this needs a closer look unsigned savedBanks = SPEC_ISR_SAVED_BANKS(currFunc->etype); int ix; @@ -2618,9 +2756,6 @@ genEndFunction (iCode * ic) if (!inExcludeList ("acc")) emitcode ("pop", "acc"); - if (IFFUNC_ISCRITICAL (sym->type)) - emitcode ("setb", "ea"); - /* if debug then send end of function */ if (options.debug && currFunc) { @@ -2639,9 +2774,6 @@ genEndFunction (iCode * ic) } else { - if (IFFUNC_ISCRITICAL (sym->type)) - emitcode ("setb", "ea"); - if (IFFUNC_CALLEESAVES(sym->type)) { int i; @@ -2687,7 +2819,7 @@ genRet (iCode * ic) { int size, offset = 0, pushed = 0; - D(emitcode (";", "genRet")); + D(emitcode ("; genRet","")); /* if we have no return value then just generate the "ret" */ @@ -2816,10 +2948,11 @@ genPlusIncr (iCode * ic) if ((icount = (unsigned int) floatFromVal (AOP (IC_RIGHT (ic))->aopu.aop_lit)) > 4) return FALSE; - D(emitcode (";", "genPlusIncr")); + D(emitcode ("; genPlusIncr","")); - /* if increment 16 bits in register */ - if (sameRegs (AOP (IC_LEFT (ic)), AOP (IC_RESULT (ic))) && + /* if increment >=16 bits in register or direct space */ + if ((AOP_TYPE(IC_LEFT(ic)) == AOP_REG || AOP_TYPE(IC_LEFT(ic)) == AOP_DIR ) && + sameRegs (AOP (IC_LEFT (ic)), AOP (IC_RESULT (ic))) && (size > 1) && (icount == 1)) { @@ -2911,7 +3044,7 @@ genPlusIncr (iCode * ic) { MOVA (aopGet (AOP (IC_LEFT (ic)), 0, FALSE, FALSE)); emitcode ("add", "a,#0x%02x", ((char) icount) & 0xff); - aopPut (AOP (IC_RESULT (ic)), "a", 0); + aopPut (AOP (IC_RESULT (ic)), "a", 0, isOperandVolatile (IC_RESULT (ic), FALSE)); } else { @@ -2936,7 +3069,7 @@ outBitAcc (operand * result) /* if the result is a bit */ if (AOP_TYPE (result) == AOP_CRY) { - aopPut (AOP (result), "a", 0); + aopPut (AOP (result), "a", 0, isOperandVolatile (result, FALSE)); } else { @@ -2953,7 +3086,7 @@ outBitAcc (operand * result) static void genPlusBits (iCode * ic) { - D(emitcode (";", "genPlusBits")); + D(emitcode ("; genPlusBits","")); if (AOP_TYPE (IC_RESULT (ic)) == AOP_CRY) { @@ -2989,14 +3122,16 @@ adjustArithmeticResult (iCode * ic) !sameRegs (AOP (IC_RESULT (ic)), AOP (IC_LEFT (ic)))) aopPut (AOP (IC_RESULT (ic)), aopGet (AOP (IC_LEFT (ic)), 2, FALSE, FALSE), - 2); + 2, + isOperandVolatile (IC_RESULT (ic), FALSE)); if (AOP_SIZE (IC_RESULT (ic)) == 3 && AOP_SIZE (IC_RIGHT (ic)) == 3 && !sameRegs (AOP (IC_RESULT (ic)), AOP (IC_RIGHT (ic)))) aopPut (AOP (IC_RESULT (ic)), aopGet (AOP (IC_RIGHT (ic)), 2, FALSE, FALSE), - 2); + 2, + isOperandVolatile (IC_RESULT (ic), FALSE)); if (AOP_SIZE (IC_RESULT (ic)) == 3 && AOP_SIZE (IC_LEFT (ic)) < 3 && @@ -3006,7 +3141,7 @@ adjustArithmeticResult (iCode * ic) { char buffer[5]; sprintf (buffer, "#%d", pointerCode (getSpec (operandType (IC_LEFT (ic))))); - aopPut (AOP (IC_RESULT (ic)), buffer, 2); + aopPut (AOP (IC_RESULT (ic)), buffer, 2, isOperandVolatile (IC_RESULT (ic), FALSE)); } } #else @@ -3023,7 +3158,8 @@ adjustArithmeticResult (iCode * ic) { aopPut (AOP (IC_RESULT (ic)), aopGet (AOP (IC_LEFT (ic)), GPTRSIZE - 1, FALSE, FALSE), - GPTRSIZE - 1); + GPTRSIZE - 1, + isOperandVolatile (IC_RESULT (ic), FALSE)); } if (opIsGptr (IC_RESULT (ic)) && @@ -3032,7 +3168,8 @@ adjustArithmeticResult (iCode * ic) { aopPut (AOP (IC_RESULT (ic)), aopGet (AOP (IC_RIGHT (ic)), GPTRSIZE - 1, FALSE, FALSE), - GPTRSIZE - 1); + GPTRSIZE - 1, + isOperandVolatile (IC_RESULT (ic), FALSE)); } if (opIsGptr (IC_RESULT (ic)) && @@ -3043,7 +3180,7 @@ adjustArithmeticResult (iCode * ic) { char buffer[5]; sprintf (buffer, "#%d", pointerCode (getSpec (operandType (IC_LEFT (ic))))); - aopPut (AOP (IC_RESULT (ic)), buffer, GPTRSIZE - 1); + aopPut (AOP (IC_RESULT (ic)), buffer, GPTRSIZE - 1, isOperandVolatile (IC_RESULT (ic), FALSE)); } } #endif @@ -3055,10 +3192,14 @@ static void genPlus (iCode * ic) { int size, offset = 0; + int skip_bytes = 0; + char *add = "add"; + asmop *leftOp, *rightOp; + operand * op; /* special cases :- */ - D(emitcode (";", "genPlus")); + D(emitcode ("; genPlus","")); aopOp (IC_LEFT (ic), ic, FALSE); aopOp (IC_RIGHT (ic), ic, FALSE); @@ -3104,7 +3245,7 @@ genPlus (iCode * ic) { MOVA (aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE)); emitcode ("addc", "a,#00"); - aopPut (AOP (IC_RESULT (ic)), "a", offset++); + aopPut (AOP (IC_RESULT (ic)), "a", offset++, isOperandVolatile (IC_RESULT (ic), FALSE)); } } goto release; @@ -3116,30 +3257,92 @@ genPlus (iCode * ic) goto release; size = getDataSize (IC_RESULT (ic)); + leftOp = AOP(IC_LEFT(ic)); + rightOp = AOP(IC_RIGHT(ic)); + op=IC_LEFT(ic); + + /* if this is an add for an array access + at a 256 byte boundary */ + if ( 2 == size + && AOP_TYPE (op) == AOP_IMMD + && IS_SYMOP (op) + && IS_SPEC (OP_SYM_ETYPE (op)) + && SPEC_ABSA (OP_SYM_ETYPE (op)) + && (SPEC_ADDR (OP_SYM_ETYPE (op)) & 0xff) == 0 + ) + { + D(emitcode ("; genPlus aligned array","")); + aopPut (AOP (IC_RESULT (ic)), + aopGet (rightOp, 0, FALSE, FALSE), + 0, + isOperandVolatile (IC_RESULT (ic), FALSE)); - while (size--) - { - if (AOP_TYPE (IC_LEFT (ic)) == AOP_ACC) + if( 1 == getDataSize (IC_RIGHT (ic)) ) { - MOVA (aopGet (AOP (IC_LEFT (ic)), offset, FALSE, FALSE)); - if (offset == 0) - emitcode ("add", "a,%s", - aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE)); - else - emitcode ("addc", "a,%s", - aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE)); + aopPut (AOP (IC_RESULT (ic)), + aopGet (leftOp, 1, FALSE, FALSE), + 1, + isOperandVolatile (IC_RESULT (ic), FALSE)); } else - { - MOVA (aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE)); - if (offset == 0) - emitcode ("add", "a,%s", - aopGet (AOP (IC_LEFT (ic)), offset, FALSE, FALSE)); + { + MOVA (aopGet (AOP (IC_LEFT (ic)), 1, FALSE, FALSE)); + emitcode ("add", "a,%s", aopGet (rightOp, 1, FALSE, FALSE)); + aopPut (AOP (IC_RESULT (ic)), "a", 1, isOperandVolatile (IC_RESULT (ic), FALSE)); + } + goto release; + } + + /* if the lower bytes of a literal are zero skip the addition */ + if (AOP_TYPE (IC_RIGHT (ic)) == AOP_LIT ) + { + while ((0 == ((unsigned int) floatFromVal (AOP (IC_RIGHT (ic))->aopu.aop_lit) & (0xff << skip_bytes*8))) && + (skip_bytes+1 < size)) + { + skip_bytes++; + } + if (skip_bytes) + D(emitcode ("; genPlus shortcut","")); + } + + while (size--) + { + if( offset >= skip_bytes ) + { + if (aopGetUsesAcc (leftOp, offset) && aopGetUsesAcc (rightOp, offset)) + { + emitcode("mov", "b,a"); + MOVA (aopGet (leftOp, offset, FALSE, TRUE)); + emitcode("xch", "a,b"); + MOVA (aopGet (rightOp, offset, FALSE, TRUE)); + emitcode (add, "a,b"); + } + else if (aopGetUsesAcc (leftOp, offset)) + { + MOVA (aopGet (leftOp, offset, FALSE, TRUE)); + emitcode (add, "a,%s", aopGet (rightOp, offset, FALSE, TRUE)); + } else - emitcode ("addc", "a,%s", - aopGet (AOP (IC_LEFT (ic)), offset, FALSE, FALSE)); + { + MOVA (aopGet (rightOp, offset, FALSE, TRUE)); + emitcode (add, "a,%s", aopGet (leftOp, offset, FALSE, TRUE)); + } + aopPut (AOP (IC_RESULT (ic)), "a", offset, isOperandVolatile (IC_RESULT (ic), FALSE)); + add = "addc"; /* further adds must propagate carry */ + } + else + { + if( !sameRegs (AOP (IC_LEFT (ic)), AOP (IC_RESULT (ic))) || + isOperandVolatile (IC_RESULT (ic), FALSE)) + { + /* just move */ + aopPut (AOP (IC_RESULT (ic)), + aopGet (leftOp, offset, FALSE, FALSE), + offset, + isOperandVolatile (IC_RESULT (ic), FALSE)); + } } - aopPut (AOP (IC_RESULT (ic)), "a", offset++); + offset++; } adjustArithmeticResult (ic); @@ -3170,10 +3373,11 @@ genMinusDec (iCode * ic) if ((icount = (unsigned int) floatFromVal (AOP (IC_RIGHT (ic))->aopu.aop_lit)) > 4) return FALSE; - D(emitcode (";", "genMinusDec")); + D(emitcode ("; genMinusDec","")); - /* if decrement 16 bits in register */ - if (sameRegs (AOP (IC_LEFT (ic)), AOP (IC_RESULT (ic))) && + /* if decrement >=16 bits in register or direct space */ + if ((AOP_TYPE(IC_LEFT(ic)) == AOP_REG || AOP_TYPE(IC_LEFT(ic)) == AOP_DIR) && + sameRegs (AOP (IC_LEFT (ic)), AOP (IC_RESULT (ic))) && (size > 1) && (icount == 1)) { @@ -3284,11 +3488,11 @@ addSign (operand * result, int offset, int sign) emitcode ("rlc", "a"); emitcode ("subb", "a,acc"); while (size--) - aopPut (AOP (result), "a", offset++); + aopPut (AOP (result), "a", offset++, isOperandVolatile (result, FALSE)); } else while (size--) - aopPut (AOP (result), zero, offset++); + aopPut (AOP (result), zero, offset++, isOperandVolatile (result, FALSE)); } } @@ -3300,7 +3504,7 @@ genMinusBits (iCode * ic) { symbol *lbl = newiTempLabel (NULL); - D(emitcode (";", "genMinusBits")); + D(emitcode ("; genMinusBits","")); if (AOP_TYPE (IC_RESULT (ic)) == AOP_CRY) { @@ -3317,7 +3521,7 @@ genMinusBits (iCode * ic) emitcode ("jnb", "%s,%05d$", AOP (IC_LEFT (ic))->aopu.aop_dir, (lbl->key + 100)); emitcode ("inc", "a"); emitcode ("", "%05d$:", (lbl->key + 100)); - aopPut (AOP (IC_RESULT (ic)), "a", 0); + aopPut (AOP (IC_RESULT (ic)), "a", 0, isOperandVolatile (IC_RESULT (ic), FALSE)); addSign (IC_RESULT (ic), MSB16, SPEC_USIGN (getSpec (operandType (IC_RESULT (ic))))); } } @@ -3329,9 +3533,8 @@ static void genMinus (iCode * ic) { int size, offset = 0; - unsigned long lit = 0L; - D(emitcode (";", "genMinus")); + D(emitcode ("; genMinus","")); aopOp (IC_LEFT (ic), ic, FALSE); aopOp (IC_RIGHT (ic), ic, FALSE); @@ -3353,41 +3556,62 @@ genMinus (iCode * ic) size = getDataSize (IC_RESULT (ic)); - if (AOP_TYPE (IC_RIGHT (ic)) != AOP_LIT) - { - CLRC; - } - else + /* if literal, add a,#-lit, else normal subb */ + if (AOP_TYPE (IC_RIGHT (ic)) == AOP_LIT) { + unsigned long lit = 0L; + lit = (unsigned long) floatFromVal (AOP (IC_RIGHT (ic))->aopu.aop_lit); lit = -(long) lit; - } - /* if literal, add a,#-lit, else normal subb */ - while (size--) - { - MOVA (aopGet (AOP (IC_LEFT (ic)), offset, FALSE, FALSE)); - if (AOP_TYPE (IC_RIGHT (ic)) != AOP_LIT) - emitcode ("subb", "a,%s", - aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE)); - else + while (size--) { + MOVA (aopGet (AOP (IC_LEFT (ic)), offset, FALSE, FALSE)); /* first add without previous c */ if (!offset) { - if (!size && lit==-1) { + if (!size && lit== (unsigned long) -1) { emitcode ("dec", "a"); } else { - emitcode ("add", "a,#0x%02x", + emitcode ("add", "a,#0x%02x", (unsigned int) (lit & 0x0FFL)); } } else { emitcode ("addc", "a,#0x%02x", (unsigned int) ((lit >> (offset * 8)) & 0x0FFL)); } + aopPut (AOP (IC_RESULT (ic)), "a", offset++, isOperandVolatile (IC_RESULT (ic), FALSE)); } - aopPut (AOP (IC_RESULT (ic)), "a", offset++); } + else + { + asmop *leftOp, *rightOp; + + leftOp = AOP(IC_LEFT(ic)); + rightOp = AOP(IC_RIGHT(ic)); + + while (size--) + { + if (aopGetUsesAcc(rightOp, offset)) { + 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"); + } else { + MOVA (aopGet (leftOp, offset, FALSE, FALSE)); + if (offset == 0) + CLRC; + emitcode ("subb", "a,%s", + aopGet(rightOp, offset, FALSE, TRUE)); + } + aopPut (AOP (IC_RESULT (ic)), "a", offset++, isOperandVolatile (IC_RESULT (ic), FALSE)); + } + } + + adjustArithmeticResult (ic); release: @@ -3405,7 +3629,7 @@ genMultbits (operand * left, operand * right, operand * result) { - D(emitcode (";", "genMultbits")); + D(emitcode ("; genMultbits","")); emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir); emitcode ("anl", "c,%s", AOP (right)->aopu.aop_dir); @@ -3425,11 +3649,11 @@ genMultOneByte (operand * left, symbol *lbl; int size=AOP_SIZE(result); - D(emitcode (";", "genMultOneByte")); + D(emitcode ("; genMultOneByte","")); if (size<1 || size>2) { // this should never happen - fprintf (stderr, "size!=1||2 (%d) in %s at line:%d \n", + fprintf (stderr, "size!=1||2 (%d) in %s at line:%d \n", AOP_SIZE(result), __FILE__, lineno); exit (1); } @@ -3446,16 +3670,25 @@ genMultOneByte (operand * left, if (SPEC_USIGN(opetype) // ignore the sign of left and right, what else can we do? - || (SPEC_USIGN(operandType(left)) && + || (SPEC_USIGN(operandType(left)) && SPEC_USIGN(operandType(right)))) { // just an unsigned 8*8=8/16 multiply //emitcode (";","unsigned"); - emitcode ("mov", "b,%s", aopGet (AOP (right), 0, FALSE, FALSE)); - MOVA (aopGet (AOP (left), 0, FALSE, FALSE)); + // TODO: check for accumulator clash between left & right aops? + + if( AOP_TYPE(right)==AOP_LIT ){ + // moving to accumulator first helps peepholes + MOVA (aopGet (AOP (left), 0, FALSE, FALSE)); + emitcode ("mov", "b,%s", aopGet (AOP (right), 0, FALSE, FALSE)); + } else { + emitcode ("mov", "b,%s", aopGet (AOP (right), 0, FALSE, FALSE)); + MOVA (aopGet (AOP (left), 0, FALSE, FALSE)); + } + emitcode ("mul", "ab"); - aopPut (AOP (result), "a", 0); + aopPut (AOP (result), "a", 0, isOperandVolatile (result, FALSE)); if (size==2) { - aopPut (AOP (result), "b", 1); + aopPut (AOP (result), "b", 1, isOperandVolatile (result, FALSE)); } return; } @@ -3477,7 +3710,7 @@ genMultOneByte (operand * left, /* if literal */ if (AOP_TYPE(right)==AOP_LIT) { - signed char val=floatFromVal (AOP (right)->aopu.aop_lit); + signed char val=(signed char)floatFromVal (AOP (right)->aopu.aop_lit); /* AND literal negative */ if (val < 0) { emitcode ("cpl", "F0"); // complement sign flag @@ -3497,7 +3730,7 @@ genMultOneByte (operand * left, emitcode ("", "%05d$:", lbl->key+100); } emitcode ("mul", "ab"); - + lbl=newiTempLabel(NULL); emitcode ("jnb", "F0,%05d$", lbl->key+100); // only ONE op was negative, we have to do a 8/16-bit two's complement @@ -3513,9 +3746,9 @@ genMultOneByte (operand * left, } emitcode ("", "%05d$:", lbl->key+100); - aopPut (AOP (result), "a", 0); + aopPut (AOP (result), "a", 0, isOperandVolatile (result, FALSE)); if (size==2) { - aopPut (AOP (result), "b", 1); + aopPut (AOP (result), "b", 1, isOperandVolatile (result, FALSE)); } } @@ -3529,7 +3762,7 @@ genMult (iCode * ic) operand *right = IC_RIGHT (ic); operand *result = IC_RESULT (ic); - D(emitcode (";", "genMult")); + D(emitcode ("; genMult","")); /* assign the amsops */ aopOp (left, ic, FALSE); @@ -3549,7 +3782,7 @@ genMult (iCode * ic) #if 0 // one of them can be a sloc shared with the result if (AOP_SIZE (left) == 1 && AOP_SIZE (right) == 1) #else - if (getSize(operandType(left)) == 1 && + if (getSize(operandType(left)) == 1 && getSize(operandType(right)) == 1) #endif { @@ -3563,9 +3796,9 @@ genMult (iCode * ic) assert (0); release: - freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); - freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); freeAsmop (result, NULL, ic, TRUE); + freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); + freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); } /*-----------------------------------------------------------------*/ @@ -3579,7 +3812,7 @@ genDivbits (operand * left, char *l; - D(emitcode (";", "genDivbits")); + D(emitcode ("; genDivbits","")); /* the result must be bit */ emitcode ("mov", "b,%s", aopGet (AOP (right), 0, FALSE, FALSE)); @@ -3589,7 +3822,7 @@ genDivbits (operand * left, emitcode ("div", "ab"); emitcode ("rrc", "a"); - aopPut (AOP (result), "c", 0); + aopPut (AOP (result), "c", 0, isOperandVolatile (result, FALSE)); } /*-----------------------------------------------------------------*/ @@ -3605,7 +3838,7 @@ genDivOneByte (operand * left, symbol *lbl; int size, offset; - D(emitcode (";", "genDivOneByte")); + D(emitcode ("; genDivOneByte","")); size = AOP_SIZE (result) - 1; offset = 1; @@ -3617,9 +3850,9 @@ genDivOneByte (operand * left, l = aopGet (AOP (left), 0, FALSE, FALSE); MOVA (l); emitcode ("div", "ab"); - aopPut (AOP (result), "a", 0); + aopPut (AOP (result), "a", 0, isOperandVolatile (result, FALSE)); while (size--) - aopPut (AOP (result), zero, offset++); + aopPut (AOP (result), zero, offset++, isOperandVolatile (result, FALSE)); return; } @@ -3669,14 +3902,14 @@ genDivOneByte (operand * left, emitcode ("", "%05d$:", (lbl->key + 100)); /* now we are done */ - aopPut (AOP (result), "b", 0); + aopPut (AOP (result), "b", 0, isOperandVolatile (result, FALSE)); if (size > 0) { emitcode ("mov", "c,b.7"); emitcode ("subb", "a,acc"); } while (size--) - aopPut (AOP (result), "a", offset++); + aopPut (AOP (result), "a", offset++, isOperandVolatile (result, FALSE)); } @@ -3690,7 +3923,7 @@ genDiv (iCode * ic) operand *right = IC_RIGHT (ic); operand *result = IC_RESULT (ic); - D(emitcode (";", "genDiv")); + D(emitcode ("; genDiv","")); /* assign the amsops */ aopOp (left, ic, FALSE); @@ -3717,8 +3950,8 @@ genDiv (iCode * ic) /* should have been converted to function call */ assert (0); release: - freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); + freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); freeAsmop (result, NULL, ic, TRUE); } @@ -3733,7 +3966,7 @@ genModbits (operand * left, char *l; - D(emitcode (";", "genModbits")); + D(emitcode ("; genModbits","")); /* the result must be bit */ emitcode ("mov", "b,%s", aopGet (AOP (right), 0, FALSE, FALSE)); @@ -3744,7 +3977,7 @@ genModbits (operand * left, emitcode ("div", "ab"); emitcode ("mov", "a,b"); emitcode ("rrc", "a"); - aopPut (AOP (result), "c", 0); + aopPut (AOP (result), "c", 0, isOperandVolatile (result, FALSE)); } /*-----------------------------------------------------------------*/ @@ -3759,7 +3992,7 @@ genModOneByte (operand * left, char *l; symbol *lbl; - D(emitcode (";", "genModOneByte")); + D(emitcode ("; genModOneByte","")); /* signed or unsigned */ if (SPEC_USIGN (opetype)) @@ -3769,7 +4002,7 @@ genModOneByte (operand * left, l = aopGet (AOP (left), 0, FALSE, FALSE); MOVA (l); emitcode ("div", "ab"); - aopPut (AOP (result), "b", 0); + aopPut (AOP (result), "b", 0, isOperandVolatile (result, FALSE)); return; } @@ -3820,7 +4053,7 @@ genModOneByte (operand * left, emitcode ("", "%05d$:", (lbl->key + 100)); /* now we are done */ - aopPut (AOP (result), "b", 0); + aopPut (AOP (result), "b", 0, isOperandVolatile (result, FALSE)); } @@ -3834,7 +4067,7 @@ genMod (iCode * ic) operand *right = IC_RIGHT (ic); operand *result = IC_RESULT (ic); - D(emitcode (";", "genMod")); + D(emitcode ("; genMod","")); /* assign the amsops */ aopOp (left, ic, FALSE); @@ -3862,8 +4095,8 @@ genMod (iCode * ic) assert (0); release: - freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); + freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); freeAsmop (result, NULL, ic, TRUE); } @@ -3877,7 +4110,7 @@ genIfxJump (iCode * ic, char *jval) symbol *tlbl = newiTempLabel (NULL); char *inst; - D(emitcode (";", "genIfxJump")); + D(emitcode ("; genIfxJump","")); /* if true label then we jump if condition supplied is true */ @@ -3914,15 +4147,16 @@ genCmp (operand * left, operand * right, { int size, offset = 0; unsigned long lit = 0L; + bool rightInB; - D(emitcode (";", "genCmp")); + D(emitcode ("; genCmp","")); /* if left & right are bit variables */ if (AOP_TYPE (left) == AOP_CRY && AOP_TYPE (right) == AOP_CRY) { emitcode ("mov", "c,%s", AOP (right)->aopu.aop_dir); - emitcode ("anl", "c,/%s", AOP (left)->aopu.aop_dir); + emitcode ("anl", "c,%s", AOP (left)->aopu.aop_dir); } else { @@ -3971,6 +4205,9 @@ genCmp (operand * left, operand * right, CLRC; while (size--) { + rightInB = aopGetUsesAcc(AOP (right), offset); + if (rightInB) + emitcode ("mov", "b,%s", aopGet (AOP (right), offset, FALSE, FALSE)); MOVA (aopGet (AOP (left), offset, FALSE, FALSE)); if (sign && size == 0) { @@ -3984,20 +4221,27 @@ genCmp (operand * left, operand * right, } else { - emitcode ("mov", "b,%s", aopGet (AOP (right), offset++, FALSE, FALSE)); + if (!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) + emitcode ("subb", "a,b"); + else + emitcode ("subb", "a,%s", aopGet (AOP (right), offset, FALSE, FALSE)); + } + offset++; } } } release: - freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); + freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); if (AOP_TYPE (result) == AOP_CRY && AOP_SIZE (result)) { outBitC (result); @@ -4025,7 +4269,7 @@ genCmpGt (iCode * ic, iCode * ifx) sym_link *letype, *retype; int sign; - D(emitcode (";", "genCmpGt")); + D(emitcode ("; genCmpGt","")); left = IC_LEFT (ic); right = IC_RIGHT (ic); @@ -4054,7 +4298,7 @@ genCmpLt (iCode * ic, iCode * ifx) sym_link *letype, *retype; int sign; - D(emitcode (";", "genCmpLt")); + D(emitcode ("; genCmpLt","")); left = IC_LEFT (ic); right = IC_RIGHT (ic); @@ -4088,18 +4332,21 @@ gencjneshort (operand * left, operand * right, symbol * lbl) if the right is in a pointer register and left is not */ if ((AOP_TYPE (left) == AOP_LIT) || + (AOP_TYPE (left) == AOP_IMMD) || (IS_AOP_PREG (right) && !IS_AOP_PREG (left))) { operand *t = right; right = left; left = t; } + if (AOP_TYPE (right) == AOP_LIT) lit = (unsigned long) floatFromVal (AOP (right)->aopu.aop_lit); /* if the right side is a literal then anything goes */ if (AOP_TYPE (right) == AOP_LIT && - AOP_TYPE (left) != AOP_DIR) + AOP_TYPE (left) != AOP_DIR && + AOP_TYPE (left) != AOP_IMMD) { while (size--) { @@ -4115,6 +4362,8 @@ gencjneshort (operand * left, operand * right, symbol * lbl) if the left is a pointer register & right is not */ else if (AOP_TYPE (right) == AOP_REG || AOP_TYPE (right) == AOP_DIR || + AOP_TYPE (right) == AOP_LIT || + AOP_TYPE (right) == AOP_IMMD || (AOP_TYPE (left) == AOP_DIR && AOP_TYPE (right) == AOP_LIT) || (IS_AOP_PREG (left) && !IS_AOP_PREG (right))) { @@ -4171,7 +4420,7 @@ genCmpEq (iCode * ic, iCode * ifx) { operand *left, *right, *result; - D(emitcode (";", "genCmpEq")); + D(emitcode ("; genCmpEq","")); aopOp ((left = IC_LEFT (ic)), ic, FALSE); aopOp ((right = IC_RIGHT (ic)), ic, FALSE); @@ -4309,7 +4558,7 @@ genCmpEq (iCode * ic, iCode * ifx) gencjne (left, right, newiTempLabel (NULL)); if (AOP_TYPE (result) == AOP_CRY && AOP_SIZE (result)) { - aopPut (AOP (result), "a", 0); + aopPut (AOP (result), "a", 0, isOperandVolatile (result, FALSE)); goto release; } if (ifx) @@ -4325,8 +4574,8 @@ genCmpEq (iCode * ic, iCode * ifx) } release: - freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); + freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); freeAsmop (result, NULL, ic, TRUE); } @@ -4398,7 +4647,7 @@ genAndOp (iCode * ic) operand *left, *right, *result; symbol *tlbl; - D(emitcode (";", "genAndOp")); + D(emitcode ("; genAndOp","")); /* note here that && operations that are in an if statement are taken away by backPatchLabels @@ -4425,8 +4674,8 @@ genAndOp (iCode * ic) outBitAcc (result); } - freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); + freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); freeAsmop (result, NULL, ic, TRUE); } @@ -4440,7 +4689,7 @@ genOrOp (iCode * ic) operand *left, *right, *result; symbol *tlbl; - D(emitcode (";", "genOrOp")); + D(emitcode ("; genOrOp","")); /* note here that || operations that are in an if statement are taken away by backPatchLabels @@ -4467,8 +4716,8 @@ genOrOp (iCode * ic) outBitAcc (result); } - freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); + freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); freeAsmop (result, NULL, ic, TRUE); } @@ -4551,7 +4800,7 @@ genAnd (iCode * ic, iCode * ifx) int bytelit = 0; char buffer[10]; - D(emitcode (";", "genAnd")); + D(emitcode ("; genAnd","")); aopOp ((left = IC_LEFT (ic)), ic, FALSE); aopOp ((right = IC_RIGHT (ic)), ic, FALSE); @@ -4714,6 +4963,8 @@ genAnd (iCode * ic, iCode * ifx) { if (ifx) jmpTrueOrFalse (ifx, tlbl); + else + emitcode ("", "%05d$:", tlbl->key + 100); goto release; } } @@ -4731,12 +4982,14 @@ genAnd (iCode * ic, iCode * ifx) if ((bytelit = (int) ((lit >> (offset * 8)) & 0x0FFL)) == 0x0FF) continue; else if (bytelit == 0) - aopPut (AOP (result), zero, offset); + { + aopPut (AOP (result), zero, offset, isOperandVolatile (result, FALSE)); + } else if (IS_AOP_PREG (result)) { MOVA (aopGet (AOP (right), offset, FALSE, FALSE)); emitcode ("anl", "a,%s", aopGet (AOP (left), offset, FALSE, TRUE)); - aopPut (AOP (result), "a", offset); + aopPut (AOP (result), "a", offset, isOperandVolatile (result, FALSE)); } else emitcode ("anl", "%s,%s", @@ -4753,7 +5006,7 @@ genAnd (iCode * ic, iCode * ifx) if (IS_AOP_PREG (result)) { emitcode ("anl", "a,%s", aopGet (AOP (left), offset, FALSE, TRUE)); - aopPut (AOP (result), "a", offset); + aopPut (AOP (result), "a", offset, isOperandVolatile (result, FALSE)); } else @@ -4802,6 +5055,8 @@ genAnd (iCode * ic, iCode * ifx) } else if (ifx) jmpTrueOrFalse (ifx, tlbl); + else + emitcode ("", "%05d$:", tlbl->key + 100); } else { @@ -4815,12 +5070,16 @@ genAnd (iCode * ic, iCode * ifx) { aopPut (AOP (result), aopGet (AOP (left), offset, FALSE, FALSE), - offset); + offset, + isOperandVolatile (result, FALSE)); continue; } else if (bytelit == 0) { - aopPut (AOP (result), zero, offset); + /* dummy read of volatile operand */ + if (isOperandVolatile (left, FALSE)) + MOVA (aopGet (AOP (left), offset, FALSE, FALSE)); + aopPut (AOP (result), zero, offset, isOperandVolatile (result, FALSE)); continue; } } @@ -4834,14 +5093,14 @@ genAnd (iCode * ic, iCode * ifx) emitcode ("anl", "a,%s", aopGet (AOP (left), offset, FALSE, FALSE)); } - aopPut (AOP (result), "a", offset); + aopPut (AOP (result), "a", offset, isOperandVolatile (result, FALSE)); } } } release: - freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); + freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); freeAsmop (result, NULL, ic, TRUE); } @@ -4855,7 +5114,7 @@ genOr (iCode * ic, iCode * ifx) int size, offset = 0; unsigned long lit = 0L; - D(emitcode (";", "genOr")); + D(emitcode ("; genOr","")); aopOp ((left = IC_LEFT (ic)), ic, FALSE); aopOp ((right = IC_RIGHT (ic)), ic, FALSE); @@ -5014,12 +5273,18 @@ genOr (iCode * ic, iCode * ifx) if (AOP_TYPE (right) == AOP_LIT) { if (((lit >> (offset * 8)) & 0x0FFL) == 0x00L) - continue; + { + /* dummy read of volatile operand */ + if (isOperandVolatile (left, FALSE)) + MOVA (aopGet (AOP (left), offset, FALSE, FALSE)); + else + continue; + } else if (IS_AOP_PREG (left)) { MOVA (aopGet (AOP (right), offset, FALSE, FALSE)); emitcode ("orl", "a,%s", aopGet (AOP (left), offset, FALSE, TRUE)); - aopPut (AOP (result), "a", offset); + aopPut (AOP (result), "a", offset, isOperandVolatile (result, FALSE)); } else emitcode ("orl", "%s,%s", @@ -5036,7 +5301,7 @@ genOr (iCode * ic, iCode * ifx) if (IS_AOP_PREG (left)) { emitcode ("orl", "a,%s", aopGet (AOP (left), offset, FALSE, TRUE)); - aopPut (AOP (result), "a", offset); + aopPut (AOP (result), "a", offset, isOperandVolatile (result, FALSE)); } else emitcode ("orl", "%s,a", @@ -5078,6 +5343,8 @@ genOr (iCode * ic, iCode * ifx) } else if (ifx) jmpTrueOrFalse (ifx, tlbl); + else + emitcode ("", "%05d$:", tlbl->key + 100); } else for (; (size--); offset++) @@ -5090,7 +5357,8 @@ genOr (iCode * ic, iCode * ifx) { aopPut (AOP (result), aopGet (AOP (left), offset, FALSE, FALSE), - offset); + offset, + isOperandVolatile (result, FALSE)); continue; } } @@ -5104,13 +5372,13 @@ genOr (iCode * ic, iCode * ifx) emitcode ("orl", "a,%s", aopGet (AOP (left), offset, FALSE, FALSE)); } - aopPut (AOP (result), "a", offset); + aopPut (AOP (result), "a", offset, isOperandVolatile (result, FALSE)); } } release: - freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); + freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); freeAsmop (result, NULL, ic, TRUE); } @@ -5124,7 +5392,7 @@ genXor (iCode * ic, iCode * ifx) int size, offset = 0; unsigned long lit = 0L; - D(emitcode (";", "genXor")); + D(emitcode ("; genXor","")); aopOp ((left = IC_LEFT (ic)), ic, FALSE); aopOp ((right = IC_RIGHT (ic)), ic, FALSE); @@ -5271,7 +5539,7 @@ genXor (iCode * ic, iCode * ifx) { MOVA (aopGet (AOP (right), offset, FALSE, FALSE)); emitcode ("xrl", "a,%s", aopGet (AOP (left), offset, FALSE, TRUE)); - aopPut (AOP (result), "a", offset); + aopPut (AOP (result), "a", offset, isOperandVolatile (result, FALSE)); } else emitcode ("xrl", "%s,%s", @@ -5288,7 +5556,7 @@ genXor (iCode * ic, iCode * ifx) if (IS_AOP_PREG (left)) { emitcode ("xrl", "a,%s", aopGet (AOP (left), offset, FALSE, TRUE)); - aopPut (AOP (result), "a", offset); + aopPut (AOP (result), "a", offset, isOperandVolatile (result, FALSE)); } else emitcode ("xrl", "%s,a", @@ -5350,7 +5618,8 @@ genXor (iCode * ic, iCode * ifx) { aopPut (AOP (result), aopGet (AOP (left), offset, FALSE, FALSE), - offset); + offset, + isOperandVolatile (result, FALSE)); continue; } } @@ -5364,13 +5633,13 @@ genXor (iCode * ic, iCode * ifx) emitcode ("xrl", "a,%s", aopGet (AOP (left), offset, FALSE, TRUE)); } - aopPut (AOP (result), "a", offset); + aopPut (AOP (result), "a", offset, isOperandVolatile (result, FALSE)); } } release: - freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); + freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); freeAsmop (result, NULL, ic, TRUE); } @@ -5382,7 +5651,7 @@ genInline (iCode * ic) { char *buffer, *bp, *bp1; - D(emitcode (";", "genInline")); + D(emitcode ("; genInline","")); _G.inLine += (!options.asmpeep); @@ -5428,7 +5697,7 @@ genRRC (iCode * ic) int size, offset = 0; char *l; - D(emitcode (";", "genRRC")); + D(emitcode ("; genRRC","")); /* rotate right with carry */ left = IC_LEFT (ic); @@ -5452,7 +5721,7 @@ genRRC (iCode * ic) MOVA (l); emitcode ("rrc", "a"); if (AOP_SIZE (result) > 1) - aopPut (AOP (result), "a", offset--); + aopPut (AOP (result), "a", offset--, isOperandVolatile (result, FALSE)); } /* now we need to put the carry into the highest order byte of the result */ @@ -5463,7 +5732,7 @@ genRRC (iCode * ic) } emitcode ("mov", "acc.7,c"); release: - aopPut (AOP (result), "a", AOP_SIZE (result) - 1); + aopPut (AOP (result), "a", AOP_SIZE (result) - 1, isOperandVolatile (result, FALSE)); freeAsmop (left, NULL, ic, TRUE); freeAsmop (result, NULL, ic, TRUE); } @@ -5478,7 +5747,7 @@ genRLC (iCode * ic) int size, offset = 0; char *l; - D(emitcode (";", "genRLC")); + D(emitcode ("; genRLC","")); /* rotate right with carry */ left = IC_LEFT (ic); @@ -5499,14 +5768,14 @@ genRLC (iCode * ic) } emitcode ("add", "a,acc"); if (AOP_SIZE (result) > 1) - aopPut (AOP (result), "a", offset++); + aopPut (AOP (result), "a", offset++, isOperandVolatile (result, FALSE)); while (size--) { l = aopGet (AOP (left), offset, FALSE, FALSE); MOVA (l); emitcode ("rlc", "a"); if (AOP_SIZE (result) > 1) - aopPut (AOP (result), "a", offset++); + aopPut (AOP (result), "a", offset++, isOperandVolatile (result, FALSE)); } } /* now we need to put the carry into the @@ -5518,7 +5787,7 @@ genRLC (iCode * ic) } emitcode ("mov", "acc.0,c"); release: - aopPut (AOP (result), "a", 0); + aopPut (AOP (result), "a", 0, isOperandVolatile (result, FALSE)); freeAsmop (left, NULL, ic, TRUE); freeAsmop (result, NULL, ic, TRUE); } @@ -5531,7 +5800,7 @@ genGetHbit (iCode * ic) { operand *left, *result; - D(emitcode (";", "genGetHbit")); + D(emitcode ("; genGetHbit","")); left = IC_LEFT (ic); result = IC_RESULT (ic); @@ -5557,6 +5826,66 @@ genGetHbit (iCode * ic) freeAsmop (result, NULL, ic, TRUE); } +/*-----------------------------------------------------------------*/ +/* genSwap - generates code to swap nibbles or bytes */ +/*-----------------------------------------------------------------*/ +static void +genSwap (iCode * ic) +{ + operand *left, *result; + + D(emitcode ("; genSwap","")); + + left = IC_LEFT (ic); + result = IC_RESULT (ic); + aopOp (left, ic, FALSE); + aopOp (result, ic, FALSE); + + switch (AOP_SIZE (left)) + { + case 1: /* swap nibbles in byte */ + MOVA (aopGet (AOP (left), 0, FALSE, FALSE)); + emitcode ("swap", "a"); + aopPut (AOP (result), "a", 0, isOperandVolatile (result, FALSE)); + break; + case 2: /* swap bytes in word */ + if (AOP_TYPE(left) == AOP_REG && sameRegs(AOP(left), AOP(result))) + { + MOVA (aopGet (AOP (left), 0, FALSE, FALSE)); + aopPut (AOP (result), aopGet (AOP (left), 1, FALSE, FALSE), + 0, isOperandVolatile (result, FALSE)); + aopPut (AOP (result), "a", 1, isOperandVolatile (result, FALSE)); + } + else if (operandsEqu (left, result)) + { + char * reg = "a"; + MOVA (aopGet (AOP (left), 0, FALSE, FALSE)); + if (aopGetUsesAcc(AOP (left), 1) || aopGetUsesAcc(AOP (result), 0)) + { + emitcode ("mov", "b,a"); + reg = "b"; + } + aopPut (AOP (result), aopGet (AOP (left), 1, FALSE, FALSE), + 0, isOperandVolatile (result, FALSE)); + aopPut (AOP (result), reg, 1, isOperandVolatile (result, FALSE)); + } + else + { + aopPut (AOP (result), aopGet (AOP (left), 1, FALSE, FALSE), + 0, isOperandVolatile (result, FALSE)); + aopPut (AOP (result), aopGet (AOP (left), 0, FALSE, FALSE), + 1, isOperandVolatile (result, FALSE)); + } + break; + default: + wassertl(FALSE, "unsupported SWAP operand size"); + } + + freeAsmop (left, NULL, ic, TRUE); + freeAsmop (result, NULL, ic, TRUE); +} + + /*-----------------------------------------------------------------*/ /* AccRol - rotate left accumulator by known count */ /*-----------------------------------------------------------------*/ @@ -5695,7 +6024,7 @@ shiftR1Left2Result (operand * left, int offl, AccSRsh (shCount); else AccRsh (shCount); - aopPut (AOP (result), "a", offr); + aopPut (AOP (result), "a", offr, isOperandVolatile (result, FALSE)); } /*-----------------------------------------------------------------*/ @@ -5710,7 +6039,7 @@ shiftL1Left2Result (operand * left, int offl, MOVA (l); /* shift left accumulator */ AccLsh (shCount); - aopPut (AOP (result), "a", offr); + aopPut (AOP (result), "a", offr, isOperandVolatile (result, FALSE)); } /*-----------------------------------------------------------------*/ @@ -5728,19 +6057,19 @@ movLeft2Result (operand * left, int offl, if (*l == '@' && (IS_AOP_PREG (result))) { emitcode ("mov", "a,%s", l); - aopPut (AOP (result), "a", offr); + aopPut (AOP (result), "a", offr, isOperandVolatile (result, FALSE)); } else { if (!sign) - aopPut (AOP (result), l, offr); + aopPut (AOP (result), l, offr, isOperandVolatile (result, FALSE)); else { /* MSB sign in acc.7 ! */ if (getDataSize (left) == offl + 1) { emitcode ("mov", "a,%s", l); - aopPut (AOP (result), "a", offr); + aopPut (AOP (result), "a", offr, isOperandVolatile (result, FALSE)); } } } @@ -5920,6 +6249,7 @@ AccAXRsh (char *x, int shCount) emitcode ("mov", "c,acc.7"); AccAXLrl1 (x); // ABBBBBBC:CDDDDDDA + emitcode ("mov", "c,acc.7"); AccAXLrl1 (x); // BBBBBBCC:DDDDDDAA emitcode ("xch", "a,%s", x); // DDDDDDAA:BBBBBBCC @@ -6009,6 +6339,7 @@ AccAXRshS (char *x, int shCount) emitcode ("mov", "c,acc.7"); AccAXLrl1 (x); // ABBBBBBC:CDDDDDDA + emitcode ("mov", "c,acc.7"); AccAXLrl1 (x); // BBBBBBCC:DDDDDDAA emitcode ("xch", "a,%s", x); // DDDDDDAA:BBBBBBCC @@ -6066,7 +6397,7 @@ shiftL2Left2Result (operand * left, int offl, } /* ax << shCount (x = lsb(result)) */ AccAXLsh (aopGet (AOP (result), offr, FALSE, FALSE), shCount); - aopPut (AOP (result), "a", offr + MSB16); + aopPut (AOP (result), "a", offr + MSB16, isOperandVolatile (result, FALSE)); } @@ -6096,7 +6427,7 @@ shiftR2Left2Result (operand * left, int offl, else AccAXRsh (aopGet (AOP (result), offr, FALSE, FALSE), shCount); if (getDataSize (result) > 1) - aopPut (AOP (result), "a", offr + MSB16); + aopPut (AOP (result), "a", offr + MSB16, isOperandVolatile (result, FALSE)); } /*-----------------------------------------------------------------*/ @@ -6112,7 +6443,7 @@ shiftLLeftOrResult (operand * left, int offl, /* or with result */ emitcode ("orl", "a,%s", aopGet (AOP (result), offr, FALSE, FALSE)); /* back to result */ - aopPut (AOP (result), "a", offr); + aopPut (AOP (result), "a", offr, isOperandVolatile (result, FALSE)); } /*-----------------------------------------------------------------*/ @@ -6128,7 +6459,7 @@ shiftRLeftOrResult (operand * left, int offl, /* or with result */ emitcode ("orl", "a,%s", aopGet (AOP (result), offr, FALSE, FALSE)); /* back to result */ - aopPut (AOP (result), "a", offr); + aopPut (AOP (result), "a", offr, isOperandVolatile (result, FALSE)); } /*-----------------------------------------------------------------*/ @@ -6137,7 +6468,7 @@ shiftRLeftOrResult (operand * left, int offl, static void genlshOne (operand * result, operand * left, int shCount) { - D(emitcode (";", "genlshOne")); + D(emitcode ("; genlshOne","")); shiftL1Left2Result (left, LSB, result, LSB, shCount); } @@ -6150,7 +6481,7 @@ genlshTwo (operand * result, operand * left, int shCount) { int size; - D(emitcode (";", "genlshTwo")); + D(emitcode ("; genlshTwo","")); size = getDataSize (result); @@ -6166,7 +6497,7 @@ genlshTwo (operand * result, operand * left, int shCount) else movLeft2Result (left, LSB, result, MSB16, 0); } - aopPut (AOP (result), zero, LSB); + aopPut (AOP (result), zero, LSB, isOperandVolatile (result, FALSE)); } /* 1 <= shCount <= 7 */ @@ -6199,7 +6530,7 @@ shiftLLong (operand * left, operand * result, int offr) emitcode ("xch", "a,%s", aopGet (AOP (left), LSB + offr, FALSE, FALSE)); else - aopPut (AOP (result), "a", LSB + offr); + aopPut (AOP (result), "a", LSB + offr, isOperandVolatile (result, FALSE)); } if (size >= MSB16 + offr) @@ -6215,7 +6546,7 @@ shiftLLong (operand * left, operand * result, int offr) emitcode ("xch", "a,%s", aopGet (AOP (left), MSB16 + offr, FALSE, FALSE)); else - aopPut (AOP (result), "a", MSB16 + offr); + aopPut (AOP (result), "a", MSB16 + offr, isOperandVolatile (result, FALSE)); } if (size >= MSB24 + offr) @@ -6231,7 +6562,7 @@ shiftLLong (operand * left, operand * result, int offr) emitcode ("xch", "a,%s", aopGet (AOP (left), MSB24 + offr, FALSE, FALSE)); else - aopPut (AOP (result), "a", MSB24 + offr); + aopPut (AOP (result), "a", MSB24 + offr, isOperandVolatile (result, FALSE)); } if (size > MSB32 + offr) @@ -6242,10 +6573,10 @@ shiftLLong (operand * left, operand * result, int offr) MOVA (l); } emitcode ("rlc", "a"); - aopPut (AOP (result), "a", MSB32 + offr); + aopPut (AOP (result), "a", MSB32 + offr, isOperandVolatile (result, FALSE)); } if (offr != LSB) - aopPut (AOP (result), zero, LSB); + aopPut (AOP (result), zero, LSB, isOperandVolatile (result, FALSE)); } /*-----------------------------------------------------------------*/ @@ -6256,7 +6587,7 @@ genlshFour (operand * result, operand * left, int shCount) { int size; - D(emitcode (";", "genlshFour")); + D(emitcode ("; genlshFour","")); size = AOP_SIZE (result); @@ -6270,9 +6601,9 @@ genlshFour (operand * result, operand * left, int shCount) shiftL1Left2Result (left, LSB, result, MSB32, shCount); else movLeft2Result (left, LSB, result, MSB32, 0); - aopPut (AOP (result), zero, LSB); - aopPut (AOP (result), zero, MSB16); - aopPut (AOP (result), zero, MSB24); + aopPut (AOP (result), zero, LSB, isOperandVolatile (result, FALSE)); + aopPut (AOP (result), zero, MSB16, isOperandVolatile (result, FALSE)); + aopPut (AOP (result), zero, MSB24, isOperandVolatile (result, FALSE)); return; } @@ -6289,8 +6620,8 @@ genlshFour (operand * result, operand * left, int shCount) movLeft2Result (left, MSB16, result, MSB32, 0); movLeft2Result (left, LSB, result, MSB24, 0); } - aopPut (AOP (result), zero, MSB16); - aopPut (AOP (result), zero, LSB); + aopPut (AOP (result), zero, MSB16, isOperandVolatile (result, FALSE)); + aopPut (AOP (result), zero, LSB, isOperandVolatile (result, FALSE)); return; } @@ -6313,7 +6644,7 @@ genlshFour (operand * result, operand * left, int shCount) movLeft2Result (left, MSB24, result, MSB32, 0); movLeft2Result (left, MSB16, result, MSB24, 0); movLeft2Result (left, LSB, result, MSB16, 0); - aopPut (AOP (result), zero, LSB); + aopPut (AOP (result), zero, LSB, isOperandVolatile (result, FALSE)); } else if (shCount == 1) shiftLLong (left, result, MSB16); @@ -6322,7 +6653,7 @@ genlshFour (operand * result, operand * left, int shCount) shiftL2Left2Result (left, MSB16, result, MSB24, shCount); shiftL1Left2Result (left, LSB, result, MSB16, shCount); shiftRLeftOrResult (left, LSB, result, MSB24, 8 - shCount); - aopPut (AOP (result), zero, LSB); + aopPut (AOP (result), zero, LSB, isOperandVolatile (result, FALSE)); } } } @@ -6355,7 +6686,7 @@ genLeftShiftLiteral (operand * left, int shCount = (int) floatFromVal (AOP (right)->aopu.aop_lit); int size; - D(emitcode (";", "genLeftShiftLiteral")); + D(emitcode ("; genLeftShiftLiteral","")); freeAsmop (right, NULL, ic, TRUE); @@ -6380,7 +6711,7 @@ genLeftShiftLiteral (operand * left, else if (shCount >= (size * 8)) while (size--) - aopPut (AOP (result), zero, size); + aopPut (AOP (result), zero, size, isOperandVolatile (result, FALSE)); else { switch (size) @@ -6397,7 +6728,8 @@ genLeftShiftLiteral (operand * left, genlshFour (result, left, shCount); break; default: - fprintf(stderr, "*** ack! mystery literal shift!\n"); + werror (E_INTERNAL_ERROR, __FILE__, __LINE__, + "*** ack! mystery literal shift!\n"); break; } } @@ -6416,7 +6748,7 @@ genLeftShift (iCode * ic) char *l; symbol *tlbl, *tlbl1; - D(emitcode (";", "genLeftShift")); + D(emitcode ("; genLeftShift","")); right = IC_RIGHT (ic); left = IC_LEFT (ic); @@ -6459,10 +6791,10 @@ genLeftShift (iCode * ic) { emitcode ("mov", "a,%s", l); - aopPut (AOP (result), "a", offset); + aopPut (AOP (result), "a", offset, isOperandVolatile (result, FALSE)); } else - aopPut (AOP (result), l, offset); + aopPut (AOP (result), l, offset, isOperandVolatile (result, FALSE)); offset++; } } @@ -6484,7 +6816,7 @@ genLeftShift (iCode * ic) emitcode ("add", "a,acc"); emitcode ("", "%05d$:", tlbl1->key + 100); emitcode ("djnz", "b,%05d$", tlbl->key + 100); - aopPut (AOP (result), "a", 0); + aopPut (AOP (result), "a", 0, isOperandVolatile (result, FALSE)); goto release; } @@ -6495,13 +6827,13 @@ genLeftShift (iCode * ic) l = aopGet (AOP (result), offset, FALSE, FALSE); MOVA (l); emitcode ("add", "a,acc"); - aopPut (AOP (result), "a", offset++); + aopPut (AOP (result), "a", offset++, isOperandVolatile (result, FALSE)); while (--size) { l = aopGet (AOP (result), offset, FALSE, FALSE); MOVA (l); emitcode ("rlc", "a"); - aopPut (AOP (result), "a", offset++); + aopPut (AOP (result), "a", offset++, isOperandVolatile (result, FALSE)); } reAdjustPreg (AOP (result)); @@ -6519,7 +6851,7 @@ static void genrshOne (operand * result, operand * left, int shCount, int sign) { - D(emitcode (";", "genrshOne")); + D(emitcode ("; genrshOne","")); shiftR1Left2Result (left, LSB, result, LSB, shCount, sign); } @@ -6531,7 +6863,7 @@ static void genrshTwo (operand * result, operand * left, int shCount, int sign) { - D(emitcode (";", "genrshTwo")); + D(emitcode ("; genrshTwo","")); /* if shCount >= 8 */ if (shCount >= 8) @@ -6572,9 +6904,14 @@ shiftRLong (operand * left, int offl, if (sign) { emitcode ("rlc", "a"); emitcode ("subb", "a,acc"); - emitcode ("xch", "a,%s", aopGet(AOP(left), MSB32, FALSE, FALSE)); + if (isSameRegs) + emitcode ("xch", "a,%s", aopGet(AOP(left), MSB32, FALSE, FALSE)); + else { + aopPut (AOP (result), "a", MSB32, isOperandVolatile (result, FALSE)); + MOVA (aopGet (AOP (left), MSB32, FALSE, FALSE)); + } } else { - aopPut (AOP(result), zero, MSB32); + aopPut (AOP(result), zero, MSB32, isOperandVolatile (result, FALSE)); } } @@ -6589,7 +6926,7 @@ shiftRLong (operand * left, int offl, if (isSameRegs && offl==MSB16) { emitcode ("xch", "a,%s",aopGet (AOP (left), MSB24, FALSE, FALSE)); } else { - aopPut (AOP (result), "a", MSB32); + aopPut (AOP (result), "a", MSB32-offl, isOperandVolatile (result, FALSE)); MOVA (aopGet (AOP (left), MSB24, FALSE, FALSE)); } @@ -6597,17 +6934,17 @@ shiftRLong (operand * left, int offl, if (isSameRegs && offl==1) { emitcode ("xch", "a,%s",aopGet (AOP (left), MSB16, FALSE, FALSE)); } else { - aopPut (AOP (result), "a", MSB24); + aopPut (AOP (result), "a", MSB24-offl, isOperandVolatile (result, FALSE)); MOVA (aopGet (AOP (left), MSB16, FALSE, FALSE)); } emitcode ("rrc", "a"); - aopPut (AOP (result), "a", MSB16 - offl); + aopPut (AOP (result), "a", MSB16 - offl, isOperandVolatile (result, FALSE)); if (offl == LSB) { MOVA (aopGet (AOP (left), LSB, FALSE, FALSE)); emitcode ("rrc", "a"); - aopPut (AOP (result), "a", LSB); + aopPut (AOP (result), "a", LSB, isOperandVolatile (result, FALSE)); } } @@ -6618,7 +6955,7 @@ static void genrshFour (operand * result, operand * left, int shCount, int sign) { - D(emitcode (";", "genrshFour")); + D(emitcode ("; genrshFour","")); /* if shifting more that 3 bytes */ if (shCount >= 24) @@ -6693,7 +7030,7 @@ genRightShiftLiteral (operand * left, int shCount = (int) floatFromVal (AOP (right)->aopu.aop_lit); int size; - D(emitcode (";", "genRightShiftLiteral")); + D(emitcode ("; genRightShiftLiteral","")); freeAsmop (right, NULL, ic, TRUE); @@ -6718,9 +7055,10 @@ genRightShiftLiteral (operand * left, else if (shCount >= (size * 8)) { - if (sign) + if (sign) { /* get sign in acc.7 */ MOVA (aopGet (AOP (left), size - 1, FALSE, FALSE)); + } addSign (result, LSB, sign); } else @@ -6741,10 +7079,9 @@ genRightShiftLiteral (operand * left, default: break; } - - freeAsmop (left, NULL, ic, TRUE); - freeAsmop (result, NULL, ic, TRUE); } + freeAsmop (left, NULL, ic, TRUE); + freeAsmop (result, NULL, ic, TRUE); } /*-----------------------------------------------------------------*/ @@ -6758,7 +7095,7 @@ genSignedRightShift (iCode * ic) char *l; symbol *tlbl, *tlbl1; - D(emitcode (";", "genSignedRightShift")); + D(emitcode ("; genSignedRightShift","")); /* we do it the hard way put the shift count in b and loop thru preserving the sign */ @@ -6802,10 +7139,10 @@ genSignedRightShift (iCode * ic) { emitcode ("mov", "a,%s", l); - aopPut (AOP (result), "a", offset); + aopPut (AOP (result), "a", offset, isOperandVolatile (result, FALSE)); } else - aopPut (AOP (result), l, offset); + aopPut (AOP (result), l, offset, isOperandVolatile (result, FALSE)); offset++; } } @@ -6830,7 +7167,7 @@ genSignedRightShift (iCode * ic) emitcode ("rrc", "a"); emitcode ("", "%05d$:", tlbl1->key + 100); emitcode ("djnz", "b,%05d$", tlbl->key + 100); - aopPut (AOP (result), "a", 0); + aopPut (AOP (result), "a", 0, isOperandVolatile (result, FALSE)); goto release; } @@ -6843,7 +7180,7 @@ genSignedRightShift (iCode * ic) l = aopGet (AOP (result), offset, FALSE, FALSE); MOVA (l); emitcode ("rrc", "a"); - aopPut (AOP (result), "a", offset--); + aopPut (AOP (result), "a", offset--, isOperandVolatile (result, FALSE)); } reAdjustPreg (AOP (result)); emitcode ("", "%05d$:", tlbl1->key + 100); @@ -6861,18 +7198,18 @@ static void genRightShift (iCode * ic) { operand *right, *left, *result; - sym_link *retype; + sym_link *letype; int size, offset; char *l; symbol *tlbl, *tlbl1; - D(emitcode (";", "genRightShift")); + D(emitcode ("; genRightShift","")); /* if signed then we do it the hard way preserve the sign bit moving it inwards */ - retype = getSpec (operandType (IC_RESULT (ic))); + letype = getSpec (operandType (IC_LEFT (ic))); - if (!SPEC_USIGN (retype)) + if (!SPEC_USIGN (letype)) { genSignedRightShift (ic); return; @@ -6926,10 +7263,10 @@ genRightShift (iCode * ic) { emitcode ("mov", "a,%s", l); - aopPut (AOP (result), "a", offset); + aopPut (AOP (result), "a", offset, isOperandVolatile (result, FALSE)); } else - aopPut (AOP (result), l, offset); + aopPut (AOP (result), l, offset, isOperandVolatile (result, FALSE)); offset++; } } @@ -6950,7 +7287,7 @@ genRightShift (iCode * ic) emitcode ("rrc", "a"); emitcode ("", "%05d$:", tlbl1->key + 100); emitcode ("djnz", "b,%05d$", tlbl->key + 100); - aopPut (AOP (result), "a", 0); + aopPut (AOP (result), "a", 0, isOperandVolatile (result, FALSE)); goto release; } @@ -6963,7 +7300,7 @@ genRightShift (iCode * ic) l = aopGet (AOP (result), offset, FALSE, FALSE); MOVA (l); emitcode ("rrc", "a"); - aopPut (AOP (result), "a", offset--); + aopPut (AOP (result), "a", offset--, isOperandVolatile (result, FALSE)); } reAdjustPreg (AOP (result)); @@ -6976,116 +7313,137 @@ release: } /*-----------------------------------------------------------------*/ -/* genUnpackBits - generates code for unpacking bits */ +/* emitPtrByteGet - emits code to get a byte into A through a */ +/* pointer register (R0, R1, or DPTR). The */ +/* original value of A can be preserved in B. */ /*-----------------------------------------------------------------*/ static void -genUnpackBits (operand * result, char *rname, int ptype) +emitPtrByteGet (char *rname, int p_type, bool preserveAinB) { - int shCnt; - int rlen = 0; - sym_link *etype; - int offset = 0; - int rsize; - - D(emitcode (";", "genUnpackBits")); - - etype = getSpec (operandType (result)); - rsize = getSize (operandType (result)); - /* read the first byte */ - switch (ptype) + switch (p_type) { - - case POINTER: case IPOINTER: + case POINTER: + if (preserveAinB) + emitcode ("mov", "b,a"); emitcode ("mov", "a,@%s", rname); break; case PPOINTER: + if (preserveAinB) + emitcode ("mov", "b,a"); emitcode ("movx", "a,@%s", rname); break; - + case FPOINTER: + if (preserveAinB) + emitcode ("mov", "b,a"); emitcode ("movx", "a,@dptr"); break; case CPOINTER: + if (preserveAinB) + emitcode ("mov", "b,a"); emitcode ("clr", "a"); emitcode ("movc", "a,@a+dptr"); break; case GPOINTER: + if (preserveAinB) + { + emitcode ("push", "b"); + emitcode ("push", "acc"); + } emitcode ("lcall", "__gptrget"); + if (preserveAinB) + emitcode ("pop", "b"); break; } +} - rlen = SPEC_BLEN (etype); - - /* if we have bitdisplacement then it fits */ - /* into this byte completely or if length is */ - /* less than a byte */ - if ((shCnt = SPEC_BSTR (etype)) || - (SPEC_BLEN (etype) <= 8)) +/*-----------------------------------------------------------------*/ +/* emitPtrByteSet - emits code to set a byte from src through a */ +/* pointer register (R0, R1, or DPTR). */ +/*-----------------------------------------------------------------*/ +static void +emitPtrByteSet (char *rname, int p_type, char *src) +{ + switch (p_type) { + case IPOINTER: + case POINTER: + if (*src=='@') + { + MOVA (src); + emitcode ("mov", "@%s,a", rname); + } + else + emitcode ("mov", "@%s,%s", rname, src); + break; - /* shift right acc */ - AccRsh (shCnt); + case PPOINTER: + MOVA (src); + emitcode ("movx", "@%s,a", rname); + break; + + case FPOINTER: + MOVA (src); + emitcode ("movx", "@dptr,a"); + break; - emitcode ("anl", "a,#0x%02x", - ((unsigned char) -1) >> (8 - SPEC_BLEN (etype))); - aopPut (AOP (result), "a", offset++); - goto finish; + case GPOINTER: + MOVA (src); + emitcode ("lcall", "__gptrput"); + break; } +} - /* bit field did not fit in a byte */ - aopPut (AOP (result), "a", offset++); - - while (1) - { - - switch (ptype) - { - case POINTER: - case IPOINTER: - emitcode ("inc", "%s", rname); - emitcode ("mov", "a,@%s", rname); - break; - - case PPOINTER: - emitcode ("inc", "%s", rname); - emitcode ("movx", "a,@%s", rname); - break; - - case FPOINTER: - emitcode ("inc", "dptr"); - emitcode ("movx", "a,@dptr"); - break; - - case CPOINTER: - emitcode ("clr", "a"); - emitcode ("inc", "dptr"); - emitcode ("movc", "a,@a+dptr"); - break; +/*-----------------------------------------------------------------*/ +/* genUnpackBits - generates code for unpacking bits */ +/*-----------------------------------------------------------------*/ +static void +genUnpackBits (operand * result, char *rname, int ptype) +{ + int offset = 0; /* result byte offset */ + int rsize; /* result size */ + int rlen = 0; /* remaining bitfield length */ + sym_link *etype; /* bitfield type information */ + int blen; /* bitfield length */ + int bstr; /* bitfield starting bit within byte */ - case GPOINTER: - emitcode ("inc", "dptr"); - emitcode ("lcall", "__gptrget"); - break; - } + D(emitcode ("; genUnpackBits","")); - rlen -= 8; - /* if we are done */ - if (rlen < 8) - break; + etype = getSpec (operandType (result)); + rsize = getSize (operandType (result)); + blen = SPEC_BLEN (etype); + bstr = SPEC_BSTR (etype); - aopPut (AOP (result), "a", offset++); + /* If the bitfield length is less than a byte */ + if (blen < 8) + { + emitPtrByteGet (rname, ptype, FALSE); + AccRsh (bstr); + emitcode ("anl", "a,#0x%02x", ((unsigned char) -1) >> (8 - blen)); + aopPut (AOP (result), "a", offset++, isOperandVolatile (result, FALSE)); + goto finish; + } + /* Bit field did not fit in a byte. Copy all + but the partial byte at the end. */ + for (rlen=blen;rlen>=8;rlen-=8) + { + emitPtrByteGet (rname, ptype, FALSE); + aopPut (AOP (result), "a", offset++, isOperandVolatile (result, FALSE)); + if (rlen>8) + emitcode ("inc", "%s", rname); } + /* Handle the partial byte at the end */ if (rlen) { - // emitcode("anl","a,#0x%02x",((unsigned char)-1)>>(rlen)); - AccLsh (8 - rlen); - aopPut (AOP (result), "a", offset++); + emitPtrByteGet (rname, ptype, FALSE); + emitcode ("anl", "a,#0x%02x", ((unsigned char) -1) >> (8-rlen)); + aopPut (AOP (result), "a", offset++, isOperandVolatile (result, FALSE)); } finish: @@ -7093,9 +7451,8 @@ finish: { rsize -= offset; while (rsize--) - aopPut (AOP (result), zero, offset++); + aopPut (AOP (result), zero, offset++, isOperandVolatile (result, FALSE)); } - return; } @@ -7111,7 +7468,7 @@ genDataPointerGet (operand * left, char buffer[256]; int size, offset = 0; - D(emitcode (";", "genDataPointerGet")); + D(emitcode ("; genDataPointerGet","")); aopOp (result, ic, TRUE); @@ -7124,7 +7481,7 @@ genDataPointerGet (operand * left, sprintf (buffer, "(%s + %d)", l + 1, offset); else sprintf (buffer, "%s", l + 1); - aopPut (AOP (result), buffer, offset++); + aopPut (AOP (result), buffer, offset++, isOperandVolatile (result, FALSE)); } freeAsmop (left, NULL, ic, TRUE); @@ -7147,7 +7504,7 @@ genNearPointerGet (operand * left, sym_link *ltype = operandType (left); char buffer[80]; - D(emitcode (";", "genNearPointerGet")); + D(emitcode ("; genNearPointerGet","")); rtype = operandType (result); retype = getSpec (rtype); @@ -7166,21 +7523,40 @@ genNearPointerGet (operand * left, return; } - /* if the value is already in a pointer register + /* if the value is already in a pointer register then don't need anything more */ if (!AOP_INPREG (AOP (left))) { - /* otherwise get a free pointer register */ - aop = newAsmop (0); - preg = getFreePtr (ic, &aop, FALSE); - emitcode ("mov", "%s,%s", - preg->name, - aopGet (AOP (left), 0, FALSE, TRUE)); - rname = preg->name; + if (IS_AOP_PREG (left)) + { + // Aha, it is a pointer, just in disguise. + rname = aopGet (AOP (left), 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 (AOP (left), 0, FALSE, TRUE)); + rname = preg->name; + } } else rname = aopGet (AOP (left), 0, FALSE, FALSE); - + //aopOp (result, ic, FALSE); aopOp (result, ic, result?TRUE:FALSE); @@ -7199,12 +7575,12 @@ genNearPointerGet (operand * left, { emitcode ("mov", "a,@%s", rname); - aopPut (AOP (result), "a", offset); + aopPut (AOP (result), "a", offset, isOperandVolatile (result, FALSE)); } else { sprintf (buffer, "@%s", rname); - aopPut (AOP (result), buffer, offset); + aopPut (AOP (result), buffer, offset, isOperandVolatile (result, FALSE)); } offset++; if (size || pi) @@ -7216,9 +7592,9 @@ genNearPointerGet (operand * left, if (aop) /* we had to allocate for this iCode */ { if (pi) { /* post increment present */ - aopPut(AOP ( left ),rname,0); + aopPut(AOP ( left ),rname,0, isOperandVolatile (left, FALSE)); } - freeAsmop (NULL, aop, ic, TRUE); + freeAsmop (NULL, aop, ic, RESULTONSTACK (ic) ? FALSE : TRUE); } else { @@ -7240,8 +7616,8 @@ genNearPointerGet (operand * left, } /* done */ + freeAsmop (result, NULL, ic, RESULTONSTACK (ic) ? FALSE : TRUE); freeAsmop (left, NULL, ic, TRUE); - freeAsmop (result, NULL, ic, TRUE); if (pi) pi->generated = 1; } @@ -7259,7 +7635,7 @@ genPagedPointerGet (operand * left, char *rname; sym_link *rtype, *retype; - D(emitcode (";", "genPagedPointerGet")); + D(emitcode ("; genPagedPointerGet","")); rtype = operandType (result); retype = getSpec (rtype); @@ -7296,7 +7672,7 @@ genPagedPointerGet (operand * left, { emitcode ("movx", "a,@%s", rname); - aopPut (AOP (result), "a", offset); + aopPut (AOP (result), "a", offset, isOperandVolatile (result, FALSE)); offset++; @@ -7308,7 +7684,7 @@ genPagedPointerGet (operand * left, /* now some housekeeping stuff */ if (aop) /* we had to allocate for this iCode */ { - if (pi) aopPut ( AOP (left), rname, 0); + if (pi) aopPut ( AOP (left), rname, 0, isOperandVolatile (left, FALSE)); freeAsmop (NULL, aop, ic, TRUE); } else @@ -7337,35 +7713,83 @@ genPagedPointerGet (operand * left, } -/*-----------------------------------------------------------------*/ -/* genFarPointerGet - gget value from far space */ -/*-----------------------------------------------------------------*/ +/*--------------------------------------------------------------------*/ +/* loadDptrFromOperand - load dptr (and optionally B) from operand op */ +/*--------------------------------------------------------------------*/ static void -genFarPointerGet (operand * left, - operand * result, iCode * ic, iCode * pi) +loadDptrFromOperand (operand *op, bool loadBToo) { - int size, offset; - sym_link *retype = getSpec (operandType (result)); - - D(emitcode (";", "genFarPointerGet")); - - aopOp (left, ic, FALSE); - - /* if the operand is already in dptr - then we do nothing else we move the value to dptr */ - if (AOP_TYPE (left) != AOP_STR) + if (AOP_TYPE (op) != AOP_STR) { /* if this is remateriazable */ - if (AOP_TYPE (left) == AOP_IMMD) - emitcode ("mov", "dptr,%s", aopGet (AOP (left), 0, TRUE, FALSE)); - else - { /* we need to get it byte by byte */ - emitcode ("mov", "dpl,%s", aopGet (AOP (left), 0, FALSE, FALSE)); - emitcode ("mov", "dph,%s", aopGet (AOP (left), 1, FALSE, FALSE)); - } - } - /* so dptr know contains the address */ - aopOp (result, ic, FALSE); + if (AOP_TYPE (op) == AOP_IMMD) + { + emitcode ("mov", "dptr,%s", aopGet (AOP (op), 0, TRUE, FALSE)); + if (loadBToo) + { + if (AOP(op)->aopu.aop_immd.from_cast_remat) + emitcode ("mov", "b,%s",aopGet(AOP (op), AOP_SIZE(op)-1, FALSE, FALSE)); + else + { + wassertl(FALSE, "need pointerCode"); + emitcode ("", "; mov b,???"); + /* genPointerGet and genPointerSet originally did different + ** things for this case. Both seem wrong. + ** from genPointerGet: + ** emitcode ("mov", "b,#%d", pointerCode (retype)); + ** from genPointerSet: + ** emitcode ("mov", "b,%s + 1", aopGet (AOP (result), 0, TRUE, FALSE)); + */ + } + } + } + else if (AOP_TYPE (op) == AOP_DPTR) + { + if (loadBToo) + { + MOVA (aopGet (AOP (op), 0, FALSE, FALSE)); + emitcode ("push", "acc"); + MOVA (aopGet (AOP (op), 1, FALSE, FALSE)); + emitcode ("push", "acc"); + emitcode ("mov", "b,%s", aopGet (AOP (op), 2, FALSE, FALSE)); + emitcode ("pop", "dph"); + emitcode ("pop", "dpl"); + } + else + { + MOVA (aopGet (AOP (op), 0, FALSE, FALSE)); + emitcode ("push", "acc"); + emitcode ("mov", "dph,%s", aopGet (AOP (op), 1, FALSE, FALSE)); + emitcode ("pop", "dpl"); + } + } + else + { /* we need to get it byte by byte */ + emitcode ("mov", "dpl,%s", aopGet (AOP (op), 0, FALSE, FALSE)); + emitcode ("mov", "dph,%s", aopGet (AOP (op), 1, FALSE, FALSE)); + if (loadBToo) + emitcode ("mov", "b,%s", aopGet (AOP (op), 2, FALSE, FALSE)); + } + } +} + +/*-----------------------------------------------------------------*/ +/* genFarPointerGet - gget value from far space */ +/*-----------------------------------------------------------------*/ +static void +genFarPointerGet (operand * left, + operand * result, iCode * ic, iCode * pi) +{ + int size, offset; + sym_link *retype = getSpec (operandType (result)); + + D(emitcode ("; genFarPointerGet","")); + + aopOp (left, ic, FALSE); + loadDptrFromOperand (left, FALSE); + + /* so dptr now contains the address */ + aopOp (result, ic, FALSE); /* if bit then unpack */ if (IS_BITVAR (retype)) @@ -7378,15 +7802,15 @@ genFarPointerGet (operand * left, while (size--) { emitcode ("movx", "a,@dptr"); - aopPut (AOP (result), "a", offset++); + 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) { - aopPut ( AOP (left), "dpl", 0); - aopPut ( AOP (left), "dph", 1); + aopPut ( AOP (left), "dpl", 0, isOperandVolatile (left, FALSE)); + aopPut ( AOP (left), "dph", 1, isOperandVolatile (left, FALSE)); pi->generated = 1; } freeAsmop (left, NULL, ic, TRUE); @@ -7403,24 +7827,12 @@ genCodePointerGet (operand * left, int size, offset; sym_link *retype = getSpec (operandType (result)); - D(emitcode (";", "genCodePointerGet")); + D(emitcode ("; genCodePointerGet","")); aopOp (left, ic, FALSE); - - /* if the operand is already in dptr - then we do nothing else we move the value to dptr */ - if (AOP_TYPE (left) != AOP_STR) - { - /* if this is remateriazable */ - if (AOP_TYPE (left) == AOP_IMMD) - emitcode ("mov", "dptr,%s", aopGet (AOP (left), 0, TRUE, FALSE)); - else - { /* we need to get it byte by byte */ - emitcode ("mov", "dpl,%s", aopGet (AOP (left), 0, FALSE, FALSE)); - emitcode ("mov", "dph,%s", aopGet (AOP (left), 1, FALSE, FALSE)); - } - } - /* so dptr know contains the address */ + loadDptrFromOperand (left, FALSE); + + /* so dptr now contains the address */ aopOp (result, ic, FALSE); /* if bit then unpack */ @@ -7433,17 +7845,25 @@ genCodePointerGet (operand * left, while (size--) { - emitcode ("clr", "a"); - emitcode ("movc", "a,@a+dptr"); - aopPut (AOP (result), "a", offset++); - if (size || pi) - emitcode ("inc", "dptr"); + if (pi) + { + emitcode ("clr", "a"); + emitcode ("movc", "a,@a+dptr"); + aopPut (AOP (result), "a", offset++, isOperandVolatile (result, FALSE)); + emitcode ("inc", "dptr"); + } + else + { + emitcode ("mov", "a,#0x%02x", offset); + emitcode ("movc", "a,@a+dptr"); + aopPut (AOP (result), "a", offset++, isOperandVolatile (result, FALSE)); + } } } if (pi && AOP_TYPE (left) != AOP_IMMD && AOP_TYPE (left) != AOP_STR) { - aopPut ( AOP (left), "dpl", 0); - aopPut ( AOP (left), "dph", 1); + aopPut ( AOP (left), "dpl", 0, isOperandVolatile (left, FALSE)); + aopPut ( AOP (left), "dph", 1, isOperandVolatile (left, FALSE)); pi->generated = 1; } freeAsmop (left, NULL, ic, TRUE); @@ -7460,30 +7880,11 @@ genGenPointerGet (operand * left, int size, offset; sym_link *retype = getSpec (operandType (result)); - D(emitcode (";", "genGenPointerGet")); + D(emitcode ("; genGenPointerGet","")); aopOp (left, ic, FALSE); - - /* if the operand is already in dptr - then we do nothing else we move the value to dptr */ - if (AOP_TYPE (left) != AOP_STR) - { - /* if this is remateriazable */ - if (AOP_TYPE (left) == AOP_IMMD) - { - emitcode ("mov", "dptr,%s", aopGet (AOP (left), 0, TRUE, FALSE)); - if (AOP(left)->aopu.aop_immd.from_cast_remat) - emitcode ("mov", "b,%s",aopGet(AOP (left), AOP_SIZE(left)-1, FALSE, FALSE)); - else - emitcode ("mov", "b,#%d", pointerCode (retype)); - } - else - { /* we need to get it byte by byte */ - emitcode ("mov", "dpl,%s", aopGet (AOP (left), 0, FALSE, FALSE)); - emitcode ("mov", "dph,%s", aopGet (AOP (left), 1, FALSE, FALSE)); - emitcode ("mov", "b,%s", aopGet (AOP (left), 2, FALSE, FALSE)); - } - } + loadDptrFromOperand (left, TRUE); + /* so dptr know contains the address */ aopOp (result, ic, FALSE); @@ -7498,16 +7899,15 @@ genGenPointerGet (operand * left, while (size--) { emitcode ("lcall", "__gptrget"); - aopPut (AOP (result), "a", offset++); + 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) { - aopPut ( AOP (left), "dpl", 0); - aopPut ( AOP (left), "dph", 1); - aopPut ( AOP (left), "b", 2); + aopPut ( AOP (left), "dpl", 0, isOperandVolatile (left, FALSE)); + aopPut ( AOP (left), "dph", 1, isOperandVolatile (left, FALSE)); pi->generated = 1; } freeAsmop (left, NULL, ic, TRUE); @@ -7524,7 +7924,7 @@ genPointerGet (iCode * ic, iCode *pi) sym_link *type, *etype; int p_type; - D(emitcode (";", "genPointerGet")); + D(emitcode ("; genPointerGet","")); left = IC_LEFT (ic); result = IC_RESULT (ic); @@ -7546,7 +7946,7 @@ genPointerGet (iCode * ic, iCode *pi) if (p_type == GPOINTER && OP_SYMBOL(left)->remat && IS_CAST_ICODE(OP_SYMBOL(left)->rematiCode)) { left = IC_RIGHT(OP_SYMBOL(left)->rematiCode); - type = type = operandType (left); + type = operandType (left); p_type = DCL_TYPE (type); } /* now that we have the pointer type we assign @@ -7578,6 +7978,8 @@ genPointerGet (iCode * ic, iCode *pi) } + + /*-----------------------------------------------------------------*/ /* genPackBits - generates code for packed bit storage */ /*-----------------------------------------------------------------*/ @@ -7586,168 +7988,125 @@ genPackBits (sym_link * etype, operand * right, char *rname, int p_type) { - int shCount = 0; - int offset = 0; - int rLen = 0; - int blen, bstr; - char *l; + int offset = 0; /* source byte offset */ + int rlen = 0; /* remaining bitfield length */ + int blen; /* bitfield length */ + int bstr; /* bitfield starting bit within byte */ + int litval; /* source literal value (if AOP_LIT) */ + unsigned char mask; /* bitmask within current byte */ - D(emitcode (";", "genPackBits")); + D(emitcode ("; genPackBits","")); blen = SPEC_BLEN (etype); bstr = SPEC_BSTR (etype); - l = aopGet (AOP (right), offset++, FALSE, FALSE); - MOVA (l); - - /* if the bit lenth is less than or */ - /* it exactly fits a byte then */ - if (SPEC_BLEN (etype) <= 8) - { - shCount = SPEC_BSTR (etype); - - /* shift left acc */ - AccLsh (shCount); - - if (SPEC_BLEN (etype) < 8) - { /* if smaller than a byte */ - - - switch (p_type) - { - case POINTER: - emitcode ("mov", "b,a"); - emitcode ("mov", "a,@%s", rname); - break; - - case FPOINTER: - emitcode ("mov", "b,a"); - emitcode ("movx", "a,@dptr"); - break; - - case GPOINTER: - emitcode ("push", "b"); - emitcode ("push", "acc"); - emitcode ("lcall", "__gptrget"); - emitcode ("pop", "b"); - break; - } - - emitcode ("anl", "a,#0x%02x", (unsigned char) - ((unsigned char) (0xFF << (blen + bstr)) | - (unsigned char) (0xFF >> (8 - bstr)))); - emitcode ("orl", "a,b"); - if (p_type == GPOINTER) - emitcode ("pop", "b"); - } - } - - switch (p_type) + /* If the bitfield length is less than a byte */ + if (blen < 8) { - case POINTER: - emitcode ("mov", "@%s,a", rname); - break; - - case FPOINTER: - emitcode ("movx", "@dptr,a"); - break; + mask = ((unsigned char) (0xFF << (blen + bstr)) | + (unsigned char) (0xFF >> (8 - bstr))); - case GPOINTER: - emitcode ("lcall", "__gptrput"); - break; + if (AOP_TYPE (right) == AOP_LIT) + { + /* Case with a bitfield length <8 and literal source + */ + litval = (int) floatFromVal (AOP (right)->aopu.aop_lit); + litval <<= bstr; + litval &= (~mask) & 0xff; + emitPtrByteGet (rname, p_type, FALSE); + if ((mask|litval)!=0xff) + emitcode ("anl","a,#0x%02x", mask); + if (litval) + emitcode ("orl","a,#0x%02x", litval); + } + else + { + if ((blen==1) && (p_type!=GPOINTER)) + { + /* Case with a bitfield length == 1 and no generic pointer + */ + if (AOP_TYPE (right) == AOP_CRY) + emitcode ("mov", "c,%s", AOP(right)->aopu.aop_dir); + else + { + MOVA (aopGet (AOP (right), 0, FALSE, FALSE)); + emitcode ("rrc","a"); + } + emitPtrByteGet (rname, p_type, FALSE); + emitcode ("mov","acc.%d,c",bstr); + } + else + { + /* Case with a bitfield length < 8 and arbitrary source + */ + MOVA (aopGet (AOP (right), 0, FALSE, FALSE)); + /* shift and mask source value */ + AccLsh (bstr); + emitcode ("anl", "a,#0x%02x", (~mask) & 0xff); + + /* transfer A to B and get next byte */ + emitPtrByteGet (rname, p_type, TRUE); + + emitcode ("anl", "a,#0x%02x", mask); + emitcode ("orl", "a,b"); + if (p_type == GPOINTER) + emitcode ("pop", "b"); + } + } + + emitPtrByteSet (rname, p_type, "a"); + return; } - /* if we r done */ - if (SPEC_BLEN (etype) <= 8) - return; - - emitcode ("inc", "%s", rname); - rLen = SPEC_BLEN (etype); - - /* now generate for lengths greater than one byte */ - while (1) + /* Bit length is greater than 7 bits. In this case, copy */ + /* all except the partial byte at the end */ + for (rlen=blen;rlen>=8;rlen-=8) { - - l = aopGet (AOP (right), offset++, FALSE, TRUE); - - rLen -= 8; - if (rLen < 8) - break; - - switch (p_type) - { - case POINTER: - if (*l == '@') - { - MOVA (l); - emitcode ("mov", "@%s,a", rname); - } - else - emitcode ("mov", "@%s,%s", rname, l); - break; - - case FPOINTER: - MOVA (l); - emitcode ("movx", "@dptr,a"); - break; - - case GPOINTER: - MOVA (l); - emitcode ("lcall", "__gptrput"); - break; - } - emitcode ("inc", "%s", rname); + emitPtrByteSet (rname, p_type, + aopGet (AOP (right), offset++, FALSE, TRUE) ); + if (rlen>8) + emitcode ("inc", "%s", rname); } - MOVA (l); - - /* last last was not complete */ - if (rLen) + /* If there was a partial byte at the end */ + if (rlen) { - /* save the byte & read byte */ - switch (p_type) - { - case POINTER: - emitcode ("mov", "b,a"); - emitcode ("mov", "a,@%s", rname); - break; - - case FPOINTER: - emitcode ("mov", "b,a"); - emitcode ("movx", "a,@dptr"); - break; + mask = (((unsigned char) -1 << rlen) & 0xff); + + if (AOP_TYPE (right) == AOP_LIT) + { + /* Case with partial byte and literal source + */ + litval = (int) floatFromVal (AOP (right)->aopu.aop_lit); + litval >>= (blen-rlen); + litval &= (~mask) & 0xff; + emitPtrByteGet (rname, p_type, FALSE); + if ((mask|litval)!=0xff) + emitcode ("anl","a,#0x%02x", mask); + if (litval) + emitcode ("orl","a,#0x%02x", litval); + } + else + { + /* Case with partial byte and arbitrary source + */ + MOVA (aopGet (AOP (right), offset++, FALSE, FALSE)); + emitcode ("anl", "a,#0x%02x", (~mask) & 0xff); - case GPOINTER: - emitcode ("push", "b"); - emitcode ("push", "acc"); - emitcode ("lcall", "__gptrget"); - emitcode ("pop", "b"); - break; - } + /* transfer A to B and get next byte */ + emitPtrByteGet (rname, p_type, TRUE); - emitcode ("anl", "a,#0x%02x", (((unsigned char) -1 << rLen) & 0xff)); - emitcode ("orl", "a,b"); + emitcode ("anl", "a,#0x%02x", mask); + emitcode ("orl", "a,b"); + if (p_type == GPOINTER) + emitcode ("pop", "b"); + } + emitPtrByteSet (rname, p_type, "a"); } - if (p_type == GPOINTER) - emitcode ("pop", "b"); - - switch (p_type) - { - - case POINTER: - emitcode ("mov", "@%s,a", rname); - break; +} - case FPOINTER: - emitcode ("movx", "@dptr,a"); - break; - case GPOINTER: - emitcode ("lcall", "__gptrput"); - break; - } -} /*-----------------------------------------------------------------*/ /* genDataPointerSet - remat pointer to data space */ /*-----------------------------------------------------------------*/ @@ -7759,7 +8118,7 @@ genDataPointerSet (operand * right, int size, offset = 0; char *l, buffer[256]; - D(emitcode (";", "genDataPointerSet")); + D(emitcode ("; genDataPointerSet","")); aopOp (right, ic, FALSE); @@ -7794,7 +8153,7 @@ genNearPointerSet (operand * right, sym_link *retype, *letype; sym_link *ptype = operandType (result); - D(emitcode (";", "genNearPointerSet")); + D(emitcode ("; genNearPointerSet","")); retype = getSpec (operandType (right)); letype = getSpec (ptype); @@ -7810,7 +8169,7 @@ genNearPointerSet (operand * right, genDataPointerSet (right, result, ic); return; } - + /* if the value is already in a pointer register then don't need anything more */ if (!AOP_INPREG (AOP (result))) @@ -7830,6 +8189,7 @@ genNearPointerSet (operand * right, else { // Expected case. + emitcode ("mov", "a%s,%s", rname + 1, rname); rname++; // skip the '@'. } } @@ -7850,7 +8210,7 @@ genNearPointerSet (operand * right, } aopOp (right, ic, FALSE); - + /* if bitfield then unpack the bits */ if (IS_BITVAR (retype) || IS_BITVAR (letype)) genPackBits ((IS_BITVAR (retype) ? retype : letype), right, rname, POINTER); @@ -7879,7 +8239,8 @@ genNearPointerSet (operand * right, /* now some housekeeping stuff */ if (aop) /* we had to allocate for this iCode */ { - if (pi) aopPut (AOP (result),rname,0); + if (pi) + aopPut (AOP (result), rname, 0, isOperandVolatile (result, FALSE)); freeAsmop (NULL, aop, ic, TRUE); } else @@ -7921,7 +8282,7 @@ genPagedPointerSet (operand * right, char *rname, *l; sym_link *retype, *letype; - D(emitcode (";", "genPagedPointerSet")); + D(emitcode ("; genPagedPointerSet","")); retype = getSpec (operandType (right)); letype = getSpec (operandType (result)); @@ -7971,7 +8332,8 @@ genPagedPointerSet (operand * right, /* now some housekeeping stuff */ if (aop) /* we had to allocate for this iCode */ { - if (pi) aopPut (AOP (result),rname,0); + if (pi) + aopPut (AOP (result), rname, 0, isOperandVolatile (result, FALSE)); freeAsmop (NULL, aop, ic, TRUE); } else @@ -8011,23 +8373,11 @@ genFarPointerSet (operand * right, sym_link *retype = getSpec (operandType (right)); sym_link *letype = getSpec (operandType (result)); - D(emitcode (";", "genFarPointerSet")); + D(emitcode ("; genFarPointerSet","")); aopOp (result, ic, FALSE); - - /* if the operand is already in dptr - then we do nothing else we move the value to dptr */ - if (AOP_TYPE (result) != AOP_STR) - { - /* if this is remateriazable */ - if (AOP_TYPE (result) == AOP_IMMD) - emitcode ("mov", "dptr,%s", aopGet (AOP (result), 0, TRUE, FALSE)); - else - { /* we need to get it byte by byte */ - emitcode ("mov", "dpl,%s", aopGet (AOP (result), 0, FALSE, FALSE)); - emitcode ("mov", "dph,%s", aopGet (AOP (result), 1, FALSE, FALSE)); - } - } + loadDptrFromOperand (result, FALSE); + /* so dptr know contains the address */ aopOp (right, ic, FALSE); @@ -8049,8 +8399,8 @@ genFarPointerSet (operand * right, } } if (pi && AOP_TYPE (result) != AOP_STR && AOP_TYPE (result) != AOP_IMMD) { - aopPut (AOP(result),"dpl",0); - aopPut (AOP(result),"dph",1); + aopPut (AOP(result), "dpl", 0, isOperandVolatile (result, FALSE)); + aopPut (AOP(result), "dph", 1, isOperandVolatile (result, FALSE)); pi->generated=1; } freeAsmop (result, NULL, ic, TRUE); @@ -8068,30 +8418,11 @@ genGenPointerSet (operand * right, sym_link *retype = getSpec (operandType (right)); sym_link *letype = getSpec (operandType (result)); - D(emitcode (";", "genGenPointerSet")); + D(emitcode ("; genGenPointerSet","")); aopOp (result, ic, FALSE); - - /* if the operand is already in dptr - then we do nothing else we move the value to dptr */ - if (AOP_TYPE (result) != AOP_STR) - { - /* if this is remateriazable */ - if (AOP_TYPE (result) == AOP_IMMD) - { - emitcode ("mov", "dptr,%s", aopGet (AOP (result), 0, TRUE, FALSE)); - if (AOP(result)->aopu.aop_immd.from_cast_remat) - emitcode ("mov", "b,%s",aopGet(AOP (result), AOP_SIZE(result)-1, FALSE, FALSE)); - else - emitcode ("mov", "b,%s + 1", aopGet (AOP (result), 0, TRUE, FALSE)); - } - else - { /* we need to get it byte by byte */ - emitcode ("mov", "dpl,%s", aopGet (AOP (result), 0, FALSE, FALSE)); - emitcode ("mov", "dph,%s", aopGet (AOP (result), 1, FALSE, FALSE)); - emitcode ("mov", "b,%s", aopGet (AOP (result), 2, FALSE, FALSE)); - } - } + loadDptrFromOperand (result, TRUE); + /* so dptr know contains the address */ aopOp (right, ic, FALSE); @@ -8114,9 +8445,8 @@ genGenPointerSet (operand * right, } if (pi && AOP_TYPE (result) != AOP_STR && AOP_TYPE (result) != AOP_IMMD) { - aopPut (AOP(result),"dpl",0); - aopPut (AOP(result),"dph",1); - aopPut (AOP(result),"b",2); + aopPut (AOP(result), "dpl", 0, isOperandVolatile (result, FALSE)); + aopPut (AOP(result), "dph", 1, isOperandVolatile (result, FALSE)); pi->generated=1; } freeAsmop (result, NULL, ic, TRUE); @@ -8133,7 +8463,7 @@ genPointerSet (iCode * ic, iCode *pi) sym_link *type, *etype; int p_type; - D(emitcode (";", "genPointerSet")); + D(emitcode ("; genPointerSet","")); right = IC_RIGHT (ic); result = IC_RESULT (ic); @@ -8157,7 +8487,7 @@ genPointerSet (iCode * ic, iCode *pi) if (p_type == GPOINTER && OP_SYMBOL(result)->remat && IS_CAST_ICODE(OP_SYMBOL(result)->rematiCode)) { result = IC_RIGHT(OP_SYMBOL(result)->rematiCode); - type = type = operandType (result); + type = operandType (result); p_type = DCL_TYPE (type); } /* now that we have the pointer type we assign @@ -8181,6 +8511,10 @@ genPointerSet (iCode * ic, iCode *pi) case GPOINTER: genGenPointerSet (right, result, ic, pi); break; + + default: + werror (E_INTERNAL_ERROR, __FILE__, __LINE__, + "genPointerSet: illegal pointer type"); } } @@ -8194,7 +8528,7 @@ genIfx (iCode * ic, iCode * popIc) operand *cond = IC_COND (ic); int isbit = 0; - D(emitcode (";", "genIfx")); + D(emitcode ("; genIfx","")); aopOp (cond, ic, FALSE); @@ -8231,7 +8565,7 @@ genAddrOf (iCode * ic) symbol *sym = OP_SYMBOL (IC_LEFT (ic)); int size, offset; - D(emitcode (";", "genAddrOf")); + D(emitcode ("; genAddrOf","")); aopOp (IC_RESULT (ic), ic, FALSE); @@ -8248,12 +8582,12 @@ genAddrOf (iCode * ic) emitcode ("add", "a,#0x%02x", ((sym->stack < 0) ? ((char) (sym->stack - _G.nRegsSaved)) : ((char) sym->stack)) & 0xff); - aopPut (AOP (IC_RESULT (ic)), "a", 0); + aopPut (AOP (IC_RESULT (ic)), "a", 0, isOperandVolatile (IC_RESULT (ic), FALSE)); } else { /* we can just move _bp */ - aopPut (AOP (IC_RESULT (ic)), "_bp", 0); + aopPut (AOP (IC_RESULT (ic)), "_bp", 0, isOperandVolatile (IC_RESULT (ic), FALSE)); } /* fill the result with zero */ size = AOP_SIZE (IC_RESULT (ic)) - 1; @@ -8261,7 +8595,7 @@ genAddrOf (iCode * ic) offset = 1; while (size--) { - aopPut (AOP (IC_RESULT (ic)), zero, offset++); + aopPut (AOP (IC_RESULT (ic)), zero, offset++, isOperandVolatile (IC_RESULT (ic), FALSE)); } goto release; @@ -8280,7 +8614,7 @@ genAddrOf (iCode * ic) offset * 8); else sprintf (s, "#%s", sym->rname); - aopPut (AOP (IC_RESULT (ic)), s, offset++); + aopPut (AOP (IC_RESULT (ic)), s, offset++, isOperandVolatile (IC_RESULT (ic), FALSE)); } release: @@ -8298,7 +8632,7 @@ genFarFarAssign (operand * result, operand * right, iCode * ic) int offset = 0; char *l; - D(emitcode (";", "genFarFarAssign")); + D(emitcode ("; genFarFarAssign","")); /* first push the right side on to the stack */ while (size--) @@ -8315,7 +8649,7 @@ genFarFarAssign (operand * result, operand * right, iCode * ic) while (size--) { emitcode ("pop", "acc"); - aopPut (AOP (result), "a", --offset); + aopPut (AOP (result), "a", --offset, isOperandVolatile (result, FALSE)); } freeAsmop (result, NULL, ic, FALSE); @@ -8331,13 +8665,15 @@ genAssign (iCode * ic) int size, offset; unsigned long lit = 0L; - D(emitcode(";","genAssign")); + D(emitcode("; genAssign","")); result = IC_RESULT (ic); right = IC_RIGHT (ic); /* if they are the same */ - if (operandsEqu (IC_RESULT (ic), IC_RIGHT (ic))) + if (operandsEqu (result, right) && + !isOperandVolatile (result, FALSE) && + !isOperandVolatile (right, FALSE)) return; aopOp (right, ic, FALSE); @@ -8355,7 +8691,9 @@ genAssign (iCode * ic) aopOp (result, ic, TRUE); /* if they are the same registers */ - if (sameRegs (AOP (right), AOP (result))) + if (sameRegs (AOP (right), AOP (result)) && + !isOperandVolatile (result, FALSE) && + !isOperandVolatile (right, FALSE)) goto release; /* if the result is a bit */ @@ -8367,9 +8705,9 @@ genAssign (iCode * ic) if (AOP_TYPE (right) == AOP_LIT) { if (((int) operandLitValue (right))) - aopPut (AOP (result), one, 0); + aopPut (AOP (result), one, 0, isOperandVolatile (result, FALSE)); else - aopPut (AOP (result), zero, 0); + aopPut (AOP (result), zero, 0, isOperandVolatile (result, FALSE)); goto release; } @@ -8377,13 +8715,13 @@ genAssign (iCode * ic) if (AOP_TYPE (right) == AOP_CRY) { emitcode ("mov", "c,%s", AOP (right)->aopu.aop_dir); - aopPut (AOP (result), "c", 0); + aopPut (AOP (result), "c", 0, isOperandVolatile (result, FALSE)); goto release; } /* we need to or */ toBoolean (right); - aopPut (AOP (result), "a", 0); + aopPut (AOP (result), "a", 0, isOperandVolatile (result, FALSE)); goto release; } @@ -8403,11 +8741,12 @@ genAssign (iCode * ic) while (size--) { if ((unsigned int) ((lit >> (size * 8)) & 0x0FFL) == 0) - aopPut (AOP (result), "a", size); + aopPut (AOP (result), "a", size, isOperandVolatile (result, FALSE)); else aopPut (AOP (result), aopGet (AOP (right), size, FALSE, FALSE), - size); + size, + isOperandVolatile (result, FALSE)); } } else @@ -8416,7 +8755,8 @@ genAssign (iCode * ic) { aopPut (AOP (result), aopGet (AOP (right), offset, FALSE, FALSE), - offset); + offset, + isOperandVolatile (result, FALSE)); offset++; } } @@ -8435,7 +8775,7 @@ genJumpTab (iCode * ic) symbol *jtab; char *l; - D(emitcode (";", "genJumpTab")); + D(emitcode ("; genJumpTab","")); aopOp (IC_JTCOND (ic), ic, FALSE); /* get the condition into accumulator */ @@ -8469,7 +8809,7 @@ genCast (iCode * ic) operand *right = IC_RIGHT (ic); int size, offset; - D(emitcode(";", "genCast")); + D(emitcode("; genCast","")); /* if they are equivalent then do nothing */ if (operandsEqu (IC_RESULT (ic), IC_RIGHT (ic))) @@ -8478,17 +8818,19 @@ genCast (iCode * ic) aopOp (right, ic, FALSE); aopOp (result, ic, FALSE); - /* if the result is a bit */ - if (IS_BITVAR(OP_SYMBOL(result)->type)) + /* if the result is a bit (and not a bitfield) */ + // if (AOP_TYPE (result) == AOP_CRY) + if (IS_BITVAR (OP_SYMBOL (result)->type) + && !IS_BITFIELD (OP_SYMBOL (result)->type) ) { /* if the right size is a literal then we know what the value is */ if (AOP_TYPE (right) == AOP_LIT) { if (((int) operandLitValue (right))) - aopPut (AOP (result), one, 0); + aopPut (AOP (result), one, 0, isOperandVolatile (result, FALSE)); else - aopPut (AOP (result), zero, 0); + aopPut (AOP (result), zero, 0, isOperandVolatile (result, FALSE)); goto release; } @@ -8497,16 +8839,17 @@ genCast (iCode * ic) if (AOP_TYPE (right) == AOP_CRY) { emitcode ("mov", "c,%s", AOP (right)->aopu.aop_dir); - aopPut (AOP (result), "c", 0); + aopPut (AOP (result), "c", 0, isOperandVolatile (result, FALSE)); goto release; } /* we need to or */ toBoolean (right); - aopPut (AOP (result), "a", 0); + aopPut (AOP (result), "a", 0, isOperandVolatile (result, FALSE)); goto release; } + /* if they are the same size : or less */ if (AOP_SIZE (result) <= AOP_SIZE (right)) { @@ -8522,7 +8865,8 @@ genCast (iCode * ic) { aopPut (AOP (result), aopGet (AOP (right), offset, FALSE, FALSE), - offset); + offset, + isOperandVolatile (result, FALSE)); offset++; } goto release; @@ -8540,8 +8884,6 @@ genCast (iCode * ic) /* pointer to generic pointer */ if (IS_GENPTR (ctype)) { - char *l = zero; - if (IS_PTR (type)) p_type = DCL_TYPE (type); else @@ -8562,36 +8904,24 @@ genCast (iCode * ic) { aopPut (AOP (result), aopGet (AOP (right), offset, FALSE, FALSE), - offset); + offset, + isOperandVolatile (result, FALSE)); offset++; } /* the last byte depending on type */ - switch (p_type) { - case IPOINTER: - case POINTER: - l = zero; - break; - case FPOINTER: - l = one; - break; - case CPOINTER: - l = "#0x02"; - break; - case GPOINTER: - l = "0x03"; - break; - case PPOINTER: // what the fck is this? - l = "#0x03"; - break; - - default: - /* this should never happen */ - werror (E_INTERNAL_ERROR, __FILE__, __LINE__, - "got unknown pointer type"); - exit (1); - } - aopPut (AOP (result), l, GPTRSIZE - 1); + int gpVal = pointerTypeToGPByte(p_type, NULL, NULL); + char gpValStr[10]; + + if (gpVal == -1) + { + // pointerTypeToGPByte will have bitched. + exit(1); + } + + sprintf(gpValStr, "#0x%d", gpVal); + aopPut (AOP (result), gpValStr, GPTRSIZE - 1, isOperandVolatile (result, FALSE)); + } goto release; } @@ -8602,7 +8932,8 @@ genCast (iCode * ic) { aopPut (AOP (result), aopGet (AOP (right), offset, FALSE, FALSE), - offset); + offset, + isOperandVolatile (result, FALSE)); offset++; } goto release; @@ -8617,17 +8948,18 @@ genCast (iCode * ic) { aopPut (AOP (result), aopGet (AOP (right), offset, FALSE, FALSE), - offset); + offset, + isOperandVolatile (result, FALSE)); offset++; } /* now depending on the sign of the source && destination */ size = AOP_SIZE (result) - AOP_SIZE (right); /* if unsigned or not an integral type */ - if (SPEC_USIGN (rtype) || !IS_SPEC (rtype) || AOP_TYPE(right)==AOP_CRY) + if (!IS_SPEC (rtype) || SPEC_USIGN (rtype) || AOP_TYPE(right)==AOP_CRY) { while (size--) - aopPut (AOP (result), zero, offset++); + aopPut (AOP (result), zero, offset++, isOperandVolatile (result, FALSE)); } else { @@ -8638,7 +8970,7 @@ genCast (iCode * ic) emitcode ("rlc", "a"); emitcode ("subb", "a,acc"); while (size--) - aopPut (AOP (result), "a", offset++); + aopPut (AOP (result), "a", offset++, isOperandVolatile (result, FALSE)); } /* we are done hurray !!!! */ @@ -8659,7 +8991,7 @@ genDjnz (iCode * ic, iCode * ifx) if (!ifx) return 0; - D(emitcode (";", "genDjnz")); + D(emitcode ("; genDjnz","")); /* if the if condition has a false label then we cannot save */ @@ -8706,7 +9038,7 @@ genDjnz (iCode * ic, iCode * ifx) return 0; } emitcode ("dec", "%s", rByte); - aopPut(AOP(IC_RESULT(ic)), rByte, 0); + aopPut(AOP(IC_RESULT(ic)), rByte, 0, isOperandVolatile (IC_RESULT (ic), FALSE)); emitcode ("jnz", "%05d$", lbl->key + 100); } else if (IS_AOP_PREG (IC_RESULT (ic))) @@ -8737,42 +9069,165 @@ genDjnz (iCode * ic, iCode * ifx) static void genReceive (iCode * ic) { - D(emitcode (";", "genReceive")); + int size = getSize (operandType (IC_RESULT (ic))); + int offset = 0; + D(emitcode ("; genReceive","")); - if (isOperandInFarSpace (IC_RESULT (ic)) && - (OP_SYMBOL (IC_RESULT (ic))->isspilt || - IS_TRUE_SYMOP (IC_RESULT (ic)))) + if (ic->argreg == 1) { /* first parameter */ + if (isOperandInFarSpace (IC_RESULT (ic)) && + (OP_SYMBOL (IC_RESULT (ic))->isspilt || + IS_TRUE_SYMOP (IC_RESULT (ic)))) { + + offset = fReturnSizeMCS51 - size; + while (size--) { + emitcode ("push", "%s", (strcmp (fReturn[fReturnSizeMCS51 - offset - 1], "a") ? + fReturn[fReturnSizeMCS51 - offset - 1] : "acc")); + offset++; + } + aopOp (IC_RESULT (ic), ic, FALSE); + size = AOP_SIZE (IC_RESULT (ic)); + offset = 0; + while (size--) { + emitcode ("pop", "acc"); + aopPut (AOP (IC_RESULT (ic)), "a", offset++, isOperandVolatile (IC_RESULT (ic), FALSE)); + } + + } else { + _G.accInUse++; + aopOp (IC_RESULT (ic), ic, FALSE); + _G.accInUse--; + assignResultValue (IC_RESULT (ic)); + } + } else { /* second receive onwards */ + int rb1off ; + aopOp (IC_RESULT (ic), ic, FALSE); + rb1off = ic->argreg; + while (size--) { + aopPut (AOP (IC_RESULT (ic)), rb1regs[rb1off++ -5], offset++, isOperandVolatile (IC_RESULT (ic), FALSE)); + } + } + freeAsmop (IC_RESULT (ic), NULL, ic, TRUE); +} + +/*-----------------------------------------------------------------*/ +/* genDummyRead - generate code for dummy read of volatiles */ +/*-----------------------------------------------------------------*/ +static void +genDummyRead (iCode * ic) +{ + operand *op; + int size, offset; + + D(emitcode("; genDummyRead","")); + + op = IC_RIGHT (ic); + if (op && IS_SYMOP (op)) { + aopOp (op, ic, FALSE); - int size = getSize (operandType (IC_RESULT (ic))); - int offset = fReturnSizeMCS51 - size; - while (size--) + /* if the result is a bit */ + if (AOP_TYPE (op) == AOP_CRY) + emitcode ("mov", "c,%s", AOP (op)->aopu.aop_dir); + else { - emitcode ("push", "%s", (strcmp (fReturn[fReturnSizeMCS51 - offset - 1], "a") ? - fReturn[fReturnSizeMCS51 - offset - 1] : "acc")); - offset++; + /* bit variables done */ + /* general case */ + size = AOP_SIZE (op); + offset = 0; + while (size--) + { + MOVA (aopGet (AOP (op), offset, FALSE, FALSE)); + offset++; + } } - aopOp (IC_RESULT (ic), ic, FALSE); - size = AOP_SIZE (IC_RESULT (ic)); - offset = 0; - while (size--) + + freeAsmop (op, NULL, ic, TRUE); + } + + op = IC_LEFT (ic); + if (op && IS_SYMOP (op)) + { + aopOp (op, ic, FALSE); + + /* if the result is a bit */ + if (AOP_TYPE (op) == AOP_CRY) + emitcode ("mov", "c,%s", AOP (op)->aopu.aop_dir); + else { - emitcode ("pop", "acc"); - aopPut (AOP (IC_RESULT (ic)), "a", offset++); + /* bit variables done */ + /* general case */ + size = AOP_SIZE (op); + offset = 0; + while (size--) + { + MOVA (aopGet (AOP (op), offset, FALSE, FALSE)); + offset++; + } } + freeAsmop (op, NULL, ic, TRUE); + } +} + +/*-----------------------------------------------------------------*/ +/* genCritical - generate code for start of a critical sequence */ +/*-----------------------------------------------------------------*/ +static void +genCritical (iCode *ic) +{ + symbol *tlbl = newiTempLabel (NULL); + + D(emitcode("; genCritical","")); + + if (IC_RESULT (ic)) + aopOp (IC_RESULT (ic), ic, TRUE); + + emitcode ("setb", "c"); + emitcode ("jbc", "ea,%05d$", (tlbl->key + 100)); /* atomic test & clear */ + emitcode ("clr", "c"); + emitcode ("", "%05d$:", (tlbl->key + 100)); + + if (IC_RESULT (ic)) + outBitC (IC_RESULT (ic)); /* save old ea in an operand */ + else + emitcode ("push", "psw"); /* save old ea via c in psw on top of stack*/ + + if (IC_RESULT (ic)) + freeAsmop (IC_RESULT (ic), NULL, ic, TRUE); +} + +/*-----------------------------------------------------------------*/ +/* genEndCritical - generate code for end of a critical sequence */ +/*-----------------------------------------------------------------*/ +static void +genEndCritical (iCode *ic) +{ + D(emitcode("; genEndCritical","")); + + if (IC_RIGHT (ic)) + { + aopOp (IC_RIGHT (ic), ic, FALSE); + if (AOP_TYPE (IC_RIGHT (ic)) == AOP_CRY) + { + emitcode ("mov", "c,%s", IC_RIGHT (ic)->aop->aopu.aop_dir); + emitcode ("mov", "ea,c"); + } + else + { + MOVA (aopGet (AOP (IC_RIGHT (ic)), 0, FALSE, FALSE)); + emitcode ("rrc", "a"); + emitcode ("mov", "ea,c"); + } + freeAsmop (IC_RIGHT (ic), NULL, ic, TRUE); } else { - _G.accInUse++; - aopOp (IC_RESULT (ic), ic, FALSE); - _G.accInUse--; - assignResultValue (IC_RESULT (ic)); + emitcode ("pop", "psw"); /* restore ea via c in psw on top of stack */ + emitcode ("mov", "ea,c"); } - - freeAsmop (IC_RESULT (ic), NULL, ic, TRUE); } + /*-----------------------------------------------------------------*/ /* gen51Code - generate code for 8051 based controllers */ /*-----------------------------------------------------------------*/ @@ -8785,12 +9240,12 @@ gen51Code (iCode * lic) lineHead = lineCurr = NULL; /* print the allocation information */ - if (allocInfo) + if (allocInfo && currFunc) printAllocInfo (currFunc, codeOutFile); /* if debug information required */ if (options.debug && currFunc) { - cdbSymbol (currFunc, cdbFile, FALSE, TRUE); + debugFile->writeFunction(currFunc); _G.debugLine = 1; if (IS_STATIC (currFunc->etype)) emitcode ("", "F%s$%s$0$0 ==.", moduleName, currFunc->name); @@ -8807,7 +9262,8 @@ gen51Code (iCode * lic) for (ic = lic; ic; ic = ic->next) { - + _G.current_iCode = ic; + if (ic->lineno && cln != ic->lineno) { if (options.debug) @@ -8818,10 +9274,23 @@ gen51Code (iCode * lic) ic->level, ic->block); _G.debugLine = 0; } - emitcode ("", ";\t%s:%d: %s", ic->filename, ic->lineno, - printCLine(ic->filename, ic->lineno)); + if (!options.noCcodeInAsm) { + emitcode ("", ";%s:%d: %s", ic->filename, ic->lineno, + printCLine(ic->filename, ic->lineno)); + } cln = ic->lineno; } + if (options.iCodeInAsm) { + char regsInUse[80]; + int i; + + for (i=0; i<8; i++) { + sprintf (®sInUse[i], + "%c", ic->riu & (1<seq, printILine(ic)); + } /* if the result is marked as spilt and rematerializable or code for this has already been generated then @@ -8979,7 +9448,7 @@ gen51Code (iCode * lic) break; case GET_VALUE_AT_ADDRESS: - genPointerGet (ic, hasInc(IC_LEFT(ic),ic,getSize(operandType(IC_LEFT(ic))))); + genPointerGet (ic, hasInc(IC_LEFT(ic),ic,getSize(operandType(IC_RESULT(ic))))); break; case '=': @@ -9013,11 +9482,28 @@ gen51Code (iCode * lic) addSet (&_G.sendSet, ic); break; + case DUMMY_READ_VOLATILE: + genDummyRead (ic); + break; + + case CRITICAL: + genCritical (ic); + break; + + case ENDCRITICAL: + genEndCritical (ic); + break; + + case SWAP: + genSwap (ic); + break; + default: ic = ic; } } + _G.current_iCode = NULL; /* now we are ready to call the peep hole optimizer */