X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fds390%2Fgen.c;h=436a490b7767c136ee758698d06a74da268e52a1;hb=4aaeb0f34f305307c495ba6ce9c25eb492f131c1;hp=caab13cd3919c97a9587b398ec0d6d0cf88d0d56;hpb=d237f07c608546609969da3a62320a6a91ce674f;p=fw%2Fsdcc diff --git a/src/ds390/gen.c b/src/ds390/gen.c index caab13cd..436a490b 100644 --- a/src/ds390/gen.c +++ b/src/ds390/gen.c @@ -30,29 +30,12 @@ #include #include -#include +#include "common.h" #include "ralloc.h" #include "gen.h" #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 - #define BETTER_LITERAL_SHIFT char *aopLiteral (value * val, int offset); @@ -93,6 +76,8 @@ static struct short inLine; short debugLine; short nRegsSaved; + short dptrInUse; + short dptr1InUse; set *sendSet; } _G; @@ -107,14 +92,9 @@ 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) { char *_mova_tmp = strdup(x); \ - if (strcmp(_mova_tmp,"a") && strcmp(_mova_tmp,"acc")) \ - { \ - emitcode("mov","a,%s",_mova_tmp); \ - } \ - free(_mova_tmp); \ - } +#define MOVA(x) _movA(x) +#define MOVB(x) _movB(x) + #define CLRC emitcode("clr","c") #define SETC emitcode("setb","c") @@ -157,33 +137,71 @@ static unsigned char SRMask[] = static void emitcode (char *inst, char *fmt,...) { - va_list ap; - char lb[INITIAL_INLINEASM]; - char *lbp = lb; + va_list ap; + char lb[INITIAL_INLINEASM]; + char *lbp = lb; + + va_start (ap, fmt); + + if (inst && *inst) + { + if (fmt && *fmt) + { + SNPRINTF (lb, sizeof(lb), "%s\t", inst); + } + else + { + SNPRINTF (lb, sizeof(lb), "%s", inst); + } + + tvsprintf (lb + strlen(lb), sizeof(lb) - strlen(lb), + fmt, ap); + } + else + { + tvsprintf (lb, sizeof(lb), fmt, ap); + } + - va_start (ap, fmt); + while (isspace (*lbp)) + { + lbp++; + } - if (inst && *inst) + if (lbp && *lbp) { - if (fmt && *fmt) - sprintf (lb, "%s\t", inst); - else - sprintf (lb, "%s", inst); - tvsprintf (lb + (strlen (lb)), fmt, ap); + lineCurr = (lineCurr ? + connectLine (lineCurr, newLineNode (lb)) : + (lineHead = newLineNode (lb))); } - else - tvsprintf (lb, fmt, ap); + + lineCurr->isInline = _G.inLine; + lineCurr->isDebug = _G.debugLine; + va_end (ap); +} - while (isspace (*lbp)) - lbp++; +// +// Move the passed value into A unless it is already there. +// +static void +_movA(const char *s) +{ + if (strcmp(s,"a") && strcmp(s,"acc")) + { + emitcode("mov","a,%s",s); + } +} - if (lbp && *lbp) - lineCurr = (lineCurr ? - connectLine (lineCurr, newLineNode (lb)) : - (lineHead = newLineNode (lb))); - lineCurr->isInline = _G.inLine; - lineCurr->isDebug = _G.debugLine; - va_end (ap); +// +// Move the passed value into B unless it is already there. +// +static void +_movB(const char *s) +{ + if (strcmp(s,"b")) + { + emitcode("mov","b,%s",s); + } } /*-----------------------------------------------------------------*/ @@ -192,8 +210,8 @@ emitcode (char *inst, char *fmt,...) static regs * getFreePtr (iCode * ic, asmop ** aopp, bool result) { - bool r0iu = FALSE, r1iu = FALSE; - bool r0ou = FALSE, r1ou = FALSE; + bool r0iu, r1iu; + bool r0ou, r1ou; /* the logic: if r0 & r1 used in the instruction then we are in trouble otherwise */ @@ -275,6 +293,8 @@ endOfWorld: werror (E_INTERNAL_ERROR, __FILE__, __LINE__, "getFreePtr should never reach here"); exit (1); + + return NULL; // notreached, but makes compiler happy. } /*-----------------------------------------------------------------*/ @@ -418,6 +438,72 @@ 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 */ /*-----------------------------------------------------------------*/ @@ -426,6 +512,7 @@ aopForSym (iCode * ic, symbol * sym, bool result, bool useDP2) { asmop *aop; memmap *space = SPEC_OCLS (sym->etype); + int accuse = leftRightUseAcc (ic); /* if already has one */ if (sym->aop) @@ -447,10 +534,10 @@ aopForSym (iCode * ic, symbol * sym, bool result, bool useDP2) if (sym->onStack) { - if (_G.accInUse) + if (_G.accInUse || accuse) emitcode ("push", "acc"); - if (_G.bInUse) + if (_G.bInUse || (accuse>1)) emitcode ("push", "b"); emitcode ("mov", "a,_bp"); @@ -461,10 +548,10 @@ aopForSym (iCode * ic, symbol * sym, bool result, bool useDP2) emitcode ("mov", "%s,a", aop->aopu.aop_ptr->name); - if (_G.bInUse) + if (_G.bInUse || (accuse>1)) emitcode ("pop", "b"); - if (_G.accInUse) + if (_G.accInUse || accuse) emitcode ("pop", "acc"); } else @@ -483,20 +570,35 @@ aopForSym (iCode * ic, symbol * sym, bool result, bool useDP2) short stack_val = -((sym->stack < 0) ? ((short) (sym->stack - _G.nRegsSaved)) : ((short) sym->stack)) ; + if (useDP2 && _G.dptr1InUse) { + emitcode ("push","dpl1"); + emitcode ("push","dph1"); + emitcode ("push","dpx1"); + } else if (_G.dptrInUse ) { + emitcode ("push","dpl"); + emitcode ("push","dph"); + emitcode ("push","dpx"); + } /* It's on the 10 bit stack, which is located in * far data space. - */ + */ if (stack_val < 0 && stack_val > -5) { /* between -5 & -1 */ if (useDP2) { if (options.model == MODEL_FLAT24) - emitcode ("mov", "dpx1,#!constbyte", (options.stack_loc >> 16) & 0xff); - TR_DPTR("#2"); + { + emitcode ("mov", "dpx1,#!constbyte", + (options.stack_loc >> 16) & 0xff); + } emitcode ("mov", "dph1,_bpx+1"); + emitcode ("mov", "dpl1,_bpx"); emitcode ("mov","dps,#1"); } else { if (options.model == MODEL_FLAT24) - emitcode ("mov", "dpx,#!constbyte", (options.stack_loc >> 16) & 0xff); + { + emitcode ("mov", "dpx,#!constbyte", + (options.stack_loc >> 16) & 0xff); + } emitcode ("mov", "dph,_bpx+1"); emitcode ("mov", "dpl,_bpx"); } @@ -508,10 +610,10 @@ aopForSym (iCode * ic, symbol * sym, bool result, bool useDP2) emitcode("mov","dps,#0"); } } else { - if (_G.accInUse) + if (_G.accInUse || accuse) emitcode ("push", "acc"); - if (_G.bInUse) + if (_G.bInUse || (accuse>1)) emitcode ("push", "b"); emitcode ("mov", "a,_bpx"); @@ -522,21 +624,26 @@ aopForSym (iCode * ic, symbol * sym, bool result, bool useDP2) emitcode ("subb","a,#!constbyte",(stack_val >> 8) & 0xff); if (useDP2) { if (options.model == MODEL_FLAT24) - emitcode ("mov", "dpx1,#!constbyte", (options.stack_loc >> 16) & 0xff); - TR_DPTR("#2"); + { + emitcode ("mov", "dpx1,#!constbyte", + (options.stack_loc >> 16) & 0xff); + } emitcode ("mov", "dph1,a"); emitcode ("mov", "dpl1,b"); } else { if (options.model == MODEL_FLAT24) - emitcode ("mov", "dpx,#!constbyte", (options.stack_loc >> 16) & 0xff); + { + emitcode ("mov", "dpx,#!constbyte", + (options.stack_loc >> 16) & 0xff); + } emitcode ("mov", "dph,a"); emitcode ("mov", "dpl,b"); } - if (_G.bInUse) + if (_G.bInUse || (accuse>1)) emitcode ("pop", "b"); - if (_G.accInUse) + if (_G.accInUse || accuse) emitcode ("pop", "acc"); } sym->aop = aop = newAsmop ((short) (useDP2 ? AOP_DPTR2 : AOP_DPTR)); @@ -562,15 +669,14 @@ aopForSym (iCode * ic, symbol * sym, bool result, bool useDP2) } /* special case for a function */ - if (IS_FUNC (sym->type)) + if (IS_FUNC (sym->type) && !(sym->isitmp)) { sym->aop = aop = newAsmop (AOP_IMMD); - aop->aopu.aop_immd.aop_immd1 = Safe_calloc (1, strlen (sym->rname) + 1); - strcpy (aop->aopu.aop_immd.aop_immd1, sym->rname); + aop->aopu.aop_immd.aop_immd1 = Safe_strdup(sym->rname); aop->size = FPTRSIZE; return aop; } - + /* only remaining is far space */ /* in which case DPTR gets the address */ sym->aop = aop = newAsmop ((short) (useDP2 ? AOP_DPTR2 : AOP_DPTR)); @@ -627,24 +733,32 @@ aopForRemat (symbol * sym) } if (val) - sprintf (buffer, "(%s %c 0x%04x)", - OP_SYMBOL (IC_LEFT (ic))->rname, - val >= 0 ? '+' : '-', - abs (val) & 0xffff); - else { + { + SNPRINTF (buffer, sizeof(buffer), + "(%s %c 0x%04x)", + OP_SYMBOL (IC_LEFT (ic))->rname, + val >= 0 ? '+' : '-', + abs (val) & 0xffffff); + } + else + { if (IS_ASSIGN_ICODE(ic) && isOperandLiteral(IC_RIGHT(ic))) - sprintf(buffer,"0x%x",(int) operandLitValue (IC_RIGHT (ic))); + { + SNPRINTF(buffer, sizeof(buffer), + "0x%x",(int) operandLitValue (IC_RIGHT (ic))); + } else - strcpy (buffer, OP_SYMBOL (IC_LEFT (ic))->rname); + { + strncpyz (buffer, OP_SYMBOL (IC_LEFT (ic))->rname, sizeof(buffer)); + } } - aop->aopu.aop_immd.aop_immd1 = Safe_calloc (1, strlen (buffer) + 1); - strcpy (aop->aopu.aop_immd.aop_immd1, buffer); + aop->aopu.aop_immd.aop_immd1 = Safe_strdup(buffer); /* set immd2 field if required */ - if (aop->aopu.aop_immd.from_cast_remat) { - tsprintf(buffer,"#!constbyte",ptr_type); - aop->aopu.aop_immd.aop_immd2 = Safe_calloc (1, strlen (buffer) + 1); - strcpy (aop->aopu.aop_immd.aop_immd2, buffer); + if (aop->aopu.aop_immd.from_cast_remat) + { + tsprintf(buffer, sizeof(buffer), "#!constbyte",ptr_type); + aop->aopu.aop_immd.aop_immd2 = Safe_strdup(buffer); } return aop; @@ -892,13 +1006,22 @@ aopOp (operand * op, iCode * ic, bool result, bool useDP2) aop->aopu.dptr = sym->dptr; 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, useDP2); + + 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, useDP2); + 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; } @@ -1010,8 +1133,21 @@ freeAsmop (operand * op, asmop * aaop, iCode * ic, bool pop) _G.r1Pushed--; } } + case AOP_DPTR2: + if (_G.dptr1InUse) { + emitcode ("pop","dpx1"); + emitcode ("pop","dph1"); + emitcode ("pop","dpl1"); + } + break; + case AOP_DPTR: + if (_G.dptrInUse) { + emitcode ("pop","dpx"); + emitcode ("pop","dph"); + emitcode ("pop","dpl"); + } + break; } - dealloc: /* all other cases just dealloc */ if (op) @@ -1027,24 +1163,25 @@ dealloc: } } -/*------------------------------------------------------------------*/ -/* aopGet - for fetching value of the aop */ -/* */ -/* Set canClobberACC if you are sure it is OK to clobber the value */ -/* in the accumulator. Set it FALSE otherwise; FALSE is always safe, */ -/* just less efficient. */ -/*------------------------------------------------------------------*/ +#define DEFAULT_ACC_WARNING 0 +static int saveAccWarn = DEFAULT_ACC_WARNING; + +/*-------------------------------------------------------------------*/ +/* aopGet - for fetching value of the aop */ +/* */ +/* Set saveAcc to NULL if you are sure it is OK to clobber the value */ +/* in the accumulator. Set it to the name of a free register */ +/* if acc must be preserved; the register will be used to preserve */ +/* acc temporarily and to return the result byte. */ +/*-------------------------------------------------------------------*/ static char * -aopGet (asmop * aop, - int offset, - bool bit16, - bool dname, - bool canClobberACC) +aopGet (asmop *aop, + int offset, + bool bit16, + bool dname, + char *saveAcc) { - char *s = buffer; - char *rs; - /* offset is greater than size then zero */ if (offset > (aop->size - 1) && @@ -1054,6 +1191,8 @@ aopGet (asmop * aop, /* depending on type */ switch (aop->type) { + case AOP_DUMMY: + return zero; case AOP_R0: case AOP_R1: @@ -1076,10 +1215,8 @@ aopGet (asmop * aop, emitcode ("movx", "a,@%s", aop->aopu.aop_ptr->name); return (dname ? "acc" : "a"); } - sprintf (s, "@%s", aop->aopu.aop_ptr->name); - rs = Safe_calloc (1, strlen (s) + 1); - strcpy (rs, s); - return rs; + SNPRINTF (buffer, sizeof(buffer), "@%s", aop->aopu.aop_ptr->name); + return Safe_strdup(buffer); case AOP_DPTRn: assert(offset <= 3); @@ -1091,11 +1228,18 @@ aopGet (asmop * aop, if (aop->type == AOP_DPTR2) { genSetDPTR (1); - if (!canClobberACC) - { - TR_AP("#1"); - emitcode ("xch", "a, %s", DP2_RESULT_REG); - } + } + + if (saveAcc) + { + TR_AP("#1"); +// if (aop->type != AOP_DPTR2) +// { +// if (saveAccWarn) { fprintf(stderr, "saveAcc for DPTR...\n"); } +// emitcode(";", "spanky: saveAcc for DPTR"); +// } + + emitcode ("xch", "a, %s", saveAcc); } _flushLazyDPS (); @@ -1126,54 +1270,76 @@ aopGet (asmop * aop, if (aop->type == AOP_DPTR2) { genSetDPTR (0); - if (!canClobberACC) - { + } + + if (saveAcc) + { TR_AP("#2"); - emitcode ("xch", "a, %s", DP2_RESULT_REG); - return DP2_RESULT_REG; - } + emitcode ("xch", "a, %s", saveAcc); +// if (strcmp(saveAcc, "_ap")) +// { +// emitcode(";", "spiffy: non _ap return from aopGet."); +// } + + return saveAcc; } return (dname ? "acc" : "a"); case AOP_IMMD: - if (aop->aopu.aop_immd.from_cast_remat && (offset == (aop->size-1))) { - sprintf(s,"%s",aop->aopu.aop_immd.aop_immd2); - } else if (bit16) - sprintf (s, "#%s", aop->aopu.aop_immd.aop_immd1); - else if (offset) { + if (aop->aopu.aop_immd.from_cast_remat && (offset == (aop->size-1))) + { + SNPRINTF(buffer, sizeof(buffer), + "%s",aop->aopu.aop_immd.aop_immd2); + } + else if (bit16) + { + SNPRINTF(buffer, sizeof(buffer), + "#%s", aop->aopu.aop_immd.aop_immd1); + } + else if (offset) + { switch (offset) { case 1: - tsprintf(s,"#!his",aop->aopu.aop_immd.aop_immd1); + tsprintf(buffer, sizeof(buffer), + "#!his",aop->aopu.aop_immd.aop_immd1); break; case 2: - tsprintf(s,"#!hihis",aop->aopu.aop_immd.aop_immd1); + tsprintf(buffer, sizeof(buffer), + "#!hihis",aop->aopu.aop_immd.aop_immd1); break; case 3: - tsprintf(s,"#!hihihis",aop->aopu.aop_immd.aop_immd1); + tsprintf(buffer, sizeof(buffer), + "#!hihihis",aop->aopu.aop_immd.aop_immd1); break; default: /* should not need this (just in case) */ - sprintf (s, "#(%s >> %d)", + SNPRINTF (buffer, sizeof(buffer), + "#(%s >> %d)", aop->aopu.aop_immd.aop_immd1, offset * 8); } } else - sprintf (s, "#%s", - aop->aopu.aop_immd.aop_immd1); - rs = Safe_calloc (1, strlen (s) + 1); - strcpy (rs, s); - return rs; + { + SNPRINTF (buffer, sizeof(buffer), + "#%s", aop->aopu.aop_immd.aop_immd1); + } + return Safe_strdup(buffer); case AOP_DIR: if (offset) - sprintf (s, "(%s + %d)", + { + SNPRINTF (buffer, sizeof(buffer), + "(%s + %d)", aop->aopu.aop_dir, offset); + } else - sprintf (s, "%s", aop->aopu.aop_dir); - rs = Safe_calloc (1, strlen (s) + 1); - strcpy (rs, s); - return rs; + { + SNPRINTF(buffer, sizeof(buffer), + "%s", aop->aopu.aop_dir); + } + + return Safe_strdup(buffer); case AOP_REG: if (dname) @@ -1208,6 +1374,8 @@ aopGet (asmop * aop, werror (E_INTERNAL_ERROR, __FILE__, __LINE__, "aopget got unsupported aop->type"); exit (1); + + return NULL; // not reached, but makes compiler happy. } /*-----------------------------------------------------------------*/ /* aopPut - puts a string for a aop */ @@ -1215,8 +1383,6 @@ aopGet (asmop * aop, static void aopPut (asmop * aop, char *s, int offset) { - char *d = buffer; - if (aop->size && offset > (aop->size - 1)) { werror (E_INTERNAL_ERROR, __FILE__, __LINE__, @@ -1228,16 +1394,28 @@ 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)", - aop->aopu.aop_dir, offset); - else - sprintf (d, "%s", aop->aopu.aop_dir); - - if (strcmp (d, s)) - emitcode ("mov", "%s,%s", d, s); + if (offset) + { + SNPRINTF (buffer, sizeof(buffer), + "(%s + %d)", + aop->aopu.aop_dir, offset); + } + else + { + SNPRINTF (buffer, sizeof(buffer), + "%s", aop->aopu.aop_dir); + } + + if (strcmp (buffer, s)) + { + emitcode ("mov", "%s,%s", buffer, s); + } break; case AOP_REG: @@ -1253,11 +1431,15 @@ aopPut (asmop * aop, char *s, int offset) strcmp (s, "r5") == 0 || strcmp (s, "r6") == 0 || strcmp (s, "r7") == 0) - emitcode ("mov", "%s,%s", - aop->aopu.aop_reg[offset]->dname, s); - else - emitcode ("mov", "%s,%s", - aop->aopu.aop_reg[offset]->name, s); + { + emitcode ("mov", "%s,%s", + aop->aopu.aop_reg[offset]->dname, s); + } + else + { + emitcode ("mov", "%s,%s", + aop->aopu.aop_reg[offset]->name, s); + } } break; @@ -1340,14 +1522,16 @@ aopPut (asmop * aop, char *s, int offset) strcmp (s, "r6") == 0 || strcmp (s, "r7") == 0) { - char buffer[10]; - sprintf (buffer, "a%s", s); + char buff[10]; + SNPRINTF(buff, sizeof(buff), + "a%s", s); emitcode ("mov", "@%s,%s", - aop->aopu.aop_ptr->name, buffer); + aop->aopu.aop_ptr->name, buff); + } + else + { + emitcode ("mov", "@%s,%s", aop->aopu.aop_ptr->name, s); } - else - emitcode ("mov", "@%s,%s", aop->aopu.aop_ptr->name, s); - break; case AOP_STK: @@ -1386,7 +1570,7 @@ aopPut (asmop * aop, char *s, int offset) } { /* set C, if a >= 1 */ - emitcode ("add", "a,0xff"); + emitcode ("add", "a,#!constbyte",0xff); emitcode ("mov", "%s,c", aop->aopu.aop_dir); } } @@ -1470,7 +1654,12 @@ reAdjustPreg (asmop * aop) (x->aopu.aop_reg[0] == ds390_regWithIdx(R0_IDX) || \ x->aopu.aop_reg[0] == ds390_regWithIdx(R1_IDX) ))) #define AOP_INDPTRn(x) (AOP_TYPE(x) == AOP_DPTRn) -#define AOP_USESDPTR(x) (AOP_TYPE(x) == AOP_DPTR || AOP_TYPE(x) == AOP_STR) +#define AOP_USESDPTR(x) ((AOP_TYPE(x) == AOP_DPTR) || (AOP_TYPE(x) == AOP_STR)) +#define AOP_USESDPTR2(x) ((AOP_TYPE(x) == AOP_DPTR2) || (AOP_TYPE(x) == AOP_DPTRn)) + +// The following two macros can be used even if the aop has not yet been aopOp'd. +#define AOP_IS_STR(x) (IS_SYMOP(x) && OP_SYMBOL(x)->ruonly) +#define AOP_IS_DPTRn(x) (IS_SYMOP(x) && OP_SYMBOL(x)->dptr) /* Workaround for DS80C390 bug: div ab may return bogus results * if A is accessed in instruction immediately before the div. @@ -1486,62 +1675,20 @@ reAdjustPreg (asmop * aop) * thus avoiding touching A right before the div. \ */ \ D(emitcode(";", "DS80C390 div bug: rearranged ops.");); \ - L = aopGet(AOP(LEFT),0,FALSE,FALSE,TRUE); \ + L = aopGet(AOP(LEFT),0,FALSE,FALSE,NULL); \ MOVA(L); \ - emitcode("mov","b,%s",aopGet(AOP(RIGHT),0,FALSE,FALSE,FALSE));\ + L = aopGet(AOP(RIGHT),0,FALSE,FALSE,"b"); \ + MOVB(L); \ } \ else \ { \ /* Just stuff in a nop after loading A. */ \ - emitcode("mov","b,%s",aopGet(AOP(RIGHT),0,FALSE,FALSE,FALSE));\ - L = aopGet(AOP(LEFT),0,FALSE,FALSE,TRUE); \ + emitcode("mov","b,%s",aopGet(AOP(RIGHT),0,FALSE,FALSE,NULL));\ + L = aopGet(AOP(LEFT),0,FALSE,FALSE,NULL); \ MOVA(L); \ emitcode("nop", "; workaround for DS80C390 div bug."); \ } -/*-----------------------------------------------------------------*/ -/* 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; - - _startLazyDPSEvaluation (); - l = aopGet (op->aop, offset++, FALSE, FALSE, TRUE); - MOVA (l); - - while (size--) - { - emitcode ("orl", "a,%s", - aopGet (op->aop, - offset++, FALSE, FALSE, FALSE)); - } - _endLazyDPSEvaluation (); - - tlbl = newiTempLabel (NULL); - aopPut (res->aop, one, 1); - emitcode ("jz", "!tlabel", (tlbl->key + 100)); - aopPut (res->aop, zero, 1); - emitcode ("", "!tlabeldef", (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 */ @@ -1638,8 +1785,7 @@ toBoolean (operand * oper) */ if (opIsGptr (oper)) { - D (emitcode (";", "toBoolean: generic ptr special case."); - ); + D (emitcode (";", "toBoolean: generic ptr special case.");); size--; } @@ -1647,22 +1793,28 @@ toBoolean (operand * oper) if (AOP_NEEDSACC (oper) && size) { usedB = TRUE; - emitcode ("push", "b"); - emitcode ("mov", "b, %s", aopGet (AOP (oper), 0, FALSE, FALSE, FALSE)); + if (_G.bInUse) + { + emitcode ("push", "b"); + } + MOVB (aopGet (AOP (oper), 0, FALSE, FALSE, NULL)); } else { - MOVA (aopGet (AOP (oper), 0, FALSE, FALSE, TRUE)); + MOVA (aopGet (AOP (oper), 0, FALSE, FALSE, NULL)); } + while (size--) { if (usedB) { - emitcode ("orl", "b,%s", aopGet (AOP (oper), offset++, FALSE, FALSE, FALSE)); + emitcode ("orl", "b,%s", + aopGet (AOP (oper), offset++, FALSE, FALSE, NULL)); } else { - emitcode ("orl", "a,%s", aopGet (AOP (oper), offset++, FALSE, FALSE, FALSE)); + emitcode ("orl", "a,%s", + aopGet (AOP (oper), offset++, FALSE, FALSE, NULL)); } } _endLazyDPSEvaluation (); @@ -1670,7 +1822,11 @@ toBoolean (operand * oper) if (usedB) { emitcode ("mov", "a,b"); - emitcode ("pop", "b"); + if (_G.bInUse) + { + emitcode ("pop", "b"); + } + } } @@ -1682,14 +1838,12 @@ 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, FALSE); - aopOp (IC_RESULT (ic), ic, TRUE, AOP_TYPE (IC_LEFT (ic)) == AOP_DPTR); + aopOp (IC_RESULT (ic), ic, TRUE, AOP_USESDPTR(IC_LEFT (ic))); /* if in bit space then a special case */ if (AOP_TYPE (IC_LEFT (ic)) == AOP_CRY) @@ -1700,13 +1854,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); @@ -1731,13 +1878,12 @@ genCpl (iCode * ic) int size; symbol *tlbl; - D (emitcode (";", "genCpl "); - ); + D (emitcode (";", "genCpl ");); /* assign asmOps to operand & result */ aopOp (IC_LEFT (ic), ic, FALSE, FALSE); - aopOp (IC_RESULT (ic), ic, TRUE, AOP_TYPE (IC_LEFT (ic)) == AOP_DPTR); + aopOp (IC_RESULT (ic), ic, TRUE, AOP_USESDPTR(IC_LEFT (ic))); /* special case if in bit space */ if (AOP_TYPE (IC_RESULT (ic)) == AOP_CRY) { @@ -1749,7 +1895,7 @@ genCpl (iCode * ic) } tlbl=newiTempLabel(NULL); emitcode ("cjne", "%s,#0x01,%05d$", - aopGet(AOP(IC_LEFT(ic)), 0, FALSE,FALSE,TRUE), tlbl->key+100); + aopGet(AOP(IC_LEFT(ic)), 0, FALSE,FALSE,NULL), tlbl->key+100); emitcode ("", "%05d$:", tlbl->key+100); outBitC (IC_RESULT(ic)); goto release; @@ -1759,8 +1905,7 @@ genCpl (iCode * ic) _startLazyDPSEvaluation (); while (size--) { - char *l = aopGet (AOP (IC_LEFT (ic)), offset, FALSE, FALSE, TRUE); - MOVA (l); + MOVA (aopGet (AOP (IC_LEFT (ic)), offset, FALSE, FALSE, NULL)); emitcode ("cpl", "a"); aopPut (AOP (IC_RESULT (ic)), "a", offset++); } @@ -1780,27 +1925,26 @@ static void genUminusFloat (operand * op, operand * result) { int size, offset = 0; - char *l; - /* for this we just need to flip the - first it then copy the rest in place */ - D (emitcode (";", "genUminusFloat"); - ); - + + D(emitcode (";", "genUminusFloat");); + + /* for this we just copy and then flip the bit */ + _startLazyDPSEvaluation (); size = AOP_SIZE (op) - 1; - l = aopGet (AOP (op), 3, FALSE, FALSE, TRUE); - MOVA (l); - - emitcode ("cpl", "acc.7"); - aopPut (AOP (result), "a", 3); while (size--) - { + { aopPut (AOP (result), - aopGet (AOP (op), offset, FALSE, FALSE, FALSE), + aopGet (AOP (op), offset, FALSE, FALSE, NULL), offset); offset++; } + + MOVA(aopGet (AOP (op), offset, FALSE, FALSE, NULL)); + + emitcode ("cpl", "acc.7"); + aopPut (AOP (result), "a", offset); _endLazyDPSEvaluation (); } @@ -1811,15 +1955,13 @@ static void genUminus (iCode * ic) { int offset, size; - sym_link *optype, *rtype; - - D (emitcode (";", "genUminus "); - ); + sym_link *optype; + D (emitcode (";", "genUminus ");); /* assign asmops */ aopOp (IC_LEFT (ic), ic, FALSE, FALSE); - aopOp (IC_RESULT (ic), ic, TRUE, AOP_TYPE (IC_LEFT (ic)) == AOP_DPTR); + aopOp (IC_RESULT (ic), ic, TRUE, (AOP_TYPE(IC_LEFT (ic)) == AOP_DPTR)); /* if both in bit space then special case */ @@ -1834,7 +1976,6 @@ genUminus (iCode * ic) } optype = operandType (IC_LEFT (ic)); - rtype = operandType (IC_RESULT (ic)); /* if float then do float stuff */ if (IS_FLOAT (optype)) @@ -1849,7 +1990,7 @@ genUminus (iCode * ic) _startLazyDPSEvaluation (); while (size--) { - char *l = aopGet (AOP (IC_LEFT (ic)), offset, FALSE, FALSE, TRUE); + char *l = aopGet (AOP (IC_LEFT (ic)), offset, FALSE, FALSE, NULL); if (!strcmp (l, "a")) { if (offset == 0) @@ -1870,7 +2011,7 @@ genUminus (iCode * ic) /* if any remaining bytes in the result */ /* we just need to propagate the sign */ - if ((size = (AOP_SIZE (IC_RESULT (ic)) - AOP_SIZE (IC_LEFT (ic))))) + if ((size = (AOP_SIZE(IC_RESULT(ic)) - AOP_SIZE(IC_LEFT(ic)))) != 0) { emitcode ("rlc", "a"); emitcode ("subb", "a,acc"); @@ -1937,12 +2078,15 @@ saveRegisters (iCode * lic) /* if the registers have been saved already then do nothing */ - if (ic->regsSaved || IFFUNC_ISNAKED(OP_SYM_TYPE(IC_LEFT(ic)))) return ; + if (ic->regsSaved + || (IS_SYMOP(IC_LEFT(ic)) && IFFUNC_ISNAKED(OP_SYM_TYPE(IC_LEFT(ic))) && !TARGET_IS_DS400) ) + return ; /* special case if DPTR alive across a function call then must save it even though callee saves */ - if (IFFUNC_CALLEESAVES(OP_SYMBOL (IC_LEFT (ic))->type)) { - int i =0; + if (IS_SYMOP(IC_LEFT(ic)) && + IFFUNC_CALLEESAVES(OP_SYMBOL (IC_LEFT (ic))->type)) { + int i; rsave = newBitVect(ic->rMask->size); for (i = DPL_IDX ; i <= B_IDX ; i++ ) { if (bitVectBitValue(ic->rMask,i)) @@ -1997,7 +2141,7 @@ unsaveRegisters (iCode * ic) bitVect *rsave; if (IFFUNC_CALLEESAVES(OP_SYMBOL (IC_LEFT (ic))->type)) { - int i =0; + int i; rsave = newBitVect(ic->rMask->size); for (i = DPL_IDX ; i <= B_IDX ; i++ ) { if (bitVectBitValue(ic->rMask,i)) @@ -2024,7 +2168,7 @@ pushSide (operand * oper, int size) _startLazyDPSEvaluation (); while (size--) { - char *l = aopGet (AOP (oper), offset++, FALSE, TRUE, FALSE); + char *l = aopGet (AOP (oper), offset++, FALSE, TRUE, NULL); if (AOP_TYPE (oper) != AOP_REG && AOP_TYPE (oper) != AOP_DIR && strcmp (l, "a")) @@ -2046,7 +2190,24 @@ assignResultValue (operand * oper) { int offset = 0; int size = AOP_SIZE (oper); + bool pushedAcc = FALSE; + if (size == fReturnSizeDS390) + { + /* I don't think this case can ever happen... */ + /* ACC is the last part of this. If writing the result + * uses AC, we must preserve it. + */ + if (AOP_NEEDSACC(oper)) + { + emitcode(";", "assignResultValue special case for ACC."); + emitcode("push", "acc"); + pushedAcc = TRUE; + size--; + } + } + + _startLazyDPSEvaluation (); while (size--) { @@ -2054,6 +2215,12 @@ assignResultValue (operand * oper) offset++; } _endLazyDPSEvaluation (); + + if (pushedAcc) + { + emitcode("pop", "acc"); + aopPut(AOP(oper), "a", offset); + } } @@ -2081,9 +2248,8 @@ genXpush (iCode * ic) while (size--) { - char *l = aopGet (AOP (IC_LEFT (ic)), - offset++, FALSE, FALSE, TRUE); - MOVA (l); + MOVA (aopGet (AOP (IC_LEFT (ic)), + offset++, FALSE, FALSE, NULL)); emitcode ("movx", "@%s,a", r->name); emitcode ("inc", "%s", r->name); @@ -2098,7 +2264,7 @@ genXpush (iCode * ic) } /*-----------------------------------------------------------------*/ -/* genIpush - genrate code for pushing this gets a little complex */ +/* genIpush - generate code for pushing this gets a little complex */ /*-----------------------------------------------------------------*/ static void genIpush (iCode * ic) @@ -2115,7 +2281,7 @@ genIpush (iCode * ic) { /* and the item is spilt then do nothing */ - if (OP_SYMBOL (IC_LEFT (ic))->isspilt) + if (OP_SYMBOL (IC_LEFT (ic))->isspilt || OP_SYMBOL(IC_LEFT(ic))->dptr) return; aopOp (IC_LEFT (ic), ic, FALSE, FALSE); @@ -2124,7 +2290,7 @@ genIpush (iCode * ic) _startLazyDPSEvaluation (); while (size--) { - l = aopGet (AOP (IC_LEFT (ic)), offset++, FALSE, TRUE, TRUE); + l = aopGet (AOP (IC_LEFT (ic)), offset++, FALSE, TRUE, NULL); if (*l == '#') { MOVA (l); @@ -2158,16 +2324,18 @@ genIpush (iCode * ic) _startLazyDPSEvaluation (); while (size--) { - l = aopGet (AOP (IC_LEFT (ic)), offset++, FALSE, TRUE, FALSE); + l = aopGet (AOP (IC_LEFT (ic)), offset++, FALSE, TRUE, NULL); if (AOP_TYPE (IC_LEFT (ic)) != AOP_REG && AOP_TYPE (IC_LEFT (ic)) != AOP_DIR && - strcmp (l, "a")) + strcmp (l, "acc")) { emitcode ("mov", "a,%s", l); emitcode ("push", "acc"); } else - emitcode ("push", "%s", l); + { + emitcode ("push", "%s", l); + } } _endLazyDPSEvaluation (); @@ -2187,7 +2355,7 @@ genIpop (iCode * ic) /* if the temp was not pushed then */ - if (OP_SYMBOL (IC_LEFT (ic))->isspilt) + if (OP_SYMBOL (IC_LEFT (ic))->isspilt || OP_SYMBOL (IC_LEFT (ic))->dptr) return; aopOp (IC_LEFT (ic), ic, FALSE, FALSE); @@ -2197,7 +2365,7 @@ genIpop (iCode * ic) while (size--) { emitcode ("pop", "%s", aopGet (AOP (IC_LEFT (ic)), offset--, - FALSE, TRUE, TRUE)); + FALSE, TRUE, NULL)); } _endLazyDPSEvaluation (); @@ -2357,13 +2525,13 @@ static void genSend(set *sendSet) _startLazyDPSEvaluation (); if (size>1) { aopOp (IC_LEFT (sic), sic, FALSE, - (IS_SYMOP(IC_LEFT(sic)) && OP_SYMBOL(IC_LEFT(sic))->ruonly ? FALSE : TRUE)); + (AOP_IS_STR(IC_LEFT(sic)) ? FALSE : TRUE)); } else { aopOp (IC_LEFT (sic), sic, FALSE, FALSE); } while (size--) { char *l = aopGet (AOP (IC_LEFT (sic)), offset, - FALSE, FALSE, TRUE); + FALSE, FALSE, NULL); if (strcmp (l, fReturn[offset])) { emitcode ("mov", "%s,%s", fReturn[offset], @@ -2378,7 +2546,7 @@ static void genSend(set *sendSet) aopOp (IC_LEFT (sic), sic, FALSE, TRUE); while (size--) { emitcode ("mov","b1_%d,%s",rb1_count++,aopGet (AOP (IC_LEFT (sic)), offset++, - FALSE, FALSE, TRUE)); + FALSE, FALSE, NULL)); } freeAsmop (IC_LEFT (sic), NULL, sic, TRUE); } @@ -2386,6 +2554,18 @@ static void genSend(set *sendSet) } } +static void +adjustEsp(const char *reg) +{ + emitcode ("anl","%s,#3", reg); + if (TARGET_IS_DS400) + { + emitcode ("orl","%s,#!constbyte", + reg, + (options.stack_loc >> 8) & 0xff); + } +} + /*-----------------------------------------------------------------*/ /* genCall - generates a call statement */ /*-----------------------------------------------------------------*/ @@ -2402,7 +2582,7 @@ genCall (iCode * ic) the same register bank then we need to save the destination registers on the stack */ dtype = operandType (IC_LEFT (ic)); - if (currFunc && dtype && !IFFUNC_ISNAKED(dtype) && + if (currFunc && dtype && (!IFFUNC_ISNAKED(dtype) || TARGET_IS_DS400) && (FUNC_REGBANK (currFunc->type) != FUNC_REGBANK (dtype)) && IFFUNC_ISISR (currFunc->type)) { @@ -2484,9 +2664,9 @@ genCall (iCode * ic) } else { - _G.accInUse++; + _G.bInUse++; aopOp (IC_RESULT (ic), ic, FALSE, TRUE); - _G.accInUse--; + _G.bInUse--; assignResultValue (IC_RESULT (ic)); @@ -2511,7 +2691,7 @@ genCall (iCode * ic) emitcode ("subb","a,#!constbyte",ic->parmBytes & 0xff); emitcode ("mov","sp,a"); emitcode ("mov","a,esp"); - emitcode ("anl","a,#3"); + adjustEsp("a"); emitcode ("subb","a,#!constbyte",(ic->parmBytes >> 8) & 0xff); emitcode ("mov","esp,a"); UNPROTECT_SP; @@ -2558,7 +2738,7 @@ genPcall (iCode * ic) the same register bank then we need to save the destination registers on the stack */ dtype = operandType (IC_LEFT (ic)); - if (currFunc && dtype && !IFFUNC_ISNAKED(dtype) && + if (currFunc && dtype && (!IFFUNC_ISNAKED(dtype) || TARGET_IS_DS400) && IFFUNC_ISISR (currFunc->type) && (FUNC_REGBANK (currFunc->type) != FUNC_REGBANK (dtype))) { saveRBank (FUNC_REGBANK (dtype), ic, TRUE); @@ -2629,7 +2809,7 @@ genPcall (iCode * ic) emitcode ("subb","a,#!constbyte",ic->parmBytes & 0xff); emitcode ("mov","sp,a"); emitcode ("mov","a,esp"); - emitcode ("anl","a,#3"); + adjustEsp("a"); emitcode ("subb","a,#!constbyte",(ic->parmBytes >> 8) & 0xff); emitcode ("mov","esp,a"); UNPROTECT_SP; @@ -2685,22 +2865,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); } /*-----------------------------------------------------------------*/ @@ -2732,9 +2912,6 @@ genFunction (iCode * ic) if (options.stack_probe) emitcode ("lcall","__stack_probe"); - /* 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 */ @@ -2912,7 +3089,7 @@ genFunction (iCode * ic) } } } - // jwk: this needs a closer look + // TODO: this needs a closer look SPEC_ISR_SAVED_BANKS(currFunc->etype) = banksToSave; } } @@ -2956,7 +3133,7 @@ genFunction (iCode * ic) emitcode ("push","_bpx+1"); emitcode ("mov","_bpx,%s",spname); emitcode ("mov","_bpx+1,esp"); - emitcode ("anl","_bpx+1,#3"); + adjustEsp("_bpx+1"); } else { if (options.useXstack) { emitcode ("mov", "r0,%s", spname); @@ -2985,7 +3162,7 @@ genFunction (iCode * ic) emitcode ("add","a,#!constbyte", ((short) sym->stack & 0xff)); emitcode ("mov","sp,a"); emitcode ("mov","a,esp"); - emitcode ("anl","a,#3"); + adjustEsp("a"); emitcode ("addc","a,#!constbyte", (((short) sym->stack) >> 8) & 0xff); emitcode ("mov","esp,a"); UNPROTECT_SP; @@ -3013,6 +3190,17 @@ genFunction (iCode * ic) emitcode ("add", "a,#!constbyte", ((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 */ + } } @@ -3032,8 +3220,14 @@ genEndFunction (iCode * ic) return; } - if ((IFFUNC_ISREENT (sym->type) || options.stackAuto) && - (sym->stack || FUNC_HASSTACKPARM(sym->type))) { + 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) && + (sym->stack || FUNC_HASSTACKPARM(sym->type))) { if (options.stack10bit) { PROTECT_SP; @@ -3135,7 +3329,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; @@ -3177,9 +3370,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) { _G.debugLine = 1; @@ -3197,9 +3387,6 @@ genEndFunction (iCode * ic) } else { - if (IFFUNC_ISCRITICAL (sym->type)) - emitcode ("setb", "ea"); - if (IFFUNC_CALLEESAVES(sym->type)) { int i; @@ -3245,7 +3432,7 @@ static void genJavaNativeRet(iCode *ic) int i, size; aopOp (IC_LEFT (ic), ic, FALSE, - (IS_SYMOP(IC_LEFT(ic)) && OP_SYMBOL(IC_LEFT(ic))->ruonly ? FALSE :TRUE)); + AOP_IS_STR(IC_LEFT(ic)) ? FALSE :TRUE); size = AOP_SIZE (IC_LEFT (ic)); assert (size <= 4); @@ -3254,14 +3441,16 @@ static void genJavaNativeRet(iCode *ic) if (aopHasRegs(AOP(IC_LEFT(ic)),R0_IDX,R1_IDX) || aopHasRegs(AOP(IC_LEFT(ic)),R2_IDX,R3_IDX)) { for (i = 0 ; i < size ; i++ ) { - emitcode ("push","%s",aopGet(AOP(IC_LEFT(ic)),i,FALSE,TRUE,FALSE)); + emitcode ("push","%s", + aopGet(AOP(IC_LEFT(ic)),i,FALSE,TRUE,DP2_RESULT_REG)); } for (i = (size-1) ; i >= 0 ; i--) { emitcode ("pop","a%s",javaRet[i]); } } else { for (i = 0 ; i < size ; i++) - emitcode ("mov","%s,%s",javaRet[i],aopGet(AOP(IC_LEFT(ic)),i,FALSE,TRUE,FALSE)); + emitcode ("mov","%s,%s",javaRet[i], + aopGet(AOP(IC_LEFT(ic)),i,FALSE,TRUE,DP2_RESULT_REG)); } for (i = size ; i < 4 ; i++ ) emitcode ("mov","%s,#0",javaRet[i]); @@ -3276,8 +3465,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" */ @@ -3293,7 +3481,7 @@ genRet (iCode * ic) /* we have something to return then move the return value into place */ aopOp (IC_LEFT (ic), ic, FALSE, - (IS_SYMOP(IC_LEFT(ic)) && OP_SYMBOL(IC_LEFT(ic))->ruonly ? FALSE :TRUE)); + (AOP_IS_STR(IC_LEFT(ic)) ? FALSE :TRUE)); size = AOP_SIZE (IC_LEFT (ic)); _startLazyDPSEvaluation (); @@ -3303,7 +3491,7 @@ genRet (iCode * ic) if (AOP_TYPE (IC_LEFT (ic)) == AOP_DPTR) { l = aopGet (AOP (IC_LEFT (ic)), offset++, - FALSE, TRUE, FALSE); + FALSE, TRUE, NULL); emitcode ("push", "%s", l); pushed++; } @@ -3313,7 +3501,7 @@ genRet (iCode * ic) * is is OK to clobber it in the aopGet. */ l = aopGet (AOP (IC_LEFT (ic)), offset, - FALSE, FALSE, TRUE); + FALSE, FALSE, NULL); if (strcmp (fReturn[offset], l)) emitcode ("mov", "%s,%s", fReturn[offset++], l); } @@ -3426,7 +3614,7 @@ genPlusIncr (iCode * ic) if (size == 1 && AOP(IC_LEFT(ic)) == AOP(IC_RESULT(ic)) && AOP_TYPE(IC_LEFT(ic)) == AOP_DIR ) { while (icount--) { - emitcode("inc","%s",aopGet(AOP(IC_RESULT(ic)),0,FALSE,FALSE,FALSE)); + emitcode("inc","%s",aopGet(AOP(IC_RESULT(ic)),0,FALSE,FALSE,NULL)); } return TRUE; } @@ -3438,9 +3626,10 @@ genPlusIncr (iCode * ic) (size > 1) && (icount == 1)) { - symbol *tlbl; - int emitTlbl; - int labelRange; + symbol *tlbl; + int emitTlbl; + int labelRange; + char *l; /* If the next instruction is a goto and the goto target * is <= 5 instructions previous to this, we can generate @@ -3450,7 +3639,7 @@ genPlusIncr (iCode * ic) && (labelRange = findLabelBackwards (ic, IC_LABEL (ic->next)->key)) != 0 && labelRange <= 5) { - emitcode (";", "tail increment optimized (range %d)", labelRange); + D(emitcode (";", "tail increment optimized (range %d)", labelRange);); tlbl = IC_LABEL (ic->next); emitTlbl = 0; } @@ -3459,50 +3648,60 @@ genPlusIncr (iCode * ic) tlbl = newiTempLabel (NULL); emitTlbl = 1; } - emitcode ("inc", "%s", aopGet (AOP (IC_RESULT (ic)), LSB, FALSE, FALSE, FALSE)); + + l = aopGet (AOP (IC_RESULT (ic)), LSB, FALSE, FALSE, NULL); + emitcode ("inc", "%s", l); + if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG || IS_AOP_PREG (IC_RESULT (ic))) - emitcode ("cjne", "%s,#0,!tlabel" - ,aopGet (AOP (IC_RESULT (ic)), LSB, FALSE, FALSE, FALSE) - ,tlbl->key + 100); + { + emitcode ("cjne", "%s,#0,!tlabel", l, tlbl->key + 100); + } else - { + { emitcode ("clr", "a"); - emitcode ("cjne", "a,%s,!tlabel" - ,aopGet (AOP (IC_RESULT (ic)), LSB, FALSE, FALSE, FALSE) - ,tlbl->key + 100); - } + emitcode ("cjne", "a,%s,!tlabel", l, tlbl->key + 100); + } - emitcode ("inc", "%s", aopGet (AOP (IC_RESULT (ic)), MSB16, FALSE, FALSE, FALSE)); + l = aopGet (AOP (IC_RESULT (ic)), MSB16, FALSE, FALSE, NULL); + emitcode ("inc", "%s", l); if (size > 2) { - if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG || - IS_AOP_PREG (IC_RESULT (ic))) - emitcode ("cjne", "%s,#0,!tlabel" - ,aopGet (AOP (IC_RESULT (ic)), MSB16, FALSE, FALSE, FALSE) - ,tlbl->key + 100); - else - emitcode ("cjne", "a,%s,!tlabel" - ,aopGet (AOP (IC_RESULT (ic)), MSB16, FALSE, FALSE, FALSE) - ,tlbl->key + 100); + if (!strcmp(l, "acc")) + { + emitcode("jnz", "!tlabel", tlbl->key + 100); + } + else if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG || + IS_AOP_PREG (IC_RESULT (ic))) + { + emitcode ("cjne", "%s,#0,!tlabel", l, tlbl->key + 100); + } + else + { + emitcode ("cjne", "a,%s,!tlabel", l, tlbl->key + 100); + } - emitcode ("inc", "%s", aopGet (AOP (IC_RESULT (ic)), MSB24, FALSE, FALSE, FALSE)); + l = aopGet (AOP (IC_RESULT (ic)), MSB24, FALSE, FALSE, NULL); + emitcode ("inc", "%s", l); } if (size > 3) { - if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG || - IS_AOP_PREG (IC_RESULT (ic))) - emitcode ("cjne", "%s,#0,!tlabel" - ,aopGet (AOP (IC_RESULT (ic)), MSB24, FALSE, FALSE, FALSE) - ,tlbl->key + 100); - else + if (!strcmp(l, "acc")) { - emitcode ("cjne", "a,%s,!tlabel" - ,aopGet (AOP (IC_RESULT (ic)), MSB24, FALSE, FALSE, FALSE) - ,tlbl->key + 100); + emitcode("jnz", "!tlabel", tlbl->key + 100); } - emitcode ("inc", "%s", aopGet (AOP (IC_RESULT (ic)), MSB32, FALSE, FALSE, FALSE)); - } + else if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG || + IS_AOP_PREG (IC_RESULT (ic))) + { + emitcode ("cjne", "%s,#0,!tlabel", l, tlbl->key + 100); + } + else + { + emitcode ("cjne", "a,%s,!tlabel", l, tlbl->key + 100); + } + + l = aopGet (AOP (IC_RESULT (ic)), MSB32, FALSE, FALSE, NULL); + emitcode ("inc", "%s", l); } if (emitTlbl) { @@ -3511,6 +3710,23 @@ genPlusIncr (iCode * ic) return TRUE; } + if (AOP_TYPE(IC_RESULT(ic))==AOP_STR && IS_ITEMP(IC_RESULT(ic)) && + !AOP_USESDPTR(IC_LEFT(ic)) && icount <= 5 && size <= 3 && + options.model == MODEL_FLAT24 ) { + + switch (size) { + case 3: + emitcode ("mov","dpx,%s",aopGet(AOP (IC_LEFT (ic)), 2, FALSE, FALSE, NULL)); + case 2: + emitcode ("mov","dph,%s",aopGet(AOP (IC_LEFT (ic)), 1, FALSE, FALSE, NULL)); + case 1: + emitcode ("mov","dpl,%s",aopGet(AOP (IC_LEFT (ic)), 0, FALSE, FALSE, NULL)); + break; + } + while (icount--) emitcode ("inc","dptr"); + return TRUE; + } + if (AOP_INDPTRn(IC_LEFT(ic)) && AOP_INDPTRn(IC_RESULT(ic)) && AOP(IC_LEFT(ic))->aopu.dptr == AOP(IC_RESULT(ic))->aopu.dptr && icount <= 5 ) { @@ -3536,7 +3752,7 @@ genPlusIncr (iCode * ic) if (icount > 3) { - MOVA (aopGet (AOP (IC_LEFT (ic)), 0, FALSE, FALSE, TRUE)); + MOVA (aopGet (AOP (IC_LEFT (ic)), 0, FALSE, FALSE, NULL)); emitcode ("add", "a,#!constbyte", ((char) icount) & 0xff); aopPut (AOP (IC_RESULT (ic)), "a", 0); } @@ -3546,7 +3762,7 @@ genPlusIncr (iCode * ic) _startLazyDPSEvaluation (); while (icount--) { - emitcode ("inc", "%s", aopGet (AOP (IC_LEFT (ic)), 0, FALSE, FALSE, FALSE)); + emitcode ("inc", "%s", aopGet (AOP (IC_LEFT (ic)), 0, FALSE, FALSE, NULL)); } _endLazyDPSEvaluation (); } @@ -3584,8 +3800,8 @@ outBitAcc (operand * result) static void genPlusBits (iCode * ic) { - D (emitcode (";", "genPlusBits "); - ); + D (emitcode (";", "genPlusBits ");); + if (AOP_TYPE (IC_RESULT (ic)) == AOP_CRY) { symbol *lbl = newiTempLabel (NULL); @@ -3614,7 +3830,7 @@ adjustArithmeticResult (iCode * ic) !sameRegs (AOP (IC_RESULT (ic)), AOP (IC_LEFT (ic)))) { aopPut (AOP (IC_RESULT (ic)), - aopGet (AOP (IC_LEFT (ic)), GPTRSIZE - 1, FALSE, FALSE, FALSE), + aopGet (AOP (IC_LEFT (ic)), GPTRSIZE - 1, FALSE, FALSE, NULL), GPTRSIZE - 1); } @@ -3623,7 +3839,7 @@ adjustArithmeticResult (iCode * ic) !sameRegs (AOP (IC_RESULT (ic)), AOP (IC_RIGHT (ic)))) { aopPut (AOP (IC_RESULT (ic)), - aopGet (AOP (IC_RIGHT (ic)), GPTRSIZE - 1, FALSE, FALSE, FALSE), + aopGet (AOP (IC_RIGHT (ic)), GPTRSIZE - 1, FALSE, FALSE, NULL), GPTRSIZE - 1); } @@ -3633,44 +3849,144 @@ adjustArithmeticResult (iCode * ic) !sameRegs (AOP (IC_RESULT (ic)), AOP (IC_LEFT (ic))) && !sameRegs (AOP (IC_RESULT (ic)), AOP (IC_RIGHT (ic)))) { - char buffer[5]; - sprintf (buffer, "#%d", pointerCode (getSpec (operandType (IC_LEFT (ic))))); - aopPut (AOP (IC_RESULT (ic)), buffer, GPTRSIZE - 1); + char buff[5]; + SNPRINTF (buff, sizeof(buff), + "#%d", pointerCode (getSpec (operandType (IC_LEFT (ic))))); + aopPut (AOP (IC_RESULT (ic)), buff, GPTRSIZE - 1); + } +} + +// The guts of AOP_OP_3_NOFATAL. Generates the left & right opcodes of an IC, +// generates the result if possible. If result is generated, returns TRUE; otherwise +// returns false and caller must deal with fact that result isn't aopOp'd. +bool aopOp3(iCode * ic) +{ + bool dp1InUse, dp2InUse; + bool useDp2; + + // First, generate the right opcode. DPTR may be used if neither left nor result are + // of type AOP_STR. + +// D(emitcode(";", "aopOp3: AOP_IS_STR left: %s right: %s result: %s", +// AOP_IS_STR(IC_LEFT(ic)) ? "true" : "false", +// AOP_IS_STR(IC_RIGHT(ic)) ? "true" : "false", +// AOP_IS_STR(IC_RESULT(ic)) ? "true" : "false"); +// ); +// D(emitcode(";", "aopOp3: AOP_IS_DPTRn left: %s right: %s result: %s", +// AOP_IS_DPTRn(IC_LEFT(ic)) ? "true" : "false", +// AOP_IS_DPTRn(IC_RIGHT(ic)) ? "true" : "false", +// AOP_IS_DPTRn(IC_RESULT(ic)) ? "true" : "false"); +// ); + + // Right uses DPTR unless left or result is an AOP_STR; however, + // if right is an AOP_STR, it must use DPTR regardless. + if ((AOP_IS_STR(IC_LEFT(ic)) || AOP_IS_STR(IC_RESULT(ic))) + && !AOP_IS_STR(IC_RIGHT(ic))) + { + useDp2 = TRUE; + } + else + { + useDp2 = FALSE; + } + + aopOp (IC_RIGHT(ic),ic,FALSE, useDp2); + + // if the right used DPTR, left MUST use DPTR2. + // if the right used DPTR2, left MUST use DPTR. + // if both are still available, we prefer to use DPTR. But if result is an AOP_STR + // and left is not an AOP_STR, then we will get better code if we use DP2 for left, + // enabling us to assign DPTR to result. + + if (AOP_USESDPTR(IC_RIGHT(ic))) + { + useDp2 = TRUE; + } + else if (AOP_USESDPTR2(IC_RIGHT(ic))) + { + useDp2 = FALSE; + } + else + { + if (AOP_IS_STR(IC_RESULT(ic)) && !AOP_IS_STR(IC_LEFT(ic))) + { + useDp2 = TRUE; + } + else + { + useDp2 = FALSE; + } + } + + aopOp(IC_LEFT(ic), ic, FALSE, useDp2); + + // We've op'd the left & right. So, if left or right are the same operand as result, + // we know aopOp will succeed, and we can just do it & bail. + if (isOperandEqual(IC_LEFT(ic),IC_RESULT(ic)) || + isOperandEqual(IC_RIGHT(ic),IC_RESULT(ic))) + { +// D(emitcode(";", "aopOp3: (left | right) & result equal");); + aopOp(IC_RESULT(ic),ic,TRUE, FALSE); + return TRUE; + } + + // Note which dptrs are currently in use. + dp1InUse = AOP_USESDPTR(IC_LEFT(ic)) || AOP_USESDPTR(IC_RIGHT(ic)); + dp2InUse = AOP_USESDPTR2(IC_LEFT(ic)) || AOP_USESDPTR2(IC_RIGHT(ic)); + + // OK, now if either left or right uses DPTR and the result is an AOP_STR, we cannot + // generate it. + if (dp1InUse && AOP_IS_STR(IC_RESULT(ic))) + { + return FALSE; + } + + // Likewise, if left or right uses DPTR2 and the result is a DPTRn, we cannot generate it. + if (dp2InUse && AOP_IS_DPTRn(IC_RESULT(ic))) + { + return FALSE; + } + + // or, if both dp1 & dp2 are in use and the result needs a dptr, we're out of luck + if (dp1InUse && dp2InUse && isOperandInFarSpace(IC_RESULT(ic))) + { + return FALSE; + } + + aopOp (IC_RESULT(ic),ic,TRUE, dp1InUse); + + // Some sanity checking... + if (dp1InUse && AOP_USESDPTR(IC_RESULT(ic))) + { + fprintf(stderr, + "Internal error: got unexpected DPTR (%s:%d %s:%d)\n", + __FILE__, __LINE__, ic->filename, ic->lineno); + emitcode(";", ">>> unexpected DPTR here."); } + + if (dp2InUse && AOP_USESDPTR2(IC_RESULT(ic))) + { + fprintf(stderr, + "Internal error: got unexpected DPTR2 (%s:%d %s:%d)\n", + __FILE__, __LINE__, ic->filename, ic->lineno); + emitcode(";", ">>> unexpected DPTR2 here."); + } + + return TRUE; } // Macro to aopOp all three operands of an ic. If this cannot be done, // the IC_LEFT and IC_RIGHT operands will be aopOp'd, and the rc parameter // will be set TRUE. The caller must then handle the case specially, noting // that the IC_RESULT operand is not aopOp'd. +// #define AOP_OP_3_NOFATAL(ic, rc) \ - aopOp (IC_RIGHT(ic),ic,FALSE, FALSE); \ - aopOp (IC_LEFT(ic),ic,FALSE, (AOP_TYPE(IC_RIGHT(ic)) == AOP_DPTR) || \ - ((OP_SYMBOL(IC_RESULT(ic))->ruonly) && !isOperandEqual(IC_LEFT(ic),IC_RESULT(ic)))); \ - if (AOP_TYPE(IC_LEFT(ic)) == AOP_DPTR2 && \ - (isOperandInFarSpace(IC_RESULT(ic)) || (OP_SYMBOL(IC_RESULT(ic))->ruonly && !isOperandEqual(IC_LEFT(ic),IC_RESULT(ic))))) \ - { \ - /* No can do; DPTR & DPTR2 in use, and we need another. */ \ - rc = TRUE; \ - } \ - else \ - { \ - aopOp (IC_RESULT(ic),ic,TRUE, (AOP_TYPE(IC_LEFT(ic)) == AOP_DPTR) || \ - (AOP_TYPE(IC_RIGHT(ic)) == AOP_DPTR)); \ - rc = FALSE; \ - if (AOP_TYPE(IC_LEFT(ic)) == AOP_DPTR2 && \ - AOP_TYPE(IC_RESULT(ic)) == AOP_DPTR2) \ - { \ - /* werror(E_INTERNAL_ERROR,__FILE__,__LINE__, */ \ - fprintf(stderr, \ - "Ack: got unexpected DP2! (%s:%d %s:%d)\n", __FILE__, __LINE__, ic->filename, ic->lineno); \ - } \ - } + do { rc = !aopOp3(ic); } while (0) // aopOp the left & right operands of an ic. #define AOP_OP_2(ic) \ - aopOp (IC_RIGHT(ic),ic,FALSE, FALSE); \ - aopOp (IC_LEFT(ic),ic,FALSE, (AOP_TYPE(IC_RIGHT(ic)) == AOP_DPTR)); + aopOp (IC_RIGHT(ic),ic,FALSE, AOP_IS_STR(IC_LEFT(ic))); \ + aopOp (IC_LEFT(ic),ic,FALSE, AOP_USESDPTR(IC_RIGHT(ic))); // convienience macro. #define AOP_SET_LOCALS(ic) \ @@ -3716,16 +4032,16 @@ static void genPlus (iCode * ic) { int size, offset = 0; - bool pushResult = FALSE; + bool pushResult; int rSize; D (emitcode (";", "genPlus ");); /* special cases :- */ - if ( IS_SYMOP(IC_LEFT(ic)) && OP_SYMBOL(IC_LEFT(ic))->ruonly && + if ( AOP_IS_STR(IC_LEFT(ic)) && isOperandLiteral(IC_RIGHT(ic)) && OP_SYMBOL(IC_RESULT(ic))->ruonly) { aopOp (IC_RIGHT (ic), ic, TRUE, FALSE); - size = floatFromVal (AOP (IC_RIGHT(ic))->aopu.aop_lit); + size = (int)floatFromVal (AOP (IC_RIGHT(ic))->aopu.aop_lit); if (size <= 9) { while (size--) emitcode ("inc","dptr"); } else { @@ -3751,6 +4067,7 @@ genPlus (iCode * ic) } AOP_OP_3_NOFATAL (ic, pushResult); + if (pushResult) { D (emitcode (";", "genPlus: must push result: 3 ops in far space");); @@ -3798,7 +4115,7 @@ genPlus (iCode * ic) _startLazyDPSEvaluation (); while (size--) { - MOVA (aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE, TRUE)); + MOVA (aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE, NULL)); emitcode ("addc", "a,#0"); aopPut (AOP (IC_RESULT (ic)), "a", offset++); } @@ -3823,13 +4140,13 @@ genPlus (iCode * ic) { if (AOP_TYPE(IC_LEFT(ic)) == AOP_ACC && !AOP_NEEDSACC(IC_RIGHT(ic))) { - MOVA (aopGet (AOP (IC_LEFT (ic)), offset, FALSE, FALSE, TRUE)); + MOVA (aopGet (AOP (IC_LEFT (ic)), offset, FALSE, FALSE, NULL)); if (offset == 0) emitcode ("add", "a,%s", - aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE, FALSE)); + aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE, NULL)); else emitcode ("addc", "a,%s", - aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE, FALSE)); + aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE, NULL)); } else { @@ -3843,7 +4160,7 @@ genPlus (iCode * ic) D(emitcode(";", "+ AOP_ACC special case.");); emitcode("xch", "a, %s", DP2_RESULT_REG); } - MOVA (aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE, TRUE)); + MOVA (aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE, NULL)); if (offset == 0) { if (AOP_TYPE(IC_LEFT(ic)) == AOP_ACC) @@ -3854,13 +4171,15 @@ genPlus (iCode * ic) else { emitcode ("add", "a,%s", - aopGet (AOP(IC_LEFT(ic)), offset, FALSE, FALSE, FALSE)); + aopGet (AOP(IC_LEFT(ic)), offset, FALSE, FALSE, + DP2_RESULT_REG)); } } else { emitcode ("addc", "a,%s", - aopGet (AOP (IC_LEFT (ic)), offset, FALSE, FALSE, FALSE)); + aopGet (AOP (IC_LEFT (ic)), offset, FALSE, FALSE, + DP2_RESULT_REG)); } } if (!pushResult) @@ -3924,7 +4243,7 @@ genMinusDec (iCode * ic) if (size == 1 && AOP(IC_LEFT(ic)) == AOP(IC_RESULT(ic)) && AOP_TYPE(IC_LEFT(ic)) == AOP_DIR ) { while (icount--) { - emitcode("dec","%s",aopGet(AOP(IC_RESULT(ic)),0,FALSE,FALSE,FALSE)); + emitcode("dec","%s",aopGet(AOP(IC_RESULT(ic)),0,FALSE,FALSE,NULL)); } return TRUE; } @@ -3936,8 +4255,9 @@ genMinusDec (iCode * ic) (icount == 1)) { symbol *tlbl; - int emitTlbl; - int labelRange; + int emitTlbl; + int labelRange; + char *l; /* If the next instruction is a goto and the goto target * is <= 5 instructions previous to this, we can generate @@ -3957,52 +4277,61 @@ genMinusDec (iCode * ic) emitTlbl = 1; } - emitcode ("dec", "%s", aopGet (AOP (IC_RESULT (ic)), LSB, FALSE, FALSE, FALSE)); + l = aopGet (AOP (IC_RESULT (ic)), LSB, FALSE, FALSE, NULL); + emitcode ("dec", "%s", l); + if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG || AOP_TYPE (IC_RESULT (ic)) == AOP_DPTR || IS_AOP_PREG (IC_RESULT (ic))) - emitcode ("cjne", "%s,#!constbyte,!tlabel" - ,aopGet (AOP (IC_RESULT (ic)), LSB, FALSE, FALSE, FALSE), 0xff - ,tlbl->key + 100); + { + emitcode ("cjne", "%s,#!constbyte,!tlabel", l, 0xff, tlbl->key + 100); + } else - { + { emitcode ("mov", "a,#!constbyte",0xff); - emitcode ("cjne", "a,%s,!tlabel" - ,aopGet (AOP (IC_RESULT (ic)), LSB, FALSE, FALSE, FALSE) - ,tlbl->key + 100); - } - emitcode ("dec", "%s", aopGet (AOP (IC_RESULT (ic)), MSB16, FALSE, FALSE, FALSE)); + emitcode ("cjne", "a,%s,!tlabel", l, tlbl->key + 100); + } + l = aopGet (AOP (IC_RESULT (ic)), MSB16, FALSE, FALSE, NULL); + emitcode ("dec", "%s", l); if (size > 2) { - if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG || - AOP_TYPE (IC_RESULT (ic)) == AOP_DPTR || - IS_AOP_PREG (IC_RESULT (ic))) - emitcode ("cjne", "%s,#!constbyte,!tlabel" - ,aopGet (AOP (IC_RESULT (ic)), MSB16, FALSE, FALSE, FALSE),0xff - ,tlbl->key + 100); - else + if (!strcmp(l, "acc")) + { + emitcode("jnz", "!tlabel", tlbl->key + 100); + } + else if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG || + AOP_TYPE (IC_RESULT (ic)) == AOP_DPTR || + IS_AOP_PREG (IC_RESULT (ic))) + { + emitcode ("cjne", "%s,#!constbyte,!tlabel", l, 0xff, tlbl->key + 100); + } + else { - emitcode ("cjne", "a,%s,!tlabel" - ,aopGet (AOP (IC_RESULT (ic)), MSB16, FALSE, FALSE, FALSE) - ,tlbl->key + 100); + emitcode ("mov", "a,#!constbyte",0xff); + emitcode ("cjne", "a,%s,!tlabel", l, tlbl->key + 100); } - emitcode ("dec", "%s", aopGet (AOP (IC_RESULT (ic)), MSB24, FALSE, FALSE, FALSE)); + l = aopGet (AOP (IC_RESULT (ic)), MSB24, FALSE, FALSE, NULL); + emitcode ("dec", "%s", l); } if (size > 3) { - if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG || - AOP_TYPE (IC_RESULT (ic)) == AOP_DPTR || - IS_AOP_PREG (IC_RESULT (ic))) - emitcode ("cjne", "%s,#!constbyte,!tlabel" - ,aopGet (AOP (IC_RESULT (ic)), MSB24, FALSE, FALSE, FALSE),0xff - ,tlbl->key + 100); - else + if (!strcmp(l, "acc")) { - emitcode ("cjne", "a,%s,!tlabel" - ,aopGet (AOP (IC_RESULT (ic)), MSB24, FALSE, FALSE, FALSE) - ,tlbl->key + 100); + emitcode("jnz", "!tlabel", tlbl->key + 100); + } + else if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG || + AOP_TYPE (IC_RESULT (ic)) == AOP_DPTR || + IS_AOP_PREG (IC_RESULT (ic))) + { + emitcode ("cjne", "%s,#!constbyte,!tlabel", l, 0xff, tlbl->key + 100); } - emitcode ("dec", "%s", aopGet (AOP (IC_RESULT (ic)), MSB32, FALSE, FALSE, FALSE)); + else + { + emitcode ("mov", "a,#!constbyte",0xff); + emitcode ("cjne", "a,%s,!tlabel", l, tlbl->key + 100); + } + l = aopGet (AOP (IC_RESULT (ic)), MSB32, FALSE, FALSE, NULL); + emitcode ("dec", "%s", l); } if (emitTlbl) { @@ -4028,7 +4357,8 @@ genMinusDec (iCode * ic) _startLazyDPSEvaluation (); while (icount--) { - emitcode ("dec", "%s", aopGet (AOP (IC_RESULT (ic)), 0, FALSE, FALSE, FALSE)); + emitcode ("dec", "%s", + aopGet (AOP (IC_RESULT (ic)), 0, FALSE, FALSE, NULL)); } _endLazyDPSEvaluation (); @@ -4104,25 +4434,17 @@ genMinusBits (iCode * ic) static void genMinus (iCode * ic) { - int size, offset = 0; - int rSize; - unsigned long lit = 0L; - bool pushResult = FALSE; + int size, offset = 0; + int rSize; + long lit = 0L; + bool pushResult; - D (emitcode (";", "genMinus ");); + D (emitcode (";", "genMinus ");); - aopOp (IC_LEFT (ic), ic, FALSE, FALSE); - aopOp (IC_RIGHT (ic), ic, FALSE, - (AOP_INDPTRn(IC_LEFT(ic)) ? FALSE : (AOP_USESDPTR(IC_LEFT(ic)) ? TRUE : FALSE))); - if ((AOP_TYPE (IC_LEFT (ic)) == AOP_DPTR) && - (AOP_TYPE (IC_RIGHT (ic)) == AOP_DPTR2)) - { - pushResult = TRUE; - } - else - { - aopOp (IC_RESULT (ic), ic, TRUE, AOP_TYPE (IC_LEFT (ic)) == AOP_DPTR); + AOP_OP_3_NOFATAL(ic, pushResult); + if (!pushResult) + { /* special cases :- */ /* if both left & right are in bit space */ if (AOP_TYPE (IC_LEFT (ic)) == AOP_CRY && @@ -4147,26 +4469,28 @@ genMinus (iCode * ic) } else { - lit = (unsigned long) floatFromVal (AOP (IC_RIGHT (ic))->aopu.aop_lit); - lit = -(long) lit; + lit = (long) floatFromVal (AOP (IC_RIGHT (ic))->aopu.aop_lit); + lit = -lit; } /* if literal, add a,#-lit, else normal subb */ _startLazyDPSEvaluation (); while (size--) { - MOVA (aopGet (AOP (IC_LEFT (ic)), offset, FALSE, FALSE, TRUE)); if (AOP_TYPE (IC_RIGHT (ic)) != AOP_LIT) { if (AOP_USESDPTR(IC_RIGHT(ic))) { - emitcode ("mov","b,a"); - MOVA(aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE, FALSE)); - emitcode ("xch","a,b"); + emitcode ("mov","b,%s", + aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE, NULL)); + MOVA(aopGet (AOP (IC_LEFT (ic)), offset, FALSE, FALSE, NULL)); emitcode ("subb","a,b"); } else { + MOVA (aopGet (AOP (IC_LEFT (ic)), offset, FALSE, FALSE, NULL)); emitcode ("subb", "a,%s", - aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE, FALSE)); + aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE, + DP2_RESULT_REG)); } } else { + MOVA (aopGet (AOP (IC_LEFT (ic)), offset, FALSE, FALSE, NULL)); /* first add without previous c */ if (!offset) { if (!size && lit==-1) { @@ -4262,8 +4586,8 @@ genMultOneByte (operand * 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, TRUE)); - MOVA (aopGet (AOP (left), 0, FALSE, FALSE, TRUE)); + emitcode ("mov", "b,%s", aopGet (AOP (right), 0, FALSE, FALSE, NULL)); + MOVA (aopGet (AOP (left), 0, FALSE, FALSE, NULL)); emitcode ("mul", "ab"); _G.accInUse++; _G.bInUse++; @@ -4290,7 +4614,7 @@ genMultOneByte (operand * left, emitcode (";", "signed"); emitcode ("clr", "F0"); // reset sign flag - MOVA (aopGet (AOP (left), 0, FALSE, FALSE, TRUE)); + MOVA (aopGet (AOP (left), 0, FALSE, FALSE, NULL)); lbl=newiTempLabel(NULL); emitcode ("jnb", "acc.7,!tlabel", lbl->key+100); @@ -4303,7 +4627,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 ((int) val < 0) { emitcode ("cpl", "F0"); // complement sign flag @@ -4314,7 +4638,7 @@ genMultOneByte (operand * left, } else { lbl=newiTempLabel(NULL); emitcode ("mov", "b,a"); - emitcode ("mov", "a,%s", aopGet (AOP (right), 0, FALSE, FALSE, TRUE)); + emitcode ("mov", "a,%s", aopGet (AOP (right), 0, FALSE, FALSE, NULL)); emitcode ("jnb", "acc.7,!tlabel", lbl->key+100); // right side is negative, 8-bit two's complement emitcode ("cpl", "F0"); // complement sign flag @@ -4384,7 +4708,7 @@ static void genMultTwoByte (operand *left, operand *right, if (!umult) { emitcode("clr","F0"); if (AOP_TYPE(right) == AOP_LIT) { - int val=floatFromVal (AOP (right)->aopu.aop_lit); + int val=(int)floatFromVal (AOP (right)->aopu.aop_lit); if (val < 0) { emitcode("setb","F0"); val = -val; @@ -4393,8 +4717,8 @@ static void genMultTwoByte (operand *left, operand *right, emitcode ("mov","mb,#!constbyte",(val >> 8) & 0xff); } else { lbl = newiTempLabel(NULL); - emitcode ("mov","b,%s",aopGet(AOP(right),0,FALSE,FALSE,TRUE)); - emitcode ("mov","a,%s",aopGet(AOP(right),1,FALSE,FALSE,TRUE)); + emitcode ("mov","b,%s",aopGet(AOP(right),0,FALSE,FALSE,NULL)); + emitcode ("mov","a,%s",aopGet(AOP(right),1,FALSE,FALSE,NULL)); emitcode ("jnb","acc.7,!tlabel",lbl->key+100); emitcode ("xch", "a,b"); emitcode ("cpl","a"); @@ -4408,14 +4732,14 @@ static void genMultTwoByte (operand *left, operand *right, emitcode ("mov","mb,a"); } } else { - emitcode ("mov","mb,%s",aopGet(AOP(right),0,FALSE,FALSE,TRUE)); - emitcode ("mov","mb,%s",aopGet(AOP(right),1,FALSE,FALSE,TRUE)); + emitcode ("mov","mb,%s",aopGet(AOP(right),0,FALSE,FALSE,NULL)); + emitcode ("mov","mb,%s",aopGet(AOP(right),1,FALSE,FALSE,NULL)); } /* load up MA with left */ if (!umult) { lbl = newiTempLabel(NULL); - emitcode ("mov","b,%s",aopGet(AOP(left),0,FALSE,FALSE,TRUE)); - emitcode ("mov","a,%s",aopGet(AOP(left),1,FALSE,FALSE,TRUE)); + emitcode ("mov","b,%s",aopGet(AOP(left),0,FALSE,FALSE,NULL)); + emitcode ("mov","a,%s",aopGet(AOP(left),1,FALSE,FALSE,NULL)); emitcode ("jnb","acc.7,!tlabel",lbl->key+100); emitcode ("xch", "a,b"); emitcode ("cpl","a"); @@ -4429,8 +4753,8 @@ static void genMultTwoByte (operand *left, operand *right, emitcode ("mov","ma,b"); emitcode ("mov","ma,a"); } else { - emitcode ("mov","ma,%s",aopGet(AOP(left),0,FALSE,FALSE,TRUE)); - emitcode ("mov","ma,%s",aopGet(AOP(left),1,FALSE,FALSE,TRUE)); + emitcode ("mov","ma,%s",aopGet(AOP(left),0,FALSE,FALSE,NULL)); + emitcode ("mov","ma,%s",aopGet(AOP(left),1,FALSE,FALSE,NULL)); } /* wait for multiplication to finish */ lbl = newiTempLabel(NULL); @@ -4623,14 +4947,12 @@ genDivOneByte (operand * left, /* signed is a little bit more difficult */ /* save the signs of the operands */ - l = aopGet (AOP (left), 0, FALSE, FALSE, TRUE); - MOVA (l); + MOVA (aopGet (AOP (left), 0, FALSE, FALSE, NULL)); emitcode ("xrl", "a,%s", aopGet (AOP (right), 0, FALSE, TRUE, FALSE)); emitcode ("push", "acc"); /* save it on the stack */ /* now sign adjust for both left & right */ - l = aopGet (AOP (right), 0, FALSE, FALSE, TRUE); - MOVA (l); + MOVA (aopGet (AOP (right), 0, FALSE, FALSE, NULL)); lbl = newiTempLabel (NULL); emitcode ("jnb", "acc.7,!tlabel", (lbl->key + 100)); emitcode ("cpl", "a"); @@ -4639,8 +4961,7 @@ genDivOneByte (operand * left, emitcode ("mov", "b,a"); /* sign adjust left side */ - l = aopGet (AOP (left), 0, FALSE, FALSE, TRUE); - MOVA (l); + MOVA( aopGet (AOP (left), 0, FALSE, FALSE, NULL)); lbl = newiTempLabel (NULL); emitcode ("jnb", "acc.7,!tlabel", (lbl->key + 100)); @@ -4709,8 +5030,8 @@ static void genDivTwoByte (operand *left, operand *right, if (!umult) { emitcode("clr","F0"); lbl = newiTempLabel(NULL); - emitcode ("mov","b,%s",aopGet(AOP(left),0,FALSE,FALSE,TRUE)); - emitcode ("mov","a,%s",aopGet(AOP(left),1,FALSE,FALSE,TRUE)); + emitcode ("mov","b,%s",aopGet(AOP(left),0,FALSE,FALSE,NULL)); + emitcode ("mov","a,%s",aopGet(AOP(left),1,FALSE,FALSE,NULL)); emitcode ("jnb","acc.7,!tlabel",lbl->key+100); emitcode ("xch", "a,b"); emitcode ("cpl","a"); @@ -4723,14 +5044,14 @@ static void genDivTwoByte (operand *left, operand *right, emitcode ("mov","ma,b"); emitcode ("mov","ma,a"); } else { - emitcode ("mov","ma,%s",aopGet(AOP(left),0,FALSE,FALSE,TRUE)); - emitcode ("mov","ma,%s",aopGet(AOP(left),1,FALSE,FALSE,TRUE)); + emitcode ("mov","ma,%s",aopGet(AOP(left),0,FALSE,FALSE,NULL)); + emitcode ("mov","ma,%s",aopGet(AOP(left),1,FALSE,FALSE,NULL)); } /* load up MB with right */ if (!umult) { if (AOP_TYPE(right) == AOP_LIT) { - int val=floatFromVal (AOP (right)->aopu.aop_lit); + int val=(int)floatFromVal (AOP (right)->aopu.aop_lit); if (val < 0) { lbl = newiTempLabel(NULL); emitcode ("jbc","F0,!tlabel",lbl->key+100); @@ -4742,8 +5063,8 @@ static void genDivTwoByte (operand *left, operand *right, emitcode ("mov","mb,#!constbyte",(val >> 8) & 0xff); } else { lbl = newiTempLabel(NULL); - emitcode ("mov","b,%s",aopGet(AOP(right),0,FALSE,FALSE,TRUE)); - emitcode ("mov","a,%s",aopGet(AOP(right),1,FALSE,FALSE,TRUE)); + emitcode ("mov","b,%s",aopGet(AOP(right),0,FALSE,FALSE,NULL)); + emitcode ("mov","a,%s",aopGet(AOP(right),1,FALSE,FALSE,NULL)); emitcode ("jnb","acc.7,!tlabel",lbl->key+100); emitcode ("xch", "a,b"); emitcode ("cpl","a"); @@ -4758,8 +5079,8 @@ static void genDivTwoByte (operand *left, operand *right, emitcode ("mov","mb,a"); } } else { - emitcode ("mov","mb,%s",aopGet(AOP(right),0,FALSE,FALSE,TRUE)); - emitcode ("mov","mb,%s",aopGet(AOP(right),1,FALSE,FALSE,TRUE)); + emitcode ("mov","mb,%s",aopGet(AOP(right),0,FALSE,FALSE,NULL)); + emitcode ("mov","mb,%s",aopGet(AOP(right),1,FALSE,FALSE,NULL)); } /* wait for multiplication to finish */ @@ -4897,15 +5218,13 @@ genModOneByte (operand * left, /* signed is a little bit more difficult */ /* save the signs of the operands */ - l = aopGet (AOP (left), 0, FALSE, FALSE, TRUE); - MOVA (l); + MOVA (aopGet (AOP (left), 0, FALSE, FALSE, NULL)); emitcode ("xrl", "a,%s", aopGet (AOP (right), 0, FALSE, FALSE, FALSE)); emitcode ("push", "acc"); /* save it on the stack */ /* now sign adjust for both left & right */ - l = aopGet (AOP (right), 0, FALSE, FALSE, TRUE); - MOVA (l); + MOVA (aopGet (AOP (right), 0, FALSE, FALSE, NULL)); lbl = newiTempLabel (NULL); emitcode ("jnb", "acc.7,!tlabel", (lbl->key + 100)); @@ -4915,8 +5234,7 @@ genModOneByte (operand * left, emitcode ("mov", "b,a"); /* sign adjust left side */ - l = aopGet (AOP (left), 0, FALSE, FALSE, TRUE); - MOVA (l); + MOVA (aopGet (AOP (left), 0, FALSE, FALSE, NULL)); lbl = newiTempLabel (NULL); emitcode ("jnb", "acc.7,!tlabel", (lbl->key + 100)); @@ -4970,8 +5288,8 @@ static void genModTwoByte (operand *left, operand *right, if (!umult) { lbl = newiTempLabel(NULL); - emitcode ("mov","b,%s",aopGet(AOP(left),0,FALSE,FALSE,TRUE)); - emitcode ("mov","a,%s",aopGet(AOP(left),1,FALSE,FALSE,TRUE)); + emitcode ("mov","b,%s",aopGet(AOP(left),0,FALSE,FALSE,NULL)); + emitcode ("mov","a,%s",aopGet(AOP(left),1,FALSE,FALSE,NULL)); emitcode ("jnb","acc.7,!tlabel",lbl->key+100); emitcode ("xch", "a,b"); emitcode ("cpl","a"); @@ -4983,14 +5301,14 @@ static void genModTwoByte (operand *left, operand *right, emitcode ("mov","ma,b"); emitcode ("mov","ma,a"); } else { - emitcode ("mov","ma,%s",aopGet(AOP(left),0,FALSE,FALSE,TRUE)); - emitcode ("mov","ma,%s",aopGet(AOP(left),1,FALSE,FALSE,TRUE)); + emitcode ("mov","ma,%s",aopGet(AOP(left),0,FALSE,FALSE,NULL)); + emitcode ("mov","ma,%s",aopGet(AOP(left),1,FALSE,FALSE,NULL)); } /* load up MB with right */ if (!umult) { if (AOP_TYPE(right) == AOP_LIT) { - int val=floatFromVal (AOP (right)->aopu.aop_lit); + int val=(int)floatFromVal (AOP (right)->aopu.aop_lit); if (val < 0) { val = -val; } @@ -4998,8 +5316,8 @@ static void genModTwoByte (operand *left, operand *right, emitcode ("mov","mb,#!constbyte",(val >> 8) & 0xff); } else { lbl = newiTempLabel(NULL); - emitcode ("mov","b,%s",aopGet(AOP(right),0,FALSE,FALSE,TRUE)); - emitcode ("mov","a,%s",aopGet(AOP(right),1,FALSE,FALSE,TRUE)); + emitcode ("mov","b,%s",aopGet(AOP(right),0,FALSE,FALSE,NULL)); + emitcode ("mov","a,%s",aopGet(AOP(right),1,FALSE,FALSE,NULL)); emitcode ("jnb","acc.7,!tlabel",lbl->key+100); emitcode ("xch", "a,b"); emitcode ("cpl","a"); @@ -5012,8 +5330,8 @@ static void genModTwoByte (operand *left, operand *right, emitcode ("mov","mb,a"); } } else { - emitcode ("mov","mb,%s",aopGet(AOP(right),0,FALSE,FALSE,TRUE)); - emitcode ("mov","mb,%s",aopGet(AOP(right),1,FALSE,FALSE,TRUE)); + emitcode ("mov","mb,%s",aopGet(AOP(right),0,FALSE,FALSE,NULL)); + emitcode ("mov","mb,%s",aopGet(AOP(right),1,FALSE,FALSE,NULL)); } /* wait for multiplication to finish */ @@ -5096,8 +5414,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 */ @@ -5136,8 +5453,7 @@ genCmp (operand * left, operand * right, unsigned long lit = 0L; operand *result; - D (emitcode (";", "genCmp"); - ); + D (emitcode (";", "genCmp");); result = IC_RESULT (ic); @@ -5146,7 +5462,7 @@ genCmp (operand * left, operand * right, 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 { @@ -5156,13 +5472,13 @@ genCmp (operand * left, operand * right, size = max (AOP_SIZE (left), AOP_SIZE (right)); /* if unsigned char cmp with lit, do cjne left,#right,zz */ - if ((size == 1) && !sign && - (AOP_TYPE (right) == AOP_LIT && AOP_TYPE (left) != AOP_DIR && AOP_TYPE (left) != AOP_STR)) + if ((size == 1) && !sign + && (AOP_TYPE (right) == AOP_LIT && AOP_TYPE (left) != AOP_DIR && AOP_TYPE (left) != AOP_STR)) { symbol *lbl = newiTempLabel (NULL); emitcode ("cjne", "%s,%s,!tlabel", - aopGet (AOP (left), offset, FALSE, FALSE, FALSE), - aopGet (AOP (right), offset, FALSE, FALSE, FALSE), + aopGet (AOP (left), offset, FALSE, FALSE, NULL), + aopGet (AOP (right), offset, FALSE, FALSE, NULL), lbl->key + 100); emitcode ("", "!tlabeldef", lbl->key + 100); } @@ -5180,7 +5496,7 @@ genCmp (operand * left, operand * right, } else { - MOVA (aopGet (AOP (left), AOP_SIZE (left) - 1, FALSE, FALSE, TRUE)); + MOVA (aopGet (AOP (left), AOP_SIZE (left) - 1, FALSE, FALSE, NULL)); freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); @@ -5205,35 +5521,28 @@ genCmp (operand * left, operand * right, CLRC; while (size--) { - //emitcode (";", "genCmp #1: %d/%d/%d", size, sign, offset); - MOVA (aopGet (AOP (left), offset, FALSE, FALSE, TRUE)); - //emitcode (";", "genCmp #2"); + // emitcode (";", "genCmp #1: %d/%d/%d", size, sign, offset); + MOVA (aopGet (AOP (left), offset, FALSE, FALSE, NULL)); + // emitcode (";", "genCmp #2"); if (sign && (size == 0)) { - //emitcode (";", "genCmp #3"); + // emitcode (";", "genCmp #3"); emitcode ("xrl", "a,#!constbyte",0x80); if (AOP_TYPE (right) == AOP_LIT) { unsigned long lit = (unsigned long) floatFromVal (AOP (right)->aopu.aop_lit); - //emitcode (";", "genCmp #3.1"); + // emitcode (";", "genCmp #3.1"); emitcode ("subb", "a,#!constbyte", 0x80 ^ (unsigned int) ((lit >> (offset * 8)) & 0x0FFL)); } else { - //emitcode (";", "genCmp #3.2"); - if (AOP_NEEDSACC (right)) - { - emitcode ("push", "acc"); - } - emitcode ("mov", "b,%s", aopGet (AOP (right), offset++, - FALSE, FALSE, FALSE)); + // emitcode (";", "genCmp #3.2"); + saveAccWarn = 0; + MOVB(aopGet (AOP (right), offset++, FALSE, FALSE, "b")); + saveAccWarn = DEFAULT_ACC_WARNING; emitcode ("xrl", "b,#!constbyte",0x80); - if (AOP_NEEDSACC (right)) - { - emitcode ("pop", "acc"); - } emitcode ("subb", "a,b"); } } @@ -5241,21 +5550,10 @@ genCmp (operand * left, operand * right, { const char *s; - //emitcode (";", "genCmp #4"); - if (AOP_NEEDSACC (right)) - { - /* Yuck!! */ - //emitcode (";", "genCmp #4.1"); - emitcode ("xch", "a, b"); - MOVA (aopGet (AOP (right), offset++, FALSE, FALSE, TRUE)); - emitcode ("xch", "a, b"); - s = "b"; - } - else - { - //emitcode (";", "genCmp #4.2"); - s = aopGet (AOP (right), offset++, FALSE, FALSE, FALSE); - } + // emitcode (";", "genCmp #4"); + saveAccWarn = 0; + s = aopGet (AOP (right), offset++, FALSE, FALSE, "b"); + saveAccWarn = DEFAULT_ACC_WARNING; emitcode ("subb", "a,%s", s); } @@ -5362,6 +5660,7 @@ 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; @@ -5378,8 +5677,7 @@ gencjneshort (operand * left, operand * right, symbol * lbl) * Exclude the generic type byte from the comparison. */ size--; - D (emitcode (";", "cjneshort: generic ptr special case."); - ) + D (emitcode (";", "cjneshort: generic ptr special case.");); } @@ -5389,10 +5687,9 @@ gencjneshort (operand * left, operand * right, symbol * lbl) { while (size--) { - char *l = aopGet (AOP (left), offset, FALSE, FALSE, TRUE); - MOVA (l); + MOVA (aopGet (AOP (left), offset, FALSE, FALSE, NULL)); emitcode ("cjne", "a,%s,!tlabel", - aopGet (AOP (right), offset, FALSE, FALSE, FALSE), + aopGet (AOP (right), offset, FALSE, FALSE, NULL), lbl->key + 100); offset++; } @@ -5402,18 +5699,20 @@ 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))) { while (size--) { - MOVA (aopGet (AOP (left), offset, FALSE, FALSE, TRUE)); + MOVA (aopGet (AOP (left), offset, FALSE, FALSE, NULL)); if ((AOP_TYPE (left) == AOP_DIR && AOP_TYPE (right) == AOP_LIT) && ((unsigned int) ((lit >> (offset * 8)) & 0x0FFL) == 0)) emitcode ("jnz", "!tlabel", lbl->key + 100); else emitcode ("cjne", "a,%s,!tlabel", - aopGet (AOP (right), offset, FALSE, TRUE, FALSE), + aopGet (AOP (right), offset, FALSE, TRUE, DP2_RESULT_REG), lbl->key + 100); offset++; } @@ -5423,10 +5722,8 @@ gencjneshort (operand * left, operand * right, symbol * lbl) /* right is a pointer reg need both a & b */ while (size--) { - char *l = aopGet (AOP (left), offset, FALSE, FALSE, TRUE); - if (strcmp (l, "b")) - emitcode ("mov", "b,%s", l); - MOVA (aopGet (AOP (right), offset, FALSE, FALSE, TRUE)); + MOVB (aopGet (AOP (left), offset, FALSE, FALSE, NULL)); + MOVA (aopGet (AOP (right), offset, FALSE, FALSE, NULL)); emitcode ("cjne", "a,b,!tlabel", lbl->key + 100); offset++; } @@ -5873,9 +6170,9 @@ genFarFarLogicOp(iCode *ic, char *logicOp) _startLazyDPSEvaluation(); for (size = compSize; (size--); offset++) { - MOVA (aopGet (AOP (IC_LEFT(ic)), offset, FALSE, FALSE, TRUE)); + MOVA (aopGet (AOP (IC_LEFT(ic)), offset, FALSE, FALSE, NULL)); emitcode ("mov", "%s, acc", DP2_RESULT_REG); - MOVA (aopGet (AOP (IC_RIGHT(ic)), offset, FALSE, FALSE, TRUE)); + MOVA (aopGet (AOP (IC_RIGHT(ic)), offset, FALSE, FALSE, NULL)); emitcode (logicOp, "a,%s", DP2_RESULT_REG); emitcode ("push", "acc"); @@ -5910,8 +6207,8 @@ genAnd (iCode * ic, iCode * ifx) operand *left, *right, *result; int size, offset = 0; unsigned long lit = 0L; - int bytelit = 0; - char buffer[10]; + int bytelit; + char buff[10]; bool pushResult; D (emitcode (";", "genAnd ");); @@ -6008,7 +6305,7 @@ genAnd (iCode * ic, iCode * ifx) else { // c = bit & val; - MOVA (aopGet (AOP (right), 0, FALSE, FALSE, TRUE)); + MOVA (aopGet (AOP (right), 0, FALSE, FALSE, NULL)); // c = lsb emitcode ("rrc", "a"); emitcode ("anl", "c,%s", AOP (left)->aopu.aop_dir); @@ -6035,7 +6332,7 @@ genAnd (iCode * ic, iCode * ifx) if (posbit) { posbit--; - MOVA (aopGet (AOP (left), posbit >> 3, FALSE, FALSE, TRUE)); + MOVA (aopGet (AOP (left), posbit >> 3, FALSE, FALSE, NULL)); // bit = left & 2^n if (size) emitcode ("mov", "c,acc.%d", posbit & 0x07); @@ -6044,8 +6341,9 @@ genAnd (iCode * ic, iCode * ifx) { if (ifx) { - sprintf (buffer, "acc.%d", posbit & 0x07); - genIfxJump (ifx, buffer); + SNPRINTF (buff, sizeof(buff), + "acc.%d", posbit & 0x07); + genIfxJump (ifx, buff); } else { @@ -6064,7 +6362,7 @@ genAnd (iCode * ic, iCode * ifx) { if ((bytelit = ((lit >> (offset * 8)) & 0x0FFL)) != 0x0L) { - MOVA (aopGet (AOP (left), offset, FALSE, FALSE, TRUE)); + MOVA (aopGet (AOP (left), offset, FALSE, FALSE, NULL)); // byte == 2^n ? if ((posbit = isLiteralBit (bytelit)) != 0) emitcode ("jb", "acc.%d,!tlabel", (posbit - 1) & 0x07, tlbl->key + 100); @@ -6072,7 +6370,7 @@ genAnd (iCode * ic, iCode * ifx) { if (bytelit != 0x0FFL) emitcode ("anl", "a,%s", - aopGet (AOP (right), offset, FALSE, TRUE, FALSE)); + aopGet (AOP (right), offset, FALSE, TRUE, DP2_RESULT_REG)); emitcode ("jnz", "!tlabel", tlbl->key + 100); } } @@ -6089,6 +6387,8 @@ genAnd (iCode * ic, iCode * ifx) { if (ifx) jmpTrueOrFalse (ifx, tlbl); + else + emitcode ("", "!tlabeldef", tlbl->key + 100); goto release; } } @@ -6109,31 +6409,33 @@ genAnd (iCode * ic, iCode * ifx) aopPut (AOP (result), zero, offset); else if (IS_AOP_PREG (result)) { - MOVA (aopGet (AOP (right), offset, FALSE, FALSE, TRUE)); - emitcode ("anl", "a,%s", aopGet (AOP (left), offset, FALSE, TRUE, FALSE)); + MOVA (aopGet (AOP (right), offset, FALSE, FALSE, NULL)); + emitcode ("anl", "a,%s", + aopGet (AOP (left), offset, FALSE, TRUE, DP2_RESULT_REG)); aopPut (AOP (result), "a", offset); } else emitcode ("anl", "%s,%s", - aopGet (AOP (left), offset, FALSE, TRUE, FALSE), - aopGet (AOP (right), offset, FALSE, FALSE, FALSE)); + aopGet (AOP (left), offset, FALSE, TRUE, NULL), + aopGet (AOP (right), offset, FALSE, FALSE, NULL)); } else { if (AOP_TYPE (left) == AOP_ACC) - emitcode ("anl", "a,%s", aopGet (AOP (right), offset, FALSE, FALSE, FALSE)); + emitcode ("anl", "a,%s", + aopGet (AOP (right), offset, FALSE, FALSE, DP2_RESULT_REG)); else { - MOVA (aopGet (AOP (right), offset, FALSE, FALSE, TRUE)); + MOVA (aopGet (AOP (right), offset, FALSE, FALSE, NULL)); if (IS_AOP_PREG (result)) { - emitcode ("anl", "a,%s", aopGet (AOP (left), offset, FALSE, TRUE, FALSE)); + emitcode ("anl", "a,%s", + aopGet (AOP (left), offset, FALSE, TRUE, DP2_RESULT_REG)); aopPut (AOP (result), "a", offset); - } else emitcode ("anl", "%s,a", - aopGet (AOP (left), offset, FALSE, TRUE, FALSE)); + aopGet (AOP (left), offset, FALSE, TRUE, DP2_RESULT_REG)); } } } @@ -6154,16 +6456,16 @@ genAnd (iCode * ic, iCode * ifx) { if (AOP_TYPE(right)==AOP_REG && AOP_TYPE(left)==AOP_ACC) { emitcode ("anl", "a,%s", - aopGet (AOP (right), offset, FALSE, FALSE, FALSE)); + aopGet (AOP (right), offset, FALSE, FALSE, DP2_RESULT_REG)); } else { if (AOP_TYPE(left)==AOP_ACC) { emitcode("mov", "b,a"); - MOVA (aopGet (AOP (right), offset, FALSE, FALSE, TRUE)); + MOVA (aopGet (AOP (right), offset, FALSE, FALSE, NULL)); emitcode("anl", "a,b"); }else { - MOVA (aopGet (AOP (right), offset, FALSE, FALSE, TRUE)); + MOVA (aopGet (AOP (right), offset, FALSE, FALSE, NULL)); emitcode ("anl", "a,%s", - aopGet (AOP (left), offset, FALSE, FALSE, FALSE)); + aopGet (AOP (left), offset, FALSE, FALSE, DP2_RESULT_REG)); } } emitcode ("jnz", "!tlabel", tlbl->key + 100); @@ -6177,6 +6479,8 @@ genAnd (iCode * ic, iCode * ifx) } else if (ifx) jmpTrueOrFalse (ifx, tlbl); + else + emitcode ("", "!tlabeldef", tlbl->key + 100); } else { @@ -6189,7 +6493,7 @@ genAnd (iCode * ic, iCode * ifx) if ((bytelit = (int) ((lit >> (offset * 8)) & 0x0FFL)) == 0x0FF) { aopPut (AOP (result), - aopGet (AOP (left), offset, FALSE, FALSE, FALSE), + aopGet (AOP (left), offset, FALSE, FALSE, NULL), offset); continue; } @@ -6199,9 +6503,9 @@ genAnd (iCode * ic, iCode * ifx) continue; } D (emitcode (";", "better literal AND.");); - MOVA (aopGet (AOP (left), offset, FALSE, FALSE, TRUE)); + MOVA (aopGet (AOP (left), offset, FALSE, FALSE, NULL)); emitcode ("anl", "a, %s", aopGet (AOP (right), offset, - FALSE, FALSE, FALSE)); + FALSE, FALSE, DP2_RESULT_REG)); } else @@ -6210,19 +6514,19 @@ genAnd (iCode * ic, iCode * ifx) // and better if result is SFR if (AOP_TYPE (left) == AOP_ACC) { - emitcode ("anl", "a,%s", aopGet (AOP (right), offset, - FALSE, FALSE, FALSE)); + emitcode ("anl", "a,%s", + aopGet (AOP (right), offset, FALSE, FALSE, DP2_RESULT_REG)); } else { - char *rOp = aopGet (AOP (right), offset, FALSE, FALSE, TRUE); + char *rOp = aopGet (AOP (right), offset, FALSE, FALSE, NULL); if (!strcmp(rOp, "a") || !strcmp(rOp, "acc")) { emitcode("mov", "b,a"); rOp = "b"; } - MOVA (aopGet (AOP (left), offset, FALSE, FALSE, TRUE)); + MOVA (aopGet (AOP (left), offset, FALSE, FALSE, NULL)); emitcode ("anl", "a,%s", rOp); } } @@ -6367,7 +6671,7 @@ genOr (iCode * ic, iCode * ifx) outBitC (result); // if(bit | ...) else if ((AOP_TYPE (result) == AOP_CRY) && ifx) - genIfxJump (ifx, "c"); + genIfxJump (ifx, "c"); goto release; } @@ -6424,15 +6728,16 @@ genOr (iCode * ic, iCode * ifx) { if (IS_AOP_PREG (left)) { - MOVA (aopGet (AOP (right), offset, FALSE, FALSE, TRUE)); - emitcode ("orl", "a,%s", aopGet (AOP (left), offset, FALSE, TRUE, FALSE)); + MOVA (aopGet (AOP (right), offset, FALSE, FALSE, NULL)); + emitcode ("orl", "a,%s", + aopGet (AOP (left), offset, FALSE, TRUE, DP2_RESULT_REG)); aopPut (AOP (result), "a", offset); } else { emitcode ("orl", "%s,%s", - aopGet (AOP (left), offset, FALSE, TRUE, FALSE), - aopGet (AOP (right), offset, FALSE, FALSE, FALSE)); + aopGet (AOP (left), offset, FALSE, TRUE, NULL), + aopGet (AOP (right), offset, FALSE, FALSE, DP2_RESULT_REG)); } } } @@ -6440,20 +6745,22 @@ genOr (iCode * ic, iCode * ifx) { if (AOP_TYPE (left) == AOP_ACC) { - emitcode ("orl", "a,%s", aopGet (AOP (right), offset, FALSE, FALSE, FALSE)); + emitcode ("orl", "a,%s", + aopGet (AOP (right), offset, FALSE, FALSE, DP2_RESULT_REG)); } else { - MOVA (aopGet (AOP (right), offset, FALSE, FALSE, TRUE)); + MOVA (aopGet (AOP (right), offset, FALSE, FALSE, NULL)); if (IS_AOP_PREG (left)) { - emitcode ("orl", "a,%s", aopGet (AOP (left), offset, FALSE, TRUE, FALSE)); + emitcode ("orl", "a,%s", + aopGet (AOP (left), offset, FALSE, TRUE, DP2_RESULT_REG)); aopPut (AOP (result), "a", offset); } else { emitcode ("orl", "%s,a", - aopGet (AOP (left), offset, FALSE, TRUE, FALSE)); + aopGet (AOP (left), offset, FALSE, TRUE, DP2_RESULT_REG)); } } } @@ -6475,11 +6782,11 @@ genOr (iCode * ic, iCode * ifx) { if (AOP_TYPE(right)==AOP_REG && AOP_TYPE(left)==AOP_ACC) { emitcode ("orl", "a,%s", - aopGet (AOP (right), offset, FALSE, FALSE, FALSE)); + aopGet (AOP (right), offset, FALSE, FALSE, DP2_RESULT_REG)); } else { - MOVA (aopGet (AOP (right), offset, FALSE, FALSE, TRUE)); + MOVA (aopGet (AOP (right), offset, FALSE, FALSE, NULL)); emitcode ("orl", "a,%s", - aopGet (AOP (left), offset, FALSE, FALSE, FALSE)); + aopGet (AOP (left), offset, FALSE, FALSE, DP2_RESULT_REG)); } emitcode ("jnz", "!tlabel", tlbl->key + 100); offset++; @@ -6492,6 +6799,8 @@ genOr (iCode * ic, iCode * ifx) } else if (ifx) jmpTrueOrFalse (ifx, tlbl); + else + emitcode ("", "!tlabeldef", tlbl->key + 100); } else { @@ -6505,14 +6814,15 @@ genOr (iCode * ic, iCode * ifx) if (((lit >> (offset * 8)) & 0x0FFL) == 0x00L) { aopPut (AOP (result), - aopGet (AOP (left), offset, FALSE, FALSE, FALSE), + aopGet (AOP (left), offset, FALSE, FALSE, NULL), offset); continue; } D (emitcode (";", "better literal OR.");); - MOVA (aopGet (AOP (left), offset, FALSE, FALSE, TRUE)); - emitcode ("orl", "a, %s", aopGet (AOP (right), offset, - FALSE, FALSE, FALSE)); + MOVA (aopGet (AOP (left), offset, FALSE, FALSE, NULL)); + emitcode ("orl", "a, %s", + aopGet (AOP (right), offset, + FALSE, FALSE, DP2_RESULT_REG)); } else @@ -6521,12 +6831,13 @@ genOr (iCode * ic, iCode * ifx) // and better if result is SFR if (AOP_TYPE (left) == AOP_ACC) { - emitcode ("orl", "a,%s", aopGet (AOP (right), offset, - FALSE, FALSE, FALSE)); + emitcode ("orl", "a,%s", + aopGet (AOP (right), offset, + FALSE, FALSE, DP2_RESULT_REG)); } else { - char *rOp = aopGet (AOP (right), offset, FALSE, FALSE, TRUE); + char *rOp = aopGet (AOP (right), offset, FALSE, FALSE, NULL); if (!strcmp(rOp, "a") || !strcmp(rOp, "acc")) { @@ -6534,7 +6845,7 @@ genOr (iCode * ic, iCode * ifx) rOp = "b"; } - MOVA (aopGet (AOP (left), offset, FALSE, FALSE, TRUE)); + MOVA (aopGet (AOP (left), offset, FALSE, FALSE, NULL)); emitcode ("orl", "a,%s", rOp); } } @@ -6679,7 +6990,7 @@ genXor (iCode * ic, iCode * ifx) emitcode ("setb", "c"); while (sizer) { - MOVA (aopGet (AOP (right), sizer - 1, FALSE, FALSE, TRUE)); + MOVA (aopGet (AOP (right), sizer - 1, FALSE, FALSE, NULL)); if (sizer == 1) // test the msb of the lsb emitcode ("anl", "a,#!constbyte",0xfe); @@ -6714,30 +7025,33 @@ genXor (iCode * ic, iCode * ifx) continue; else if (IS_AOP_PREG (left)) { - MOVA (aopGet (AOP (right), offset, FALSE, FALSE, TRUE)); - emitcode ("xrl", "a,%s", aopGet (AOP (left), offset, FALSE, TRUE, FALSE)); + MOVA (aopGet (AOP (right), offset, FALSE, FALSE, NULL)); + emitcode ("xrl", "a,%s", + aopGet (AOP (left), offset, FALSE, TRUE, DP2_RESULT_REG)); aopPut (AOP (result), "a", offset); } else emitcode ("xrl", "%s,%s", - aopGet (AOP (left), offset, FALSE, TRUE, FALSE), - aopGet (AOP (right), offset, FALSE, FALSE, FALSE)); + aopGet (AOP (left), offset, FALSE, TRUE, NULL), + aopGet (AOP (right), offset, FALSE, FALSE, DP2_RESULT_REG)); } else { if (AOP_TYPE (left) == AOP_ACC) - emitcode ("xrl", "a,%s", aopGet (AOP (right), offset, FALSE, FALSE, FALSE)); + emitcode ("xrl", "a,%s", + aopGet (AOP (right), offset, FALSE, FALSE, DP2_RESULT_REG)); else { - MOVA (aopGet (AOP (right), offset, FALSE, FALSE, TRUE)); + MOVA (aopGet (AOP (right), offset, FALSE, FALSE, NULL)); if (IS_AOP_PREG (left)) { - emitcode ("xrl", "a,%s", aopGet (AOP (left), offset, FALSE, TRUE, FALSE)); + emitcode ("xrl", "a,%s", + aopGet (AOP (left), offset, FALSE, TRUE, DP2_RESULT_REG)); aopPut (AOP (result), "a", offset); } else emitcode ("xrl", "%s,a", - aopGet (AOP (left), offset, FALSE, TRUE, FALSE)); + aopGet (AOP (left), offset, FALSE, TRUE, DP2_RESULT_REG)); } } } @@ -6760,22 +7074,22 @@ genXor (iCode * ic, iCode * ifx) if ((AOP_TYPE (right) == AOP_LIT) && (((lit >> (offset * 8)) & 0x0FFL) == 0x00L)) { - MOVA (aopGet (AOP (left), offset, FALSE, FALSE, TRUE)); + MOVA (aopGet (AOP (left), offset, FALSE, FALSE, NULL)); } else { if (AOP_TYPE(right)==AOP_REG && AOP_TYPE(left)==AOP_ACC) { emitcode ("xrl", "a,%s", - aopGet (AOP (right), offset, FALSE, FALSE, FALSE)); + aopGet (AOP (right), offset, FALSE, FALSE, DP2_RESULT_REG)); } else { - char *rOp = aopGet (AOP (right), offset, FALSE, FALSE, TRUE); + char *rOp = aopGet (AOP (right), offset, FALSE, FALSE, NULL); if (!strcmp(rOp, "a") || !strcmp(rOp, "acc")) { emitcode("mov", "b,a"); rOp = "b"; } - MOVA (aopGet (AOP (left), offset, FALSE, FALSE, TRUE)); + MOVA (aopGet (AOP (left), offset, FALSE, FALSE, NULL)); emitcode ("xrl", "a,%s", rOp); } } @@ -6802,14 +7116,14 @@ genXor (iCode * ic, iCode * ifx) if (((lit >> (offset * 8)) & 0x0FFL) == 0x00L) { aopPut (AOP (result), - aopGet (AOP (left), offset, FALSE, FALSE, FALSE), + aopGet (AOP (left), offset, FALSE, FALSE, NULL), offset); continue; } D (emitcode (";", "better literal XOR.");); - MOVA (aopGet (AOP (left), offset, FALSE, FALSE, TRUE)); - emitcode ("xrl", "a, %s", aopGet (AOP (right), offset, - FALSE, FALSE, FALSE)); + MOVA (aopGet (AOP (left), offset, FALSE, FALSE, NULL)); + emitcode ("xrl", "a, %s", + aopGet (AOP (right), offset, FALSE, FALSE, DP2_RESULT_REG)); } else { @@ -6817,19 +7131,20 @@ genXor (iCode * ic, iCode * ifx) // and better if result is SFR if (AOP_TYPE (left) == AOP_ACC) { - emitcode ("xrl", "a,%s", aopGet (AOP (right), offset, - FALSE, FALSE, FALSE)); + emitcode ("xrl", "a,%s", + aopGet (AOP (right), offset, + FALSE, FALSE, DP2_RESULT_REG)); } else { - char *rOp = aopGet (AOP (right), offset, FALSE, FALSE, TRUE); + char *rOp = aopGet (AOP (right), offset, FALSE, FALSE, NULL); if (!strcmp(rOp, "a") || !strcmp(rOp, "acc")) { emitcode("mov", "b,a"); rOp = "b"; } - MOVA (aopGet (AOP (left), offset, FALSE, FALSE, TRUE)); + MOVA (aopGet (AOP (left), offset, FALSE, FALSE, NULL)); emitcode ("xrl", "a,%s", rOp); } } @@ -6853,13 +7168,13 @@ genInline (iCode * ic) { char *buffer, *bp, *bp1; - D (emitcode (";", "genInline "); - ); + D (emitcode (";", "genInline "); ); _G.inLine += (!options.asmpeep); - buffer = bp = bp1 = Safe_calloc(1, strlen(IC_INLINE(ic))+1); - strcpy (buffer, IC_INLINE (ic)); + buffer = Safe_strdup(IC_INLINE(ic)); + bp = buffer; + bp1 = buffer; /* emit each line as a code */ while (*bp) @@ -6897,17 +7212,15 @@ static void genRRC (iCode * ic) { operand *left, *result; - int size, offset = 0; - char *l; + int size, offset; - D (emitcode (";", "genRRC "); - ); + D (emitcode (";", "genRRC ");); /* rotate right with carry */ left = IC_LEFT (ic); result = IC_RESULT (ic); aopOp (left, ic, FALSE, FALSE); - aopOp (result, ic, FALSE, AOP_TYPE (left) == AOP_DPTR); + aopOp (result, ic, FALSE, AOP_USESDPTR(left)); /* move it to the result */ size = AOP_SIZE (result); @@ -6917,8 +7230,7 @@ genRRC (iCode * ic) _startLazyDPSEvaluation (); while (size--) { - l = aopGet (AOP (left), offset, FALSE, FALSE, TRUE); - MOVA (l); + MOVA (aopGet (AOP (left), offset, FALSE, FALSE, NULL)); emitcode ("rrc", "a"); if (AOP_SIZE (result) > 1) aopPut (AOP (result), "a", offset--); @@ -6929,8 +7241,7 @@ genRRC (iCode * ic) highest order byte of the result */ if (AOP_SIZE (result) > 1) { - l = aopGet (AOP (result), AOP_SIZE (result) - 1, FALSE, FALSE, TRUE); - MOVA (l); + MOVA (aopGet (AOP (result), AOP_SIZE (result) - 1, FALSE, FALSE, NULL)); } emitcode ("mov", "acc.7,c"); aopPut (AOP (result), "a", AOP_SIZE (result) - 1); @@ -6945,24 +7256,23 @@ static void genRLC (iCode * ic) { operand *left, *result; - int size, offset = 0; + int size, offset; char *l; - D (emitcode (";", "genRLC "); - ); + D (emitcode (";", "genRLC ");); /* rotate right with carry */ left = IC_LEFT (ic); result = IC_RESULT (ic); aopOp (left, ic, FALSE, FALSE); - aopOp (result, ic, FALSE, AOP_TYPE (left) == AOP_DPTR); + aopOp (result, ic, FALSE, AOP_USESDPTR(left)); /* move it to the result */ size = AOP_SIZE (result); offset = 0; if (size--) { - l = aopGet (AOP (left), offset, FALSE, FALSE, TRUE); + l = aopGet (AOP (left), offset, FALSE, FALSE, NULL); MOVA (l); emitcode ("add", "a,acc"); if (AOP_SIZE (result) > 1) @@ -6973,7 +7283,7 @@ genRLC (iCode * ic) _startLazyDPSEvaluation (); while (size--) { - l = aopGet (AOP (left), offset, FALSE, FALSE, TRUE); + l = aopGet (AOP (left), offset, FALSE, FALSE, NULL); MOVA (l); emitcode ("rlc", "a"); if (AOP_SIZE (result) > 1) @@ -6985,7 +7295,7 @@ genRLC (iCode * ic) highest order byte of the result */ if (AOP_SIZE (result) > 1) { - l = aopGet (AOP (result), 0, FALSE, FALSE, TRUE); + l = aopGet (AOP (result), 0, FALSE, FALSE, NULL); MOVA (l); } emitcode ("mov", "acc.0,c"); @@ -7004,13 +7314,12 @@ genGetHbit (iCode * ic) left = IC_LEFT (ic); result = IC_RESULT (ic); aopOp (left, ic, FALSE, FALSE); - aopOp (result, ic, FALSE, AOP_TYPE (left) == AOP_DPTR); + aopOp (result, ic, FALSE, AOP_USESDPTR(left)); - D (emitcode (";", "genGetHbit "); - ); + D (emitcode (";", "genGetHbit ");); /* get the highest order byte into a */ - MOVA (aopGet (AOP (left), AOP_SIZE (left) - 1, FALSE, FALSE, TRUE)); + MOVA (aopGet (AOP (left), AOP_SIZE (left) - 1, FALSE, FALSE, NULL)); if (AOP_TYPE (result) == AOP_CRY) { emitcode ("rlc", "a"); @@ -7028,6 +7337,65 @@ 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, FALSE); + aopOp (result, ic, FALSE, AOP_USESDPTR(left)); + + _startLazyDPSEvaluation (); + switch (AOP_SIZE (left)) + { + case 1: /* swap nibbles in byte */ + MOVA (aopGet (AOP (left), 0, FALSE, FALSE, NULL)); + emitcode ("swap", "a"); + aopPut (AOP (result), "a", 0); + 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, NULL)); + aopPut (AOP (result), aopGet (AOP (left), 1, FALSE, FALSE, NULL), 0); + aopPut (AOP (result), "a", 1); + } + else if (operandsEqu (left, result)) + { + char * reg = "a"; + MOVA (aopGet (AOP (left), 0, FALSE, FALSE, NULL)); + if (AOP_NEEDSACC (left) || AOP_NEEDSACC (result)) + { + emitcode ("mov", "b,a"); + reg = "b"; + _G.bInUse=1; + } + aopPut (AOP (result), aopGet (AOP (left), 1, FALSE, FALSE, NULL), 0); + aopPut (AOP (result), reg, 1); + _G.bInUse=0; + } + else + { + aopPut (AOP (result), aopGet (AOP (left), 1, FALSE, FALSE, NULL), 0); + aopPut (AOP (result), aopGet (AOP (left), 0, FALSE, FALSE, NULL), 1); + } + break; + default: + wassertl(FALSE, "unsupported SWAP operand size"); + } + _endLazyDPSEvaluation (); + + freeAsmop (left, NULL, ic, TRUE); + freeAsmop (result, NULL, ic, TRUE); +} + /*-----------------------------------------------------------------*/ /* AccRol - rotate left accumulator by known count */ /*-----------------------------------------------------------------*/ @@ -7163,7 +7531,7 @@ shiftR1Left2Result (operand * left, int offl, operand * result, int offr, int shCount, int sign) { - MOVA (aopGet (AOP (left), offl, FALSE, FALSE, TRUE)); + MOVA (aopGet (AOP (left), offl, FALSE, FALSE, NULL)); /* shift right accumulator */ if (sign) AccSRsh (shCount); @@ -7181,7 +7549,7 @@ static void shiftL1Left2Result (operand * left, int offl, operand * result, int offr, int shCount) { - MOVA(aopGet (AOP (left), offl, FALSE, FALSE, TRUE)); + MOVA(aopGet (AOP (left), offl, FALSE, FALSE, NULL)); /* shift left accumulator */ AccLsh (shCount); aopPut (AOP (result), "a", offr); @@ -7199,7 +7567,7 @@ movLeft2Result (operand * left, int offl, char *l; if (!sameRegs (AOP (left), AOP (result)) || (offl != offr)) { - l = aopGet (AOP (left), offl, FALSE, FALSE, TRUE); + l = aopGet (AOP (left), offl, FALSE, FALSE, NULL); if (*l == '@' && (IS_AOP_PREG (result))) { @@ -7563,22 +7931,22 @@ _loadLeftIntoAx(char **lsb, if (AOP_TYPE(left) == AOP_DPTR2) { // Get MSB in A. - MOVA(aopGet(AOP(left), offl + MSB16, FALSE, FALSE, TRUE)); + MOVA(aopGet(AOP(left), offl + MSB16, FALSE, FALSE, NULL)); // get LSB in DP2_RESULT_REG. - leftByte = aopGet(AOP(left), offl, FALSE, FALSE, FALSE); + leftByte = aopGet(AOP(left), offl, FALSE, FALSE, DP2_RESULT_REG); assert(!strcmp(leftByte, DP2_RESULT_REG)); } else { // get LSB into DP2_RESULT_REG - leftByte = aopGet (AOP(left), offl, FALSE, FALSE, TRUE); + leftByte = aopGet (AOP(left), offl, FALSE, FALSE, NULL); if (strcmp(leftByte, DP2_RESULT_REG)) { TR_AP("#7"); emitcode("mov","%s,%s", DP2_RESULT_REG, leftByte); } // And MSB in A. - leftByte = aopGet(AOP(left), offl + MSB16, FALSE, FALSE, TRUE); + leftByte = aopGet(AOP(left), offl + MSB16, FALSE, FALSE, NULL); assert(strcmp(leftByte, DP2_RESULT_REG)); MOVA(leftByte); } @@ -7591,16 +7959,16 @@ _loadLeftIntoAx(char **lsb, ((offl + MSB16) == offr)) { /* don't crash result[offr] */ - MOVA(aopGet(AOP(left), offl, FALSE, FALSE, TRUE)); + MOVA(aopGet(AOP(left), offl, FALSE, FALSE, NULL)); emitcode ("xch", "a,%s", - aopGet(AOP(left), offl + MSB16, FALSE, FALSE, FALSE)); + aopGet(AOP(left), offl + MSB16, FALSE, FALSE, DP2_RESULT_REG)); } else { movLeft2Result (left, offl, result, offr, 0); - MOVA (aopGet (AOP (left), offl + MSB16, FALSE, FALSE, TRUE)); + MOVA (aopGet (AOP (left), offl + MSB16, FALSE, FALSE, NULL)); } - *lsb = aopGet(AOP (result), offr, FALSE, FALSE, FALSE); + *lsb = aopGet(AOP (result), offr, FALSE, FALSE, DP2_RESULT_REG); assert(strcmp(*lsb,"a")); } } @@ -7670,8 +8038,6 @@ shiftR2Left2Result (operand * left, int offl, } #endif -#if 0 -//REMOVE ME!!! /*-----------------------------------------------------------------*/ /* shiftLLeftOrResult - shift left one byte from left, or to result */ /*-----------------------------------------------------------------*/ @@ -7679,15 +8045,15 @@ static void shiftLLeftOrResult (operand * left, int offl, operand * result, int offr, int shCount) { - MOVA (aopGet (AOP (left), offl, FALSE, FALSE, TRUE)); + MOVA (aopGet (AOP (left), offl, FALSE, FALSE, NULL)); /* shift left accumulator */ AccLsh (shCount); /* or with result */ - emitcode ("orl", "a,%s", aopGet (AOP (result), offr, FALSE, FALSE, FALSE)); + emitcode ("orl", "a,%s", + aopGet (AOP (result), offr, FALSE, FALSE, DP2_RESULT_REG)); /* back to result */ aopPut (AOP (result), "a", offr); } -#endif #if 0 //REMOVE ME!!! @@ -7698,11 +8064,12 @@ static void shiftRLeftOrResult (operand * left, int offl, operand * result, int offr, int shCount) { - MOVA (aopGet (AOP (left), offl, FALSE, FALSE, TRUE)); + MOVA (aopGet (AOP (left), offl, FALSE, FALSE, NULL)); /* shift right accumulator */ AccRsh (shCount); /* or with result */ - emitcode ("orl", "a,%s", aopGet (AOP (result), offr, FALSE, FALSE, FALSE)); + emitcode ("orl", "a,%s", + aopGet (AOP (result), offr, FALSE, FALSE, DP2_RESULT_REG)); /* back to result */ aopPut (AOP (result), "a", offr); } @@ -7791,13 +8158,13 @@ shiftLLong (operand * left, operand * result, int offr) if (size >= LSB + offr) { - l = aopGet (AOP (left), LSB, FALSE, FALSE, TRUE); + l = aopGet (AOP (left), LSB, FALSE, FALSE, NULL); MOVA (l); emitcode ("add", "a,acc"); if (sameRegs (AOP (left), AOP (result)) && size >= MSB16 + offr && offr != LSB) emitcode ("xch", "a,%s", - aopGet (AOP (left), LSB + offr, FALSE, FALSE, FALSE)); + aopGet (AOP (left), LSB + offr, FALSE, FALSE, DP2_RESULT_REG)); else aopPut (AOP (result), "a", LSB + offr); } @@ -7806,14 +8173,13 @@ shiftLLong (operand * left, operand * result, int offr) { if (!(sameRegs (AOP (result), AOP (left)) && size >= MSB16 + offr && offr != LSB)) { - l = aopGet (AOP (left), MSB16, FALSE, FALSE, TRUE); - MOVA (l); + MOVA (aopGet (AOP (left), MSB16, FALSE, FALSE, TRUE)); } emitcode ("rlc", "a"); if (sameRegs (AOP (left), AOP (result)) && size >= MSB24 + offr && offr != LSB) emitcode ("xch", "a,%s", - aopGet (AOP (left), MSB16 + offr, FALSE, FALSE, FALSE)); + aopGet (AOP (left), MSB16 + offr, FALSE, FALSE, DP2_RESULT_REG)); else aopPut (AOP (result), "a", MSB16 + offr); } @@ -7822,14 +8188,13 @@ shiftLLong (operand * left, operand * result, int offr) { if (!(sameRegs (AOP (left), AOP (left)) && size >= MSB24 + offr && offr != LSB)) { - l = aopGet (AOP (left), MSB24, FALSE, FALSE, TRUE); - MOVA (l); + MOVA (aopGet (AOP (left), MSB24, FALSE, FALSE, NULL)); } emitcode ("rlc", "a"); if (sameRegs (AOP (left), AOP (result)) && size >= MSB32 + offr && offr != LSB) emitcode ("xch", "a,%s", - aopGet (AOP (left), MSB24 + offr, FALSE, FALSE, FALSE)); + aopGet (AOP (left), MSB24 + offr, FALSE, FALSE, DP2_RESULT_REG)); else aopPut (AOP (result), "a", MSB24 + offr); } @@ -7838,8 +8203,7 @@ shiftLLong (operand * left, operand * result, int offr) { if (!(sameRegs (AOP (result), AOP (left)) && size >= MSB32 + offr && offr != LSB)) { - l = aopGet (AOP (left), MSB32, FALSE, FALSE, TRUE); - MOVA (l); + MOVA (aopGet (AOP (left), MSB32, FALSE, FALSE, NULL)); } emitcode ("rlc", "a"); aopPut (AOP (result), "a", MSB32 + offr); @@ -7978,7 +8342,7 @@ genLeftShiftLiteral (operand * left, freeAsmop (right, NULL, ic, TRUE); aopOp(left, ic, FALSE, FALSE); - aopOp(result, ic, FALSE, (AOP_TYPE(left) == AOP_DPTR)); + aopOp(result, ic, FALSE, AOP_USESDPTR(left)); #if 0 // debug spew if (IS_SYMOP(left) && OP_SYMBOL(left)->aop) @@ -8099,12 +8463,12 @@ genLeftShift (iCode * ic) } else { - emitcode ("mov", "b,%s", aopGet (AOP (right), 0, FALSE, FALSE, FALSE)); - emitcode ("inc", "b"); + MOVB(aopGet (AOP (right), 0, FALSE, FALSE, "b")); + emitcode ("inc", "b"); } freeAsmop (right, NULL, ic, TRUE); aopOp (left, ic, FALSE, FALSE); - aopOp (result, ic, FALSE, AOP_TYPE (left) == AOP_DPTR); + aopOp (result, ic, FALSE, AOP_USESDPTR(left)); /* now move the left to the result if they are not the same */ @@ -8117,7 +8481,7 @@ genLeftShift (iCode * ic) _startLazyDPSEvaluation (); while (size--) { - l = aopGet (AOP (left), offset, FALSE, TRUE, FALSE); + l = aopGet (AOP (left), offset, FALSE, TRUE, NULL); if (*l == '@' && (IS_AOP_PREG (result))) { @@ -8141,8 +8505,7 @@ genLeftShift (iCode * ic) { symbol *tlbl1 = newiTempLabel (NULL); - l = aopGet (AOP (left), 0, FALSE, FALSE, TRUE); - MOVA (l); + MOVA (aopGet (AOP (left), 0, FALSE, FALSE, NULL)); emitcode ("sjmp", "!tlabel", tlbl1->key + 100); emitcode ("", "!tlabeldef", tlbl->key + 100); emitcode ("add", "a,acc"); @@ -8156,15 +8519,13 @@ genLeftShift (iCode * ic) emitcode ("sjmp", "!tlabel", tlbl1->key + 100); emitcode ("", "!tlabeldef", tlbl->key + 100); - l = aopGet (AOP (result), offset, FALSE, FALSE, TRUE); - MOVA (l); + MOVA (aopGet (AOP (result), offset, FALSE, FALSE, NULL)); emitcode ("add", "a,acc"); aopPut (AOP (result), "a", offset++); _startLazyDPSEvaluation (); while (--size) { - l = aopGet (AOP (result), offset, FALSE, FALSE, TRUE); - MOVA (l); + MOVA (aopGet (AOP (result), offset, FALSE, FALSE, NULL)); emitcode ("rlc", "a"); aopPut (AOP (result), "a", offset++); } @@ -8227,8 +8588,6 @@ genrshTwo (operand * result, operand * left, } #endif -#if 0 -//REMOVE ME!!! /*-----------------------------------------------------------------*/ /* shiftRLong - shift right one long from left to result */ /* offl = LSB or MSB16 */ @@ -8244,14 +8603,15 @@ shiftRLong (operand * left, int offl, werror(E_INTERNAL_ERROR, __FILE__, __LINE__); } - MOVA (aopGet (AOP (left), MSB32, FALSE, FALSE)); + MOVA (aopGet (AOP (left), MSB32, FALSE, FALSE, NULL)); if (offl==MSB16) { // shift is > 8 if (sign) { emitcode ("rlc", "a"); emitcode ("subb", "a,acc"); - emitcode ("xch", "a,%s", aopGet(AOP(left), MSB32, FALSE, FALSE)); + emitcode ("xch", "a,%s", + aopGet(AOP(left), MSB32, FALSE, FALSE, DP2_RESULT_REG)); } else { aopPut (AOP(result), zero, MSB32); } @@ -8266,33 +8626,32 @@ shiftRLong (operand * left, int offl, emitcode ("rrc", "a"); if (isSameRegs && offl==MSB16) { - emitcode ("xch", "a,%s",aopGet (AOP (left), MSB24, FALSE, FALSE)); + emitcode ("xch", + "a,%s",aopGet (AOP (left), MSB24, FALSE, FALSE, DP2_RESULT_REG)); } else { aopPut (AOP (result), "a", MSB32); - MOVA (aopGet (AOP (left), MSB24, FALSE, FALSE)); + MOVA (aopGet (AOP (left), MSB24, FALSE, FALSE, NULL)); } emitcode ("rrc", "a"); if (isSameRegs && offl==1) { - emitcode ("xch", "a,%s",aopGet (AOP (left), MSB16, FALSE, FALSE)); + emitcode ("xch", "a,%s", + aopGet (AOP (left), MSB16, FALSE, FALSE, DP2_RESULT_REG)); } else { aopPut (AOP (result), "a", MSB24); - MOVA (aopGet (AOP (left), MSB16, FALSE, FALSE)); + MOVA (aopGet (AOP (left), MSB16, FALSE, FALSE, NULL)); } emitcode ("rrc", "a"); aopPut (AOP (result), "a", MSB16 - offl); if (offl == LSB) { - MOVA (aopGet (AOP (left), LSB, FALSE, FALSE)); + MOVA (aopGet (AOP (left), LSB, FALSE, FALSE, NULL)); emitcode ("rrc", "a"); aopPut (AOP (result), "a", LSB); } } -#endif -#if 0 -//REMOVE ME!!! /*-----------------------------------------------------------------*/ /* genrshFour - shift four byte by a known amount != 0 */ /*-----------------------------------------------------------------*/ @@ -8300,22 +8659,24 @@ 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) { shCount -= 24; + _startLazyDPSEvaluation(); if (shCount) shiftR1Left2Result (left, MSB32, result, LSB, shCount, sign); else movLeft2Result (left, MSB32, result, LSB, sign); addSign (result, MSB16, sign); + _endLazyDPSEvaluation(); } else if (shCount >= 16) { shCount -= 16; + _startLazyDPSEvaluation(); if (shCount) shiftR2Left2Result (left, MSB24, result, LSB, shCount, sign); else @@ -8324,12 +8685,16 @@ genrshFour (operand * result, operand * left, movLeft2Result (left, MSB32, result, MSB16, sign); } addSign (result, MSB24, sign); + _endLazyDPSEvaluation(); } else if (shCount >= 8) { shCount -= 8; + _startLazyDPSEvaluation(); if (shCount == 1) - shiftRLong (left, MSB16, result, sign); + { + shiftRLong (left, MSB16, result, sign); + } else if (shCount == 0) { movLeft2Result (left, MSB16, result, LSB, 0); @@ -8345,9 +8710,11 @@ genrshFour (operand * result, operand * left, shiftR1Left2Result (left, MSB32, result, MSB24, shCount, sign); addSign (result, MSB32, sign); } + _endLazyDPSEvaluation(); } else - { /* 1 <= shCount <= 7 */ + { + /* 1 <= shCount <= 7 */ if (shCount <= 2) { shiftRLong (left, LSB, result, sign); @@ -8362,7 +8729,6 @@ genrshFour (operand * result, operand * left, } } } -#endif #ifdef BETTER_LITERAL_SHIFT /*-----------------------------------------------------------------*/ @@ -8386,16 +8752,17 @@ genRightShiftLiteral (operand * left, if ((shCount != 0) && (shCount < (size * 8)) && (size != 1) - && (size != 2)) + && (size != 2) + && (size != 4)) { - D(emitcode (";", "genRightShiftLiteral wimping out");); + D(emitcode (";", "genRightShiftLiteral wimping out");); return FALSE; } freeAsmop (right, NULL, ic, TRUE); aopOp (left, ic, FALSE, FALSE); - aopOp (result, ic, FALSE, AOP_TYPE (left) == AOP_DPTR); + aopOp (result, ic, FALSE, AOP_USESDPTR(left)); #if VIEW_SIZE emitcode ("; shift right ", "result %d, left %d", AOP_SIZE (result), @@ -8420,7 +8787,7 @@ genRightShiftLiteral (operand * left, if (sign) { /* get sign in acc.7 */ - MOVA (aopGet (AOP (left), size - 1, FALSE, FALSE, TRUE)); + MOVA (aopGet (AOP (left), size - 1, FALSE, FALSE, NULL)); } addSign (result, LSB, sign); } @@ -8435,7 +8802,7 @@ genRightShiftLiteral (operand * left, case 2: genrshTwo (result, left, shCount, sign); break; -#if 0 +#if 1 case 4: genrshFour (result, left, shCount, sign); break; @@ -8443,11 +8810,11 @@ genRightShiftLiteral (operand * left, default: break; } - - freeAsmop (left, NULL, ic, TRUE); - freeAsmop (result, NULL, ic, TRUE); } - return TRUE; + freeAsmop (left, NULL, ic, TRUE); + freeAsmop (result, NULL, ic, TRUE); + + return TRUE; } #endif @@ -8499,12 +8866,12 @@ genSignedRightShift (iCode * ic) } else { - emitcode ("mov", "b,%s", aopGet (AOP (right), 0, FALSE, FALSE, FALSE)); + MOVB(aopGet (AOP (right), 0, FALSE, FALSE, "b")); emitcode ("inc", "b"); } freeAsmop (right, NULL, ic, TRUE); aopOp (left, ic, FALSE, FALSE); - aopOp (result, ic, FALSE, AOP_TYPE (left) == AOP_DPTR); + aopOp (result, ic, FALSE, AOP_USESDPTR(left)); /* now move the left to the result if they are not the same */ @@ -8517,7 +8884,7 @@ genSignedRightShift (iCode * ic) _startLazyDPSEvaluation (); while (size--) { - l = aopGet (AOP (left), offset, FALSE, TRUE, FALSE); + l = aopGet (AOP (left), offset, FALSE, TRUE, NULL); if (*l == '@' && IS_AOP_PREG (result)) { @@ -8537,14 +8904,13 @@ genSignedRightShift (iCode * ic) size = AOP_SIZE (result); offset = size - 1; - emitcode ("mov", "a,%s", aopGet (AOP (left), offset, FALSE, FALSE, FALSE)); + MOVA (aopGet (AOP (left), offset, FALSE, FALSE, NULL)); emitcode ("rlc", "a"); emitcode ("mov", "ov,c"); /* if it is only one byte then */ if (size == 1) { - l = aopGet (AOP (left), 0, FALSE, FALSE, TRUE); - MOVA (l); + MOVA( aopGet (AOP (left), 0, FALSE, FALSE, NULL)); emitcode ("sjmp", "!tlabel", tlbl1->key + 100); emitcode ("", "!tlabeldef", tlbl->key + 100); emitcode ("mov", "c,ov"); @@ -8562,8 +8928,7 @@ genSignedRightShift (iCode * ic) _startLazyDPSEvaluation (); while (size--) { - l = aopGet (AOP (result), offset, FALSE, FALSE, TRUE); - MOVA (l); + MOVA (aopGet (AOP (result), offset, FALSE, FALSE, NULL)); emitcode ("rrc", "a"); aopPut (AOP (result), "a", offset--); } @@ -8584,7 +8949,7 @@ static void genRightShift (iCode * ic) { operand *right, *left, *result; - sym_link *retype; + sym_link *letype; int size, offset; char *l; symbol *tlbl, *tlbl1; @@ -8593,9 +8958,9 @@ genRightShift (iCode * ic) /* 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; @@ -8643,12 +9008,12 @@ genRightShift (iCode * ic) } else { - emitcode ("mov", "b,%s", aopGet (AOP (right), 0, FALSE, FALSE, FALSE)); - emitcode ("inc", "b"); + MOVB(aopGet (AOP (right), 0, FALSE, FALSE, "b")); + emitcode ("inc", "b"); } freeAsmop (right, NULL, ic, TRUE); aopOp (left, ic, FALSE, FALSE); - aopOp (result, ic, FALSE, AOP_TYPE (left) == AOP_DPTR); + aopOp (result, ic, FALSE, AOP_USESDPTR(left)); /* now move the left to the result if they are not the same */ @@ -8661,7 +9026,7 @@ genRightShift (iCode * ic) _startLazyDPSEvaluation (); while (size--) { - l = aopGet (AOP (left), offset, FALSE, TRUE, FALSE); + l = aopGet (AOP (left), offset, FALSE, TRUE, NULL); if (*l == '@' && IS_AOP_PREG (result)) { @@ -8683,8 +9048,7 @@ genRightShift (iCode * ic) /* if it is only one byte then */ if (size == 1) { - l = aopGet (AOP (left), 0, FALSE, FALSE, TRUE); - MOVA (l); + MOVA (aopGet (AOP (left), 0, FALSE, FALSE, NULL)); emitcode ("sjmp", "!tlabel", tlbl1->key + 100); emitcode ("", "!tlabeldef", tlbl->key + 100); CLRC; @@ -8702,8 +9066,7 @@ genRightShift (iCode * ic) _startLazyDPSEvaluation (); while (size--) { - l = aopGet (AOP (result), offset, FALSE, FALSE, TRUE); - MOVA (l); + MOVA (aopGet (AOP (result), offset, FALSE, FALSE, NULL)); emitcode ("rrc", "a"); aopPut (AOP (result), "a", offset--); } @@ -8718,118 +9081,148 @@ release: freeAsmop (result, NULL, ic, TRUE); } + /*-----------------------------------------------------------------*/ -/* 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; - - D (emitcode (";", "genUnpackBits "); - ); - - etype = getSpec (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; } +} - /* 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); - - emitcode ("anl", "a,#!constbyte", - ((unsigned char) -1) >> (8 - SPEC_BLEN (etype))); - aopPut (AOP (result), "a", offset); - return; - } - - /* bit field did not fit in a byte */ - rlen = SPEC_BLEN (etype) - 8; - 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 PPOINTER: + MOVA (src); + emitcode ("movx", "@%s,a", rname); + break; + + case FPOINTER: + MOVA (src); + emitcode ("movx", "@dptr,a"); + break; - case FPOINTER: - emitcode ("inc", "dptr"); - emitcode ("movx", "a,@dptr"); - break; + case GPOINTER: + MOVA (src); + emitcode ("lcall", "__gptrput"); + 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); + /* If the bitfield length is less than a byte */ + if (blen < 8) + { + emitPtrByteGet (rname, ptype, FALSE); + AccRsh (bstr); + emitcode ("anl", "a,#!constbyte", ((unsigned char) -1) >> (8 - blen)); aopPut (AOP (result), "a", offset++); + 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++); + if (rlen>8) + emitcode ("inc", "%s", rname); } + /* Handle the partial byte at the end */ if (rlen) { - emitcode ("anl", "a,#!constbyte", ((unsigned char) -1) >> (rlen)); - aopPut (AOP (result), "a", offset); + emitPtrByteGet (rname, ptype, FALSE); + emitcode ("anl", "a,#!constbyte", ((unsigned char) -1) >> (8-rlen)); + aopPut (AOP (result), "a", offset++); } - return; +finish: + if (offset < rsize) + { + rsize -= offset; + while (rsize--) + aopPut (AOP (result), zero, offset++); + } } @@ -8842,21 +9235,27 @@ genDataPointerGet (operand * left, iCode * ic) { char *l; - char buffer[256]; + char buff[256]; int size, offset = 0; aopOp (result, ic, TRUE, FALSE); /* get the string representation of the name */ - l = aopGet (AOP (left), 0, FALSE, TRUE, FALSE); + l = aopGet (AOP (left), 0, FALSE, TRUE, NULL); size = AOP_SIZE (result); _startLazyDPSEvaluation (); while (size--) { - if (offset) - sprintf (buffer, "(%s + %d)", l + 1, offset); - else - sprintf (buffer, "%s", l + 1); - aopPut (AOP (result), buffer, offset++); + if (offset) + { + SNPRINTF (buff, sizeof(buff), + "(%s + %d)", l + 1, offset); + } + else + { + SNPRINTF (buff, sizeof(buff), + "%s", l + 1); + } + aopPut (AOP (result), buff, offset++); } _endLazyDPSEvaluation (); @@ -8874,11 +9273,11 @@ genNearPointerGet (operand * left, iCode *pi) { asmop *aop = NULL; - regs *preg = NULL; + regs *preg; char *rname; sym_link *rtype, *retype, *letype; sym_link *ltype = operandType (left); - char buffer[80]; + char buff[80]; rtype = operandType (result); retype = getSpec (rtype); @@ -8908,11 +9307,11 @@ genNearPointerGet (operand * left, preg = getFreePtr (ic, &aop, FALSE); emitcode ("mov", "%s,%s", preg->name, - aopGet (AOP (left), 0, FALSE, TRUE, FALSE)); + aopGet (AOP (left), 0, FALSE, TRUE, DP2_RESULT_REG)); rname = preg->name; } else - rname = aopGet (AOP (left), 0, FALSE, FALSE, FALSE); + rname = aopGet (AOP (left), 0, FALSE, FALSE, DP2_RESULT_REG); freeAsmop (left, NULL, ic, TRUE); aopOp (result, ic, FALSE, FALSE); @@ -8936,12 +9335,14 @@ genNearPointerGet (operand * left, } else { - sprintf (buffer, "@%s", rname); - aopPut (AOP (result), buffer, offset); + SNPRINTF (buff, sizeof(buff), "@%s", rname); + aopPut (AOP (result), buff, offset); } offset++; if (size || pi) - emitcode ("inc", "%s", rname); + { + emitcode ("inc", "%s", rname); + } } } @@ -8988,7 +9389,7 @@ genPagedPointerGet (operand * left, iCode * pi) { asmop *aop = NULL; - regs *preg = NULL; + regs *preg; char *rname; sym_link *rtype, *retype, *letype; @@ -9006,11 +9407,11 @@ genPagedPointerGet (operand * left, preg = getFreePtr (ic, &aop, FALSE); emitcode ("mov", "%s,%s", preg->name, - aopGet (AOP (left), 0, FALSE, TRUE, FALSE)); + aopGet (AOP (left), 0, FALSE, TRUE, NULL)); rname = preg->name; } else - rname = aopGet (AOP (left), 0, FALSE, FALSE, FALSE); + rname = aopGet (AOP (left), 0, FALSE, FALSE, NULL); freeAsmop (left, NULL, ic, TRUE); aopOp (result, ic, FALSE, FALSE); @@ -9078,8 +9479,7 @@ genFarPointerGet (operand * left, int size, offset, dopi=1; sym_link *retype = getSpec (operandType (result)); sym_link *letype = getSpec (operandType (left)); - D (emitcode (";", "genFarPointerGet"); - ); + D (emitcode (";", "genFarPointerGet");); aopOp (left, ic, FALSE, FALSE); @@ -9090,7 +9490,7 @@ genFarPointerGet (operand * left, /* if this is remateriazable */ if (AOP_TYPE (left) == AOP_IMMD) { - emitcode ("mov", "dptr,%s", aopGet (AOP (left), 0, TRUE, FALSE, FALSE)); + emitcode ("mov", "dptr,%s", aopGet (AOP (left), 0, TRUE, FALSE, NULL)); } else { @@ -9098,20 +9498,19 @@ genFarPointerGet (operand * left, _startLazyDPSEvaluation (); if (AOP_TYPE (left) != AOP_DPTR) { - emitcode ("mov", "dpl,%s", aopGet (AOP (left), 0, FALSE, FALSE, TRUE)); - emitcode ("mov", "dph,%s", aopGet (AOP (left), 1, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpl,%s", aopGet (AOP (left), 0, FALSE, FALSE, NULL)); + emitcode ("mov", "dph,%s", aopGet (AOP (left), 1, FALSE, FALSE, NULL)); if (options.model == MODEL_FLAT24) - emitcode ("mov", "dpx,%s", aopGet (AOP (left), 2, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpx,%s", aopGet (AOP (left), 2, FALSE, FALSE, NULL)); } else { /* We need to generate a load to DPTR indirect through DPTR. */ - D (emitcode (";", "genFarPointerGet -- indirection special case."); - ); - emitcode ("push", "%s", aopGet (AOP (left), 0, FALSE, TRUE, TRUE)); - emitcode ("push", "%s", aopGet (AOP (left), 1, FALSE, TRUE, TRUE)); + D (emitcode (";", "genFarPointerGet -- indirection special case.");); + emitcode ("push", "%s", aopGet (AOP (left), 0, FALSE, TRUE, NULL)); + emitcode ("push", "%s", aopGet (AOP (left), 1, FALSE, TRUE, NULL)); if (options.model == MODEL_FLAT24) - emitcode ("mov", "dpx,%s", aopGet (AOP (left), 2, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpx,%s", aopGet (AOP (left), 2, FALSE, FALSE, NULL)); emitcode ("pop", "dph"); emitcode ("pop", "dpl"); dopi =0; @@ -9166,15 +9565,18 @@ genFarPointerGet (operand * left, } if (dopi && pi && AOP_TYPE (left) != AOP_IMMD) { if (!AOP_INDPTRn(left)) { + _startLazyDPSEvaluation (); aopPut ( AOP (left), "dpl", 0); aopPut ( AOP (left), "dph", 1); if (options.model == MODEL_FLAT24) aopPut ( AOP (left), "dpx", 2); + _endLazyDPSEvaluation (); } pi->generated = 1; - } else if ((OP_SYMBOL(left)->ruonly || AOP_INDPTRn(left)) && + } else if ((AOP_IS_STR(left) || AOP_INDPTRn(left)) && AOP_SIZE(result) > 1 && - (OP_SYMBOL (left)->liveTo > ic->seq || ic->depth)) { + IS_SYMOP(left) && + (OP_SYMBOL(left)->liveTo > ic->seq || ic->depth)) { size = AOP_SIZE (result) - 1; if (AOP_INDPTRn(left)) { @@ -9191,10 +9593,10 @@ genFarPointerGet (operand * left, } /*-----------------------------------------------------------------*/ -/* emitcodePointerGet - gget value from code space */ +/* genCodePointerGet - get value from code space */ /*-----------------------------------------------------------------*/ static void -emitcodePointerGet (operand * left, +genCodePointerGet (operand * left, operand * result, iCode * ic, iCode *pi) { int size, offset, dopi=1; @@ -9209,27 +9611,26 @@ emitcodePointerGet (operand * left, /* if this is remateriazable */ if (AOP_TYPE (left) == AOP_IMMD) { - emitcode ("mov", "dptr,%s", aopGet (AOP (left), 0, TRUE, FALSE, FALSE)); + emitcode ("mov", "dptr,%s", aopGet (AOP (left), 0, TRUE, FALSE, NULL)); } else { /* we need to get it byte by byte */ _startLazyDPSEvaluation (); if (AOP_TYPE (left) != AOP_DPTR) { - emitcode ("mov", "dpl,%s", aopGet (AOP (left), 0, FALSE, FALSE, TRUE)); - emitcode ("mov", "dph,%s", aopGet (AOP (left), 1, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpl,%s", aopGet (AOP (left), 0, FALSE, FALSE, NULL)); + emitcode ("mov", "dph,%s", aopGet (AOP (left), 1, FALSE, FALSE, NULL)); if (options.model == MODEL_FLAT24) - emitcode ("mov", "dpx,%s", aopGet (AOP (left), 2, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpx,%s", aopGet (AOP (left), 2, FALSE, FALSE, NULL)); } else { /* We need to generate a load to DPTR indirect through DPTR. */ - D (emitcode (";", "gencodePointerGet -- indirection special case."); - ); - emitcode ("push", "%s", aopGet (AOP (left), 0, FALSE, TRUE, TRUE)); - emitcode ("push", "%s", aopGet (AOP (left), 1, FALSE, TRUE, TRUE)); + D (emitcode (";", "gencodePointerGet -- indirection special case.");); + emitcode ("push", "%s", aopGet (AOP (left), 0, FALSE, TRUE, NULL)); + emitcode ("push", "%s", aopGet (AOP (left), 1, FALSE, TRUE, NULL)); if (options.model == MODEL_FLAT24) - emitcode ("mov", "dpx,%s", aopGet (AOP (left), 2, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpx,%s", aopGet (AOP (left), 2, FALSE, FALSE, NULL)); emitcode ("pop", "dph"); emitcode ("pop", "dpl"); dopi=0; @@ -9285,10 +9686,14 @@ emitcodePointerGet (operand * left, } if (dopi && pi && AOP_TYPE (left) != AOP_IMMD) { if (!AOP_INDPTRn(left)) { + _startLazyDPSEvaluation (); + aopPut ( AOP (left), "dpl", 0); aopPut ( AOP (left), "dph", 1); if (options.model == MODEL_FLAT24) aopPut ( AOP (left), "dpx", 2); + + _endLazyDPSEvaluation (); } pi->generated = 1; } else if ((OP_SYMBOL(left)->ruonly || AOP_INDPTRn(left)) && @@ -9322,7 +9727,7 @@ genGenPointerGet (operand * left, D (emitcode (";", "genGenPointerGet "); ); - aopOp (left, ic, FALSE, (OP_SYMBOL(left)->ruonly ? FALSE : TRUE)); + aopOp (left, ic, FALSE, (AOP_IS_STR(left) ? FALSE : TRUE)); /* if the operand is already in dptr then we do nothing else we move the value to dptr */ @@ -9331,74 +9736,87 @@ genGenPointerGet (operand * left, /* if this is remateriazable */ if (AOP_TYPE (left) == AOP_IMMD) { - emitcode ("mov", "dptr,%s", aopGet (AOP (left), 0, TRUE, FALSE, FALSE)); + emitcode ("mov", "dptr,%s", aopGet (AOP (left), 0, TRUE, FALSE, NULL)); if (AOP(left)->aopu.aop_immd.from_cast_remat) - emitcode ("mov", "b,%s",aopGet(AOP (left), AOP_SIZE(left)-1, FALSE, FALSE, FALSE)); - else - emitcode ("mov", "b,#%d", pointerCode (retype)); + { + MOVB(aopGet(AOP (left), AOP_SIZE(left)-1, FALSE, FALSE, NULL)); + } + else + { + emitcode ("mov", "b,#%d", pointerCode (retype)); + } } else { /* we need to get it byte by byte */ - _startLazyDPSEvaluation (); - if (AOP(left)->type==AOP_DPTR2) { - char *l; - l=aopGet(AOP(left),0,FALSE,FALSE,TRUE); - genSetDPTR(0); - _flushLazyDPS(); - emitcode ("mov", "dpl,%s", l); - l=aopGet(AOP(left),1,FALSE,FALSE,TRUE); - genSetDPTR(0); - _flushLazyDPS(); - emitcode ("mov", "dph,%s", l); - if (options.model == MODEL_FLAT24) { - l=aopGet(AOP(left),2,FALSE,FALSE,TRUE); - genSetDPTR(0); - _flushLazyDPS(); - emitcode ("mov", "dpx,%s", l); - emitcode ("mov", "b,%s", aopGet (AOP(left),3,FALSE,FALSE,TRUE)); - } else { - emitcode ("mov", "b,%s", aopGet (AOP(left),2,FALSE,FALSE,TRUE)); - } - } else { - emitcode ("mov", "dpl,%s", aopGet (AOP(left),0,FALSE,FALSE,TRUE)); - emitcode ("mov", "dph,%s", aopGet (AOP(left),1,FALSE,FALSE,TRUE)); + _startLazyDPSEvaluation (); + emitcode ("mov", "dpl,%s", aopGet (AOP(left),0,FALSE,FALSE,NULL)); + emitcode ("mov", "dph,%s", aopGet (AOP(left),1,FALSE,FALSE,NULL)); if (options.model == MODEL_FLAT24) { - emitcode ("mov", "dpx,%s", aopGet (AOP(left),2,FALSE,FALSE,TRUE)); - emitcode ("mov", "b,%s", aopGet (AOP(left),3,FALSE,FALSE,TRUE)); + emitcode ("mov", "dpx,%s", aopGet (AOP(left),2,FALSE,FALSE,NULL)); + emitcode ("mov", "b,%s", aopGet (AOP(left),3,FALSE,FALSE,NULL)); } else { - emitcode ("mov", "b,%s", aopGet (AOP(left),2,FALSE,FALSE,TRUE)); + emitcode ("mov", "b,%s", aopGet (AOP(left),2,FALSE,FALSE,NULL)); } - } - _endLazyDPSEvaluation (); + _endLazyDPSEvaluation (); } } - /* so dptr know contains the address */ + + /* so dptr-b now contains the address */ + _G.bInUse++; aopOp (result, ic, FALSE, TRUE); + _G.bInUse--; /* if bit then unpack */ if (IS_BITVAR (retype) || IS_BITVAR (letype)) + { genUnpackBits (result, "dptr", GPOINTER); + } else { - size = AOP_SIZE (result); - offset = 0; + size = AOP_SIZE (result); + offset = 0; - while (size--) + while (size--) { - emitcode ("lcall", "__gptrget"); - aopPut (AOP (result), "a", offset++); - if (size || (pi && AOP_TYPE (left) != AOP_IMMD)) - emitcode ("inc", "dptr"); + if (size) + { + // Get two bytes at a time, results in _AP & A. + // dptr will be incremented ONCE by __gptrgetWord. + // + // Note: any change here must be coordinated + // with the implementation of __gptrgetWord + // in device/lib/_gptrget.c + emitcode ("lcall", "__gptrgetWord"); + aopPut (AOP (result), DP2_RESULT_REG, offset++); + aopPut (AOP (result), "a", offset++); + size--; + } + else + { + // Only one byte to get. + emitcode ("lcall", "__gptrget"); + aopPut (AOP (result), "a", offset++); + } + + if (size || (pi && AOP_TYPE (left) != AOP_IMMD)) + { + emitcode ("inc", "dptr"); + } } } if (pi && AOP_TYPE (left) != AOP_IMMD) { + _startLazyDPSEvaluation (); + aopPut ( AOP (left), "dpl", 0); aopPut ( AOP (left), "dph", 1); if (options.model == MODEL_FLAT24) { aopPut ( AOP (left), "dpx", 2); aopPut ( AOP (left), "b", 3); } else aopPut ( AOP (left), "b", 2); + + _endLazyDPSEvaluation (); + pi->generated = 1; } else if (OP_SYMBOL(left)->ruonly && AOP_SIZE(result) > 1 && (OP_SYMBOL (left)->liveTo > ic->seq || ic->depth)) { @@ -9443,7 +9861,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 @@ -9465,7 +9883,7 @@ genPointerGet (iCode * ic, iCode *pi) break; case CPOINTER: - emitcodePointerGet (left, result, ic, pi); + genCodePointerGet (left, result, ic, pi); break; case GPOINTER: @@ -9483,166 +9901,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","")); blen = SPEC_BLEN (etype); bstr = SPEC_BSTR (etype); - l = aopGet (AOP (right), offset++, FALSE, FALSE, TRUE); - 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,#!constbyte", (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; + mask = ((unsigned char) (0xFF << (blen + bstr)) | + (unsigned char) (0xFF >> (8 - bstr))); - case FPOINTER: - emitcode ("movx", "@dptr,a"); - 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,#!constbyte", mask); + if (litval) + emitcode ("orl","a,#!constbyte", 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, NULL)); + 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, NULL)); + /* shift and mask source value */ + AccLsh (bstr); + emitcode ("anl", "a,#!constbyte", (~mask) & 0xff); + + /* transfer A to B and get next byte */ + emitPtrByteGet (rname, p_type, TRUE); + + emitcode ("anl", "a,#!constbyte", mask); + emitcode ("orl", "a,b"); + if (p_type == GPOINTER) + emitcode ("pop", "b"); + } + } - case GPOINTER: - emitcode ("lcall", "__gptrput"); - break; + 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, FALSE); - - 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, NULL) ); + 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; - - case GPOINTER: - emitcode ("push", "b"); - emitcode ("push", "acc"); - emitcode ("lcall", "__gptrget"); - emitcode ("pop", "b"); - break; - } - - emitcode ("anl", "a,#!constbyte", ((unsigned char) -1 << rLen)); - emitcode ("orl", "a,b"); + 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,#!constbyte", mask); + if (litval) + emitcode ("orl","a,#!constbyte", litval); + } + else + { + /* Case with partial byte and arbitrary source + */ + MOVA (aopGet (AOP (right), offset++, FALSE, FALSE, NULL)); + emitcode ("anl", "a,#!constbyte", (~mask) & 0xff); + + /* transfer A to B and get next byte */ + emitPtrByteGet (rname, p_type, TRUE); + + emitcode ("anl", "a,#!constbyte", 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 */ /*-----------------------------------------------------------------*/ @@ -9652,20 +10029,25 @@ genDataPointerSet (operand * right, iCode * ic) { int size, offset = 0; - char *l, buffer[256]; + char *l, buff[256]; aopOp (right, ic, FALSE, FALSE); - l = aopGet (AOP (result), 0, FALSE, TRUE, FALSE); + l = aopGet (AOP (result), 0, FALSE, TRUE, NULL); size = AOP_SIZE (right); while (size--) { if (offset) - sprintf (buffer, "(%s + %d)", l + 1, offset); + { + SNPRINTF (buff, sizeof(buff), "(%s + %d)", l + 1, offset); + } else - sprintf (buffer, "%s", l + 1); - emitcode ("mov", "%s,%s", buffer, - aopGet (AOP (right), offset++, FALSE, FALSE, FALSE)); + { + SNPRINTF (buff, sizeof(buff), "%s", l + 1); + } + + emitcode ("mov", "%s,%s", buff, + aopGet (AOP (right), offset++, FALSE, FALSE, NULL)); } freeAsmop (right, NULL, ic, TRUE); @@ -9682,7 +10064,6 @@ genNearPointerSet (operand * right, iCode * pi) { asmop *aop = NULL; - regs *preg = NULL; char *rname, *l; sym_link *retype, *letype; sym_link *ptype = operandType (result); @@ -9708,15 +10089,17 @@ genNearPointerSet (operand * right, if (!AOP_INPREG (AOP (result))) { /* otherwise get a free pointer register */ + regs *preg; + aop = newAsmop (0); preg = getFreePtr (ic, &aop, FALSE); emitcode ("mov", "%s,%s", preg->name, - aopGet (AOP (result), 0, FALSE, TRUE, FALSE)); + aopGet (AOP (result), 0, FALSE, TRUE, NULL)); rname = preg->name; } else - rname = aopGet (AOP (result), 0, FALSE, FALSE, FALSE); + rname = aopGet (AOP (result), 0, FALSE, FALSE, NULL); aopOp (right, ic, FALSE, FALSE); @@ -9731,7 +10114,7 @@ genNearPointerSet (operand * right, while (size--) { - l = aopGet (AOP (right), offset, FALSE, TRUE, FALSE); + l = aopGet (AOP (right), offset, FALSE, TRUE, NULL); if (*l == '@') { MOVA (l); @@ -9789,8 +10172,7 @@ genPagedPointerSet (operand * right, iCode *pi) { asmop *aop = NULL; - regs *preg = NULL; - char *rname, *l; + char *rname; sym_link *retype, *letype; retype = getSpec (operandType (right)); @@ -9803,15 +10185,17 @@ genPagedPointerSet (operand * right, if (!AOP_INPREG (AOP (result))) { /* otherwise get a free pointer register */ + regs *preg; + aop = newAsmop (0); preg = getFreePtr (ic, &aop, FALSE); emitcode ("mov", "%s,%s", preg->name, - aopGet (AOP (result), 0, FALSE, TRUE, FALSE)); + aopGet (AOP (result), 0, FALSE, TRUE, NULL)); rname = preg->name; } else - rname = aopGet (AOP (result), 0, FALSE, FALSE, FALSE); + rname = aopGet (AOP (result), 0, FALSE, FALSE, NULL); aopOp (right, ic, FALSE, FALSE); @@ -9826,9 +10210,8 @@ genPagedPointerSet (operand * right, while (size--) { - l = aopGet (AOP (right), offset, FALSE, TRUE, TRUE); + MOVA (aopGet (AOP (right), offset, FALSE, TRUE, NULL)); - MOVA (l); emitcode ("movx", "@%s,a", rname); if (size || pi) @@ -9891,27 +10274,28 @@ genFarPointerSet (operand * right, { /* if this is remateriazable */ if (AOP_TYPE (result) == AOP_IMMD) - emitcode ("mov", "dptr,%s", aopGet (AOP (result), 0, TRUE, FALSE, FALSE)); + emitcode ("mov", "dptr,%s", + aopGet (AOP (result), 0, TRUE, FALSE, NULL)); else { /* we need to get it byte by byte */ _startLazyDPSEvaluation (); if (AOP_TYPE (result) != AOP_DPTR) { - emitcode ("mov", "dpl,%s", aopGet (AOP (result), 0, FALSE, FALSE, TRUE)); - emitcode ("mov", "dph,%s", aopGet (AOP (result), 1, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpl,%s", aopGet (AOP (result), 0, FALSE, FALSE, NULL)); + emitcode ("mov", "dph,%s", aopGet (AOP (result), 1, FALSE, FALSE, NULL)); if (options.model == MODEL_FLAT24) - emitcode ("mov", "dpx,%s", aopGet (AOP (result), 2, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpx,%s", aopGet (AOP (result), 2, FALSE, FALSE, NULL)); } else { /* We need to generate a load to DPTR indirect through DPTR. */ - D (emitcode (";", "genFarPointerSet -- indirection special case."); - ); - emitcode ("push", "%s", aopGet (AOP (result), 0, FALSE, TRUE, TRUE)); - emitcode ("push", "%s", aopGet (AOP (result), 1, FALSE, TRUE, TRUE)); + D (emitcode (";", "genFarPointerSet -- indirection special case.");); + + emitcode ("push", "%s", aopGet (AOP (result), 0, FALSE, TRUE, NULL)); + emitcode ("push", "%s", aopGet (AOP (result), 1, FALSE, TRUE, NULL)); if (options.model == MODEL_FLAT24) - emitcode ("mov", "dpx,%s", aopGet (AOP (result), 2, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpx,%s", aopGet (AOP (result), 2, FALSE, FALSE, NULL)); emitcode ("pop", "dph"); emitcode ("pop", "dpl"); dopi=0; @@ -9936,8 +10320,7 @@ genFarPointerSet (operand * right, offset = 0; if (AOP_INDPTRn(result) && AOP_USESDPTR(right)) { while (size--) { - char *l = aopGet (AOP (right), offset++, FALSE, FALSE, TRUE); - MOVA (l); + MOVA (aopGet (AOP (right), offset++, FALSE, FALSE, NULL)); genSetDPTR(AOP(result)->aopu.dptr); emitcode ("movx", "@dptr,a"); @@ -9948,8 +10331,7 @@ genFarPointerSet (operand * right, } else { _startLazyDPSEvaluation (); while (size--) { - char *l = aopGet (AOP (right), offset++, FALSE, FALSE, TRUE); - MOVA (l); + MOVA (aopGet (AOP (right), offset++, FALSE, FALSE, NULL)); if (AOP_INDPTRn(result)) { genSetDPTR(AOP(result)->aopu.dptr); @@ -9968,10 +10350,14 @@ genFarPointerSet (operand * right, if (dopi && pi && AOP_TYPE (result) != AOP_IMMD) { if (!AOP_INDPTRn(result)) { + _startLazyDPSEvaluation (); + aopPut (AOP(result),"dpl",0); aopPut (AOP(result),"dph",1); if (options.model == MODEL_FLAT24) aopPut (AOP(result),"dpx",2); + + _endLazyDPSEvaluation (); } pi->generated=1; } else if ((OP_SYMBOL(result)->ruonly || AOP_INDPTRn(result)) && @@ -10002,7 +10388,7 @@ genGenPointerSet (operand * right, sym_link *retype = getSpec (operandType (right)); sym_link *letype = getSpec (operandType (result)); - aopOp (result, ic, FALSE, OP_SYMBOL(result)->ruonly ? FALSE : TRUE); + aopOp (result, ic, FALSE, AOP_IS_STR(result) ? FALSE : TRUE); /* if the operand is already in dptr then we do nothing else we move the value to dptr */ @@ -10012,53 +10398,87 @@ genGenPointerSet (operand * right, /* if this is remateriazable */ if (AOP_TYPE (result) == AOP_IMMD) { - emitcode ("mov", "dptr,%s", aopGet (AOP (result), 0, TRUE, FALSE, FALSE)); + emitcode ("mov", "dptr,%s", aopGet (AOP (result), 0, TRUE, FALSE, NULL)); if (AOP(result)->aopu.aop_immd.from_cast_remat) - emitcode ("mov", "b,%s",aopGet(AOP (result), AOP_SIZE(result)-1, FALSE, FALSE, FALSE)); + { + MOVB(aopGet(AOP (result), AOP_SIZE(result)-1, FALSE, FALSE, NULL)); + } else - emitcode ("mov", "b,%s + 1", aopGet (AOP (result), 0, TRUE, FALSE, FALSE)); + { + emitcode ("mov", + "b,%s + 1", aopGet (AOP (result), 0, TRUE, FALSE, NULL)); + } } else { /* we need to get it byte by byte */ - emitcode ("mov", "dpl,%s", aopGet (AOP (result), 0, FALSE, FALSE, TRUE)); - emitcode ("mov", "dph,%s", aopGet (AOP (result), 1, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpl,%s", aopGet (AOP (result), 0, FALSE, FALSE, NULL)); + emitcode ("mov", "dph,%s", aopGet (AOP (result), 1, FALSE, FALSE, NULL)); if (options.model == MODEL_FLAT24) { - emitcode ("mov", "dpx,%s", aopGet (AOP (result), 2, FALSE, FALSE, TRUE)); - emitcode ("mov", "b,%s", aopGet (AOP (result), 3, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpx,%s", aopGet (AOP (result), 2, FALSE, FALSE, NULL)); + emitcode ("mov", "b,%s", aopGet (AOP (result), 3, FALSE, FALSE, NULL)); } else { - emitcode ("mov", "b,%s", aopGet (AOP (result), 2, FALSE, FALSE, TRUE)); + emitcode ("mov", "b,%s", aopGet (AOP (result), 2, FALSE, FALSE, NULL)); } } _endLazyDPSEvaluation (); } - /* so dptr know contains the address */ + /* so dptr + b now contains the address */ + _G.bInUse++; aopOp (right, ic, FALSE, TRUE); + _G.bInUse--; + /* if bit then unpack */ if (IS_BITVAR (retype) || IS_BITVAR (letype)) - genPackBits ((IS_BITVAR (retype) ? retype : letype), right, "dptr", GPOINTER); + { + genPackBits ((IS_BITVAR (retype) ? retype : letype), right, "dptr", GPOINTER); + } else { - size = AOP_SIZE (right); - offset = 0; + size = AOP_SIZE (right); + offset = 0; - _startLazyDPSEvaluation (); - while (size--) + _startLazyDPSEvaluation (); + while (size--) { - char *l = aopGet (AOP (right), offset++, FALSE, FALSE, TRUE); - MOVA (l); - - genSetDPTR (0); - _flushLazyDPS (); + if (size) + { + // Set two bytes at a time, passed in _AP & A. + // dptr will be incremented ONCE by __gptrputWord. + // + // Note: any change here must be coordinated + // with the implementation of __gptrputWord + // in device/lib/_gptrput.c + emitcode("mov", "_ap, %s", + aopGet (AOP (right), offset++, FALSE, FALSE, NULL)); + MOVA (aopGet (AOP (right), offset++, FALSE, FALSE, NULL)); + + genSetDPTR (0); + _flushLazyDPS (); + emitcode ("lcall", "__gptrputWord"); + size--; + } + else + { + // Only one byte to put. + MOVA (aopGet (AOP (right), offset++, FALSE, FALSE, NULL)); - emitcode ("lcall", "__gptrput"); - if (size || (pi && AOP_TYPE (result) != AOP_IMMD)) - emitcode ("inc", "dptr"); + genSetDPTR (0); + _flushLazyDPS (); + emitcode ("lcall", "__gptrput"); + } + + if (size || (pi && AOP_TYPE (result) != AOP_IMMD)) + { + emitcode ("inc", "dptr"); + } } - _endLazyDPSEvaluation (); + _endLazyDPSEvaluation (); } if (pi && AOP_TYPE (result) != AOP_IMMD) { + _startLazyDPSEvaluation (); + aopPut (AOP(result),"dpl",0); aopPut (AOP(result),"dph",1); if (options.model == MODEL_FLAT24) { @@ -10067,6 +10487,8 @@ genGenPointerSet (operand * right, } else { aopPut (AOP(result),"b",2); } + _endLazyDPSEvaluation (); + pi->generated=1; } else if (OP_SYMBOL(result)->ruonly && AOP_SIZE(right) > 1 && (OP_SYMBOL (result)->liveTo > ic->seq || ic->depth)) { @@ -10088,8 +10510,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); @@ -10112,7 +10533,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); } @@ -10137,6 +10558,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"); } } @@ -10156,9 +10581,14 @@ genIfx (iCode * ic, iCode * popIc) /* get the value into acc */ if (AOP_TYPE (cond) != AOP_CRY) - toBoolean (cond); + { + toBoolean (cond); + } else - isbit = 1; + { + isbit = 1; + } + /* the result is now in the accumulator */ freeAsmop (cond, NULL, ic, TRUE); @@ -10169,11 +10599,17 @@ genIfx (iCode * ic, iCode * popIc) /* if the condition is a bit variable */ if (isbit && IS_ITEMP (cond) && SPIL_LOC (cond)) - genIfxJump (ic, SPIL_LOC (cond)->rname); + { + genIfxJump (ic, SPIL_LOC (cond)->rname); + } else if (isbit && !IS_ITEMP (cond)) - genIfxJump (ic, OP_SYMBOL (cond)->rname); + { + genIfxJump (ic, OP_SYMBOL (cond)->rname); + } else - genIfxJump (ic, "a"); + { + genIfxJump (ic, "a"); + } ic->generated = 1; } @@ -10200,16 +10636,19 @@ genAddrOf (iCode * ic) /* if 10 bit stack */ if (options.stack10bit) { char buff[10]; - tsprintf(buff,"#!constbyte",(options.stack_loc >> 16) & 0xff); + int offset; + + tsprintf(buff, sizeof(buff), + "#!constbyte",(options.stack_loc >> 16) & 0xff); /* if it has an offset then we need to compute it */ - emitcode ("subb", "a,#!constbyte", - -((sym->stack < 0) ? - ((short) (sym->stack - _G.nRegsSaved)) : - ((short) sym->stack)) & 0xff); - emitcode ("mov","b,a"); - emitcode ("mov","a,#!constbyte",(-((sym->stack < 0) ? - ((short) (sym->stack - _G.nRegsSaved)) : - ((short) sym->stack)) >> 8) & 0xff); +/* emitcode ("subb", "a,#!constbyte", */ +/* -((sym->stack < 0) ? */ +/* ((short) (sym->stack - _G.nRegsSaved)) : */ +/* ((short) sym->stack)) & 0xff); */ +/* emitcode ("mov","b,a"); */ +/* emitcode ("mov","a,#!constbyte",(-((sym->stack < 0) ? */ +/* ((short) (sym->stack - _G.nRegsSaved)) : */ +/* ((short) sym->stack)) >> 8) & 0xff); */ if (sym->stack) { emitcode ("mov", "a,_bpx"); emitcode ("add", "a,#!constbyte", ((sym->stack < 0) ? @@ -10217,9 +10656,13 @@ genAddrOf (iCode * ic) ((char) sym->stack )) & 0xff); emitcode ("mov", "b,a"); emitcode ("mov", "a,_bpx+1"); - emitcode ("addc","a,#!constbyte", (((sym->stack < 0) ? - ((short) (sym->stack - _G.nRegsSaved)) : - ((short) sym->stack )) >> 8) & 0xff); + + offset = (((sym->stack < 0) ? + ((short) (sym->stack - _G.nRegsSaved)) : + ((short) sym->stack )) >> 8) & 0xff; + + emitcode ("addc","a,#!constbyte", offset); + aopPut (AOP (IC_RESULT (ic)), "b", 0); aopPut (AOP (IC_RESULT (ic)), "a", 1); aopPut (AOP (IC_RESULT (ic)), buff, 2); @@ -10266,21 +10709,25 @@ genAddrOf (iCode * ic) if (offset) { switch (offset) { case 1: - tsprintf(s,"!his",sym->rname); + tsprintf(s, sizeof(s), "#!his",sym->rname); break; case 2: - tsprintf(s,"!hihis",sym->rname); + tsprintf(s, sizeof(s), "#!hihis",sym->rname); break; case 3: - tsprintf(s,"!hihihis",sym->rname); + tsprintf(s, sizeof(s), "#!hihihis",sym->rname); break; default: /* should not need this (just in case) */ - sprintf (s, "#(%s >> %d)", + SNPRINTF (s, sizeof(s), "#(%s >> %d)", sym->rname, offset * 8); } - } else - sprintf (s, "#%s", sym->rname); + } + else + { + SNPRINTF (s, sizeof(s), "#%s", sym->rname); + } + aopPut (AOP (IC_RESULT (ic)), s, offset++); } @@ -10289,6 +10736,7 @@ release: } +#if 0 // obsolete, and buggy for != xdata /*-----------------------------------------------------------------*/ /* genArrayInit - generates code for address of */ /*-----------------------------------------------------------------*/ @@ -10310,7 +10758,7 @@ genArrayInit (iCode * ic) { // Load immediate value into DPTR. emitcode("mov", "dptr, %s", - aopGet(AOP(IC_LEFT(ic)), 0, TRUE, FALSE, TRUE)); + aopGet(AOP(IC_LEFT(ic)), 0, TRUE, FALSE, NULL)); } else if (AOP_TYPE(IC_LEFT(ic)) != AOP_DPTR) { @@ -10320,10 +10768,10 @@ genArrayInit (iCode * ic) exit(1); #else // a regression because of SDCCcse.c:1.52 - emitcode ("mov", "dpl,%s", aopGet (AOP (left), 0, FALSE, FALSE, TRUE)); - emitcode ("mov", "dph,%s", aopGet (AOP (left), 1, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpl,%s", aopGet (AOP (left), 0, FALSE, FALSE, NULL)); + emitcode ("mov", "dph,%s", aopGet (AOP (left), 1, FALSE, FALSE, NULL)); if (options.model == MODEL_FLAT24) - emitcode ("mov", "dpx,%s", aopGet (AOP (left), 2, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpx,%s", aopGet (AOP (left), 2, FALSE, FALSE, NULL)); #endif } @@ -10397,6 +10845,7 @@ genArrayInit (iCode * ic) freeAsmop (IC_LEFT(ic), NULL, ic, TRUE); } +#endif /*-----------------------------------------------------------------*/ /* genFarFarAssign - assignment when both are in far space */ @@ -10412,7 +10861,7 @@ genFarFarAssign (operand * result, operand * right, iCode * ic) { /* quick & easy case. */ D(emitcode(";","genFarFarAssign (1 byte case)");); - MOVA(aopGet(AOP(right), 0, FALSE, FALSE, TRUE)); + MOVA(aopGet(AOP(right), 0, FALSE, FALSE, NULL)); freeAsmop (right, NULL, ic, FALSE); /* now assign DPTR to result */ _G.accInUse++; @@ -10489,7 +10938,7 @@ no time to test now, so later well put in...kpb while (size--) { aopPut (AOP (result), - aopGet (AOP (right), offset, FALSE, FALSE, FALSE), offset); + aopGet (AOP (right), offset, FALSE, FALSE, NULL), offset); offset++; } _endLazyDPSEvaluation (); @@ -10584,7 +11033,7 @@ genAssign (iCode * ic) while (size && ((unsigned int) (lit >> (offset * 8)) != 0)) { aopPut (AOP (result), - aopGet (AOP (right), offset, FALSE, FALSE, TRUE), + aopGet (AOP (right), offset, FALSE, FALSE, NULL), offset); offset++; size--; @@ -10606,7 +11055,7 @@ genAssign (iCode * ic) while (size--) { aopPut (AOP (result), - aopGet (AOP (right), offset, FALSE, FALSE, FALSE), + aopGet (AOP (right), offset, FALSE, FALSE, NULL), offset); offset++; } @@ -10632,7 +11081,7 @@ genJumpTab (iCode * ic) aopOp (IC_JTCOND (ic), ic, FALSE, FALSE); /* get the condition into accumulator */ - l = aopGet (AOP (IC_JTCOND (ic)), 0, FALSE, FALSE, TRUE); + l = aopGet (AOP (IC_JTCOND (ic)), 0, FALSE, FALSE, NULL); MOVA (l); /* multiply by four! */ emitcode ("add", "a,acc"); @@ -10662,19 +11111,18 @@ 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))) return; aopOp (right, ic, FALSE, FALSE); - aopOp (result, ic, FALSE, AOP_TYPE (right) == AOP_DPTR); + aopOp (result, ic, FALSE, (AOP_TYPE(right) == AOP_DPTR)); /* if the result is a bit */ - // if (AOP_TYPE (result) == AOP_CRY) /* works only for true symbols */ - if (IS_BITVAR(OP_SYMBOL(result)->type)) + 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 */ @@ -10717,7 +11165,7 @@ genCast (iCode * ic) while (size--) { aopPut (AOP (result), - aopGet (AOP (right), offset, FALSE, FALSE, FALSE), + aopGet (AOP (right), offset, FALSE, FALSE, NULL), offset); offset++; } @@ -10736,8 +11184,6 @@ genCast (iCode * ic) /* pointer to generic pointer */ if (IS_GENPTR (ctype)) { - char *l = zero; - if (IS_PTR (type)) { p_type = DCL_TYPE (type); @@ -10790,36 +11236,26 @@ genCast (iCode * ic) while (size--) { aopPut (AOP (result), - aopGet (AOP (right), offset, FALSE, FALSE, FALSE), + aopGet (AOP (right), offset, FALSE, FALSE, NULL), offset); offset++; } _endLazyDPSEvaluation (); /* 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 PPOINTER: - l = "#0x03"; - break; - - default: - /* this should never happen */ - werror (E_INTERNAL_ERROR, __FILE__, __LINE__, - "got unknown pointer type"); - exit (1); + int gpVal = pointerTypeToGPByte(p_type, NULL, NULL); + char gpValStr[10]; + + if (gpVal == -1) + { + // pointerTypeToGPByte will have bitched. + exit(1); + } + + SNPRINTF(gpValStr, sizeof(gpValStr), "#0x%d", gpVal); + aopPut (AOP (result), gpValStr, GPTRSIZE - 1); } - aopPut (AOP (result), l, GPTRSIZE - 1); goto release; } @@ -10830,7 +11266,7 @@ genCast (iCode * ic) while (size--) { aopPut (AOP (result), - aopGet (AOP (right), offset, FALSE, FALSE, FALSE), + aopGet (AOP (right), offset, FALSE, FALSE, NULL), offset); offset++; } @@ -10847,7 +11283,7 @@ genCast (iCode * ic) while (size--) { aopPut (AOP (result), - aopGet (AOP (right), offset, FALSE, FALSE, FALSE), + aopGet (AOP (right), offset, FALSE, FALSE, NULL), offset); offset++; } @@ -10859,7 +11295,7 @@ genCast (iCode * ic) /* also, if the source is a bit, we don't need to sign extend, because * it can't possibly have set the sign bit. */ - 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--) { @@ -10869,9 +11305,8 @@ genCast (iCode * ic) else { /* we need to extend the sign :{ */ - char *l = aopGet (AOP (right), AOP_SIZE (right) - 1, - FALSE, FALSE, TRUE); - MOVA (l); + MOVA (aopGet (AOP (right), AOP_SIZE (right) - 1, + FALSE, FALSE, NULL)); emitcode ("rlc", "a"); emitcode ("subb", "a,acc"); while (size--) @@ -10929,7 +11364,7 @@ genDjnz (iCode * ic, iCode * ifx) * the accumulator, we must explicitly write * it back after the decrement. */ - char *rByte = aopGet(AOP(IC_RESULT(ic)), 0, FALSE, FALSE, TRUE); + char *rByte = aopGet(AOP(IC_RESULT(ic)), 0, FALSE, FALSE, NULL); if (strcmp(rByte, "a")) { @@ -10949,13 +11384,13 @@ genDjnz (iCode * ic, iCode * ifx) else if (IS_AOP_PREG (IC_RESULT (ic))) { emitcode ("dec", "%s", - aopGet (AOP (IC_RESULT (ic)), 0, FALSE, FALSE, FALSE)); - emitcode ("mov", "a,%s", aopGet (AOP (IC_RESULT (ic)), 0, FALSE, FALSE, FALSE)); + aopGet (AOP (IC_RESULT (ic)), 0, FALSE, FALSE, NULL)); + emitcode ("mov", "a,%s", aopGet (AOP (IC_RESULT (ic)), 0, FALSE, FALSE, NULL)); emitcode ("jnz", "!tlabel", lbl->key + 100); } else { - emitcode ("djnz", "%s,!tlabel", aopGet (AOP (IC_RESULT (ic)), 0, FALSE, TRUE, FALSE), + emitcode ("djnz", "%s,!tlabel", aopGet (AOP (IC_RESULT (ic)), 0, FALSE, TRUE, NULL), lbl->key + 100); } emitcode ("sjmp", "!tlabel", lbl1->key + 100); @@ -10974,53 +11409,55 @@ genDjnz (iCode * ic, iCode * ifx) static void genReceive (iCode * ic) { - int size = getSize (operandType (IC_RESULT (ic))); int offset = 0; int rb1off ; - D (emitcode (";", "genReceive "); - ); + D (emitcode (";", "genReceive ");); - if (ic->argreg == 1) { /* first parameter */ - if (isOperandInFarSpace (IC_RESULT (ic)) && - (OP_SYMBOL (IC_RESULT (ic))->isspilt || - IS_TRUE_SYMOP (IC_RESULT (ic)))) - { - offset = fReturnSizeDS390 - size; - while (size--) - { - emitcode ("push", "%s", (strcmp (fReturn[fReturnSizeDS390 - offset - 1], "a") ? - fReturn[fReturnSizeDS390 - offset - 1] : "acc")); - offset++; - } - aopOp (IC_RESULT (ic), ic, FALSE, FALSE); - size = AOP_SIZE (IC_RESULT (ic)); - offset = 0; - while (size--) - { - emitcode ("pop", "acc"); - aopPut (AOP (IC_RESULT (ic)), "a", offset++); - } - - } else { - _G.accInUse++; - aopOp (IC_RESULT (ic), ic, FALSE, FALSE); - _G.accInUse--; - assignResultValue (IC_RESULT (ic)); - } - } else { /* second receive onwards */ - /* this gets a little tricky since unused recevies will be + if (ic->argreg == 1) + { + /* first parameter */ + if (AOP_IS_STR(IC_RESULT(ic))) + { + /* Nothing to do: it's already in the proper place. */ + return; + } + else + { + bool useDp2; + + useDp2 = isOperandInFarSpace (IC_RESULT (ic)) && + (OP_SYMBOL (IC_RESULT (ic))->isspilt || + IS_TRUE_SYMOP (IC_RESULT (ic))); + + _G.accInUse++; + aopOp (IC_RESULT (ic), ic, FALSE, useDp2); + _G.accInUse--; + + /* Sanity checking... */ + if (AOP_USESDPTR(IC_RESULT(ic))) + { + werror (E_INTERNAL_ERROR, __FILE__, __LINE__, + "genReceive got unexpected DPTR."); + } + assignResultValue (IC_RESULT (ic)); + } + } + else + { + /* second receive onwards */ + /* this gets a little tricky since unused recevies will be eliminated, we have saved the reg in the type field . and we use that to figure out which register to use */ - aopOp (IC_RESULT (ic), ic, FALSE, FALSE); - rb1off = ic->argreg; - while (size--) { - aopPut (AOP (IC_RESULT (ic)), rb1regs[rb1off++ -5], offset++); - } - - } - freeAsmop (IC_RESULT (ic), NULL, ic, TRUE); + aopOp (IC_RESULT (ic), ic, FALSE, FALSE); + rb1off = ic->argreg; + while (size--) + { + aopPut (AOP (IC_RESULT (ic)), rb1regs[rb1off++ -5], offset++); + } + } + freeAsmop (IC_RESULT (ic), NULL, ic, TRUE); } /*-----------------------------------------------------------------*/ @@ -11053,10 +11490,10 @@ static void genMemcpyX2X( iCode *ic, int nparms, operand **parms, int fromc) aopOp (from, ic->next, FALSE, FALSE); /* get from into DPTR1 */ - emitcode ("mov", "dpl1,%s", aopGet (AOP (from), 0, FALSE, FALSE, TRUE)); - emitcode ("mov", "dph1,%s", aopGet (AOP (from), 1, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpl1,%s", aopGet (AOP (from), 0, FALSE, FALSE, NULL)); + emitcode ("mov", "dph1,%s", aopGet (AOP (from), 1, FALSE, FALSE, NULL)); if (options.model == MODEL_FLAT24) { - emitcode ("mov", "dpx1,%s", aopGet (AOP (from), 2, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpx1,%s", aopGet (AOP (from), 2, FALSE, FALSE, NULL)); } freeAsmop (from, NULL, ic, FALSE); @@ -11067,54 +11504,49 @@ static void genMemcpyX2X( iCode *ic, int nparms, operand **parms, int fromc) if (AOP_TYPE (to) != AOP_STR) { /* if already in DPTR then we need to push */ if (AOP_TYPE(to) == AOP_DPTR) { - emitcode ("push", "%s", aopGet (AOP (to), 0, FALSE, TRUE, TRUE)); - emitcode ("push", "%s", aopGet (AOP (to), 1, FALSE, TRUE, TRUE)); + emitcode ("push", "%s", aopGet (AOP (to), 0, FALSE, TRUE, NULL)); + emitcode ("push", "%s", aopGet (AOP (to), 1, FALSE, TRUE, NULL)); if (options.model == MODEL_FLAT24) - emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, NULL)); emitcode ("pop", "dph"); emitcode ("pop", "dpl"); } else { _startLazyDPSEvaluation (); /* if this is remateriazable */ if (AOP_TYPE (to) == AOP_IMMD) { - emitcode ("mov", "dptr,%s", aopGet (AOP (to), 0, TRUE, FALSE, FALSE)); + emitcode ("mov", "dptr,%s", aopGet (AOP (to), 0, TRUE, FALSE, NULL)); } else { /* we need to get it byte by byte */ - emitcode ("mov", "dpl,%s", aopGet (AOP (to), 0, FALSE, FALSE, TRUE)); - emitcode ("mov", "dph,%s", aopGet (AOP (to), 1, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpl,%s", aopGet (AOP (to), 0, FALSE, FALSE, NULL)); + emitcode ("mov", "dph,%s", aopGet (AOP (to), 1, FALSE, FALSE, NULL)); if (options.model == MODEL_FLAT24) { - emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, NULL)); } } _endLazyDPSEvaluation (); } } freeAsmop (to, NULL, ic, FALSE); - + _G.dptrInUse = _G.dptr1InUse = 1; aopOp (count, ic->next->next, FALSE,FALSE); lbl =newiTempLabel(NULL); /* now for the actual copy */ if (AOP_TYPE(count) == AOP_LIT && (int)floatFromVal (AOP(count)->aopu.aop_lit) <= 256) { - emitcode (";","OH JOY auto increment with djnz (very fast)"); - emitcode ("mov", "dps,#!constbyte",0x21); /* Select DPTR2 & auto-toggle. */ - emitcode ("mov", "b,%s",aopGet(AOP(count),0,FALSE,FALSE,FALSE)); - emitcode ("","!tlabeldef",lbl->key+100); + emitcode ("mov", "b,%s",aopGet(AOP(count),0,FALSE,FALSE,NULL)); if (fromc) { - emitcode ("clr","a"); - emitcode ("movc", "a,@a+dptr"); - } else - emitcode ("movx", "a,@dptr"); - emitcode ("movx", "@dptr,a"); - emitcode ("inc", "dptr"); - emitcode ("inc", "dptr"); - emitcode ("djnz","b,!tlabel",lbl->key+100); + emitcode ("lcall","__bi_memcpyc2x_s"); + } else { + emitcode ("lcall","__bi_memcpyx2x_s"); + } + freeAsmop (count, NULL, ic, FALSE); } else { symbol *lbl1 = newiTempLabel(NULL); emitcode (";"," Auto increment but no djnz"); - emitcode ("mov","_ap,%s",aopGet (AOP (count), 0, FALSE, TRUE, TRUE)); - emitcode ("mov","b,%s",aopGet (AOP (count), 1, FALSE, TRUE, TRUE)); + emitcode ("mov","_ap,%s",aopGet (AOP (count), 0, FALSE, TRUE, NULL)); + emitcode ("mov","b,%s",aopGet (AOP (count), 1, FALSE, TRUE, NULL)); + freeAsmop (count, NULL, ic, FALSE); emitcode ("mov", "dps,#!constbyte",0x21); /* Select DPTR2 & auto-toggle. */ emitcode ("","!tlabeldef",lbl->key+100); if (fromc) { @@ -11138,7 +11570,7 @@ static void genMemcpyX2X( iCode *ic, int nparms, operand **parms, int fromc) emitcode ("","!tlabeldef",lbl1->key+100); } emitcode ("mov", "dps,#0"); - freeAsmop (count, NULL, ic, FALSE); + _G.dptrInUse = _G.dptr1InUse = 0; unsavermask(rsave); } @@ -11173,10 +11605,10 @@ static void genMemcmpX2X( iCode *ic, int nparms, operand **parms, int fromc) aopOp (from, ic->next, FALSE, FALSE); /* get from into DPTR1 */ - emitcode ("mov", "dpl1,%s", aopGet (AOP (from), 0, FALSE, FALSE, TRUE)); - emitcode ("mov", "dph1,%s", aopGet (AOP (from), 1, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpl1,%s", aopGet (AOP (from), 0, FALSE, FALSE, NULL)); + emitcode ("mov", "dph1,%s", aopGet (AOP (from), 1, FALSE, FALSE, NULL)); if (options.model == MODEL_FLAT24) { - emitcode ("mov", "dpx1,%s", aopGet (AOP (from), 2, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpx1,%s", aopGet (AOP (from), 2, FALSE, FALSE, NULL)); } freeAsmop (from, NULL, ic, FALSE); @@ -11187,61 +11619,53 @@ static void genMemcmpX2X( iCode *ic, int nparms, operand **parms, int fromc) if (AOP_TYPE (to) != AOP_STR) { /* if already in DPTR then we need to push */ if (AOP_TYPE(to) == AOP_DPTR) { - emitcode ("push", "%s", aopGet (AOP (to), 0, FALSE, TRUE, TRUE)); - emitcode ("push", "%s", aopGet (AOP (to), 1, FALSE, TRUE, TRUE)); + emitcode ("push", "%s", aopGet (AOP (to), 0, FALSE, TRUE, NULL)); + emitcode ("push", "%s", aopGet (AOP (to), 1, FALSE, TRUE, NULL)); if (options.model == MODEL_FLAT24) - emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, NULL)); emitcode ("pop", "dph"); emitcode ("pop", "dpl"); } else { _startLazyDPSEvaluation (); /* if this is remateriazable */ if (AOP_TYPE (to) == AOP_IMMD) { - emitcode ("mov", "dptr,%s", aopGet (AOP (to), 0, TRUE, FALSE, FALSE)); + emitcode ("mov", "dptr,%s", aopGet (AOP (to), 0, TRUE, FALSE, NULL)); } else { /* we need to get it byte by byte */ - emitcode ("mov", "dpl,%s", aopGet (AOP (to), 0, FALSE, FALSE, TRUE)); - emitcode ("mov", "dph,%s", aopGet (AOP (to), 1, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpl,%s", aopGet (AOP (to), 0, FALSE, FALSE, NULL)); + emitcode ("mov", "dph,%s", aopGet (AOP (to), 1, FALSE, FALSE, NULL)); if (options.model == MODEL_FLAT24) { - emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, NULL)); } } _endLazyDPSEvaluation (); } } freeAsmop (to, NULL, ic, FALSE); - + _G.dptrInUse = _G.dptr1InUse = 1; aopOp (count, ic->next->next, FALSE,FALSE); lbl =newiTempLabel(NULL); lbl2 =newiTempLabel(NULL); /* now for the actual compare */ - emitcode("push","ar0"); if (AOP_TYPE(count) == AOP_LIT && (int)floatFromVal (AOP(count)->aopu.aop_lit) <= 256) { - emitcode (";","OH JOY auto increment with djnz (very fast)"); - emitcode ("mov", "dps,#!constbyte",0x21); /* Select DPTR2 & auto-toggle. */ - emitcode ("mov", "b,%s",aopGet(AOP(count),0,FALSE,FALSE,FALSE)); - emitcode ("","!tlabeldef",lbl->key+100); - if (fromc) { - emitcode ("clr","a"); - emitcode ("movc", "a,@a+dptr"); - } else - emitcode ("movx", "a,@dptr"); - emitcode ("mov","r0,a"); - emitcode ("movx", "a,@dptr"); - emitcode ("clr","c"); - emitcode ("subb","a,r0"); - emitcode ("jnz","!tlabel",lbl2->key+100); - emitcode ("inc", "dptr"); - emitcode ("inc", "dptr"); - emitcode ("djnz","b,!tlabel",lbl->key+100); - emitcode ("clr","a"); + emitcode ("mov", "b,%s",aopGet(AOP(count),0,FALSE,FALSE,NULL)); + if (fromc) + emitcode("lcall","__bi_memcmpc2x_s"); + else + emitcode("lcall","__bi_memcmpx2x_s"); + freeAsmop (count, NULL, ic, FALSE); + aopOp (IC_RESULT(ic), ic, FALSE,FALSE); + aopPut(AOP(IC_RESULT(ic)),"a",0); + freeAsmop (IC_RESULT(ic), NULL, ic, FALSE); } else { symbol *lbl1 = newiTempLabel(NULL); - + + emitcode("push","ar0"); emitcode (";"," Auto increment but no djnz"); - emitcode ("mov","_ap,%s",aopGet (AOP (count), 0, FALSE, TRUE, TRUE)); - emitcode ("mov","b,%s",aopGet (AOP (count), 1, FALSE, TRUE, TRUE)); + emitcode ("mov","_ap,%s",aopGet (AOP (count), 0, FALSE, TRUE, NULL)); + emitcode ("mov","b,%s",aopGet (AOP (count), 1, FALSE, TRUE, NULL)); + freeAsmop (count, NULL, ic, FALSE); emitcode ("mov", "dps,#!constbyte",0x21); /* Select DPTR2 & auto-toggle. */ emitcode ("","!tlabeldef",lbl->key+100); if (fromc) { @@ -11268,15 +11692,14 @@ static void genMemcmpX2X( iCode *ic, int nparms, operand **parms, int fromc) emitcode ("sjmp","!tlabel",lbl->key+100); emitcode ("","!tlabeldef",lbl1->key+100); emitcode ("clr","a"); + emitcode ("","!tlabeldef",lbl2->key+100); + aopOp (IC_RESULT(ic), ic, FALSE,FALSE); + aopPut(AOP(IC_RESULT(ic)),"a",0); + freeAsmop (IC_RESULT(ic), NULL, ic, FALSE); + emitcode("pop","ar0"); + emitcode ("mov", "dps,#0"); } - freeAsmop (count, NULL, ic, FALSE); - emitcode ("","!tlabeldef",lbl2->key+100); - aopOp (IC_RESULT(ic), ic, FALSE,FALSE); - aopPut(AOP(IC_RESULT(ic)),"a",0); - freeAsmop (IC_RESULT(ic), NULL, ic, FALSE); - emitcode("pop","ar0"); - emitcode ("mov", "dps,#0"); - + _G.dptrInUse = _G.dptr1InUse = 0; unsavermask(rsave); } @@ -11313,10 +11736,10 @@ static void genInp( iCode *ic, int nparms, operand **parms) aopOp (from, ic->next, FALSE, FALSE); /* get from into DPTR1 */ - emitcode ("mov", "dpl1,%s", aopGet (AOP (from), 0, FALSE, FALSE, TRUE)); - emitcode ("mov", "dph1,%s", aopGet (AOP (from), 1, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpl1,%s", aopGet (AOP (from), 0, FALSE, FALSE, NULL)); + emitcode ("mov", "dph1,%s", aopGet (AOP (from), 1, FALSE, FALSE, NULL)); if (options.model == MODEL_FLAT24) { - emitcode ("mov", "dpx1,%s", aopGet (AOP (from), 2, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpx1,%s", aopGet (AOP (from), 2, FALSE, FALSE, NULL)); } freeAsmop (from, NULL, ic, FALSE); @@ -11327,22 +11750,22 @@ static void genInp( iCode *ic, int nparms, operand **parms) if (AOP_TYPE (to) != AOP_STR) { /* if already in DPTR then we need to push */ if (AOP_TYPE(to) == AOP_DPTR) { - emitcode ("push", "%s", aopGet (AOP (to), 0, FALSE, TRUE, TRUE)); - emitcode ("push", "%s", aopGet (AOP (to), 1, FALSE, TRUE, TRUE)); + emitcode ("push", "%s", aopGet (AOP (to), 0, FALSE, TRUE, NULL)); + emitcode ("push", "%s", aopGet (AOP (to), 1, FALSE, TRUE, NULL)); if (options.model == MODEL_FLAT24) - emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, NULL)); emitcode ("pop", "dph"); emitcode ("pop", "dpl"); } else { _startLazyDPSEvaluation (); /* if this is remateriazable */ if (AOP_TYPE (to) == AOP_IMMD) { - emitcode ("mov", "dptr,%s", aopGet (AOP (to), 0, TRUE, FALSE, FALSE)); + emitcode ("mov", "dptr,%s", aopGet (AOP (to), 0, TRUE, FALSE, NULL)); } else { /* we need to get it byte by byte */ - emitcode ("mov", "dpl,%s", aopGet (AOP (to), 0, FALSE, FALSE, TRUE)); - emitcode ("mov", "dph,%s", aopGet (AOP (to), 1, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpl,%s", aopGet (AOP (to), 0, FALSE, FALSE, NULL)); + emitcode ("mov", "dph,%s", aopGet (AOP (to), 1, FALSE, FALSE, NULL)); if (options.model == MODEL_FLAT24) { - emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, NULL)); } } _endLazyDPSEvaluation (); @@ -11350,6 +11773,7 @@ static void genInp( iCode *ic, int nparms, operand **parms) } freeAsmop (to, NULL, ic, FALSE); + _G.dptrInUse = _G.dptr1InUse = 1; aopOp (count, ic->next->next, FALSE,FALSE); lbl =newiTempLabel(NULL); @@ -11358,7 +11782,8 @@ static void genInp( iCode *ic, int nparms, operand **parms) (int)floatFromVal (AOP(count)->aopu.aop_lit) <= 256) { emitcode (";","OH JOY auto increment with djnz (very fast)"); emitcode ("mov", "dps,#!constbyte",0x1); /* Select DPTR2 */ - emitcode ("mov", "b,%s",aopGet(AOP(count),0,FALSE,FALSE,FALSE)); + emitcode ("mov", "b,%s",aopGet(AOP(count),0,FALSE,FALSE,NULL)); + freeAsmop (count, NULL, ic, FALSE); emitcode ("","!tlabeldef",lbl->key+100); emitcode ("movx", "a,@dptr"); /* read data from port */ emitcode ("dec","dps"); /* switch to DPTR */ @@ -11370,8 +11795,9 @@ static void genInp( iCode *ic, int nparms, operand **parms) symbol *lbl1 = newiTempLabel(NULL); emitcode (";"," Auto increment but no djnz"); - emitcode ("mov","_ap,%s",aopGet (AOP (count), 0, FALSE, TRUE, TRUE)); - emitcode ("mov","b,%s",aopGet (AOP (count), 1, FALSE, TRUE, TRUE)); + emitcode ("mov","_ap,%s",aopGet (AOP (count), 0, FALSE, TRUE, NULL)); + emitcode ("mov","b,%s",aopGet (AOP (count), 1, FALSE, TRUE, NULL)); + freeAsmop (count, NULL, ic, FALSE); emitcode ("mov", "dps,#!constbyte",0x1); /* Select DPTR2 */ emitcode ("","!tlabeldef",lbl->key+100); emitcode ("movx", "a,@dptr"); @@ -11394,7 +11820,7 @@ static void genInp( iCode *ic, int nparms, operand **parms) emitcode ("","!tlabeldef",lbl1->key+100); } emitcode ("mov", "dps,#0"); - freeAsmop (count, NULL, ic, FALSE); + _G.dptrInUse = _G.dptr1InUse = 0; unsavermask(rsave); } @@ -11431,10 +11857,10 @@ static void genOutp( iCode *ic, int nparms, operand **parms) aopOp (from, ic->next, FALSE, FALSE); /* get from into DPTR1 */ - emitcode ("mov", "dpl1,%s", aopGet (AOP (from), 0, FALSE, FALSE, TRUE)); - emitcode ("mov", "dph1,%s", aopGet (AOP (from), 1, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpl1,%s", aopGet (AOP (from), 0, FALSE, FALSE, NULL)); + emitcode ("mov", "dph1,%s", aopGet (AOP (from), 1, FALSE, FALSE, NULL)); if (options.model == MODEL_FLAT24) { - emitcode ("mov", "dpx1,%s", aopGet (AOP (from), 2, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpx1,%s", aopGet (AOP (from), 2, FALSE, FALSE, NULL)); } freeAsmop (from, NULL, ic, FALSE); @@ -11445,22 +11871,22 @@ static void genOutp( iCode *ic, int nparms, operand **parms) if (AOP_TYPE (to) != AOP_STR) { /* if already in DPTR then we need to push */ if (AOP_TYPE(to) == AOP_DPTR) { - emitcode ("push", "%s", aopGet (AOP (to), 0, FALSE, TRUE, TRUE)); - emitcode ("push", "%s", aopGet (AOP (to), 1, FALSE, TRUE, TRUE)); + emitcode ("push", "%s", aopGet (AOP (to), 0, FALSE, TRUE, NULL)); + emitcode ("push", "%s", aopGet (AOP (to), 1, FALSE, TRUE, NULL)); if (options.model == MODEL_FLAT24) - emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, NULL)); emitcode ("pop", "dph"); emitcode ("pop", "dpl"); } else { _startLazyDPSEvaluation (); /* if this is remateriazable */ if (AOP_TYPE (to) == AOP_IMMD) { - emitcode ("mov", "dptr,%s", aopGet (AOP (to), 0, TRUE, FALSE, FALSE)); + emitcode ("mov", "dptr,%s", aopGet (AOP (to), 0, TRUE, FALSE, NULL)); } else { /* we need to get it byte by byte */ - emitcode ("mov", "dpl,%s", aopGet (AOP (to), 0, FALSE, FALSE, TRUE)); - emitcode ("mov", "dph,%s", aopGet (AOP (to), 1, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpl,%s", aopGet (AOP (to), 0, FALSE, FALSE, NULL)); + emitcode ("mov", "dph,%s", aopGet (AOP (to), 1, FALSE, FALSE, NULL)); if (options.model == MODEL_FLAT24) { - emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, NULL)); } } _endLazyDPSEvaluation (); @@ -11468,6 +11894,7 @@ static void genOutp( iCode *ic, int nparms, operand **parms) } freeAsmop (to, NULL, ic, FALSE); + _G.dptrInUse = _G.dptr1InUse = 1; aopOp (count, ic->next->next, FALSE,FALSE); lbl =newiTempLabel(NULL); @@ -11476,7 +11903,7 @@ static void genOutp( iCode *ic, int nparms, operand **parms) (int)floatFromVal (AOP(count)->aopu.aop_lit) <= 256) { emitcode (";","OH JOY auto increment with djnz (very fast)"); emitcode ("mov", "dps,#!constbyte",0x0); /* Select DPTR */ - emitcode ("mov", "b,%s",aopGet(AOP(count),0,FALSE,FALSE,FALSE)); + emitcode ("mov", "b,%s",aopGet(AOP(count),0,FALSE,FALSE,NULL)); emitcode ("","!tlabeldef",lbl->key+100); emitcode ("movx", "a,@dptr"); /* read data from port */ emitcode ("inc","dps"); /* switch to DPTR2 */ @@ -11484,23 +11911,21 @@ static void genOutp( iCode *ic, int nparms, operand **parms) emitcode ("inc", "dptr"); /* point to next area */ emitcode ("dec","dps"); /* switch to DPTR */ emitcode ("djnz","b,!tlabel",lbl->key+100); + freeAsmop (count, NULL, ic, FALSE); } else { symbol *lbl1 = newiTempLabel(NULL); emitcode (";"," Auto increment but no djnz"); - emitcode ("mov","_ap,%s",aopGet (AOP (count), 0, FALSE, TRUE, TRUE)); - emitcode ("mov","b,%s",aopGet (AOP (count), 1, FALSE, TRUE, TRUE)); + emitcode ("mov","_ap,%s",aopGet (AOP (count), 0, FALSE, TRUE, NULL)); + emitcode ("mov","b,%s",aopGet (AOP (count), 1, FALSE, TRUE, NULL)); + freeAsmop (count, NULL, ic, FALSE); emitcode ("mov", "dps,#!constbyte",0x0); /* Select DPTR */ emitcode ("","!tlabeldef",lbl->key+100); -/* emitcode ("push","acc"); */ emitcode ("movx", "a,@dptr"); emitcode ("inc", "dptr"); emitcode ("inc","dps"); /* switch to DPTR2 */ emitcode ("movx", "@dptr,a"); emitcode ("dec","dps"); /* switch to DPTR */ -/* emitcode ("pop","acc"); */ -/* emitcode ("djnz","acc,!tlabel",lbl->key+100); */ -/* emitcode ("djnz","b,!tlabel",lbl->key+100); */ emitcode ("mov","a,b"); emitcode ("orl","a,_ap"); emitcode ("jz","!tlabel",lbl1->key+100); @@ -11514,7 +11939,7 @@ static void genOutp( iCode *ic, int nparms, operand **parms) emitcode ("","!tlabeldef",lbl1->key+100); } emitcode ("mov", "dps,#0"); - freeAsmop (count, NULL, ic, FALSE); + _G.dptrInUse = _G.dptr1InUse = 0; unsavermask(rsave); } @@ -11534,9 +11959,9 @@ static void genSwapW(iCode *ic, int nparms, operand **parms) assert(getSize(operandType(src))==2); aopOp (src, ic, FALSE, FALSE); - emitcode ("mov","a,%s",aopGet(AOP(src),0,FALSE,FALSE,TRUE)); + emitcode ("mov","a,%s",aopGet(AOP(src),0,FALSE,FALSE,NULL)); _G.accInUse++; - emitcode ("mov","b,%s",aopGet(AOP(src),1,FALSE,FALSE,FALSE)); + MOVB(aopGet(AOP(src),1,FALSE,FALSE,"b")); _G.accInUse--; freeAsmop (src, NULL, ic, FALSE); @@ -11555,7 +11980,7 @@ static void genMemsetX(iCode *ic, int nparms, operand **parms) symbol *lbl; char *l; int i; - bitVect *rsave = NULL; + bitVect *rsave; /* we know it has to be 3 parameters */ assert (nparms == 3); @@ -11581,22 +12006,22 @@ static void genMemsetX(iCode *ic, int nparms, operand **parms) if (AOP_TYPE (to) != AOP_STR) { /* if already in DPTR then we need to push */ if (AOP_TYPE(to) == AOP_DPTR) { - emitcode ("push", "%s", aopGet (AOP (to), 0, FALSE, TRUE, TRUE)); - emitcode ("push", "%s", aopGet (AOP (to), 1, FALSE, TRUE, TRUE)); + emitcode ("push", "%s", aopGet (AOP (to), 0, FALSE, TRUE, NULL)); + emitcode ("push", "%s", aopGet (AOP (to), 1, FALSE, TRUE, NULL)); if (options.model == MODEL_FLAT24) - emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, NULL)); emitcode ("pop", "dph"); emitcode ("pop", "dpl"); } else { _startLazyDPSEvaluation (); /* if this is remateriazable */ if (AOP_TYPE (to) == AOP_IMMD) { - emitcode ("mov", "dptr,%s", aopGet (AOP (to), 0, TRUE, FALSE, FALSE)); + emitcode ("mov", "dptr,%s", aopGet (AOP (to), 0, TRUE, FALSE, NULL)); } else { /* we need to get it byte by byte */ - emitcode ("mov", "dpl,%s", aopGet (AOP (to), 0, FALSE, FALSE, TRUE)); - emitcode ("mov", "dph,%s", aopGet (AOP (to), 1, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpl,%s", aopGet (AOP (to), 0, FALSE, FALSE, NULL)); + emitcode ("mov", "dph,%s", aopGet (AOP (to), 1, FALSE, FALSE, NULL)); if (options.model == MODEL_FLAT24) { - emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, TRUE)); + emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, NULL)); } } _endLazyDPSEvaluation (); @@ -11610,8 +12035,8 @@ static void genMemsetX(iCode *ic, int nparms, operand **parms) /* now for the actual copy */ if (AOP_TYPE(count) == AOP_LIT && (int)floatFromVal (AOP(count)->aopu.aop_lit) <= 256) { - l = aopGet(AOP (val), 0, FALSE, FALSE, TRUE); - emitcode ("mov", "b,%s",aopGet(AOP(count),0,FALSE,FALSE,FALSE)); + l = aopGet(AOP (val), 0, FALSE, FALSE, NULL); + emitcode ("mov", "b,%s",aopGet(AOP(count),0,FALSE,FALSE,NULL)); MOVA(l); emitcode ("","!tlabeldef",lbl->key+100); emitcode ("movx", "@dptr,a"); @@ -11620,11 +12045,10 @@ static void genMemsetX(iCode *ic, int nparms, operand **parms) } else { symbol *lbl1 = newiTempLabel(NULL); - emitcode ("mov","_ap,%s",aopGet (AOP (count), 0, FALSE, TRUE, TRUE)); - emitcode ("mov","b,%s",aopGet (AOP (count), 1, FALSE, TRUE, TRUE)); + emitcode ("mov","_ap,%s",aopGet (AOP (count), 0, FALSE, TRUE, NULL)); + emitcode ("mov","b,%s",aopGet (AOP (count), 1, FALSE, TRUE, NULL)); emitcode ("","!tlabeldef",lbl->key+100); - l = aopGet(AOP (val), 0, FALSE, FALSE, TRUE); - MOVA(l); + MOVA (aopGet(AOP (val), 0, FALSE, FALSE, NULL)); emitcode ("movx", "@dptr,a"); emitcode ("inc", "dptr"); emitcode ("mov","a,b"); @@ -11659,7 +12083,7 @@ static void genNatLibLoadPrimitive(iCode *ic, int nparms, operand **parms,int si pnum = parms[0]; aopOp (pnum, ic, FALSE, FALSE); - emitcode ("mov","a,%s",aopGet(AOP(pnum),0,FALSE,FALSE,FALSE)); + emitcode ("mov","a,%s",aopGet(AOP(pnum),0,FALSE,FALSE,DP2_RESULT_REG)); freeAsmop (pnum, NULL, ic, FALSE); emitcode ("lcall","NatLib_LoadPrimitive"); aopOp (result=IC_RESULT(ic), ic, FALSE, FALSE); @@ -11669,7 +12093,8 @@ static void genNatLibLoadPrimitive(iCode *ic, int nparms, operand **parms,int si emitcode ("push","a%s",javaRet[i]); } for (i=0; i < size ; i++ ) { - emitcode ("pop","a%s",aopGet(AOP(result),i,FALSE,FALSE,FALSE)); + emitcode ("pop","a%s", + aopGet(AOP(result),i,FALSE,FALSE,DP2_RESULT_REG)); } } else { for (i = 0 ; i < size ; i++ ) { @@ -11697,7 +12122,7 @@ static void genNatLibLoadPointer(iCode *ic, int nparms, operand **parms) pnum = parms[0]; aopOp (pnum, ic, FALSE, FALSE); - emitcode ("mov","a,%s",aopGet(AOP(pnum),0,FALSE,FALSE,FALSE)); + emitcode ("mov","a,%s",aopGet(AOP(pnum),0,FALSE,FALSE,DP2_RESULT_REG)); freeAsmop (pnum, NULL, ic, FALSE); emitcode ("lcall","NatLib_LoadPointer"); aopOp (result=IC_RESULT(ic), ic, FALSE, FALSE); @@ -11730,12 +12155,13 @@ static void genNatLibInstallStateBlock(iCode *ic, int nparms, aopOp (psb, ic, FALSE, FALSE); if (AOP_TYPE (psb) == AOP_IMMD) { emitcode ("mov","dps,#1"); - emitcode ("mov", "dptr,%s", aopGet (AOP (psb), 0, TRUE, FALSE, FALSE)); + emitcode ("mov", "dptr,%s", + aopGet (AOP (psb), 0, TRUE, FALSE, DP2_RESULT_REG)); emitcode ("mov","dps,#0"); } else { - emitcode ("mov","dpl1,%s",aopGet(AOP(psb),0,FALSE,FALSE,FALSE)); - emitcode ("mov","dph1,%s",aopGet(AOP(psb),1,FALSE,FALSE,FALSE)); - emitcode ("mov","dpx1,%s",aopGet(AOP(psb),2,FALSE,FALSE,FALSE)); + emitcode ("mov","dpl1,%s",aopGet(AOP(psb),0,FALSE,FALSE,DP2_RESULT_REG)); + emitcode ("mov","dph1,%s",aopGet(AOP(psb),1,FALSE,FALSE,DP2_RESULT_REG)); + emitcode ("mov","dpx1,%s",aopGet(AOP(psb),2,FALSE,FALSE,DP2_RESULT_REG)); } freeAsmop (psb, NULL, ic, FALSE); @@ -11745,13 +12171,13 @@ static void genNatLibInstallStateBlock(iCode *ic, int nparms, /* put handle into r3:r2 */ aopOp (handle, ic, FALSE, FALSE); if (aopHasRegs(AOP(handle),R2_IDX,R3_IDX)) { - emitcode ("push","%s",aopGet(AOP(handle),0,FALSE,TRUE,FALSE)); - emitcode ("push","%s",aopGet(AOP(handle),1,FALSE,TRUE,FALSE)); + emitcode ("push","%s",aopGet(AOP(handle),0,FALSE,TRUE,DP2_RESULT_REG)); + emitcode ("push","%s",aopGet(AOP(handle),1,FALSE,TRUE,DP2_RESULT_REG)); emitcode ("pop","ar3"); emitcode ("pop","ar2"); } else { - emitcode ("mov","r2,%s",aopGet(AOP(handle),0,FALSE,TRUE,FALSE)); - emitcode ("mov","r3,%s",aopGet(AOP(handle),1,FALSE,TRUE,FALSE)); + emitcode ("mov","r2,%s",aopGet(AOP(handle),0,FALSE,TRUE,DP2_RESULT_REG)); + emitcode ("mov","r3,%s",aopGet(AOP(handle),1,FALSE,TRUE,DP2_RESULT_REG)); } freeAsmop (psb, NULL, ic, FALSE); @@ -11812,8 +12238,10 @@ static void genNatLibGetStateBlock(iCode *ic,int nparms, if (aopHasRegs(AOP(IC_RESULT(ic)),R2_IDX,R3_IDX)) { emitcode ("push","ar3"); emitcode ("push","ar2"); - emitcode ("pop","%s",aopGet(AOP(IC_RESULT(ic)),0,FALSE,TRUE,FALSE)); - emitcode ("pop","%s",aopGet(AOP(IC_RESULT(ic)),1,FALSE,TRUE,FALSE)); + emitcode ("pop","%s", + aopGet(AOP(IC_RESULT(ic)),0,FALSE,TRUE,DP2_RESULT_REG)); + emitcode ("pop","%s", + aopGet(AOP(IC_RESULT(ic)),1,FALSE,TRUE,DP2_RESULT_REG)); } else { aopPut(AOP(IC_RESULT(ic)),"r2",0); aopPut(AOP(IC_RESULT(ic)),"r3",1); @@ -11844,19 +12272,19 @@ static void genMMMalloc (iCode *ic,int nparms, operand **parms, /* put the size in R4-R2 */ if (aopHasRegs(AOP(bsize),R2_IDX, (size==3 ? R4_IDX: R3_IDX))) { - emitcode("push","%s",aopGet(AOP(bsize),0,FALSE,TRUE,FALSE)); - emitcode("push","%s",aopGet(AOP(bsize),1,FALSE,TRUE,FALSE)); + emitcode("push","%s",aopGet(AOP(bsize),0,FALSE,TRUE,DP2_RESULT_REG)); + emitcode("push","%s",aopGet(AOP(bsize),1,FALSE,TRUE,DP2_RESULT_REG)); if (size==3) { - emitcode("push","%s",aopGet(AOP(bsize),2,FALSE,TRUE,FALSE)); + emitcode("push","%s",aopGet(AOP(bsize),2,FALSE,TRUE,DP2_RESULT_REG)); emitcode("pop","ar4"); } emitcode("pop","ar3"); emitcode("pop","ar2"); } else { - emitcode ("mov","r2,%s",aopGet(AOP(bsize),0,FALSE,TRUE,FALSE)); - emitcode ("mov","r3,%s",aopGet(AOP(bsize),1,FALSE,TRUE,FALSE)); + emitcode ("mov","r2,%s",aopGet(AOP(bsize),0,FALSE,TRUE,DP2_RESULT_REG)); + emitcode ("mov","r3,%s",aopGet(AOP(bsize),1,FALSE,TRUE,DP2_RESULT_REG)); if (size==3) { - emitcode("mov","r4,%s",aopGet(AOP(bsize),2,FALSE,TRUE,FALSE)); + emitcode("mov","r4,%s",aopGet(AOP(bsize),2,FALSE,TRUE,DP2_RESULT_REG)); } } freeAsmop (bsize, NULL, ic, FALSE); @@ -11874,8 +12302,10 @@ static void genMMMalloc (iCode *ic,int nparms, operand **parms, if (aopHasRegs(AOP(IC_RESULT(ic)),R2_IDX,R3_IDX)) { emitcode ("push","ar3"); emitcode ("push","ar2"); - emitcode ("pop","%s",aopGet(AOP(IC_RESULT(ic)),0,FALSE,TRUE,FALSE)); - emitcode ("pop","%s",aopGet(AOP(IC_RESULT(ic)),1,FALSE,TRUE,FALSE)); + emitcode ("pop","%s", + aopGet(AOP(IC_RESULT(ic)),0,FALSE,TRUE,DP2_RESULT_REG)); + emitcode ("pop","%s", + aopGet(AOP(IC_RESULT(ic)),1,FALSE,TRUE,DP2_RESULT_REG)); } else { aopPut(AOP(IC_RESULT(ic)),"r2",0); aopPut(AOP(IC_RESULT(ic)),"r3",1); @@ -11903,13 +12333,17 @@ static void genMMDeref (iCode *ic,int nparms, operand **parms) /* put the size in R4-R2 */ if (aopHasRegs(AOP(handle),R2_IDX,R3_IDX)) { - emitcode("push","%s",aopGet(AOP(handle),0,FALSE,TRUE,FALSE)); - emitcode("push","%s",aopGet(AOP(handle),1,FALSE,TRUE,FALSE)); + emitcode("push","%s", + aopGet(AOP(handle),0,FALSE,TRUE,DP2_RESULT_REG)); + emitcode("push","%s", + aopGet(AOP(handle),1,FALSE,TRUE,DP2_RESULT_REG)); emitcode("pop","ar3"); emitcode("pop","ar2"); } else { - emitcode ("mov","r2,%s",aopGet(AOP(handle),0,FALSE,TRUE,FALSE)); - emitcode ("mov","r3,%s",aopGet(AOP(handle),1,FALSE,TRUE,FALSE)); + emitcode ("mov","r2,%s", + aopGet(AOP(handle),0,FALSE,TRUE,DP2_RESULT_REG)); + emitcode ("mov","r3,%s", + aopGet(AOP(handle),1,FALSE,TRUE,DP2_RESULT_REG)); } freeAsmop (handle, NULL, ic, FALSE); @@ -11921,9 +12355,14 @@ static void genMMDeref (iCode *ic,int nparms, operand **parms) if (rsym->liveFrom != rsym->liveTo) { aopOp (IC_RESULT(ic),ic,FALSE,FALSE); if (AOP_TYPE(IC_RESULT(ic)) != AOP_STR) { + _startLazyDPSEvaluation (); + aopPut(AOP(IC_RESULT(ic)),"dpl",0); aopPut(AOP(IC_RESULT(ic)),"dph",1); aopPut(AOP(IC_RESULT(ic)),"dpx",2); + + _endLazyDPSEvaluation (); + } } } @@ -11949,13 +12388,17 @@ static void genMMUnrestrictedPersist(iCode *ic,int nparms, operand **parms) /* put the size in R3-R2 */ if (aopHasRegs(AOP(handle),R2_IDX,R3_IDX)) { - emitcode("push","%s",aopGet(AOP(handle),0,FALSE,TRUE,FALSE)); - emitcode("push","%s",aopGet(AOP(handle),1,FALSE,TRUE,FALSE)); + emitcode("push","%s", + aopGet(AOP(handle),0,FALSE,TRUE,DP2_RESULT_REG)); + emitcode("push","%s", + aopGet(AOP(handle),1,FALSE,TRUE,DP2_RESULT_REG)); emitcode("pop","ar3"); emitcode("pop","ar2"); } else { - emitcode ("mov","r2,%s",aopGet(AOP(handle),0,FALSE,TRUE,FALSE)); - emitcode ("mov","r3,%s",aopGet(AOP(handle),1,FALSE,TRUE,FALSE)); + emitcode ("mov","r2,%s", + aopGet(AOP(handle),0,FALSE,TRUE,DP2_RESULT_REG)); + emitcode ("mov","r3,%s", + aopGet(AOP(handle),1,FALSE,TRUE,DP2_RESULT_REG)); } freeAsmop (handle, NULL, ic, FALSE); @@ -11992,24 +12435,29 @@ static void genSystemExecJavaProcess(iCode *ic,int nparms, operand **parms) /* put the handle in R3-R2 */ aopOp (handle,ic,FALSE,FALSE); if (aopHasRegs(AOP(handle),R2_IDX,R3_IDX)) { - emitcode("push","%s",aopGet(AOP(handle),0,FALSE,TRUE,FALSE)); - emitcode("push","%s",aopGet(AOP(handle),1,FALSE,TRUE,FALSE)); + emitcode("push","%s", + aopGet(AOP(handle),0,FALSE,TRUE,DP2_RESULT_REG)); + emitcode("push","%s", + aopGet(AOP(handle),1,FALSE,TRUE,DP2_RESULT_REG)); emitcode("pop","ar3"); emitcode("pop","ar2"); } else { - emitcode ("mov","r2,%s",aopGet(AOP(handle),0,FALSE,TRUE,FALSE)); - emitcode ("mov","r3,%s",aopGet(AOP(handle),1,FALSE,TRUE,FALSE)); + emitcode ("mov","r2,%s", + aopGet(AOP(handle),0,FALSE,TRUE,DP2_RESULT_REG)); + emitcode ("mov","r3,%s", + aopGet(AOP(handle),1,FALSE,TRUE,DP2_RESULT_REG)); } freeAsmop (handle, NULL, ic, FALSE); /* put pointer in DPTR */ aopOp (pp,ic,FALSE,FALSE); if (AOP_TYPE(pp) == AOP_IMMD) { - emitcode ("mov", "dptr,%s", aopGet (AOP (pp), 0, TRUE, FALSE, FALSE)); + emitcode ("mov", "dptr,%s", + aopGet (AOP (pp), 0, TRUE, FALSE, NULL)); } else if (AOP_TYPE(pp) != AOP_STR) { /* not already in dptr */ - emitcode ("mov","dpl,%s",aopGet(AOP(pp),0,FALSE,FALSE,FALSE)); - emitcode ("mov","dph,%s",aopGet(AOP(pp),1,FALSE,FALSE,FALSE)); - emitcode ("mov","dpx,%s",aopGet(AOP(pp),2,FALSE,FALSE,FALSE)); + emitcode ("mov","dpl,%s",aopGet(AOP(pp),0,FALSE,FALSE,NULL)); + emitcode ("mov","dph,%s",aopGet(AOP(pp),1,FALSE,FALSE,NULL)); + emitcode ("mov","dpx,%s",aopGet(AOP(pp),2,FALSE,FALSE,NULL)); } freeAsmop (handle, NULL, ic, FALSE); @@ -12048,12 +12496,16 @@ static void genSystemRTCRegisters(iCode *ic,int nparms, operand **parms, aopOp (pp,ic,FALSE,FALSE); if (AOP_TYPE (pp) == AOP_IMMD) { emitcode ("mov","dps,#1"); - emitcode ("mov", "dptr,%s", aopGet (AOP (pp), 0, TRUE, FALSE, FALSE)); + emitcode ("mov", "dptr,%s", + aopGet (AOP (pp), 0, TRUE, FALSE, NULL)); emitcode ("mov","dps,#0"); } else { - emitcode ("mov","dpl1,%s",aopGet(AOP(pp),0,FALSE,FALSE,FALSE)); - emitcode ("mov","dph1,%s",aopGet(AOP(pp),1,FALSE,FALSE,FALSE)); - emitcode ("mov","dpx1,%s",aopGet(AOP(pp),2,FALSE,FALSE,FALSE)); + emitcode ("mov","dpl1,%s", + aopGet(AOP(pp),0,FALSE,FALSE,DP2_RESULT_REG)); + emitcode ("mov","dph1,%s", + aopGet(AOP(pp),1,FALSE,FALSE,DP2_RESULT_REG)); + emitcode ("mov","dpx1,%s", + aopGet(AOP(pp),2,FALSE,FALSE,DP2_RESULT_REG)); } freeAsmop (pp, NULL, ic, FALSE); @@ -12080,26 +12532,35 @@ static void genSystemThreadSleep(iCode *ic,int nparms, operand **parms, char *na aopOp(to,ic,FALSE,FALSE); if (aopHasRegs(AOP(to),R2_IDX,R3_IDX) || aopHasRegs(AOP(to),R0_IDX,R1_IDX) ) { - emitcode ("push","%s",aopGet(AOP(to),0,FALSE,TRUE,FALSE)); - emitcode ("push","%s",aopGet(AOP(to),1,FALSE,TRUE,FALSE)); - emitcode ("push","%s",aopGet(AOP(to),2,FALSE,TRUE,FALSE)); - emitcode ("push","%s",aopGet(AOP(to),3,FALSE,TRUE,FALSE)); + emitcode ("push","%s", + aopGet(AOP(to),0,FALSE,TRUE,DP2_RESULT_REG)); + emitcode ("push","%s", + aopGet(AOP(to),1,FALSE,TRUE,DP2_RESULT_REG)); + emitcode ("push","%s", + aopGet(AOP(to),2,FALSE,TRUE,DP2_RESULT_REG)); + emitcode ("push","%s", + aopGet(AOP(to),3,FALSE,TRUE,DP2_RESULT_REG)); emitcode ("pop","ar3"); emitcode ("pop","ar2"); emitcode ("pop","ar1"); emitcode ("pop","ar0"); } else { - emitcode ("mov","r0,%s",aopGet(AOP(to),0,FALSE,TRUE,FALSE)); - emitcode ("mov","r1,%s",aopGet(AOP(to),1,FALSE,TRUE,FALSE)); - emitcode ("mov","r2,%s",aopGet(AOP(to),2,FALSE,TRUE,FALSE)); - emitcode ("mov","r3,%s",aopGet(AOP(to),3,FALSE,TRUE,FALSE)); + emitcode ("mov","r0,%s", + aopGet(AOP(to),0,FALSE,TRUE,DP2_RESULT_REG)); + emitcode ("mov","r1,%s", + aopGet(AOP(to),1,FALSE,TRUE,DP2_RESULT_REG)); + emitcode ("mov","r2,%s", + aopGet(AOP(to),2,FALSE,TRUE,DP2_RESULT_REG)); + emitcode ("mov","r3,%s", + aopGet(AOP(to),3,FALSE,TRUE,DP2_RESULT_REG)); } freeAsmop (to, NULL, ic, FALSE); /* suspend in acc */ s = parms[1]; aopOp(s,ic,FALSE,FALSE); - emitcode ("mov","a,%s",aopGet(AOP(s),0,FALSE,TRUE,FALSE)); + emitcode ("mov","a,%s", + aopGet(AOP(s),0,FALSE,TRUE,NULL)); freeAsmop (s, NULL, ic, FALSE); /* make the call */ @@ -12126,12 +12587,14 @@ static void genSystemThreadResume(iCode *ic,int nparms, operand **parms) /* PID in R0 */ aopOp(pid,ic,FALSE,FALSE); - emitcode ("mov","r0,%s",aopGet(AOP(pid),0,FALSE,TRUE,FALSE)); + emitcode ("mov","r0,%s", + aopGet(AOP(pid),0,FALSE,TRUE,DP2_RESULT_REG)); freeAsmop (pid, NULL, ic, FALSE); /* tid into ACC */ aopOp(tid,ic,FALSE,FALSE); - emitcode ("mov","a,%s",aopGet(AOP(tid),0,FALSE,TRUE,FALSE)); + emitcode ("mov","a,%s", + aopGet(AOP(tid),0,FALSE,TRUE,DP2_RESULT_REG)); freeAsmop (tid, NULL, ic, FALSE); emitcode ("lcall","System_ThreadResume"); @@ -12165,7 +12628,8 @@ static void genSystemProcessResume(iCode *ic,int nparms, operand **parms) /* pid into ACC */ aopOp(pid,ic,FALSE,FALSE); - emitcode ("mov","a,%s",aopGet(AOP(pid),0,FALSE,TRUE,FALSE)); + emitcode ("mov","a,%s", + aopGet(AOP(pid),0,FALSE,TRUE,DP2_RESULT_REG)); freeAsmop (pid, NULL, ic, FALSE); emitcode ("lcall","System_ProcessResume"); @@ -12199,11 +12663,15 @@ static void genSystemPoll(iCode *ic,int nparms, operand **parms,char *name) fp = parms[0]; aopOp (fp,ic,FALSE,FALSE); if (AOP_TYPE (fp) == AOP_IMMD) { - emitcode ("mov", "dptr,%s", aopGet (AOP (fp), 0, TRUE, FALSE, FALSE)); + emitcode ("mov", "dptr,%s", + aopGet (AOP (fp), 0, TRUE, FALSE, DP2_RESULT_REG)); } else if (AOP_TYPE(fp) != AOP_STR) { /* not already in dptr */ - emitcode ("mov","dpl,%s",aopGet(AOP(fp),0,FALSE,FALSE,FALSE)); - emitcode ("mov","dph,%s",aopGet(AOP(fp),1,FALSE,FALSE,FALSE)); - emitcode ("mov","dpx,%s",aopGet(AOP(fp),2,FALSE,FALSE,FALSE)); + emitcode ("mov","dpl,%s", + aopGet(AOP(fp),0,FALSE,FALSE,DP2_RESULT_REG)); + emitcode ("mov","dph,%s", + aopGet(AOP(fp),1,FALSE,FALSE,DP2_RESULT_REG)); + emitcode ("mov","dpx,%s", + aopGet(AOP(fp),2,FALSE,FALSE,DP2_RESULT_REG)); } freeAsmop (fp, NULL, ic, FALSE); @@ -12240,6 +12708,127 @@ static void genSystemGetCurrentID(iCode *ic,int nparms, operand **parms,char *na } } +/*-----------------------------------------------------------------*/ +/* 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, FALSE); + + /* if the result is a bit */ + if (AOP_TYPE (op) == AOP_CRY) + emitcode ("mov", "c,%s", AOP (op)->aopu.aop_dir); + else + { + /* bit variables done */ + /* general case */ + size = AOP_SIZE (op); + offset = 0; + while (size--) + { + MOVA (aopGet (AOP (op), offset, FALSE, FALSE, FALSE)); + offset++; + } + } + + freeAsmop (op, NULL, ic, TRUE); + } + + op = IC_LEFT (ic); + if (op && IS_SYMOP (op)) + { + aopOp (op, ic, FALSE, FALSE); + + /* if the result is a bit */ + if (AOP_TYPE (op) == AOP_CRY) + emitcode ("mov", "c,%s", AOP (op)->aopu.aop_dir); + else + { + /* bit variables done */ + /* general case */ + size = AOP_SIZE (op); + offset = 0; + while (size--) + { + MOVA (aopGet (AOP (op), offset, FALSE, 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, FALSE); + + 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, 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, FALSE)); + emitcode ("rrc", "a"); + emitcode ("mov", "ea,c"); + } + freeAsmop (IC_RIGHT (ic), NULL, ic, TRUE); + } + else + { + emitcode ("pop", "psw"); /* restore ea via c in psw on top of stack */ + emitcode ("mov", "ea,c"); + } +} + + + /*-----------------------------------------------------------------*/ /* genBuiltIn - calls the appropriate function to generating code */ /* for a built in function */ @@ -12374,13 +12963,13 @@ gen390Code (iCode * lic) } #if 1 /* print the allocation information */ - if (allocInfo) + if (allocInfo && currFunc) printAllocInfo (currFunc, codeOutFile); #endif /* 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); @@ -12408,10 +12997,15 @@ gen390Code (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 ("", ";\t%s:%d: %s", ic->filename, ic->lineno, + printCLine(ic->filename, ic->lineno)); + } cln = ic->lineno; } + if (options.iCodeInAsm) { + emitcode("", ";ic:%d: %s", ic->key, printILine(ic)); + } /* if the result is marked as spilt and rematerializable or code for this has already been generated then @@ -12604,9 +13198,27 @@ gen390Code (iCode * lic) else 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; + +#if 0 // obsolete, and buggy for != xdata case ARRAYINIT: genArrayInit(ic); break; +#endif default: ic = ic;