X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fds390%2Fgen.c;h=d32a3894a78fac776aeecab4cc8dd74280fe309f;hb=3062f96ccb55d1d05caf9c8782f4961f87b341ce;hp=1aa6a2fe9f401337467462bd97e9bb3c3b51e569;hpb=97b7ce8c891ead3f66c6cc7e61314dfabcf46a17;p=fw%2Fsdcc diff --git a/src/ds390/gen.c b/src/ds390/gen.c index 1aa6a2fe..d32a3894 100644 --- a/src/ds390/gen.c +++ b/src/ds390/gen.c @@ -25,33 +25,21 @@ what you give them. Help stamp out software-hoarding! -------------------------------------------------------------------------*/ +//#define D(x) +#define D(x) x + #include #include #include #include - -#include -#include "ralloc.h" -#include "gen.h" #include "SDCCglobl.h" #include "newalloc.h" +#include "dbuf_string.h" -#ifdef HAVE_SYS_ISA_DEFS_H -#include -#else -#ifdef HAVE_MACHINE_ENDIAN_H -#include -#else -#ifdef HAVE_ENDIAN_H -#include -#else -#if !defined(__BORLANDC__) && !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(__CYGWIN__) -#warning "Cannot determine ENDIANESS of this machine assuming LITTLE_ENDIAN" -#warning "If you running sdcc on an INTEL 80x86 Platform you are okay" -#endif -#endif -#endif -#endif +#include "common.h" +#include "main.h" +#include "ralloc.h" +#include "gen.h" #define BETTER_LITERAL_SHIFT @@ -67,12 +55,10 @@ static char *zero = "#0"; static char *one = "#1"; static char *spname; -#define D(x) x - #define TR_DPTR(s) if (options.model != MODEL_FLAT24) { emitcode(";", " Use_DPTR1 %s ", s); } #define TR_AP(s) if (options.model != MODEL_FLAT24) { emitcode(";", " Use_AP %s ", s); } -unsigned fReturnSizeDS390 = 5; /* shared with ralloc.c */ +unsigned fReturnSizeDS390 = 5; static char *fReturn24[] = {"dpl", "dph", "dpx", "b", "a"}; static char *fReturn16[] = @@ -84,21 +70,91 @@ static char *dptrn[2][3]; static char *javaRet[] = { "r0","r1","r2","r3"}; static short rbank = -1; +#define REG_WITH_INDEX ds390_regWithIdx + +#define AOP(op) op->aop +#define AOP_TYPE(op) AOP(op)->type +#define AOP_SIZE(op) AOP(op)->size +#define IS_AOP_PREG(x) (AOP(x) && (AOP_TYPE(x) == AOP_R1 || \ + AOP_TYPE(x) == AOP_R0)) + +#define AOP_NEEDSACC(x) (AOP(x) && (AOP_TYPE(x) == AOP_CRY || \ + AOP_TYPE(x) == AOP_DPTR || AOP_TYPE(x) == AOP_DPTR2 || \ + AOP(x)->paged)) + +#define AOP_INPREG(x) (x && (x->type == AOP_REG && \ + (x->aopu.aop_reg[0] == REG_WITH_INDEX(R0_IDX) || \ + x->aopu.aop_reg[0] == REG_WITH_INDEX(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_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. + * + * Will be fixed in B4 rev of processor, Dallas claims. + */ + +#define LOAD_AB_FOR_DIV(LEFT, RIGHT, L) \ + if (!AOP_NEEDSACC(RIGHT)) \ + { \ + /* We can load A first, then B, since \ + * B (the RIGHT operand) won't clobber A, \ + * thus avoiding touching A right before the div. \ + */ \ + D(emitcode(";", "DS80C390 div bug: rearranged ops.");); \ + L = aopGet(LEFT,0,FALSE,FALSE,NULL); \ + MOVA(L); \ + L = aopGet(RIGHT,0,FALSE,FALSE,"b"); \ + MOVB(L); \ + } \ + else \ + { \ + /* Just stuff in a nop after loading A. */ \ + emitcode("mov","b,%s",aopGet(RIGHT,0,FALSE,FALSE,NULL));\ + L = aopGet(LEFT,0,FALSE,FALSE,NULL); \ + MOVA(L); \ + emitcode("nop", "; workaround for DS80C390 div bug."); \ + } + +#define R0INB _G.bu.bs.r0InB +#define R1INB _G.bu.bs.r1InB +#define OPINB _G.bu.bs.OpInB +#define BINUSE _G.bu.BInUse + static struct { short r0Pushed; short r1Pushed; + union + { + struct + { + short r0InB : 2;//2 so we can see it overflow + short r1InB : 2;//2 so we can see it overflow + short OpInB : 2;//2 so we can see it overflow + } bs; + short BInUse; + } bu; short accInUse; - short bInUse; short inLine; short debugLine; short nRegsSaved; + short dptrInUse; + short dptr1InUse; set *sendSet; + iCode *current_iCode; + symbol *currentFunc; } _G; static char *rb1regs[] = { - "b1_0","b1_1","b1_2","b1_3","b1_4","b1_5","b1_6","b1_7" + "b1_0","b1_1","b1_2","b1_3","b1_4","b1_5","b1_6","b1_7", + "b0", "b1", "b2", "b3", "b4", "b5", "b6", "b7" }; static void saveRBank (int, iCode *, bool); @@ -107,20 +163,15 @@ 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) /* use function to avoid multiple eval */ +#define MOVB(x) movb(x) + #define CLRC emitcode("clr","c") #define SETC emitcode("setb","c") // A scratch register which will be used to hold // result bytes from operands in far space via DPTR2. -#define DP2_RESULT_REG "_ap" +#define DP2_RESULT_REG "_ap" static lineNode *lineHead = NULL; static lineNode *lineCurr = NULL; @@ -136,54 +187,208 @@ static unsigned char SRMask[] = #define MSB16 1 #define MSB24 2 #define MSB32 3 -#define PROTECT_SP {if (options.protect_sp_update) { \ - symbol *lbl = newiTempLabel(NULL); \ - emitcode ("setb","F1"); \ - emitcode ("jbc","EA,!tlabel",lbl->key+100); \ - emitcode ("clr","F1"); \ - emitcode ("","!tlabeldef",lbl->key+100); \ - }} -#define UNPROTECT_SP { if (options.protect_sp_update) { \ - symbol *lbl = newiTempLabel(NULL); \ - emitcode ("jnb","F1,!tlabel",lbl->key+100); \ - emitcode ("setb","EA"); \ - emitcode ("","!tlabeldef",lbl->key+100); \ - }} - +#define PROTECT_SP {if (options.protect_sp_update) { \ + symbol *lbl = newiTempLabel(NULL); \ + emitcode ("setb","F1"); \ + emitcode ("jbc","EA,!tlabel",lbl->key+100); \ + emitcode ("clr","F1"); \ + emitLabel (lbl); \ + }} +#define UNPROTECT_SP { if (options.protect_sp_update) { \ + emitcode ("mov","EA,F1"); \ + }} + +static int _currentDPS; /* Current processor DPS. */ +static int _desiredDPS; /* DPS value compiler thinks we should be using. */ +static int _lazyDPS = 0; /* if non-zero, we are doing lazy evaluation of DPS changes. */ /*-----------------------------------------------------------------*/ /* emitcode - writes the code into a file : for now it is simple */ /*-----------------------------------------------------------------*/ static void -emitcode (char *inst, char *fmt,...) +emitcode (const char *inst, const char *fmt,...) { va_list ap; - char lb[INITIAL_INLINEASM]; - char *lbp = lb; + struct dbuf_s dbuf; + const char *lbp, *lb; + + dbuf_init (&dbuf, INITIAL_INLINEASM); va_start (ap, fmt); if (inst && *inst) { + dbuf_append_str (&dbuf, inst); + if (fmt && *fmt) - sprintf (lb, "%s\t", inst); - else - sprintf (lb, "%s", inst); - tvsprintf (lb + (strlen (lb)), fmt, ap); + { + dbuf_append_char (&dbuf, '\t'); + dbuf_tvprintf (&dbuf, fmt, ap); + } } else - tvsprintf (lb, fmt, ap); + { + dbuf_tvprintf (&dbuf, fmt, ap); + } - while (isspace (*lbp)) - lbp++; + lbp = lb = dbuf_c_str(&dbuf); + + while (isspace ((unsigned char)*lbp)) + { + lbp++; + } if (lbp && *lbp) - lineCurr = (lineCurr ? - connectLine (lineCurr, newLineNode (lb)) : - (lineHead = newLineNode (lb))); + { + lineCurr = (lineCurr ? + connectLine (lineCurr, newLineNode (lb)) : + (lineHead = newLineNode (lb))); + } + lineCurr->isInline = _G.inLine; lineCurr->isDebug = _G.debugLine; + lineCurr->ic = _G.current_iCode; + lineCurr->aln = ds390newAsmLineNode(_currentDPS); + lineCurr->isComment = (*lbp == ';'); va_end (ap); + + dbuf_destroy(&dbuf); +} + +static void +emitLabel (symbol *tlbl) +{ + emitcode ("", "!tlabeldef", tlbl->key + 100); + lineCurr->isLabel = 1; +} + +/*-----------------------------------------------------------------*/ +/* ds390_emitDebuggerSymbol - associate the current code location */ +/* with a debugger symbol */ +/*-----------------------------------------------------------------*/ +void +ds390_emitDebuggerSymbol (char * debugSym) +{ + _G.debugLine = 1; + emitcode ("", "%s ==.", debugSym); + _G.debugLine = 0; +} + +/*-----------------------------------------------------------------*/ +/* mova - moves specified value into accumulator */ +/*-----------------------------------------------------------------*/ +static void +mova (const char *x) +{ + /* do some early peephole optimization */ + if (!strncmp(x, "a", 2) || !strncmp(x, "acc", 4)) + return; + + emitcode("mov", "a,%s", x); +} + +/*-----------------------------------------------------------------*/ +/* movb - moves specified value into register b */ +/*-----------------------------------------------------------------*/ +static void +movb (const char *x) +{ + /* do some early peephole optimization */ + if (!strncmp(x, "b", 2)) + return; + + emitcode("mov","b,%s", x); +} + +/*-----------------------------------------------------------------*/ +/* movc - moves specified value into the carry */ +/*-----------------------------------------------------------------*/ +static void +movc (const char *s) +{ + if (s == zero) + CLRC; + else if (s == one) + SETC; + else if (strcmp (s, "c")) + {/* it's not in carry already */ + MOVA (s); + /* set C, if a >= 1 */ + emitcode ("add", "a,#0xff"); + } +} + +/*-----------------------------------------------------------------*/ +/* pushB - saves register B if necessary */ +/*-----------------------------------------------------------------*/ +static bool +pushB (void) +{ + bool pushedB = FALSE; + + if (BINUSE) + { + emitcode ("push", "b"); +// printf("B was in use !\n"); + pushedB = TRUE; + } + else + { + OPINB++; + } + return pushedB; +} + +/*-----------------------------------------------------------------*/ +/* popB - restores value of register B if necessary */ +/*-----------------------------------------------------------------*/ +static void +popB (bool pushedB) +{ + if (pushedB) + { + emitcode ("pop", "b"); + } + else + { + OPINB--; + } +} + +/*-----------------------------------------------------------------*/ +/* pushReg - saves register */ +/*-----------------------------------------------------------------*/ +static bool +pushReg (int index, bool bits_pushed) +{ + regs * reg = REG_WITH_INDEX (index); + if (reg->type == REG_BIT) + { + if (!bits_pushed) + emitcode ("push", "%s", reg->base); + return TRUE; + } + else + emitcode ("push", "%s", reg->dname); + return bits_pushed; +} + +/*-----------------------------------------------------------------*/ +/* popReg - restores register */ +/*-----------------------------------------------------------------*/ +static bool +popReg (int index, bool bits_popped) +{ + regs * reg = REG_WITH_INDEX (index); + if (reg->type == REG_BIT) + { + if (!bits_popped) + emitcode ("pop", "%s", reg->base); + return TRUE; + } + else + emitcode ("pop", "%s", reg->dname); + return bits_popped; } /*-----------------------------------------------------------------*/ @@ -192,8 +397,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 */ @@ -215,7 +420,7 @@ getFreePtr (iCode * ic, asmop ** aopp, bool result) ic->rUsed = bitVectSetBit (ic->rUsed, R0_IDX); (*aopp)->type = AOP_R0; - return (*aopp)->aopu.aop_ptr = ds390_regWithIdx (R0_IDX); + return (*aopp)->aopu.aop_ptr = REG_WITH_INDEX (R0_IDX); } /* if no usage of r1 then return it */ @@ -224,7 +429,7 @@ getFreePtr (iCode * ic, asmop ** aopp, bool result) ic->rUsed = bitVectSetBit (ic->rUsed, R1_IDX); (*aopp)->type = AOP_R1; - return (*aopp)->aopu.aop_ptr = ds390_regWithIdx (R1_IDX); + return (*aopp)->aopu.aop_ptr = REG_WITH_INDEX (R1_IDX); } /* now we know they both have usage */ @@ -233,16 +438,16 @@ getFreePtr (iCode * ic, asmop ** aopp, bool result) { /* push it if not already pushed */ if (!_G.r0Pushed) - { - emitcode ("push", "%s", - ds390_regWithIdx (R0_IDX)->dname); - _G.r0Pushed++; - } + { + emitcode ("push", "%s", + REG_WITH_INDEX (R0_IDX)->dname); + _G.r0Pushed++; + } ic->rUsed = bitVectSetBit (ic->rUsed, R0_IDX); (*aopp)->type = AOP_R0; - return (*aopp)->aopu.aop_ptr = ds390_regWithIdx (R0_IDX); + return (*aopp)->aopu.aop_ptr = REG_WITH_INDEX (R0_IDX); } /* if r1 not used then */ @@ -251,19 +456,19 @@ getFreePtr (iCode * ic, asmop ** aopp, bool result) { /* push it if not already pushed */ if (!_G.r1Pushed) - { - emitcode ("push", "%s", - ds390_regWithIdx (R1_IDX)->dname); - _G.r1Pushed++; - } + { + emitcode ("push", "%s", + REG_WITH_INDEX (R1_IDX)->dname); + _G.r1Pushed++; + } ic->rUsed = bitVectSetBit (ic->rUsed, R1_IDX); (*aopp)->type = AOP_R1; - return ds390_regWithIdx (R1_IDX); + return REG_WITH_INDEX (R1_IDX); } endOfWorld: - /* I said end of world but not quite end of world yet */ + /* I said end of world, but not quite end of world yet */ /* if this is a result then we can push it on the stack */ if (result) { @@ -271,33 +476,19 @@ endOfWorld: return NULL; } - /* other wise this is true end of the world */ + /* now this is REALLY the end of the world */ werror (E_INTERNAL_ERROR, __FILE__, __LINE__, - "getFreePtr should never reach here"); + "getFreePtr should never reach here"); exit (1); -} - -/*-----------------------------------------------------------------*/ -/* newAsmop - creates a new asmOp */ -/*-----------------------------------------------------------------*/ -static asmop * -newAsmop (short type) -{ - asmop *aop; - aop = Safe_calloc (1, sizeof (asmop)); - aop->type = type; - return aop; + return NULL; // notreached, but makes compiler happy. } -static int _currentDPS; /* Current processor DPS. */ -static int _desiredDPS; /* DPS value compiler thinks we should be using. */ -static int _lazyDPS = 0; /* if non-zero, we are doing lazy evaluation of DPS changes. */ /*-----------------------------------------------------------------*/ /* genSetDPTR: generate code to select which DPTR is in use (zero */ /* selects standard DPTR (DPL/DPH/DPX), non-zero selects DS390 */ -/* alternate DPTR (DPL1/DPH1/DPX1). */ +/* alternate DPTR (DPL1/DPH1/DPX1). */ /*-----------------------------------------------------------------*/ static void genSetDPTR (int n) @@ -323,40 +514,40 @@ genSetDPTR (int n) } } -/*-----------------------------------------------------------------*/ +/*------------------------------------------------------------------*/ /* _startLazyDPSEvaluation: call to start doing lazy DPS evaluation */ -/* */ -/* Any code that operates on DPTR (NB: not on the individual */ -/* components, like DPH) *must* call _flushLazyDPS() before using */ -/* DPTR within a lazy DPS evaluation block. */ -/* */ -/* Note that aopPut and aopGet already contain the proper calls to */ -/* _flushLazyDPS, so it is safe to use these calls within a lazy */ -/* DPS evaluation block. */ -/* */ -/* Also, _flushLazyDPS must be called before any flow control */ -/* operations that could potentially branch out of the block. */ -/* */ -/* Lazy DPS evaluation is simply an optimization (though an */ -/* important one), so if in doubt, leave it out. */ -/*-----------------------------------------------------------------*/ +/* */ +/* Any code that operates on DPTR (NB: not on the individual */ +/* components, like DPH) *must* call _flushLazyDPS() before using */ +/* DPTR within a lazy DPS evaluation block. */ +/* */ +/* Note that aopPut and aopGet already contain the proper calls to */ +/* _flushLazyDPS, so it is safe to use these calls within a lazy */ +/* DPS evaluation block. */ +/* */ +/* Also, _flushLazyDPS must be called before any flow control */ +/* operations that could potentially branch out of the block. */ +/* */ +/* Lazy DPS evaluation is simply an optimization (though an */ +/* important one), so if in doubt, leave it out. */ +/*------------------------------------------------------------------*/ static void _startLazyDPSEvaluation (void) { _currentDPS = 0; _desiredDPS = 0; -#ifdef BETTER_LITERAL_SHIFT +#ifdef BETTER_LITERAL_SHIFT _lazyDPS++; #else _lazyDPS = 1; -#endif +#endif } -/*-----------------------------------------------------------------*/ -/* _flushLazyDPS: emit code to force the actual DPS setting to the */ +/*------------------------------------------------------------------*/ +/* _flushLazyDPS: emit code to force the actual DPS setting to the */ /* desired one. Call before using DPTR within a lazy DPS evaluation */ -/* block. */ -/*-----------------------------------------------------------------*/ +/* block. */ +/*------------------------------------------------------------------*/ static void _flushLazyDPS (void) { @@ -369,30 +560,30 @@ _flushLazyDPS (void) if (_desiredDPS != _currentDPS) { if (_desiredDPS) - { - emitcode ("inc", "dps"); - } + { + emitcode ("inc", "dps"); + } else - { - emitcode ("dec", "dps"); - } + { + emitcode ("dec", "dps"); + } _currentDPS = _desiredDPS; } } /*-----------------------------------------------------------------*/ -/* _endLazyDPSEvaluation: end lazy DPS evaluation block. */ -/* */ -/* Forces us back to the safe state (standard DPTR selected). */ +/* _endLazyDPSEvaluation: end lazy DPS evaluation block. */ +/* */ +/* Forces us back to the safe state (standard DPTR selected). */ /*-----------------------------------------------------------------*/ static void _endLazyDPSEvaluation (void) { -#ifdef BETTER_LITERAL_SHIFT +#ifdef BETTER_LITERAL_SHIFT _lazyDPS--; #else _lazyDPS = 0; -#endif +#endif if (!_lazyDPS) { if (_currentDPS) @@ -406,6 +597,19 @@ _endLazyDPSEvaluation (void) } +/*-----------------------------------------------------------------*/ +/* newAsmop - creates a new asmOp */ +/*-----------------------------------------------------------------*/ +static asmop * +newAsmop (short type) +{ + asmop *aop; + + aop = Safe_calloc (1, sizeof (asmop)); + aop->type = type; + aop->allocated = 1; + return aop; +} /*-----------------------------------------------------------------*/ /* pointerCode - returns the code for a pointer type */ @@ -418,6 +622,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 */ /*-----------------------------------------------------------------*/ @@ -425,11 +695,29 @@ static asmop * aopForSym (iCode * ic, symbol * sym, bool result, bool useDP2) { asmop *aop; - memmap *space = SPEC_OCLS (sym->etype); + memmap *space; + bool accuse = leftRightUseAcc (ic) || _G.accInUse; + char *dpl = useDP2 ? "dpl1" : "dpl"; + char *dph = useDP2 ? "dph1" : "dph"; + char *dpx = useDP2 ? "dpx1" : "dpx"; + + wassertl (ic != NULL, "Got a null iCode"); + wassertl (sym != NULL, "Got a null symbol"); + + space = SPEC_OCLS (sym->etype); /* if already has one */ if (sym->aop) - return sym->aop; + { + if ((sym->aop->type == AOP_DPTR && useDP2) + || (sym->aop->type == AOP_DPTR2 && !useDP2)) + sym->aop = NULL; + else + { + sym->aop->allocated++; + return sym->aop; + } + } /* assign depending on the storage class */ /* if it is on the stack or indirectly addressable */ @@ -443,105 +731,110 @@ aopForSym (iCode * ic, symbol * sym, bool result, bool useDP2) /* now assign the address of the variable to the pointer register */ if (aop->type != AOP_STK) - { - - if (sym->onStack) - { - if (_G.accInUse) - emitcode ("push", "acc"); - - if (_G.bInUse) - emitcode ("push", "b"); - - emitcode ("mov", "a,_bp"); - emitcode ("add", "a,#!constbyte", - ((sym->stack < 0) ? - ((char) (sym->stack - _G.nRegsSaved)) : - ((char) sym->stack)) & 0xff); - emitcode ("mov", "%s,a", - aop->aopu.aop_ptr->name); - - if (_G.bInUse) - emitcode ("pop", "b"); - - if (_G.accInUse) - emitcode ("pop", "acc"); - } - else - emitcode ("mov", "%s,#%s", - aop->aopu.aop_ptr->name, - sym->rname); - aop->paged = space->paged; - } + { + if (sym->onStack) + { + signed char offset = ((sym->stack < 0) ? + ((signed char) (sym->stack - _G.nRegsSaved)) : + ((signed char) sym->stack)) & 0xff; + + if ((abs(offset) <= 3) || + (accuse && (abs(offset) <= 7))) + { + emitcode ("mov", "%s,_bp", + aop->aopu.aop_ptr->name); + while (offset < 0) + { + emitcode ("dec", aop->aopu.aop_ptr->name); + offset++; + } + while (offset > 0) + { + emitcode ("inc", aop->aopu.aop_ptr->name); + offset--; + } + } + else + { + if (accuse) + emitcode ("push", "acc"); + emitcode ("mov", "a,_bp"); + emitcode ("add", "a,#!constbyte", offset); + emitcode ("mov", "%s,a", aop->aopu.aop_ptr->name); + if (accuse) + emitcode ("pop", "acc"); + } + } + else + { + emitcode ("mov", "%s,#%s", + aop->aopu.aop_ptr->name, + sym->rname); + } + aop->paged = space->paged; + } else - aop->aopu.aop_stk = sym->stack; + aop->aopu.aop_stk = sym->stack; return aop; } if (sym->onStack && options.stack10bit) { - short stack_val = -((sym->stack < 0) ? - ((short) (sym->stack - _G.nRegsSaved)) : - ((short) sym->stack)) ; + short stack_val = -((sym->stack < 0) ? + ((short) (sym->stack - _G.nRegsSaved)) : + ((short) sym->stack)) ; + 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", "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", "dph,_bpx+1"); - emitcode ("mov", "dpl,_bpx"); - } - stack_val = -stack_val; - while (stack_val--) { - emitcode ("inc","dptr"); - } - if (useDP2) { - emitcode("mov","dps,#0"); - } - } else { - if (_G.accInUse) - emitcode ("push", "acc"); - - if (_G.bInUse) - emitcode ("push", "b"); - - emitcode ("mov", "a,_bpx"); - emitcode ("clr","c"); - emitcode ("subb", "a,#!constbyte", stack_val & 0xff); - emitcode ("mov","b,a"); - emitcode ("mov","a,_bpx+1"); - 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", "dph1,a"); - emitcode ("mov", "dpl1,b"); - } else { - if (options.model == MODEL_FLAT24) - emitcode ("mov", "dpx,#!constbyte", (options.stack_loc >> 16) & 0xff); - emitcode ("mov", "dph,a"); - emitcode ("mov", "dpl,b"); - } - - if (_G.bInUse) - emitcode ("pop", "b"); - - if (_G.accInUse) - emitcode ("pop", "acc"); - } - sym->aop = aop = newAsmop ((short) (useDP2 ? AOP_DPTR2 : AOP_DPTR)); - aop->size = getSize (sym->type); - return aop; + if (stack_val < 0 && stack_val > -5) + { /* between -5 & -1 */ + if (options.model == MODEL_FLAT24) + { + emitcode ("mov", "%s,#!constbyte", dpx, + (options.stack_loc >> 16) & 0xff); + } + emitcode ("mov", "%s,_bpx+1", dph); + emitcode ("mov", "%s,_bpx", dpl); + if (useDP2) { + emitcode ("mov","dps,#1"); + } + stack_val = -stack_val; + while (stack_val--) { + emitcode ("inc","dptr"); + } + if (useDP2) { + emitcode("mov","dps,#0"); + } + } + else + { + if (accuse) + emitcode ("push", "acc"); + + emitcode ("mov", "a,_bpx"); + emitcode ("clr","c"); + emitcode ("subb", "a,#!constbyte", stack_val & 0xff); + emitcode ("mov","%s,a", dpl); + emitcode ("mov","a,_bpx+1"); + emitcode ("subb","a,#!constbyte",(stack_val >> 8) & 0xff); + emitcode ("mov", "%s,a", dph); + if (options.model == MODEL_FLAT24) + { + emitcode ("mov", "%s,#!constbyte", dpx, + (options.stack_loc >> 16) & 0xff); + } + + if (accuse) + emitcode ("pop", "acc"); + } + sym->aop = aop = newAsmop ((short) (useDP2 ? AOP_DPTR2 : AOP_DPTR)); + aop->size = getSize (sym->type); + return aop; } /* if in bit space */ @@ -562,15 +855,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)); @@ -602,49 +894,53 @@ aopForRemat (symbol * sym) { iCode *ic = sym->rematiCode; asmop *aop = newAsmop (AOP_IMMD); - int ptr_type =0; + int ptr_type = 0; int val = 0; for (;;) { if (ic->op == '+') - val += (int) operandLitValue (IC_RIGHT (ic)); + val += (int) operandLitValue (IC_RIGHT (ic)); else if (ic->op == '-') - val -= (int) operandLitValue (IC_RIGHT (ic)); + val -= (int) operandLitValue (IC_RIGHT (ic)); else if (IS_CAST_ICODE(ic)) { - sym_link *from_type = operandType(IC_RIGHT(ic)); - aop->aopu.aop_immd.from_cast_remat = 1; - ic = OP_SYMBOL (IC_RIGHT (ic))->rematiCode; - ptr_type = DCL_TYPE(from_type); - if (ptr_type == IPOINTER) { - // bug #481053 - ptr_type = POINTER; - } - continue ; + sym_link *from_type = operandType(IC_RIGHT(ic)); + aop->aopu.aop_immd.from_cast_remat = 1; + ic = OP_SYMBOL (IC_RIGHT (ic))->rematiCode; + ptr_type = pointerTypeToGPByte (DCL_TYPE(from_type), NULL, NULL); + continue; } else break; - + ic = OP_SYMBOL (IC_LEFT (ic))->rematiCode; } 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%06x)", + 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; @@ -660,9 +956,9 @@ static int aopHasRegs(asmop *aop, int from, int to) if (aop->type != AOP_REG) return 0; /* if not assigned to regs */ for (; size < aop->size ; size++) { - int reg; - for (reg = from ; reg <= to ; reg++) - if (aop->aopu.aop_reg[size] == ds390_regWithIdx(reg)) return 1; + int reg; + for (reg = from ; reg <= to ; reg++) + if (aop->aopu.aop_reg[size] == REG_WITH_INDEX(reg)) return 1; } return 0; } @@ -690,16 +986,16 @@ regsInCommon (operand * op1, operand * op2) { int j; if (!sym1->regs[i]) - continue; + continue; for (j = 0; j < sym2->nRegs; j++) - { - if (!sym2->regs[j]) - continue; + { + if (!sym2->regs[j]) + continue; - if (sym2->regs[j] == sym1->regs[i]) - return TRUE; - } + if (sym2->regs[j] == sym1->regs[i]) + return TRUE; + } } return FALSE; @@ -713,7 +1009,7 @@ operandsEqu (operand * op1, operand * op2) { symbol *sym1, *sym2; - /* if they not symbols */ + /* if they're not symbols */ if (!IS_SYMOP (op1) || !IS_SYMOP (op2)) return FALSE; @@ -730,10 +1026,12 @@ operandsEqu (operand * op1, operand * op2) if (sym1 == sym2) return TRUE; - if (strcmp (sym1->rname, sym2->rname) == 0) + /* if they have the same rname */ + if (sym1->rname[0] && sym2->rname[0] && + strcmp (sym1->rname, sym2->rname) == 0 && + !(IS_PARM (op2) && IS_ITEMP (op1))) return TRUE; - /* if left is a tmp & right is not */ if (IS_ITEMP (op1) && !IS_ITEMP (op2) && @@ -748,6 +1046,14 @@ operandsEqu (operand * op1, operand * op2) (sym2->usl.spillLoc == sym1)) return TRUE; + /* are they spilt to the same location */ + if (IS_ITEMP (op2) && + IS_ITEMP (op1) && + sym2->isspilt && + sym1->isspilt && + (sym1->usl.spillLoc == sym2->usl.spillLoc)) + return TRUE; + return FALSE; } @@ -762,22 +1068,23 @@ sameRegs (asmop * aop1, asmop * aop2) if (aop1 == aop2) { if (aop1->type == AOP_DPTR || aop1->type == AOP_DPTR2) - { - return FALSE; - } + { + return FALSE; + } return TRUE; } - if (aop1->type != AOP_REG || - aop2->type != AOP_REG) + if (aop1->type != AOP_REG && aop1->type != AOP_CRY) + return FALSE; + + if (aop1->type != aop2->type) return FALSE; if (aop1->size != aop2->size) return FALSE; for (i = 0; i < aop1->size; i++) - if (aop1->aopu.aop_reg[i] != - aop2->aopu.aop_reg[i]) + if (aop1->aopu.aop_reg[i] != aop2->aopu.aop_reg[i]) return FALSE; return TRUE; @@ -807,13 +1114,29 @@ aopOp (operand * op, iCode * ic, bool result, bool useDP2) /* if already has a asmop then continue */ if (op->aop) - return; + { + if ((op->aop->type == AOP_DPTR && useDP2) + || (op->aop->type == AOP_DPTR2 && !useDP2)) + op->aop = NULL; + else + { + op->aop->allocated++; + return; + } + } /* if the underlying symbol has a aop */ if (IS_SYMOP (op) && OP_SYMBOL (op)->aop) { op->aop = OP_SYMBOL (op)->aop; - return; + if ((op->aop->type == AOP_DPTR && useDP2) + || (op->aop->type == AOP_DPTR2 && !useDP2)) + op->aop = NULL; + else + { + op->aop->allocated++; + return; + } } /* if this is a true symbol */ @@ -824,7 +1147,7 @@ aopOp (operand * op, iCode * ic, bool result, bool useDP2) } /* this is a temporary : this has - only four choices : + only five choices : a) register b) spillocation c) rematerialize @@ -833,7 +1156,6 @@ aopOp (operand * op, iCode * ic, bool result, bool useDP2) sym = OP_SYMBOL (op); - /* if the type is a conditional */ if (sym->regType == REG_CND) { @@ -850,59 +1172,86 @@ aopOp (operand * op, iCode * ic, bool result, bool useDP2) /* rematerialize it NOW */ if (sym->remat) - { - sym->aop = op->aop = aop = - aopForRemat (sym); - aop->size = getSize (sym->type); - return; - } + { + sym->aop = op->aop = aop = + aopForRemat (sym); + aop->size = getSize (sym->type); + return; + } if (sym->accuse) - { - int i; - aop = op->aop = sym->aop = newAsmop (AOP_ACC); - aop->size = getSize (sym->type); - for (i = 0; i < 2; i++) - aop->aopu.aop_str[i] = accUse[i]; - return; - } + { + int i; + aop = op->aop = sym->aop = newAsmop (AOP_ACC); + aop->size = getSize (sym->type); + for (i = 0; i < 2; i++) + aop->aopu.aop_str[i] = accUse[i]; + return; + } if (sym->ruonly) - { - int i; - - if (useDP2) - { - /* a AOP_STR uses DPTR, but DPTR is already in use; - * we're just hosed. - */ - werror(E_INTERNAL_ERROR,__FILE__,__LINE__,"AOP_STR with DPTR in use!"); - } - - aop = op->aop = sym->aop = newAsmop (AOP_STR); - aop->size = getSize (sym->type); - for (i = 0; i < (int) fReturnSizeDS390; i++) - aop->aopu.aop_str[i] = fReturn[i]; - return; - } - + { + unsigned i; + + if (useDP2) + { + /* a AOP_STR uses DPTR, but DPTR is already in use; + * we're just hosed. + */ + werror(E_INTERNAL_ERROR,__FILE__,__LINE__,"AOP_STR with DPTR in use!"); + } + + aop = op->aop = sym->aop = newAsmop (AOP_STR); + aop->size = getSize (sym->type); + for (i = 0; i < fReturnSizeDS390; i++) + aop->aopu.aop_str[i] = fReturn[i]; + return; + } + if (sym->dptr) { /* has been allocated to a DPTRn */ - aop = op->aop = sym->aop = newAsmop (AOP_DPTRn); - aop->size = getSize (sym->type); - aop->aopu.dptr = sym->dptr; - return ; + aop = op->aop = sym->aop = newAsmop (AOP_DPTRn); + aop->size = getSize (sym->type); + 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) + { + asmop *oldAsmOp = NULL; + + if (getSize(sym->type) != getSize(sym->usl.spillLoc->type)) + { + /* force a new aop if sizes differ */ + oldAsmOp = sym->usl.spillLoc->aop; + sym->usl.spillLoc->aop = NULL; + } + sym->aop = op->aop = aop = + aopForSym (ic, sym->usl.spillLoc, result, useDP2); + if (getSize(sym->type) != getSize(sym->usl.spillLoc->type)) + { + /* Don't reuse the new aop, go with the last one */ + sym->usl.spillLoc->aop = oldAsmOp; + } + 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; } + /* if the type is a bit register */ + if (sym->regType == REG_BIT) + { + sym->aop = op->aop = aop = newAsmop (AOP_CRY); + aop->size = sym->nRegs;//1??? + aop->aopu.aop_reg[0] = sym->regs[0]; + aop->aopu.aop_dir = sym->regs[0]->name; + return; + } + /* must be in a register */ sym->aop = op->aop = aop = newAsmop (AOP_REG); aop->size = sym->nRegs; @@ -926,90 +1275,103 @@ freeAsmop (operand * op, asmop * aaop, iCode * ic, bool pop) if (!aop) return; - if (aop->freed) - goto dealloc; + aop->allocated--; - aop->freed = 1; + if (aop->allocated) + goto dealloc; - /* depending on the asmop type only three cases need work AOP_RO - , AOP_R1 && AOP_STK */ + /* depending on the asmop type only three cases need work + AOP_R0, AOP_R1 & AOP_STK */ switch (aop->type) { case AOP_R0: if (_G.r0Pushed) - { - if (pop) - { - emitcode ("pop", "ar0"); - _G.r0Pushed--; - } - } + { + if (pop) + { + emitcode ("pop", "ar0"); + _G.r0Pushed--; + } + } bitVectUnSetBit (ic->rUsed, R0_IDX); break; case AOP_R1: if (_G.r1Pushed) - { - if (pop) - { - emitcode ("pop", "ar1"); - _G.r1Pushed--; - } - } + { + if (pop) + { + emitcode ("pop", "ar1"); + _G.r1Pushed--; + } + } bitVectUnSetBit (ic->rUsed, R1_IDX); break; case AOP_STK: { - int sz = aop->size; - int stk = aop->aopu.aop_stk + aop->size; - bitVectUnSetBit (ic->rUsed, R0_IDX); - bitVectUnSetBit (ic->rUsed, R1_IDX); - - getFreePtr (ic, &aop, FALSE); - - if (options.stack10bit) - { - /* I'm not sure what to do here yet... */ - /* #STUB */ - fprintf (stderr, - "*** Warning: probably generating bad code for " - "10 bit stack mode.\n"); - } - - if (stk) - { - emitcode ("mov", "a,_bp"); - emitcode ("add", "a,#!constbyte", ((char) stk) & 0xff); - emitcode ("mov", "%s,a", aop->aopu.aop_ptr->name); - } - else - { - emitcode ("mov", "%s,_bp", aop->aopu.aop_ptr->name); - } - - while (sz--) - { - emitcode ("pop", "acc"); - emitcode ("mov", "@%s,a", aop->aopu.aop_ptr->name); - if (!sz) - break; - emitcode ("dec", "%s", aop->aopu.aop_ptr->name); - } - op->aop = aop; - freeAsmop (op, NULL, ic, TRUE); - if (_G.r0Pushed) - { - emitcode ("pop", "ar0"); - _G.r0Pushed--; - } - - if (_G.r1Pushed) - { - emitcode ("pop", "ar1"); - _G.r1Pushed--; - } + int sz = aop->size; + int stk = aop->aopu.aop_stk + aop->size; + bitVectUnSetBit (ic->rUsed, R0_IDX); + bitVectUnSetBit (ic->rUsed, R1_IDX); + + getFreePtr (ic, &aop, FALSE); + + if (options.stack10bit) + { + /* I'm not sure what to do here yet... */ + /* #STUB */ + fprintf (stderr, + "*** Warning: probably generating bad code for " + "10 bit stack mode.\n"); + } + + if (stk) + { + emitcode ("mov", "a,_bp"); + emitcode ("add", "a,#!constbyte", ((char) stk) & 0xff); + emitcode ("mov", "%s,a", aop->aopu.aop_ptr->name); + } + else + { + emitcode ("mov", "%s,_bp", aop->aopu.aop_ptr->name); + } + + while (sz--) + { + emitcode ("pop", "acc"); + emitcode ("mov", "@%s,a", aop->aopu.aop_ptr->name); + if (!sz) + break; + emitcode ("dec", "%s", aop->aopu.aop_ptr->name); + } + op->aop = aop; + freeAsmop (op, NULL, ic, TRUE); + if (_G.r1Pushed) + { + emitcode ("pop", "ar1"); + _G.r1Pushed--; + } + if (_G.r0Pushed) + { + emitcode ("pop", "ar0"); + _G.r0Pushed--; + } } + 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: @@ -1018,32 +1380,87 @@ dealloc: { op->aop = NULL; if (IS_SYMOP (op)) - { - OP_SYMBOL (op)->aop = NULL; - /* if the symbol has a spill */ - if (SPIL_LOC (op)) - SPIL_LOC (op)->aop = NULL; - } + { + OP_SYMBOL (op)->aop = NULL; + /* if the symbol has a spill */ + if (SPIL_LOC (op)) + SPIL_LOC (op)->aop = NULL; + } } } -/*------------------------------------------------------------------*/ -/* 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; + + +/*-----------------------------------------------------------------*/ +/* aopGetUsesAcc - indicates ahead of time whether aopGet() will */ +/* clobber the accumulator */ +/*-----------------------------------------------------------------*/ +static bool +aopGetUsesAcc (operand * oper, int offset) +{ + asmop * aop = AOP (oper); + + if (offset > (aop->size - 1)) + return FALSE; + + switch (aop->type) + { + + case AOP_R0: + case AOP_R1: + if (aop->paged) + return TRUE; + return FALSE; + case AOP_DPTR: + case AOP_DPTR2: + case AOP_DPTRn: + return TRUE; + case AOP_IMMD: + return FALSE; + case AOP_DIR: + return FALSE; + case AOP_REG: + wassert(strcmp(aop->aopu.aop_reg[offset]->name, "a")); + return FALSE; + case AOP_CRY: + return TRUE; + case AOP_ACC: + if (offset) + return FALSE; + return TRUE; + case AOP_LIT: + return FALSE; + case AOP_STR: + if (strcmp (aop->aopu.aop_str[offset], "a") == 0) + return TRUE; + return FALSE; + case AOP_DUMMY: + return FALSE; + default: + /* Error case --- will have been caught already */ + wassert(0); + return FALSE; + } +} +/*-------------------------------------------------------------------*/ +/* aopGet - for fetching value of the aop */ +/* */ +/* 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 (operand * oper, + int offset, + bool bit16, + bool dname, + char *saveAcc) { - char *s = buffer; - char *rs; + asmop * aop = AOP (oper); /* offset is greater than size then zero */ @@ -1054,132 +1471,169 @@ aopGet (asmop * aop, /* depending on type */ switch (aop->type) { + case AOP_DUMMY: + return zero; case AOP_R0: case AOP_R1: /* if we need to increment it */ while (offset > aop->coff) - { - emitcode ("inc", "%s", aop->aopu.aop_ptr->name); - aop->coff++; - } + { + emitcode ("inc", "%s", aop->aopu.aop_ptr->name); + aop->coff++; + } while (offset < aop->coff) - { - emitcode ("dec", "%s", aop->aopu.aop_ptr->name); - aop->coff--; - } + { + emitcode ("dec", "%s", aop->aopu.aop_ptr->name); + aop->coff--; + } aop->coff = offset; if (aop->paged) - { - 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; + { + emitcode ("movx", "a,@%s", aop->aopu.aop_ptr->name); + return (dname ? "acc" : "a"); + } + SNPRINTF (buffer, sizeof(buffer), "@%s", aop->aopu.aop_ptr->name); + return Safe_strdup(buffer); case AOP_DPTRn: - assert(offset <= 3); - return dptrn[aop->aopu.dptr][offset]; + assert(offset <= 3); + return dptrn[aop->aopu.dptr][offset]; case AOP_DPTR: case AOP_DPTR2: if (aop->type == AOP_DPTR2) - { - genSetDPTR (1); - if (!canClobberACC) - { - TR_AP("#1"); - emitcode ("xch", "a, %s", DP2_RESULT_REG); - } - } + { + genSetDPTR (1); + } + + 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 (); while (offset > aop->coff) - { - emitcode ("inc", "dptr"); - aop->coff++; - } + { + emitcode ("inc", "dptr"); + aop->coff++; + } while (offset < aop->coff) - { - emitcode ("lcall", "__decdptr"); - aop->coff--; - } + { + emitcode ("lcall", "__decdptr"); + aop->coff--; + } aop->coff = offset; if (aop->code) - { - emitcode ("clr", "a"); - emitcode ("movc", "a,@a+dptr"); - } + { + emitcode ("clr", "a"); + emitcode ("movc", "a,@a+dptr"); + } else - { - emitcode ("movx", "a,@dptr"); - } + { + emitcode ("movx", "a,@dptr"); + } if (aop->type == AOP_DPTR2) - { - genSetDPTR (0); - if (!canClobberACC) - { - TR_AP("#2"); - emitcode ("xch", "a, %s", DP2_RESULT_REG); - return DP2_RESULT_REG; - } - } + { + genSetDPTR (0); + } + + if (saveAcc) + { + TR_AP("#2"); + 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) { - switch (offset) { - case 1: - tsprintf(s,"#!his",aop->aopu.aop_immd.aop_immd1); - break; - case 2: - tsprintf(s,"#!hihis",aop->aopu.aop_immd.aop_immd1); - break; - case 3: - tsprintf(s,"#!hihihis",aop->aopu.aop_immd.aop_immd1); - break; - default: /* should not need this (just in case) */ - sprintf (s, "#(%s >> %d)", - aop->aopu.aop_immd.aop_immd1, - offset * 8); - } - } + 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(buffer, sizeof(buffer), + "#!his",aop->aopu.aop_immd.aop_immd1); + break; + case 2: + tsprintf(buffer, sizeof(buffer), + "#!hihis",aop->aopu.aop_immd.aop_immd1); + break; + case 3: + tsprintf(buffer, sizeof(buffer), + "#!hihihis",aop->aopu.aop_immd.aop_immd1); + break; + default: /* should not need this (just in case) */ + 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)", - aop->aopu.aop_dir, - offset); + if (SPEC_SCLS (getSpec (operandType (oper))) == S_SFR && offset) + { + SNPRINTF (buffer, sizeof(buffer), + "(%s >> %d)", + aop->aopu.aop_dir, offset * 8); + } + else if (offset) + { + 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) - return aop->aopu.aop_reg[offset]->dname; + return aop->aopu.aop_reg[offset]->dname; else - return aop->aopu.aop_reg[offset]->name; + return aop->aopu.aop_reg[offset]->name; case AOP_CRY: emitcode ("clr", "a"); @@ -1189,7 +1643,7 @@ aopGet (asmop * aop, case AOP_ACC: if (!offset && dname) - return "acc"; + return "acc"; return aop->aopu.aop_str[offset]; case AOP_LIT: @@ -1198,29 +1652,34 @@ aopGet (asmop * aop, case AOP_STR: aop->coff = offset; if (strcmp (aop->aopu.aop_str[offset], "a") == 0 && - dname) - return "acc"; + dname) + return "acc"; return aop->aopu.aop_str[offset]; } werror (E_INTERNAL_ERROR, __FILE__, __LINE__, - "aopget got unsupported aop->type"); + "aopget got unsupported aop->type"); exit (1); + + return NULL; // not reached, but makes compiler happy. } + /*-----------------------------------------------------------------*/ -/* aopPut - puts a string for a aop */ +/* aopPut - puts a string for a aop and indicates if acc is in use */ /*-----------------------------------------------------------------*/ -static void -aopPut (asmop * aop, char *s, int offset) +static bool +aopPut (operand * result, const char *s, int offset) { - char *d = buffer; + bool bvolatile = isOperandVolatile (result, FALSE); + bool accuse = FALSE; + asmop * aop = AOP (result); if (aop->size && offset > (aop->size - 1)) { werror (E_INTERNAL_ERROR, __FILE__, __LINE__, - "aopPut got offset > aop->size"); + "aopPut got offset > aop->size"); exit (1); } @@ -1228,195 +1687,218 @@ 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 */ + accuse = TRUE; + break; + case AOP_DIR: - if (offset) - sprintf (d, "(%s + %d)", - aop->aopu.aop_dir, offset); + if (SPEC_SCLS (getSpec (operandType (result))) == S_SFR && offset) + { + SNPRINTF (buffer, sizeof(buffer), + "(%s >> %d)", + aop->aopu.aop_dir, offset * 8); + } + else if (offset) + { + SNPRINTF (buffer, sizeof(buffer), + "(%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); + { + SNPRINTF (buffer, sizeof(buffer), + "%s", + aop->aopu.aop_dir); + } + if (strcmp (buffer, s) || bvolatile) + { + emitcode ("mov", "%s,%s", buffer, s); + } + if (!strcmp (buffer, "acc")) + { + accuse = TRUE; + } break; case AOP_REG: if (strcmp (aop->aopu.aop_reg[offset]->name, s) != 0 && - strcmp (aop->aopu.aop_reg[offset]->dname, s) != 0) - { - if (*s == '@' || - strcmp (s, "r0") == 0 || - strcmp (s, "r1") == 0 || - strcmp (s, "r2") == 0 || - strcmp (s, "r3") == 0 || - strcmp (s, "r4") == 0 || - 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); - } + strcmp (aop->aopu.aop_reg[offset]->dname, s) != 0) + { + if (*s == '@' || + strcmp (s, "r0") == 0 || + strcmp (s, "r1") == 0 || + strcmp (s, "r2") == 0 || + strcmp (s, "r3") == 0 || + strcmp (s, "r4") == 0 || + 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); + } + } break; case AOP_DPTRn: - emitcode ("mov","%s,%s",dptrn[aop->aopu.dptr][offset],s); - break; + emitcode ("mov","%s,%s",dptrn[aop->aopu.dptr][offset],s); + break; case AOP_DPTR: case AOP_DPTR2: if (aop->type == AOP_DPTR2) - { - genSetDPTR (1); - } + { + genSetDPTR (1); + } _flushLazyDPS (); if (aop->code) - { - werror (E_INTERNAL_ERROR, __FILE__, __LINE__, - "aopPut writting to code space"); - exit (1); - } + { + werror (E_INTERNAL_ERROR, __FILE__, __LINE__, + "aopPut writing to code space"); + exit (1); + } while (offset > aop->coff) - { - aop->coff++; - emitcode ("inc", "dptr"); - } + { + aop->coff++; + emitcode ("inc", "dptr"); + } while (offset < aop->coff) - { - aop->coff--; - emitcode ("lcall", "__decdptr"); - } + { + aop->coff--; + emitcode ("lcall", "__decdptr"); + } aop->coff = offset; - /* if not in accumulater */ + /* if not in accumulator */ MOVA (s); emitcode ("movx", "@dptr,a"); if (aop->type == AOP_DPTR2) - { - genSetDPTR (0); - } + { + genSetDPTR (0); + } break; case AOP_R0: case AOP_R1: while (offset > aop->coff) - { - aop->coff++; - emitcode ("inc", "%s", aop->aopu.aop_ptr->name); - } + { + aop->coff++; + emitcode ("inc", "%s", aop->aopu.aop_ptr->name); + } while (offset < aop->coff) - { - aop->coff--; - emitcode ("dec", "%s", aop->aopu.aop_ptr->name); - } + { + aop->coff--; + emitcode ("dec", "%s", aop->aopu.aop_ptr->name); + } aop->coff = offset; if (aop->paged) - { - MOVA (s); - emitcode ("movx", "@%s,a", aop->aopu.aop_ptr->name); - - } + { + MOVA (s); + emitcode ("movx", "@%s,a", aop->aopu.aop_ptr->name); + } else if (*s == '@') - { - MOVA (s); - emitcode ("mov", "@%s,a", aop->aopu.aop_ptr->name); - } + { + MOVA (s); + emitcode ("mov", "@%s,a", aop->aopu.aop_ptr->name); + } else if (strcmp (s, "r0") == 0 || - strcmp (s, "r1") == 0 || - strcmp (s, "r2") == 0 || - strcmp (s, "r3") == 0 || - strcmp (s, "r4") == 0 || - strcmp (s, "r5") == 0 || - strcmp (s, "r6") == 0 || - strcmp (s, "r7") == 0) - { - char buffer[10]; - sprintf (buffer, "a%s", s); - emitcode ("mov", "@%s,%s", - aop->aopu.aop_ptr->name, buffer); - } - else - emitcode ("mov", "@%s,%s", aop->aopu.aop_ptr->name, s); - + strcmp (s, "r1") == 0 || + strcmp (s, "r2") == 0 || + strcmp (s, "r3") == 0 || + strcmp (s, "r4") == 0 || + strcmp (s, "r5") == 0 || + strcmp (s, "r6") == 0 || + strcmp (s, "r7") == 0) + { + char buffer[10]; + SNPRINTF (buffer, sizeof(buffer), "a%s", s); + emitcode ("mov", "@%s,%s", + aop->aopu.aop_ptr->name, buffer); + } + else + { + emitcode ("mov", "@%s,%s", aop->aopu.aop_ptr->name, s); + } break; case AOP_STK: if (strcmp (s, "a") == 0) - emitcode ("push", "acc"); + emitcode ("push", "acc"); else - if (*s=='@') { - MOVA(s); - emitcode ("push", "acc"); - } else { - emitcode ("push", s); - } + if (*s=='@') { + MOVA(s); + emitcode ("push", "acc"); + } else { + emitcode ("push", s); + } break; case AOP_CRY: - /* if bit variable */ + /* if not bit variable */ if (!aop->aopu.aop_dir) - { - emitcode ("clr", "a"); - emitcode ("rlc", "a"); - } + { + /* inefficient: move carry into A and use jz/jnz */ + emitcode ("clr", "a"); + emitcode ("rlc", "a"); + accuse = TRUE; + } else - { - if (s == zero) - emitcode ("clr", "%s", aop->aopu.aop_dir); - else if (s == one) - emitcode ("setb", "%s", aop->aopu.aop_dir); - else if (!strcmp (s, "c")) - emitcode ("mov", "%s,c", aop->aopu.aop_dir); - else - { - if (strcmp (s, "a")) - { - MOVA (s); - } - { - symbol *lbl = newiTempLabel (NULL); - emitcode ("clr", "c"); - emitcode ("jz", "!tlabel", lbl->key + 100); - emitcode ("cpl", "c"); - emitcode ("", "!tlabeldef", lbl->key + 100); - emitcode ("mov", "%s,c", aop->aopu.aop_dir); - } - } - } + { + if (s == zero) + emitcode ("clr", "%s", aop->aopu.aop_dir); + else if (s == one) + emitcode ("setb", "%s", aop->aopu.aop_dir); + else if (!strcmp (s, "c")) + emitcode ("mov", "%s,c", aop->aopu.aop_dir); + else if (strcmp (s, aop->aopu.aop_dir)) + { + MOVA (s); + /* set C, if a >= 1 */ + emitcode ("add", "a,#!constbyte",0xff); + emitcode ("mov", "%s,c", aop->aopu.aop_dir); + } + } break; case AOP_STR: aop->coff = offset; - if (strcmp (aop->aopu.aop_str[offset], s)) - emitcode ("mov", "%s,%s", aop->aopu.aop_str[offset], s); + if (strcmp (aop->aopu.aop_str[offset], s) || bvolatile) + emitcode ("mov", "%s,%s", aop->aopu.aop_str[offset], s); break; case AOP_ACC: + accuse = TRUE; aop->coff = offset; - if (!offset && (strcmp (s, "acc") == 0)) - break; + if (!offset && (strcmp (s, "acc") == 0) && !bvolatile) + break; - if (strcmp (aop->aopu.aop_str[offset], s)) - emitcode ("mov", "%s,%s", aop->aopu.aop_str[offset], s); + if (strcmp (aop->aopu.aop_str[offset], s) && !bvolatile) + emitcode ("mov", "%s,%s", aop->aopu.aop_str[offset], s); break; default: werror (E_INTERNAL_ERROR, __FILE__, __LINE__, - "aopPut got unsupported aop->type"); + "aopPut got unsupported aop->type"); exit (1); } + return accuse; } @@ -1426,132 +1908,43 @@ aopPut (asmop * aop, char *s, int offset) static void reAdjustPreg (asmop * aop) { - if ((aop->coff==0) || (aop->size <= 1)) { + if ((aop->coff==0) || (aop->size <= 1)) return; - } switch (aop->type) { case AOP_R0: case AOP_R1: while (aop->coff--) - emitcode ("dec", "%s", aop->aopu.aop_ptr->name); + emitcode ("dec", "%s", aop->aopu.aop_ptr->name); break; case AOP_DPTR: case AOP_DPTR2: if (aop->type == AOP_DPTR2) - { - genSetDPTR (1); - _flushLazyDPS (); - } + { + genSetDPTR (1); + _flushLazyDPS (); + } while (aop->coff--) - { - emitcode ("lcall", "__decdptr"); - } + { + emitcode ("lcall", "__decdptr"); + } if (aop->type == AOP_DPTR2) - { - genSetDPTR (0); - } + { + genSetDPTR (0); + } break; - } - aop->coff=0; + aop->coff = 0; } -#define AOP(op) op->aop -#define AOP_TYPE(op) AOP(op)->type -#define AOP_SIZE(op) AOP(op)->size -#define IS_AOP_PREG(x) (AOP(x) && (AOP_TYPE(x) == AOP_R1 || \ - AOP_TYPE(x) == AOP_R0)) - -#define AOP_NEEDSACC(x) (AOP(x) && (AOP_TYPE(x) == AOP_CRY || \ - AOP_TYPE(x) == AOP_DPTR || AOP_TYPE(x) == AOP_DPTR2 || \ - AOP(x)->paged)) - -#define AOP_INPREG(x) (x && (x->type == AOP_REG && \ - (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) - -/* Workaround for DS80C390 bug: div ab may return bogus results - * if A is accessed in instruction immediately before the div. - * - * Will be fixed in B4 rev of processor, Dallas claims. - */ - -#define LOAD_AB_FOR_DIV(LEFT, RIGHT, L) \ - if (!AOP_NEEDSACC(RIGHT)) \ - { \ - /* We can load A first, then B, since \ - * B (the RIGHT operand) won't clobber A, \ - * thus avoiding touching A right before the div. \ - */ \ - D(emitcode(";", "DS80C390 div bug: rearranged ops.");); \ - L = aopGet(AOP(LEFT),0,FALSE,FALSE,TRUE); \ - MOVA(L); \ - emitcode("mov","b,%s",aopGet(AOP(RIGHT),0,FALSE,FALSE,FALSE));\ - } \ - 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); \ - MOVA(L); \ - emitcode("nop", "; workaround for DS80C390 div bug."); \ - } - /*-----------------------------------------------------------------*/ -/* genNotFloat - generates not for float operations */ +/* opIsGptr: returns non-zero if the passed operand is */ +/* a generic pointer type. */ /*-----------------------------------------------------------------*/ -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 */ -/* a generic pointer type. */ -/*-----------------------------------------------------------------*/ -static int -opIsGptr (operand * op) +static int +opIsGptr (operand * op) { sym_link *type = operandType (op); @@ -1574,12 +1967,12 @@ getDataSize (operand * op) { sym_link *type = operandType (op); if (IS_GENPTR (type)) - { - /* generic pointer; arithmetic operations - * should ignore the high byte (pointer type). - */ - size--; - } + { + /* generic pointer; arithmetic operations + * should ignore the high byte (pointer type). + */ + size--; + } } return size; } @@ -1594,14 +1987,14 @@ outAcc (operand * result) size = getDataSize (result); if (size) { - aopPut (AOP (result), "a", 0); + aopPut (result, "a", 0); size--; offset = 1; /* unsigned or positive */ while (size--) - { - aopPut (AOP (result), zero, offset++); - } + { + aopPut (result, zero, offset++); + } } } @@ -1614,7 +2007,7 @@ outBitC (operand * result) /* if the result is bit */ if (AOP_TYPE (result) == AOP_CRY) { - aopPut (AOP (result), "c", 0); + aopPut (result, "c", 0); } else { @@ -1630,9 +2023,9 @@ outBitC (operand * result) static void toBoolean (operand * oper) { - int size = AOP_SIZE (oper) - 1; - int offset = 1; - bool usedB = FALSE; + int size = AOP_SIZE (oper) - 1; + int offset = 1; + bool pushedB; /* The generic part of a generic pointer should * not participate in it's truth value. @@ -1641,40 +2034,34 @@ toBoolean (operand * oper) */ if (opIsGptr (oper)) { - D (emitcode (";", "toBoolean: generic ptr special case."); - ); + D (emitcode (";", "toBoolean: generic ptr special case.")); size--; } _startLazyDPSEvaluation (); - if (AOP_NEEDSACC (oper) && size) + MOVA (aopGet (oper, 0, FALSE, FALSE, NULL)); + if (AOP_NEEDSACC (oper) && size && (AOP (oper)->type != AOP_ACC)) { - usedB = TRUE; - emitcode ("push", "b"); - emitcode ("mov", "b, %s", aopGet (AOP (oper), 0, FALSE, FALSE, FALSE)); + pushedB = pushB (); + emitcode("mov", "b,a"); + while (--size) + { + MOVA (aopGet (oper, offset++, FALSE, FALSE, NULL)); + emitcode ("orl", "b,a"); + } + MOVA (aopGet (oper, offset++, FALSE, FALSE, NULL)); + emitcode ("orl", "a,b"); + popB (pushedB); } else { - MOVA (aopGet (AOP (oper), 0, FALSE, FALSE, TRUE)); - } - while (size--) - { - if (usedB) - { - emitcode ("orl", "b,%s", aopGet (AOP (oper), offset++, FALSE, FALSE, FALSE)); - } - else - { - emitcode ("orl", "a,%s", aopGet (AOP (oper), offset++, FALSE, FALSE, FALSE)); - } + while (size--) + { + emitcode ("orl", "a,%s", + aopGet (oper, offset++, FALSE, FALSE, NULL)); + } } _endLazyDPSEvaluation (); - - if (usedB) - { - emitcode ("mov", "a,b"); - emitcode ("pop", "b"); - } } @@ -1685,42 +2072,42 @@ 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) { - emitcode ("mov", "c,%s", IC_LEFT (ic)->aop->aopu.aop_dir); - emitcode ("cpl", "c"); - outBitC (IC_RESULT (ic)); - goto release; - } - - /* if type float then do float */ - if (IS_FLOAT (optype)) - { - genNotFloat (IC_LEFT (ic), IC_RESULT (ic)); + /* if left==result then cpl bit */ + if (sameRegs (AOP (IC_LEFT (ic)), AOP (IC_RESULT (ic)))) + { + emitcode ("cpl", "%s", IC_LEFT (ic)->aop->aopu.aop_dir); + } + else + { + emitcode ("mov", "c,%s", IC_LEFT (ic)->aop->aopu.aop_dir); + emitcode ("cpl", "c"); + outBitC (IC_RESULT (ic)); + } goto release; } toBoolean (IC_LEFT (ic)); + /* set C, if a == 0 */ tlbl = newiTempLabel (NULL); emitcode ("cjne", "a,#1,!tlabel", tlbl->key + 100); - emitcode ("", "!tlabeldef", tlbl->key + 100); + emitLabel (tlbl); outBitC (IC_RESULT (ic)); release: /* release the aops */ - freeAsmop (IC_LEFT (ic), NULL, ic, (RESULTONSTACK (ic) ? 0 : 1)); freeAsmop (IC_RESULT (ic), NULL, ic, TRUE); + freeAsmop (IC_LEFT (ic), NULL, ic, (RESULTONSTACK (ic) ? 0 : 1)); } @@ -1733,47 +2120,64 @@ genCpl (iCode * ic) int offset = 0; int size; symbol *tlbl; + sym_link *letype = getSpec (operandType (IC_LEFT (ic))); - D (emitcode (";", "genCpl "); - ); - + D(emitcode (";", "genCpl")); /* assign asmOps to operand & result */ aopOp (IC_LEFT (ic), ic, FALSE, 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) { - if (AOP_TYPE (IC_LEFT (ic)) == AOP_CRY) { - emitcode ("mov", "c,%s", IC_LEFT (ic)->aop->aopu.aop_dir); - emitcode ("cpl", "c"); - emitcode ("mov", "%s,c", IC_RESULT (ic)->aop->aopu.aop_dir); + if (AOP_TYPE (IC_RESULT (ic)) == AOP_CRY) + { + char *l; + + if (AOP_TYPE (IC_LEFT (ic)) == AOP_CRY || + (SPEC_USIGN (letype) && IS_CHAR (letype))) + { + /* promotion rules are responsible for this strange result: + bit -> int -> ~int -> bit + uchar -> int -> ~int -> bit + */ + emitcode ("setb", "%s", IC_RESULT (ic)->aop->aopu.aop_dir); + goto release; + } + + tlbl=newiTempLabel(NULL); + l = aopGet (IC_LEFT (ic), offset++, FALSE, FALSE, NULL); + if ((AOP_TYPE (IC_LEFT (ic)) == AOP_ACC && offset == 0) || + AOP_TYPE (IC_LEFT (ic)) == AOP_REG || + IS_AOP_PREG (IC_LEFT (ic))) + { + emitcode ("cjne", "%s,#0xFF,%05d$", l, tlbl->key + 100); + } + else + { + MOVA (l); + emitcode ("cjne", "a,#0xFF,%05d$", tlbl->key + 100); + } + emitLabel (tlbl); + outBitC (IC_RESULT(ic)); goto release; } - tlbl=newiTempLabel(NULL); - emitcode ("cjne", "%s,#0x01,%05d$", - aopGet(AOP(IC_LEFT(ic)), 0, FALSE,FALSE,TRUE), tlbl->key+100); - emitcode ("", "%05d$:", tlbl->key+100); - outBitC (IC_RESULT(ic)); - goto release; - } size = AOP_SIZE (IC_RESULT (ic)); _startLazyDPSEvaluation (); while (size--) { - char *l = aopGet (AOP (IC_LEFT (ic)), offset, FALSE, FALSE, TRUE); + char *l = aopGet (IC_LEFT (ic), offset, FALSE, FALSE, NULL); MOVA (l); emitcode ("cpl", "a"); - aopPut (AOP (IC_RESULT (ic)), "a", offset++); + aopPut (IC_RESULT (ic), "a", offset++); } _endLazyDPSEvaluation (); release: /* release the aops */ - freeAsmop (IC_LEFT (ic), NULL, ic, (RESULTONSTACK (ic) ? 0 : 1)); freeAsmop (IC_RESULT (ic), NULL, ic, TRUE); + freeAsmop (IC_LEFT (ic), NULL, ic, (RESULTONSTACK (ic) ? 0 : 1)); } /*-----------------------------------------------------------------*/ @@ -1784,26 +2188,27 @@ 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), - offset); + aopPut (result, + aopGet (op, offset, FALSE, FALSE, NULL), + offset); offset++; } + + l = aopGet (op, offset, FALSE, FALSE, NULL); + MOVA (l); + + emitcode ("cpl", "acc.7"); + aopPut (result, "a", offset); _endLazyDPSEvaluation (); } @@ -1814,15 +2219,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 */ @@ -1837,7 +2240,6 @@ genUminus (iCode * ic) } optype = operandType (IC_LEFT (ic)); - rtype = operandType (IC_RESULT (ic)); /* if float then do float stuff */ if (IS_FLOAT (optype)) @@ -1852,22 +2254,22 @@ genUminus (iCode * ic) _startLazyDPSEvaluation (); while (size--) { - char *l = aopGet (AOP (IC_LEFT (ic)), offset, FALSE, FALSE, TRUE); + char *l = aopGet (IC_LEFT (ic), offset, FALSE, FALSE, NULL); if (!strcmp (l, "a")) - { - if (offset == 0) - SETC; - emitcode ("cpl", "a"); - emitcode ("addc", "a,#0"); - } + { + if (offset == 0) + SETC; + emitcode ("cpl", "a"); + emitcode ("addc", "a,#0"); + } else - { - if (offset == 0) - CLRC; - emitcode ("clr", "a"); - emitcode ("subb", "a,%s", l); - } - aopPut (AOP (IC_RESULT (ic)), "a", offset++); + { + if (offset == 0) + CLRC; + emitcode ("clr", "a"); + emitcode ("subb", "a,%s", l); + } + aopPut (IC_RESULT (ic), "a", offset++); } _endLazyDPSEvaluation (); @@ -1878,13 +2280,13 @@ genUminus (iCode * ic) emitcode ("rlc", "a"); emitcode ("subb", "a,acc"); while (size--) - aopPut (AOP (IC_RESULT (ic)), "a", offset++); + aopPut (IC_RESULT (ic), "a", offset++); } release: /* release the aops */ - freeAsmop (IC_LEFT (ic), NULL, ic, (RESULTONSTACK (ic) ? 0 : 1)); freeAsmop (IC_RESULT (ic), NULL, ic, TRUE); + freeAsmop (IC_LEFT (ic), NULL, ic, (RESULTONSTACK (ic) ? 0 : 1)); } /*-----------------------------------------------------------------*/ @@ -1892,29 +2294,39 @@ release: /*-----------------------------------------------------------------*/ static void savermask(bitVect *rs_mask) { - int i; - if (options.useXstack) { - if (bitVectBitValue (rs_mask, R0_IDX)) - emitcode ("mov", "b,r0"); - emitcode ("mov", "r0,%s", spname); - for (i = 0; i < ds390_nRegs; i++) { - if (bitVectBitValue (rs_mask, i)) { - if (i == R0_IDX) - emitcode ("mov", "a,b"); - else - emitcode ("mov", "a,%s", ds390_regWithIdx (i)->name); - emitcode ("movx", "@r0,a"); - emitcode ("inc", "r0"); - } - } - emitcode ("mov", "%s,r0", spname); - if (bitVectBitValue (rs_mask, R0_IDX)) - emitcode ("mov", "r0,b"); - } else { - for (i = 0; i < ds390_nRegs; i++) { - if (bitVectBitValue (rs_mask, i)) - emitcode ("push", "%s", ds390_regWithIdx (i)->dname); - } + int i; + + if (options.useXstack) + { + if (bitVectBitValue (rs_mask, R0_IDX)) + emitcode ("mov", "b,r0"); + emitcode ("mov", "r0,%s", spname); + for (i = 0; i < ds390_nRegs; i++) + { + if (bitVectBitValue (rs_mask, i)) + { + if (i == R0_IDX) + emitcode ("mov", "a,b"); + else + emitcode ("mov", "a,%s", REG_WITH_INDEX (i)->name); + emitcode ("movx", "@r0,a"); + emitcode ("inc", "r0"); + } + } + emitcode ("mov", "%s,r0", spname); + if (bitVectBitValue (rs_mask, R0_IDX)) + emitcode ("mov", "r0,b"); + } + else + { + bool bits_pushed = FALSE; + for (i = 0; i < ds390_nRegs; i++) + { + if (bitVectBitValue (rs_mask, i)) + { + bits_pushed = pushReg (i, bits_pushed); + } + } } } @@ -1938,26 +2350,32 @@ saveRegisters (iCode * lic) return; } - /* if the registers have been saved already then + /* if the registers have been saved already or don't need to be 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 + /* 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)) - rsave = bitVectSetBit(rsave,i); + if (bitVectBitValue(ic->rMask,i)) + rsave = bitVectSetBit(rsave,i); } rsave = bitVectCplAnd(rsave,ds390_rUmaskForOp (IC_RESULT(ic))); - } else { - /* safe the registers in use at this time but skip the - ones for the result */ - rsave = bitVectCplAnd (bitVectCopy (ic->rMask), - ds390_rUmaskForOp (IC_RESULT(ic))); - } + } + else + { + /* save the registers in use at this time but skip the + ones for the result */ + rsave = bitVectCplAnd (bitVectCopy (ic->rMask), + ds390_rUmaskForOp (IC_RESULT(ic))); + } ic->regsSaved = 1; savermask(rsave); } @@ -1967,27 +2385,44 @@ saveRegisters (iCode * lic) /*-----------------------------------------------------------------*/ static void unsavermask(bitVect *rs_mask) { - int i; - if (options.useXstack) { - emitcode ("mov", "r0,%s", spname); - for (i = ds390_nRegs; i >= 0; i--) { - if (bitVectBitValue (rs_mask, i)) { - emitcode ("dec", "r0"); - emitcode ("movx", "a,@r0"); - if (i == R0_IDX) - emitcode ("mov", "b,a"); - else - emitcode ("mov", "%s,a", ds390_regWithIdx (i)->name); - } - } - emitcode ("mov", "%s,r0", spname); - if (bitVectBitValue (rs_mask, R0_IDX)) - emitcode ("mov", "r0,b"); - } else { - for (i = ds390_nRegs; i >= 0; i--) { - if (bitVectBitValue (rs_mask, i)) - emitcode ("pop", "%s", ds390_regWithIdx (i)->dname); - } + int i; + + if (options.useXstack) + { + emitcode ("mov", "r0,%s", spname); + for (i = ds390_nRegs; i >= 0; i--) + { + if (bitVectBitValue (rs_mask, i)) + { + regs * reg = REG_WITH_INDEX (i); + emitcode ("dec", "r0"); + emitcode ("movx", "a,@r0"); + if (i == R0_IDX) + { + emitcode ("push", "acc"); + } + else + { + emitcode ("mov", "%s,a", reg->name); + } + } + } + emitcode ("mov", "%s,r0", spname); + if (bitVectBitValue (rs_mask, R0_IDX)) + { + emitcode ("pop", "ar0"); + } + } + else + { + bool bits_popped = FALSE; + for (i = ds390_nRegs; i >= 0; i--) + { + if (bitVectBitValue (rs_mask, i)) + { + bits_popped = popReg (i, bits_popped); + } + } } } @@ -1999,19 +2434,20 @@ unsaveRegisters (iCode * ic) { bitVect *rsave; - 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)) - rsave = bitVectSetBit(rsave,i); + if (bitVectBitValue(ic->rMask,i)) + rsave = bitVectSetBit(rsave,i); } rsave = bitVectCplAnd(rsave,ds390_rUmaskForOp (IC_RESULT(ic))); } else { /* restore the registers in use at this time but skip the ones for the result */ - rsave = bitVectCplAnd (bitVectCopy (ic->rMask), - ds390_rUmaskForOp (IC_RESULT(ic))); + rsave = bitVectCplAnd (bitVectCopy (ic->rMask), + ds390_rUmaskForOp (IC_RESULT(ic))); } unsavermask(rsave); } @@ -2027,36 +2463,68 @@ pushSide (operand * oper, int size) _startLazyDPSEvaluation (); while (size--) { - char *l = aopGet (AOP (oper), offset++, FALSE, TRUE, FALSE); + char *l = aopGet (oper, offset++, FALSE, TRUE, NULL); if (AOP_TYPE (oper) != AOP_REG && - AOP_TYPE (oper) != AOP_DIR && - strcmp (l, "a")) - { - emitcode ("mov", "a,%s", l); - emitcode ("push", "acc"); - } + AOP_TYPE (oper) != AOP_DIR && + strcmp (l, "a")) + { + MOVA (l); + emitcode ("push", "acc"); + } else - emitcode ("push", "%s", l); + { + emitcode ("push", "%s", l); + } } _endLazyDPSEvaluation (); } /*-----------------------------------------------------------------*/ -/* assignResultValue - */ +/* assignResultValue - also indicates if acc is in use afterwards */ /*-----------------------------------------------------------------*/ -static void -assignResultValue (operand * oper) +static bool +assignResultValue (operand * oper, operand * func) { int offset = 0; - int size = AOP_SIZE (oper); + unsigned size = AOP_SIZE (oper); + bool accuse = FALSE; + bool pushedA = FALSE; + + if (func && IS_BIT (OP_SYM_ETYPE (func))) + { + outBitC (oper); + return 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 ACC, we must preserve it. + */ + if (AOP_NEEDSACC(oper)) + { + emitcode(";", "assignResultValue special case for ACC."); + emitcode("push", "acc"); + pushedA = TRUE; + size--; + } + } _startLazyDPSEvaluation (); while (size--) { - aopPut (AOP (oper), fReturn[offset], offset); + accuse |= aopPut (oper, fReturn[offset], offset); offset++; } _endLazyDPSEvaluation (); + + if (pushedA) + { + emitcode ("pop", "acc"); + accuse |= aopPut (oper, "a", offset); + } + return accuse; } @@ -2070,47 +2538,53 @@ genXpush (iCode * ic) regs *r; int size, offset = 0; - D (emitcode (";", "genXpush "); - ); + D (emitcode (";", "genXpush")); aopOp (IC_LEFT (ic), ic, FALSE, FALSE); r = getFreePtr (ic, &aop, FALSE); - - emitcode ("mov", "%s,_spx", r->name); - size = AOP_SIZE (IC_LEFT (ic)); - _startLazyDPSEvaluation (); - while (size--) - { - char *l = aopGet (AOP (IC_LEFT (ic)), - offset++, FALSE, FALSE, TRUE); - MOVA (l); + if (size == 1) + { + MOVA (aopGet (IC_LEFT (ic), 0, FALSE, FALSE, NULL)); + emitcode ("mov", "%s,_spx", r->name); + emitcode ("inc", "_spx"); // allocate space first emitcode ("movx", "@%s,a", r->name); - emitcode ("inc", "%s", r->name); - } - _endLazyDPSEvaluation (); - + else + { + // allocate space first + emitcode ("mov", "%s,_spx", r->name); + MOVA (r->name); + emitcode ("add", "a,#%d", size); + emitcode ("mov", "_spx,a"); - emitcode ("mov", "_spx,%s", r->name); + _startLazyDPSEvaluation (); + while (size--) + { + MOVA (aopGet (IC_LEFT (ic), offset++, FALSE, FALSE, NULL)); + emitcode ("movx", "@%s,a", r->name); + emitcode ("inc", "%s", r->name); + } + _endLazyDPSEvaluation (); + } freeAsmop (NULL, aop, ic, TRUE); freeAsmop (IC_LEFT (ic), NULL, ic, TRUE); } /*-----------------------------------------------------------------*/ -/* 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) { int size, offset = 0; char *l; + char *prev = ""; - D (emitcode (";", "genIpush "); - ); + D (emitcode (";", "genIpush")); /* if this is not a parm push : ie. it is spill push and spill push is always done on the local stack */ @@ -2118,28 +2592,28 @@ genIpush (iCode * ic) { /* and the item is spilt then do nothing */ - if (OP_SYMBOL (IC_LEFT (ic))->isspilt) - return; + if (OP_SYMBOL (IC_LEFT (ic))->isspilt || OP_SYMBOL(IC_LEFT(ic))->dptr) + return; aopOp (IC_LEFT (ic), ic, FALSE, FALSE); size = AOP_SIZE (IC_LEFT (ic)); /* push it on the stack */ _startLazyDPSEvaluation (); while (size--) - { - l = aopGet (AOP (IC_LEFT (ic)), offset++, FALSE, TRUE, TRUE); - if (*l == '#') - { - MOVA (l); - l = "acc"; - } - emitcode ("push", "%s", l); - } + { + l = aopGet (IC_LEFT (ic), offset++, FALSE, TRUE, NULL); + if (*l == '#') + { + MOVA (l); + l = "acc"; + } + emitcode ("push", "%s", l); + } _endLazyDPSEvaluation (); return; } - /* this is a paramter push: in this case we call + /* this is a parameter push: in this case we call the routine to find the call and save those registers that need to be saved */ saveRegisters (ic); @@ -2161,16 +2635,20 @@ genIpush (iCode * ic) _startLazyDPSEvaluation (); while (size--) { - l = aopGet (AOP (IC_LEFT (ic)), offset++, FALSE, TRUE, FALSE); + l = aopGet (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")) - { - emitcode ("mov", "a,%s", l); - emitcode ("push", "acc"); - } + AOP_TYPE (IC_LEFT (ic)) != AOP_DIR && + strcmp (l, "acc")) + { + if (strcmp (l, prev) || *l == '@') + MOVA (l); + emitcode ("push", "acc"); + } else - emitcode ("push", "%s", l); + { + emitcode ("push", "%s", l); + } + prev = l; } _endLazyDPSEvaluation (); @@ -2185,12 +2663,10 @@ genIpop (iCode * ic) { int size, offset; - D (emitcode (";", "genIpop "); - ); - + D (emitcode (";", "genIpop")); /* if the temp was not pushed then */ - if (OP_SYMBOL (IC_LEFT (ic))->isspilt) + if (OP_SYMBOL (IC_LEFT (ic))->isspilt || OP_SYMBOL (IC_LEFT (ic))->dptr) return; aopOp (IC_LEFT (ic), ic, FALSE, FALSE); @@ -2199,8 +2675,8 @@ genIpop (iCode * ic) _startLazyDPSEvaluation (); while (size--) { - emitcode ("pop", "%s", aopGet (AOP (IC_LEFT (ic)), offset--, - FALSE, TRUE, TRUE)); + emitcode ("pop", "%s", aopGet (IC_LEFT (ic), offset--, + FALSE, TRUE, NULL)); } _endLazyDPSEvaluation (); @@ -2208,75 +2684,97 @@ genIpop (iCode * ic) } /*-----------------------------------------------------------------*/ -/* unsaveRBank - restores the resgister bank from stack */ +/* saveRBank - saves an entire register bank on the stack */ /*-----------------------------------------------------------------*/ static void -unsaveRBank (int bank, iCode * ic, bool popPsw) +saveRBank (int bank, iCode * ic, bool pushPsw) { int i; + int count = 8 + (ds390_nBitRegs/8) + (pushPsw ? 1 : 0); asmop *aop = NULL; regs *r = NULL; if (options.useXstack) - { + { if (!ic) - { - /* Assume r0 is available for use. */ - r = ds390_regWithIdx (R0_IDX);; - } + { + /* Assume r0 is available for use. */ + r = REG_WITH_INDEX (R0_IDX);; + } else - { - aop = newAsmop (0); - r = getFreePtr (ic, &aop, FALSE); - } - emitcode ("mov", "%s,_spx", r->name); - } - - if (popPsw) + { + aop = newAsmop (0); + r = getFreePtr (ic, &aop, FALSE); + } + // allocate space first + emitcode ("mov", "%s,_spx", r->name); + MOVA (r->name); + emitcode ("add", "a,#%d", count); + emitcode ("mov", "_spx,a"); + } + + for (i = 0; i < 8; i++) /* only R0-R7 needs saving */ { if (options.useXstack) - { - emitcode ("movx", "a,@%s", r->name); - emitcode ("mov", "psw,a"); - emitcode ("dec", "%s", r->name); - } + { + emitcode ("mov", "a,(%s+%d)", + regs390[i].base, 8 * bank + regs390[i].offset); + emitcode ("movx", "@%s,a", r->name); + if (--count) + emitcode ("inc", "%s", r->name); + } else - { - emitcode ("pop", "psw"); - } + emitcode ("push", "(%s+%d)", + regs390[i].base, 8 * bank + regs390[i].offset); } - for (i = 7; i >= 0; i--) /* only R7-R0 needs to be popped */ + if (ds390_nBitRegs > 0) { if (options.useXstack) - { - emitcode ("movx", "a,@%s", r->name); - emitcode ("mov", "(%s+%d),a", - regs390[i].base, 8 * bank + regs390[i].offset); - emitcode ("dec", "%s", r->name); - - } + { + emitcode ("mov", "a,bits"); + emitcode ("movx", "@%s,a", r->name); + if (--count) + emitcode ("inc", "%s", r->name); + } else - emitcode ("pop", "(%s+%d)", - regs390[i].base, 8 * bank + regs390[i].offset); + { + emitcode ("push", "bits"); + } + BitBankUsed = 1; } - if (options.useXstack) + if (pushPsw) { - emitcode ("mov", "_spx,%s", r->name); + if (options.useXstack) + { + emitcode ("mov", "a,psw"); + emitcode ("movx", "@%s,a", r->name); + } + else + { + emitcode ("push", "psw"); + } + + emitcode ("mov", "psw,#!constbyte", (bank << 3) & 0x00ff); } - + if (aop) + { + freeAsmop (NULL, aop, ic, TRUE); + } + + if (ic) { - freeAsmop (NULL, aop, ic, TRUE); - } + ic->bankSaved = 1; + } } /*-----------------------------------------------------------------*/ -/* saveRBank - saves an entire register bank on the stack */ +/* unsaveRBank - restores the register bank from stack */ /*-----------------------------------------------------------------*/ static void -saveRBank (int bank, iCode * ic, bool pushPsw) +unsaveRBank (int bank, iCode * ic, bool popPsw) { int i; asmop *aop = NULL; @@ -2284,108 +2782,205 @@ saveRBank (int bank, iCode * ic, bool pushPsw) if (options.useXstack) { - if (!ic) + if (!ic) { - /* Assume r0 is available for use. */ - r = ds390_regWithIdx (R0_IDX);; + /* Assume r0 is available for use. */ + r = REG_WITH_INDEX (R0_IDX);; } - else + else { - aop = newAsmop (0); - r = getFreePtr (ic, &aop, FALSE); + aop = newAsmop (0); + r = getFreePtr (ic, &aop, FALSE); } - emitcode ("mov", "%s,_spx", r->name); + emitcode ("mov", "%s,_spx", r->name); } - for (i = 0; i < 8 ; i++) /* only R0-R7 needs saving */ + if (popPsw) { if (options.useXstack) - { - emitcode ("inc", "%s", r->name); - emitcode ("mov", "a,(%s+%d)", - regs390[i].base, 8 * bank + regs390[i].offset); - emitcode ("movx", "@%s,a", r->name); - } + { + emitcode ("dec", "%s", r->name); + emitcode ("movx", "a,@%s", r->name); + emitcode ("mov", "psw,a"); + } else - emitcode ("push", "(%s+%d)", - regs390[i].base, 8 * bank + regs390[i].offset); + { + emitcode ("pop", "psw"); + } } - if (pushPsw) + if (ds390_nBitRegs > 0) { if (options.useXstack) - { - emitcode ("mov", "a,psw"); - emitcode ("movx", "@%s,a", r->name); - emitcode ("inc", "%s", r->name); - emitcode ("mov", "_spx,%s", r->name); - } + { + emitcode ("dec", "%s", r->name); + emitcode ("movx", "a,@%s", r->name); + emitcode ("mov", "bits,a"); + } else - { - emitcode ("push", "psw"); - } - - emitcode ("mov", "psw,#!constbyte", (bank << 3) & 0x00ff); + { + emitcode ("pop", "bits"); + } } - + + for (i = 7; i >= 0; i--) /* only R7-R0 needs to be popped */ + { + if (options.useXstack) + { + emitcode ("dec", "%s", r->name); + emitcode ("movx", "a,@%s", r->name); + emitcode ("mov", "(%s+%d),a", + regs390[i].base, 8 * bank + regs390[i].offset); + } + else + { + emitcode ("pop", "(%s+%d)", + regs390[i].base, 8 * bank + regs390[i].offset); + } + } + + if (options.useXstack) + { + emitcode ("mov", "_spx,%s", r->name); + } + if (aop) - { - freeAsmop (NULL, aop, ic, TRUE); - } - - if (ic) - { - ic->bankSaved = 1; - } + { + freeAsmop (NULL, aop, ic, TRUE); + } } /*-----------------------------------------------------------------*/ -/* genSend - gen code for SEND */ +/* genSend - gen code for SEND */ /*-----------------------------------------------------------------*/ static void genSend(set *sendSet) { - iCode *sic; - int sendCount = 0 ; - static int rb1_count = 0; - - for (sic = setFirstItem (sendSet); sic; - sic = setNextItem (sendSet)) { - int size, offset = 0; - - size=getSize(operandType(IC_LEFT(sic))); - D (emitcode (";", "genSend argreg = %d, size = %d ",sic->argreg,size)); - if (sendCount == 0) { /* first parameter */ - // we know that dpl(hxb) is the result, so - rb1_count = 0 ; - _startLazyDPSEvaluation (); - if (size>1) { - aopOp (IC_LEFT (sic), sic, FALSE, - (IS_SYMOP(IC_LEFT(sic)) && OP_SYMBOL(IC_LEFT(sic))->ruonly ? FALSE : TRUE)); - } else { - aopOp (IC_LEFT (sic), sic, FALSE, FALSE); - } - while (size--) { - char *l = aopGet (AOP (IC_LEFT (sic)), offset, - FALSE, FALSE, TRUE); - if (strcmp (l, fReturn[offset])) { - emitcode ("mov", "%s,%s", - fReturn[offset], - l); - } - offset++; - } - _endLazyDPSEvaluation (); - freeAsmop (IC_LEFT (sic), NULL, sic, TRUE); - rb1_count =0; - } else { /* if more parameter in registers */ - 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)); - } - freeAsmop (IC_LEFT (sic), NULL, sic, TRUE); - } - sendCount++; + iCode *sic; + int bit_count = 0; + int sendCount = 0 ; + static int rb1_count = 0; + + /* first we do all bit parameters */ + for (sic = setFirstItem (sendSet); sic; + sic = setNextItem (sendSet)) + { + if (sic->argreg > 12) + { + int bit = sic->argreg-13; + + aopOp (IC_LEFT (sic), sic, FALSE, + (AOP_IS_STR(IC_LEFT(sic)) ? FALSE : TRUE)); + + /* if left is a literal then + we know what the value is */ + if (AOP_TYPE (IC_LEFT (sic)) == AOP_LIT) + { + if (((int) operandLitValue (IC_LEFT (sic)))) + emitcode ("setb", "b[%d]", bit); + else + emitcode ("clr", "b[%d]", bit); + } + else if (AOP_TYPE (IC_LEFT (sic)) == AOP_CRY) + { + char *l = AOP (IC_LEFT (sic))->aopu.aop_dir; + if (strcmp (l, "c")) + emitcode ("mov", "c,%s", l); + emitcode ("mov", "b[%d],c", bit); + } + else + { + /* we need to or */ + toBoolean (IC_LEFT (sic)); + /* set C, if a >= 1 */ + emitcode ("add", "a,#0xff"); + emitcode ("mov", "b[%d],c", bit); + } + bit_count++; + BitBankUsed = 1; + + freeAsmop (IC_LEFT (sic), NULL, sic, TRUE); + } + } + + if (bit_count) + { + saveRegisters (setFirstItem (sendSet)); + emitcode ("mov", "bits,b"); + } + + /* then we do all other parameters */ + for (sic = setFirstItem (sendSet); sic; + sic = setNextItem (sendSet)) + { + if (sic->argreg <= 12) + { + int size, offset = 0; + + size = getSize (operandType (IC_LEFT (sic))); + D (emitcode (";", "genSend argreg = %d, size = %d ",sic->argreg,size)); + if (sendCount == 0) { /* first parameter */ + // we know that dpl(hxb) is the result, so + rb1_count = 0 ; + _startLazyDPSEvaluation (); + if (size>1) { + aopOp (IC_LEFT (sic), sic, FALSE, + (AOP_IS_STR(IC_LEFT(sic)) ? FALSE : TRUE)); + } else { + aopOp (IC_LEFT (sic), sic, FALSE, FALSE); + } + while (size--) + { + char *l = aopGet (IC_LEFT (sic), offset, FALSE, FALSE, NULL); + if (strcmp (l, fReturn[offset])) + { + emitcode ("mov", "%s,%s", fReturn[offset], l); + } + offset++; + } + _endLazyDPSEvaluation (); + freeAsmop (IC_LEFT (sic), NULL, sic, TRUE); + rb1_count =0; + } else { /* if more parameter in registers */ + aopOp (IC_LEFT (sic), sic, FALSE, TRUE); + while (size--) { + emitcode ("mov","b1_%d,%s",rb1_count++,aopGet (IC_LEFT (sic), offset++, + FALSE, FALSE, NULL)); + } + freeAsmop (IC_LEFT (sic), NULL, sic, TRUE); + } + sendCount++; + } + } +} + +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); + } +} + +/*-----------------------------------------------------------------*/ +/* selectRegBank - emit code to select the register bank */ +/*-----------------------------------------------------------------*/ +static void +selectRegBank (short bank, bool keepFlags) +{ + /* if f.e. result is in carry */ + if (keepFlags) + { + emitcode ("anl", "psw,#0xE7"); + if (bank) + emitcode ("orl", "psw,#0x%02x", (bank << 3) & 0xff); + } + else + { + emitcode ("mov", "psw,#0x%02x", (bank << 3) & 0xff); } } @@ -2396,35 +2991,41 @@ static void genCall (iCode * ic) { sym_link *dtype; + sym_link *etype; bool restoreBank = FALSE; bool swapBanks = FALSE; + bool accuse = FALSE; + bool accPushed = FALSE; + bool resultInF0 = FALSE; + bool assignResultGenerated = FALSE; - D (emitcode (";", "genCall ");); + D (emitcode (";", "genCall")); /* if we are calling a not _naked function that is not using 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) && + etype = getSpec(dtype); + if (currFunc && dtype && (!IFFUNC_ISNAKED(dtype) || TARGET_IS_DS400) && (FUNC_REGBANK (currFunc->type) != FUNC_REGBANK (dtype)) && IFFUNC_ISISR (currFunc->type)) { - if (!ic->bankSaved) + if (!ic->bankSaved) { /* This is unexpected; the bank should have been saved in * genFunction. */ - saveRBank (FUNC_REGBANK (dtype), ic, FALSE); - restoreBank = TRUE; + saveRBank (FUNC_REGBANK (dtype), ic, FALSE); + restoreBank = TRUE; } swapBanks = TRUE; } - - /* if caller saves & we have not saved then */ - if (!ic->regsSaved) + + /* if caller saves & we have not saved then */ + if (!ic->regsSaved) saveRegisters (ic); - - /* if send set is not empty the assign */ + + /* if send set is not empty then assign */ /* We've saved all the registers we care about; * therefore, we may clobber any register not used * in the calling convention (i.e. anything not in @@ -2432,111 +3033,163 @@ genCall (iCode * ic) */ if (_G.sendSet) { - if (IFFUNC_ISREENT(dtype)) { /* need to reverse the send set */ - genSend(reverseSet(_G.sendSet)); - } else { - genSend(_G.sendSet); - } + if (IFFUNC_ISREENT(dtype)) { /* need to reverse the send set */ + genSend(reverseSet(_G.sendSet)); + } else { + genSend(_G.sendSet); + } _G.sendSet = NULL; - } - + } + if (swapBanks) - { - emitcode ("mov", "psw,#!constbyte", - ((FUNC_REGBANK(dtype)) << 3) & 0xff); - } + { + emitcode ("mov", "psw,#!constbyte", + ((FUNC_REGBANK(dtype)) << 3) & 0xff); + } /* make the call */ emitcode ("lcall", "%s", (OP_SYMBOL (IC_LEFT (ic))->rname[0] ? - OP_SYMBOL (IC_LEFT (ic))->rname : - OP_SYMBOL (IC_LEFT (ic))->name)); + OP_SYMBOL (IC_LEFT (ic))->rname : + OP_SYMBOL (IC_LEFT (ic))->name)); if (swapBanks) - { - emitcode ("mov", "psw,#!constbyte", - ((FUNC_REGBANK(currFunc->type)) << 3) & 0xff); - } + { + selectRegBank (FUNC_REGBANK(currFunc->type), IS_BIT (etype)); + } /* if we need assign a result value */ if ((IS_ITEMP (IC_RESULT (ic)) && + !IS_BIT (OP_SYM_ETYPE (IC_RESULT (ic))) && (OP_SYMBOL (IC_RESULT (ic))->nRegs || - OP_SYMBOL (IC_RESULT (ic))->accuse || - OP_SYMBOL (IC_RESULT (ic))->spildir)) || + OP_SYMBOL (IC_RESULT (ic))->accuse || + OP_SYMBOL (IC_RESULT (ic))->spildir)) || IS_TRUE_SYMOP (IC_RESULT (ic))) { if (isOperandInFarSpace (IC_RESULT (ic)) - && getSize (operandType (IC_RESULT (ic))) <= 2) - { - int size = getSize (operandType (IC_RESULT (ic))); - - /* Special case for 1 or 2 byte return in far space. */ - MOVA (fReturn[0]); - if (size > 1) - { - emitcode ("mov", "b,%s", fReturn[1]); - } - - aopOp (IC_RESULT (ic), ic, FALSE, FALSE); - aopPut (AOP (IC_RESULT (ic)), "a", 0); - - if (size > 1) - { - aopPut (AOP (IC_RESULT (ic)), "b", 1); - } - freeAsmop (IC_RESULT (ic), NULL, ic, TRUE); - } + && getSize (operandType (IC_RESULT (ic))) <= 2) + { + int size = getSize (operandType (IC_RESULT (ic))); + bool pushedB = FALSE; + + /* Special case for 1 or 2 byte return in far space. */ + MOVA (fReturn[0]); + if (size > 1) + { + pushedB = pushB (); + emitcode ("mov", "b,%s", fReturn[1]); + } + + _G.accInUse++; + aopOp (IC_RESULT (ic), ic, FALSE, FALSE); + _G.accInUse--; + + popB (pushedB); + + aopPut (IC_RESULT (ic), "a", 0); + + if (size > 1) + { + aopPut (IC_RESULT (ic), "b", 1); + } + assignResultGenerated = TRUE; + freeAsmop (IC_RESULT (ic), NULL, ic, TRUE); + } else - { - _G.accInUse++; - aopOp (IC_RESULT (ic), ic, FALSE, TRUE); - _G.accInUse--; - - assignResultValue (IC_RESULT (ic)); + { + bool pushedB = pushB (); + aopOp (IC_RESULT (ic), ic, FALSE, TRUE); + popB (pushedB); - freeAsmop (IC_RESULT (ic), NULL, ic, TRUE); - } + accuse = assignResultValue (IC_RESULT (ic), IC_LEFT (ic)); + assignResultGenerated = TRUE; + freeAsmop (IC_RESULT (ic), NULL, ic, TRUE); + } } - /* adjust the stack for parameters if - required */ - if (ic->parmBytes) { + /* adjust the stack for parameters if required */ + if (ic->parmBytes) + { int i; if (options.stack10bit) { - if (ic->parmBytes <= 10) { - emitcode(";","stack adjustment for parms"); - for (i=0; i < ic->parmBytes ; i++) { - emitcode("pop","acc"); - } - } else { - PROTECT_SP; - emitcode ("clr","c"); - emitcode ("mov","a,sp"); - emitcode ("subb","a,#!constbyte",ic->parmBytes & 0xff); - emitcode ("mov","sp,a"); - emitcode ("mov","a,esp"); - emitcode ("anl","a,#3"); - emitcode ("subb","a,#!constbyte",(ic->parmBytes >> 8) & 0xff); - emitcode ("mov","esp,a"); - UNPROTECT_SP; - } + if (ic->parmBytes <= 10) { + emitcode(";","stack adjustment for parms"); + for (i=0; i < ic->parmBytes ; i++) { + emitcode("pop","acc"); + } + } else { + PROTECT_SP; + emitcode ("clr","c"); + emitcode ("mov","a,sp"); + emitcode ("subb","a,#!constbyte",ic->parmBytes & 0xff); + emitcode ("mov","sp,a"); + emitcode ("mov","a,esp"); + adjustEsp("a"); + emitcode ("subb","a,#!constbyte",(ic->parmBytes >> 8) & 0xff); + emitcode ("mov","esp,a"); + UNPROTECT_SP; + } } else { - if (ic->parmBytes > 3) { - emitcode ("mov", "a,%s", spname); - emitcode ("add", "a,#!constbyte", (-ic->parmBytes) & 0xff); - emitcode ("mov", "%s,a", spname); - } else - for (i = 0; i < ic->parmBytes; i++) - emitcode ("dec", "%s", spname); + if (ic->parmBytes > 3) + { + if (accuse) + { + emitcode ("push", "acc"); + accPushed = TRUE; + } + if (IS_BIT (OP_SYM_ETYPE (IC_LEFT (ic))) && + IS_BIT (OP_SYM_ETYPE (IC_RESULT (ic))) && + !assignResultGenerated) + { + emitcode ("mov", "F0,c"); + resultInF0 = TRUE; + } + + emitcode ("mov", "a,%s", spname); + emitcode ("add", "a,#!constbyte", (-ic->parmBytes) & 0xff); + emitcode ("mov", "%s,a", spname); + + /* unsaveRegisters from xstack needs acc, but */ + /* unsaveRegisters from stack needs this popped */ + if (accPushed && !options.useXstack) + { + emitcode ("pop", "acc"); + accPushed = FALSE; + } + } + else + for (i = 0; i < ic->parmBytes; i++) + emitcode ("dec", "%s", spname); } } - /* if we hade saved some registers then unsave them */ - if (ic->regsSaved) - unsaveRegisters (ic); + /* if we had saved some registers then unsave them */ + if (ic->regsSaved && !IFFUNC_CALLEESAVES(dtype)) + { + if (accuse && !accPushed && options.useXstack) + { + /* xstack needs acc, but doesn't touch normal stack */ + emitcode ("push", "acc"); + accPushed = TRUE; + } + unsaveRegisters (ic); + } /* if register bank was saved then pop them */ if (restoreBank) unsaveRBank (FUNC_REGBANK (dtype), ic, FALSE); + + if (IS_BIT (OP_SYM_ETYPE (IC_RESULT (ic))) && !assignResultGenerated) + { + if (resultInF0) + emitcode ("mov", "c,F0"); + + aopOp (IC_RESULT (ic), ic, FALSE, FALSE); + assignResultValue (IC_RESULT (ic), IC_LEFT (ic)); + freeAsmop (IC_RESULT (ic), NULL, ic, TRUE); + } + + if (accPushed) + emitcode ("pop", "acc"); } /*-----------------------------------------------------------------*/ @@ -2546,22 +3199,23 @@ static void genPcall (iCode * ic) { sym_link *dtype; + sym_link *etype; symbol *rlbl = newiTempLabel (NULL); bool restoreBank=FALSE; + bool resultInF0 = FALSE; - D (emitcode (";", "genPcall "); - ); - + D (emitcode (";", "genPcall")); + dtype = operandType (IC_LEFT (ic))->next; + etype = getSpec(dtype); /* if caller saves & we have not saved then */ if (!ic->regsSaved) saveRegisters (ic); - /* if we are calling a function that is not using + /* if we are calling a not _naked function that is not using 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); @@ -2590,18 +3244,20 @@ genPcall (iCode * ic) /* if send set is not empty the assign */ if (_G.sendSet) { - genSend(reverseSet(_G.sendSet)); - _G.sendSet = NULL; + genSend(reverseSet(_G.sendSet)); + _G.sendSet = NULL; } + /* make the call */ emitcode ("ret", ""); - emitcode ("", "!tlabeldef", (rlbl->key + 100)); + emitLabel (rlbl); /* if we need assign a result value */ if ((IS_ITEMP (IC_RESULT (ic)) && + !IS_BIT (OP_SYM_ETYPE (IC_RESULT (ic))) && (OP_SYMBOL (IC_RESULT (ic))->nRegs || - OP_SYMBOL (IC_RESULT (ic))->spildir)) || + OP_SYMBOL (IC_RESULT (ic))->spildir)) || IS_TRUE_SYMOP (IC_RESULT (ic))) { @@ -2609,55 +3265,75 @@ genPcall (iCode * ic) aopOp (IC_RESULT (ic), ic, FALSE, TRUE); _G.accInUse--; - assignResultValue (IC_RESULT (ic)); + assignResultValue (IC_RESULT (ic), IC_LEFT (ic)); freeAsmop (IC_RESULT (ic), NULL, ic, TRUE); } - /* adjust the stack for parameters if - required */ + /* adjust the stack for parameters if required */ if (ic->parmBytes) { int i; if (options.stack10bit) { - if (ic->parmBytes <= 10) { - emitcode(";","stack adjustment for parms"); - for (i=0; i < ic->parmBytes ; i++) { - emitcode("pop","acc"); - } - } else { - PROTECT_SP; - emitcode ("clr","c"); - emitcode ("mov","a,sp"); - emitcode ("subb","a,#!constbyte",ic->parmBytes & 0xff); - emitcode ("mov","sp,a"); - emitcode ("mov","a,esp"); - emitcode ("anl","a,#3"); - emitcode ("subb","a,#!constbyte",(ic->parmBytes >> 8) & 0xff); - emitcode ("mov","esp,a"); - UNPROTECT_SP; - } + if (ic->parmBytes <= 10) { + emitcode(";","stack adjustment for parms"); + for (i=0; i < ic->parmBytes ; i++) { + emitcode("pop","acc"); + } + } else { + if (IS_BIT (OP_SYM_ETYPE (IC_LEFT (ic))) && + IS_BIT (OP_SYM_ETYPE (IC_RESULT (ic)))) + { + emitcode ("mov", "F0,c"); + resultInF0 = TRUE; + } + + PROTECT_SP; + emitcode ("clr","c"); + emitcode ("mov","a,sp"); + emitcode ("subb","a,#!constbyte",ic->parmBytes & 0xff); + emitcode ("mov","sp,a"); + emitcode ("mov","a,esp"); + adjustEsp("a"); + emitcode ("subb","a,#!constbyte",(ic->parmBytes >> 8) & 0xff); + emitcode ("mov","esp,a"); + UNPROTECT_SP; + } } else { - if (ic->parmBytes > 3) { - emitcode ("mov", "a,%s", spname); - emitcode ("add", "a,#!constbyte", (-ic->parmBytes) & 0xff); - emitcode ("mov", "%s,a", spname); - } - else - for (i = 0; i < ic->parmBytes; i++) - emitcode ("dec", "%s", spname); - + if (ic->parmBytes > 3) { + if (IS_BIT (OP_SYM_ETYPE (IC_LEFT (ic))) && + IS_BIT (OP_SYM_ETYPE (IC_RESULT (ic)))) + { + emitcode ("mov", "F0,c"); + resultInF0 = TRUE; + } + + emitcode ("mov", "a,%s", spname); + emitcode ("add", "a,#!constbyte", (-ic->parmBytes) & 0xff); + emitcode ("mov", "%s,a", spname); + } + else + for (i = 0; i < ic->parmBytes; i++) + emitcode ("dec", "%s", spname); } } /* if register bank was saved then unsave them */ if (restoreBank) unsaveRBank (FUNC_REGBANK (dtype), ic, TRUE); - - /* if we hade saved some registers then - unsave them */ + + /* if we had saved some registers then unsave them */ if (ic->regsSaved) unsaveRegisters (ic); + if (IS_BIT (OP_SYM_ETYPE (IC_RESULT (ic)))) + { + if (resultInF0) + emitcode ("mov", "c,F0"); + + aopOp (IC_RESULT (ic), ic, FALSE, FALSE); + assignResultValue (IC_RESULT (ic), IC_LEFT (ic)); + freeAsmop (IC_RESULT (ic), NULL, ic, TRUE); + } } /*-----------------------------------------------------------------*/ @@ -2673,37 +3349,31 @@ resultRemat (iCode * ic) { symbol *sym = OP_SYMBOL (IC_RESULT (ic)); if (sym->remat && !POINTER_SET (ic)) - return 1; + return 1; } return 0; } -#if defined(__BORLANDC__) || defined(_MSC_VER) -#define STRCASECMP stricmp -#else -#define STRCASECMP strcasecmp -#endif - /*-----------------------------------------------------------------*/ /* 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); } /*-----------------------------------------------------------------*/ @@ -2712,32 +3382,32 @@ inExcludeList (char *s) static void genFunction (iCode * ic) { - symbol *sym; + symbol *sym = OP_SYMBOL (IC_LEFT (ic)); sym_link *ftype; - bool switchedPSW = FALSE; + bool switchedPSW = FALSE; + bool fReentrant = (IFFUNC_ISREENT (sym->type) || options.stackAuto); - D (emitcode (";", "genFunction ");); + D (emitcode (";", "genFunction")); _G.nRegsSaved = 0; /* create the function header */ emitcode (";", "-----------------------------------------"); - emitcode (";", " function %s", (sym = OP_SYMBOL (IC_LEFT (ic)))->name); + emitcode (";", " function %s", sym->name); emitcode (";", "-----------------------------------------"); emitcode ("", "%s:", sym->rname); + lineCurr->isLabel = 1; ftype = operandType (IC_LEFT (ic)); + _G.currentFunc = sym; if (IFFUNC_ISNAKED(ftype)) { emitcode(";", "naked function: no prologue."); return; } - - if (options.stack_probe) + + 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 */ @@ -2747,19 +3417,19 @@ genFunction (iCode * ic) rbank = FUNC_REGBANK (ftype); for (i = 0; i < ds390_nRegs; i++) - { - if (regs390[i].print) { - if (strcmp (regs390[i].base, "0") == 0) - emitcode ("", "%s !equ !constbyte", - regs390[i].dname, - 8 * rbank + regs390[i].offset); - else - emitcode ("", "%s !equ %s + !constbyte", - regs390[i].dname, - regs390[i].base, - 8 * rbank + regs390[i].offset); - } - } + { + if (regs390[i].print) { + if (strcmp (regs390[i].base, "0") == 0) + emitcode ("", "%s !equ !constbyte", + regs390[i].dname, + 8 * rbank + regs390[i].offset); + else + emitcode ("", "%s !equ %s + !constbyte", + regs390[i].dname, + regs390[i].base, + 8 * rbank + regs390[i].offset); + } + } } /* if this is an interrupt service routine then @@ -2767,181 +3437,179 @@ genFunction (iCode * ic) if (IFFUNC_ISISR (sym->type)) { /* is ISR */ if (!inExcludeList ("acc")) - emitcode ("push", "acc"); + emitcode ("push", "acc"); if (!inExcludeList ("b")) - emitcode ("push", "b"); + emitcode ("push", "b"); if (!inExcludeList ("dpl")) - emitcode ("push", "dpl"); + emitcode ("push", "dpl"); if (!inExcludeList ("dph")) - emitcode ("push", "dph"); + emitcode ("push", "dph"); if (options.model == MODEL_FLAT24 && !inExcludeList ("dpx")) - { - emitcode ("push", "dpx"); - /* Make sure we're using standard DPTR */ - emitcode ("push", "dps"); - emitcode ("mov", "dps,#0"); - if (options.stack10bit) - { - /* This ISR could conceivably use DPTR2. Better save it. */ - emitcode ("push", "dpl1"); - emitcode ("push", "dph1"); - emitcode ("push", "dpx1"); - emitcode ("push", DP2_RESULT_REG); - } - } + { + emitcode ("push", "dpx"); + /* Make sure we're using standard DPTR */ + emitcode ("push", "dps"); + emitcode ("mov", "dps,#0"); + if (options.stack10bit) + { + /* This ISR could conceivably use DPTR2. Better save it. */ + emitcode ("push", "dpl1"); + emitcode ("push", "dph1"); + emitcode ("push", "dpx1"); + emitcode ("push", DP2_RESULT_REG); + } + } /* if this isr has no bank i.e. is going to run with bank 0 , then we need to save more registers :-) */ if (!FUNC_REGBANK (sym->type)) - { - int i; - - /* if this function does not call any other - function then we can be economical and - save only those registers that are used */ - if (!IFFUNC_HASFCALL(sym->type)) - { - - /* if any registers used */ - if (sym->regsUsed) - { - /* save the registers used */ - for (i = 0; i < sym->regsUsed->size; i++) - { - if (bitVectBitValue (sym->regsUsed, i) || - (ds390_ptrRegReq && (i == R0_IDX || i == R1_IDX))) - emitcode ("push", "%s", ds390_regWithIdx (i)->dname); - } - } - - } - else - { - /* this function has a function call cannot - determines register usage so we will have to push the - entire bank */ - saveRBank (0, ic, FALSE); - if (options.parms_in_bank1) { - for (i=0; i < 8 ; i++ ) { - emitcode ("push","%s",rb1regs[i]); - } - } - } - } - else - { - /* This ISR uses a non-zero bank. - * - * We assume that the bank is available for our - * exclusive use. - * - * However, if this ISR calls a function which uses some - * other bank, we must save that bank entirely. - */ - unsigned long banksToSave = 0; - - if (IFFUNC_HASFCALL(sym->type)) - { + { + int i; + + /* if this function does not call any other + function then we can be economical and + save only those registers that are used */ + if (!IFFUNC_HASFCALL(sym->type)) + { + /* if any registers used */ + if (sym->regsUsed) + { + bool bits_pushed = FALSE; + /* save the registers used */ + for (i = 0; i < sym->regsUsed->size; i++) + { + if (bitVectBitValue (sym->regsUsed, i)) + bits_pushed = pushReg (i, bits_pushed); + } + } + } + else + { + /* this function has a function call. We cannot + determine register usage so we will have to push the + entire bank */ + saveRBank (0, ic, FALSE); + if (options.parms_in_bank1) { + for (i=0; i < 8 ; i++ ) { + emitcode ("push","%s",rb1regs[i]); + } + } + } + } + else + { + /* This ISR uses a non-zero bank. + * + * We assume that the bank is available for our + * exclusive use. + * + * However, if this ISR calls a function which uses some + * other bank, we must save that bank entirely. + */ + unsigned long banksToSave = 0; + + if (IFFUNC_HASFCALL(sym->type)) + { #define MAX_REGISTER_BANKS 4 - iCode *i; - int ix; - - for (i = ic; i; i = i->next) - { - if (i->op == ENDFUNCTION) - { - /* we got to the end OK. */ - break; - } - - if (i->op == CALL) - { - sym_link *dtype; - - dtype = operandType (IC_LEFT(i)); - if (dtype - && FUNC_REGBANK(dtype) != FUNC_REGBANK(sym->type)) - { - /* Mark this bank for saving. */ - if (FUNC_REGBANK(dtype) >= MAX_REGISTER_BANKS) - { - werror(E_NO_SUCH_BANK, FUNC_REGBANK(dtype)); - } - else - { - banksToSave |= (1 << FUNC_REGBANK(dtype)); - } - - /* And note that we don't need to do it in - * genCall. - */ - i->bankSaved = 1; - } - } - if (i->op == PCALL) - { - /* This is a mess; we have no idea what - * register bank the called function might - * use. - * - * The only thing I can think of to do is - * throw a warning and hope. - */ - werror(W_FUNCPTR_IN_USING_ISR); - } - } - - if (banksToSave && options.useXstack) - { - /* Since we aren't passing it an ic, - * saveRBank will assume r0 is available to abuse. - * - * So switch to our (trashable) bank now, so - * the caller's R0 isn't trashed. - */ - emitcode ("push", "psw"); - emitcode ("mov", "psw,#!constbyte", - (FUNC_REGBANK (sym->type) << 3) & 0x00ff); - switchedPSW = TRUE; - } - - for (ix = 0; ix < MAX_REGISTER_BANKS; ix++) - { - if (banksToSave & (1 << ix)) - { - saveRBank(ix, NULL, FALSE); - } - } - } - // jwk: this needs a closer look - SPEC_ISR_SAVED_BANKS(currFunc->etype) = banksToSave; - } + iCode *i; + int ix; + + for (i = ic; i; i = i->next) + { + if (i->op == ENDFUNCTION) + { + /* we got to the end OK. */ + break; + } + + if (i->op == CALL) + { + sym_link *dtype; + + dtype = operandType (IC_LEFT(i)); + if (dtype + && FUNC_REGBANK(dtype) != FUNC_REGBANK(sym->type)) + { + /* Mark this bank for saving. */ + if (FUNC_REGBANK(dtype) >= MAX_REGISTER_BANKS) + { + werror(E_NO_SUCH_BANK, FUNC_REGBANK(dtype)); + } + else + { + banksToSave |= (1 << FUNC_REGBANK(dtype)); + } + + /* And note that we don't need to do it in + * genCall. + */ + i->bankSaved = 1; + } + } + if (i->op == PCALL) + { + /* This is a mess; we have no idea what + * register bank the called function might + * use. + * + * The only thing I can think of to do is + * throw a warning and hope. + */ + werror(W_FUNCPTR_IN_USING_ISR); + } + } + + if (banksToSave && options.useXstack) + { + /* Since we aren't passing it an ic, + * saveRBank will assume r0 is available to abuse. + * + * So switch to our (trashable) bank now, so + * the caller's R0 isn't trashed. + */ + emitcode ("push", "psw"); + emitcode ("mov", "psw,#!constbyte", + (FUNC_REGBANK (sym->type) << 3) & 0x00ff); + switchedPSW = TRUE; + } + + for (ix = 0; ix < MAX_REGISTER_BANKS; ix++) + { + if (banksToSave & (1 << ix)) + { + saveRBank(ix, NULL, FALSE); + } + } + } + // TODO: this needs a closer look + SPEC_ISR_SAVED_BANKS(currFunc->etype) = banksToSave; + } } else { /* if callee-save to be used for this function then save the registers being used in this function */ if (IFFUNC_CALLEESAVES(sym->type)) - { - int i; - - /* if any registers used */ - if (sym->regsUsed) - { - /* save the registers used */ - for (i = 0; i < sym->regsUsed->size; i++) - { - if (bitVectBitValue (sym->regsUsed, i) || - (ds390_ptrRegReq && (i == R0_IDX || i == R1_IDX))) - { - emitcode ("push", "%s", ds390_regWithIdx (i)->dname); - _G.nRegsSaved++; - } - } - } - } + { + int i; + + /* if any registers used */ + if (sym->regsUsed) + { + bool bits_pushed = FALSE; + /* save the registers used */ + for (i = 0; i < sym->regsUsed->size; i++) + { + if (bitVectBitValue (sym->regsUsed, i)) + { + bits_pushed = pushReg (i, bits_pushed); + _G.nRegsSaved++; + } + } + } + } } /* set the register bank to the desired value */ @@ -2952,25 +3620,26 @@ genFunction (iCode * ic) emitcode ("mov", "psw,#!constbyte", (FUNC_REGBANK (sym->type) << 3) & 0x00ff); } - if ( (IFFUNC_ISREENT (sym->type) || options.stackAuto) && + if (fReentrant && (sym->stack || FUNC_HASSTACKPARM(sym->type))) { if (options.stack10bit) { - emitcode ("push","_bpx"); - emitcode ("push","_bpx+1"); - emitcode ("mov","_bpx,%s",spname); - emitcode ("mov","_bpx+1,esp"); - emitcode ("anl","_bpx+1,#3"); + emitcode ("push","_bpx"); + emitcode ("push","_bpx+1"); + emitcode ("mov","_bpx,%s",spname); + emitcode ("mov","_bpx+1,esp"); + adjustEsp("_bpx+1"); } else { - if (options.useXstack) { - emitcode ("mov", "r0,%s", spname); - emitcode ("mov", "a,_bp"); - emitcode ("movx", "@r0,a"); - emitcode ("inc", "%s", spname); - } else { - /* set up the stack */ - emitcode ("push", "_bp"); /* save the callers stack */ - } - emitcode ("mov", "_bp,%s", spname); + if (options.useXstack) + { + emitcode ("mov", "r0,%s", spname); + emitcode ("mov", "a,_bp"); + emitcode ("movx", "@r0,a"); + emitcode ("inc", "%s", spname); + } else { + /* set up the stack */ + emitcode ("push", "_bp"); /* save the callers stack */ + } + emitcode ("mov", "_bp,%s", spname); } } @@ -2978,34 +3647,34 @@ genFunction (iCode * ic) if (sym->stack) { int i = sym->stack; if (options.stack10bit) { - if ( i > 1024) werror (W_STACK_OVERFLOW, sym->name); - assert (sym->recvSize <= 4); - if (sym->stack <= 8) { - while (i--) emitcode ("push","acc"); - } else { - PROTECT_SP; - emitcode ("mov","a,sp"); - emitcode ("add","a,#!constbyte", ((short) sym->stack & 0xff)); - emitcode ("mov","sp,a"); - emitcode ("mov","a,esp"); - emitcode ("anl","a,#3"); - emitcode ("addc","a,#!constbyte", (((short) sym->stack) >> 8) & 0xff); - emitcode ("mov","esp,a"); - UNPROTECT_SP; - } + if ( i > 1024) werror (W_STACK_OVERFLOW, sym->name); + assert (sym->recvSize <= 4); + if (sym->stack <= 8) { + while (i--) emitcode ("push","acc"); + } else { + PROTECT_SP; + emitcode ("mov","a,sp"); + emitcode ("add","a,#!constbyte", ((short) sym->stack & 0xff)); + emitcode ("mov","sp,a"); + emitcode ("mov","a,esp"); + adjustEsp("a"); + emitcode ("addc","a,#!constbyte", (((short) sym->stack) >> 8) & 0xff); + emitcode ("mov","esp,a"); + UNPROTECT_SP; + } } else { - if (i > 256) - werror (W_STACK_OVERFLOW, sym->name); - - if (i > 3 && sym->recvSize < 4) { - - emitcode ("mov", "a,sp"); - emitcode ("add", "a,#!constbyte", ((char) sym->stack & 0xff)); - emitcode ("mov", "sp,a"); - - } else - while (i--) - emitcode ("inc", "sp"); + if (i > 256) + werror (W_STACK_OVERFLOW, sym->name); + + if (i > 3 && sym->recvSize < 4) { + + emitcode ("mov", "a,sp"); + emitcode ("add", "a,#!constbyte", ((char) sym->stack & 0xff)); + emitcode ("mov", "sp,a"); + + } else + while (i--) + emitcode ("inc", "sp"); } } @@ -3017,6 +3686,16 @@ genFunction (iCode * ic) 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"); + emitLabel (tlbl); + emitcode ("push", "psw"); /* save old ea via c in psw */ + } } /*-----------------------------------------------------------------*/ @@ -3026,25 +3705,49 @@ static void genEndFunction (iCode * ic) { symbol *sym = OP_SYMBOL (IC_LEFT (ic)); + lineNode *lnp = lineCurr; + bitVect *regsUsed; + bitVect *regsUsedPrologue; + bitVect *regsUnneeded; + int idx; - D (emitcode (";", "genEndFunction ");); + D (emitcode (";", "genEndFunction")); + _G.currentFunc = NULL; if (IFFUNC_ISNAKED(sym->type)) { emitcode(";", "naked function: no epilogue."); + if (options.debug && currFunc) + debugFile->writeEndFunction (currFunc, ic, 0); return; } + if (IFFUNC_ISCRITICAL (sym->type)) + { + if (IS_BIT (OP_SYM_ETYPE (IC_LEFT (ic)))) + { + emitcode ("rlc", "a"); /* save c in a */ + emitcode ("pop", "psw"); /* restore ea via c in psw */ + emitcode ("mov", "ea,c"); + emitcode ("rrc", "a"); /* restore c from a */ + } + else + { + 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; - emitcode ("mov", "sp,_bpx", spname); - emitcode ("mov", "esp,_bpx+1", spname); - UNPROTECT_SP; + PROTECT_SP; + emitcode ("mov", "sp,_bpx", spname); + emitcode ("mov", "esp,_bpx+1", spname); + UNPROTECT_SP; } else { - emitcode ("mov", "%s,_bp", spname); + emitcode ("mov", "%s,_bp", spname); } } @@ -3062,17 +3765,17 @@ genEndFunction (iCode * ic) (sym->stack || FUNC_HASSTACKPARM(sym->type))) { if (options.useXstack) { - emitcode ("mov", "r0,%s", spname); - emitcode ("movx", "a,@r0"); - emitcode ("mov", "_bp,a"); - emitcode ("dec", "%s", spname); + emitcode ("mov", "r0,%s", spname); + emitcode ("movx", "a,@r0"); + emitcode ("mov", "_bp,a"); + emitcode ("dec", "%s", spname); } else { - if (options.stack10bit) { - emitcode ("pop", "_bpx+1"); - emitcode ("pop", "_bpx"); - } else { - emitcode ("pop", "_bp"); - } + if (options.stack10bit) { + emitcode ("pop", "_bpx+1"); + emitcode ("pop", "_bpx"); + } else { + emitcode ("pop", "_bp"); + } } } @@ -3087,157 +3790,236 @@ genEndFunction (iCode * ic) */ emitcode ("pop", "psw"); } - } + } if (IFFUNC_ISISR (sym->type)) - { /* is ISR */ + { /* is ISR */ /* now we need to restore the registers */ /* if this isr has no bank i.e. is going to run with bank 0 , then we need to save more registers :-) */ if (!FUNC_REGBANK (sym->type)) - { - int i; - /* if this function does not call any other - function then we can be economical and - save only those registers that are used */ - if (!IFFUNC_HASFCALL(sym->type)) - { - - /* if any registers used */ - if (sym->regsUsed) - { - /* save the registers used */ - for (i = sym->regsUsed->size; i >= 0; i--) - { - if (bitVectBitValue (sym->regsUsed, i) || - (ds390_ptrRegReq && (i == R0_IDX || i == R1_IDX))) - emitcode ("pop", "%s", ds390_regWithIdx (i)->dname); - } - } - - } - else - { - /* this function has a function call cannot - determines register usage so we will have to pop the - entire bank */ - if (options.parms_in_bank1) { - for (i = 7 ; i >= 0 ; i-- ) { - emitcode ("pop","%s",rb1regs[i]); - } - } - unsaveRBank (0, ic, FALSE); - } - } - else - { - /* This ISR uses a non-zero bank. - * - * 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; - - for (ix = MAX_REGISTER_BANKS - 1; ix >= 0; ix--) - { - if (savedBanks & (1 << ix)) - { - unsaveRBank(ix, NULL, FALSE); - } - } - - if (options.useXstack) - { - /* Restore bank AFTER calling unsaveRBank, - * since it can trash r0. - */ - emitcode ("pop", "psw"); - } - } + { + int i; + /* if this function does not call any other + function then we can be economical and + save only those registers that are used */ + if (!IFFUNC_HASFCALL(sym->type)) + { + /* if any registers used */ + if (sym->regsUsed) + { + bool bits_popped = FALSE; + /* save the registers used */ + for (i = sym->regsUsed->size; i >= 0; i--) + { + if (bitVectBitValue (sym->regsUsed, i)) + bits_popped = popReg (i, bits_popped); + } + } + } + else + { + /* this function has a function call. We cannot + determine register usage so we will have to pop the + entire bank */ + if (options.parms_in_bank1) { + for (i = 7 ; i >= 0 ; i-- ) { + emitcode ("pop","%s",rb1regs[i]); + } + } + unsaveRBank (0, ic, FALSE); + } + } + else + { + /* This ISR uses a non-zero bank. + * + * Restore any register banks saved by genFunction + * in reverse order. + */ + unsigned savedBanks = SPEC_ISR_SAVED_BANKS(currFunc->etype); + int ix; + + for (ix = MAX_REGISTER_BANKS - 1; ix >= 0; ix--) + { + if (savedBanks & (1 << ix)) + { + unsaveRBank(ix, NULL, FALSE); + } + } + + if (options.useXstack) + { + /* Restore bank AFTER calling unsaveRBank, + * since it can trash r0. + */ + emitcode ("pop", "psw"); + } + } if (options.model == MODEL_FLAT24 && !inExcludeList ("dpx")) - { - if (options.stack10bit) - { - emitcode ("pop", DP2_RESULT_REG); - emitcode ("pop", "dpx1"); - emitcode ("pop", "dph1"); - emitcode ("pop", "dpl1"); - } - emitcode ("pop", "dps"); - emitcode ("pop", "dpx"); - } + { + if (options.stack10bit) + { + emitcode ("pop", DP2_RESULT_REG); + emitcode ("pop", "dpx1"); + emitcode ("pop", "dph1"); + emitcode ("pop", "dpl1"); + } + emitcode ("pop", "dps"); + emitcode ("pop", "dpx"); + } if (!inExcludeList ("dph")) - emitcode ("pop", "dph"); + emitcode ("pop", "dph"); if (!inExcludeList ("dpl")) - emitcode ("pop", "dpl"); + emitcode ("pop", "dpl"); if (!inExcludeList ("b")) - emitcode ("pop", "b"); + emitcode ("pop", "b"); if (!inExcludeList ("acc")) - emitcode ("pop", "acc"); - - if (IFFUNC_ISCRITICAL (sym->type)) - emitcode ("setb", "ea"); + emitcode ("pop", "acc"); /* if debug then send end of function */ - if (options.debug && currFunc) { - _G.debugLine = 1; - emitcode ("", "C$%s$%d$%d$%d ==.", - FileBaseName (ic->filename), currFunc->lastLine, - ic->level, ic->block); - if (IS_STATIC (currFunc->etype)) - emitcode ("", "XF%s$%s$0$0 ==.", moduleName, currFunc->name); - else - emitcode ("", "XG$%s$0$0 ==.", currFunc->name); - _G.debugLine = 0; - } + if (options.debug && currFunc) + { + debugFile->writeEndFunction (currFunc, ic, 1); + } emitcode ("reti", ""); } else { - if (IFFUNC_ISCRITICAL (sym->type)) - emitcode ("setb", "ea"); - if (IFFUNC_CALLEESAVES(sym->type)) - { - int i; - - /* if any registers used */ - if (sym->regsUsed) - { - /* save the registers used */ - for (i = sym->regsUsed->size; i >= 0; i--) - { - if (bitVectBitValue (sym->regsUsed, i) || - (ds390_ptrRegReq && (i == R0_IDX || i == R1_IDX))) - emitcode ("pop", "%s", ds390_regWithIdx (i)->dname); - } - } - - } + { + int i; + + /* if any registers used */ + if (sym->regsUsed) + { + /* save the registers used */ + for (i = sym->regsUsed->size; i >= 0; i--) + { + if (bitVectBitValue (sym->regsUsed, i)) + emitcode ("pop", "%s", REG_WITH_INDEX (i)->dname); + } + } + } /* if debug then send end of function */ if (options.debug && currFunc) - { - _G.debugLine = 1; - emitcode ("", "C$%s$%d$%d$%d ==.", - FileBaseName (ic->filename), currFunc->lastLine, - ic->level, ic->block); - if (IS_STATIC (currFunc->etype)) - emitcode ("", "XF%s$%s$0$0 ==.", moduleName, currFunc->name); - else - emitcode ("", "XG$%s$0$0 ==.", currFunc->name); - _G.debugLine = 0; - } + { + debugFile->writeEndFunction (currFunc, ic, 1); + } emitcode ("ret", ""); } + if (!port->peep.getRegsRead || !port->peep.getRegsWritten || options.nopeep) + return; + + /* If this was an interrupt handler using bank 0 that called another */ + /* function, then all registers must be saved; nothing to optimized. */ + if (IFFUNC_ISISR (sym->type) && IFFUNC_HASFCALL(sym->type) + && !FUNC_REGBANK(sym->type)) + return; + + /* There are no push/pops to optimize if not callee-saves or ISR */ + if (!(FUNC_CALLEESAVES (sym->type) || FUNC_ISISR (sym->type))) + return; + + /* If there were stack parameters, we cannot optimize without also */ + /* fixing all of the stack offsets; this is too dificult to consider. */ + if (FUNC_HASSTACKPARM(sym->type)) + return; + + /* Compute the registers actually used */ + regsUsed = newBitVect (ds390_nRegs); + regsUsedPrologue = newBitVect (ds390_nRegs); + while (lnp) + { + if (lnp->ic && lnp->ic->op == FUNCTION) + regsUsedPrologue = bitVectUnion (regsUsedPrologue, port->peep.getRegsWritten(lnp)); + else + regsUsed = bitVectUnion (regsUsed, port->peep.getRegsWritten(lnp)); + + if (lnp->ic && lnp->ic->op == FUNCTION && lnp->prev + && lnp->prev->ic && lnp->prev->ic->op == ENDFUNCTION) + break; + if (!lnp->prev) + break; + lnp = lnp->prev; + } + + if (bitVectBitValue (regsUsedPrologue, DPS_IDX) + && !bitVectBitValue (regsUsed, DPS_IDX)) + { + bitVectUnSetBit (regsUsedPrologue, DPS_IDX); + } + + if (bitVectBitValue (regsUsedPrologue, CND_IDX) + && !bitVectBitValue (regsUsed, CND_IDX)) + { + regsUsed = bitVectUnion (regsUsed, regsUsedPrologue); + if (IFFUNC_ISISR (sym->type) && !FUNC_REGBANK (sym->type) + && !sym->stack && !FUNC_ISCRITICAL (sym->type)) + bitVectUnSetBit (regsUsed, CND_IDX); + } + else + regsUsed = bitVectUnion (regsUsed, regsUsedPrologue); + + /* If this was an interrupt handler that called another function */ + /* function, then assume working registers may be modified by it. */ + if (IFFUNC_ISISR (sym->type) && IFFUNC_HASFCALL(sym->type)) + { + regsUsed = bitVectSetBit (regsUsed, AP_IDX); + regsUsed = bitVectSetBit (regsUsed, DPX1_IDX); + regsUsed = bitVectSetBit (regsUsed, DPL1_IDX); + regsUsed = bitVectSetBit (regsUsed, DPH1_IDX); + regsUsed = bitVectSetBit (regsUsed, DPX_IDX); + regsUsed = bitVectSetBit (regsUsed, DPL_IDX); + regsUsed = bitVectSetBit (regsUsed, DPH_IDX); + regsUsed = bitVectSetBit (regsUsed, DPS_IDX); + regsUsed = bitVectSetBit (regsUsed, B_IDX); + regsUsed = bitVectSetBit (regsUsed, A_IDX); + regsUsed = bitVectSetBit (regsUsed, CND_IDX); + } + + /* Remove the unneeded push/pops */ + regsUnneeded = newBitVect (ds390_nRegs); + while (lnp) + { + if (lnp->ic && (lnp->ic->op == FUNCTION || lnp->ic->op == ENDFUNCTION)) + { + if (!strncmp(lnp->line, "push", 4)) + { + idx = bitVectFirstBit (port->peep.getRegsRead(lnp)); + if (idx>=0 && !bitVectBitValue (regsUsed, idx)) + { + connectLine (lnp->prev, lnp->next); + regsUnneeded = bitVectSetBit (regsUnneeded, idx); + } + } + if (!strncmp(lnp->line, "pop", 3) || !strncmp(lnp->line, "mov", 3)) + { + idx = bitVectFirstBit (port->peep.getRegsWritten(lnp)); + if (idx>=0 && !bitVectBitValue (regsUsed, idx)) + { + connectLine (lnp->prev, lnp->next); + regsUnneeded = bitVectSetBit (regsUnneeded, idx); + } + } + } + lnp = lnp->next; + } + + for (idx = 0; idx < regsUnneeded->size; idx++) + if (bitVectBitValue (regsUnneeded, idx)) + emitcode (";", "eliminated unneeded push/pop %s", REG_WITH_INDEX (idx)->dname); + + freeBitVect (regsUnneeded); + freeBitVect (regsUsed); + freeBitVect (regsUsedPrologue); } /*-----------------------------------------------------------------*/ @@ -3247,27 +4029,29 @@ 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)); + aopOp (IC_LEFT (ic), ic, FALSE, + AOP_IS_STR(IC_LEFT(ic)) ? FALSE :TRUE); size = AOP_SIZE (IC_LEFT (ic)); assert (size <= 4); /* it is assigned to GPR0-R3 then push them */ 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)); - } - for (i = (size-1) ; i >= 0 ; i--) { - emitcode ("pop","a%s",javaRet[i]); - } + aopHasRegs(AOP(IC_LEFT(ic)),R2_IDX,R3_IDX)) { + for (i = 0 ; i < size ; i++ ) { + emitcode ("push","%s", + aopGet(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)); + for (i = 0 ; i < size ; i++) + emitcode ("mov","%s,%s",javaRet[i], + aopGet(IC_LEFT(ic),i,FALSE,TRUE,DP2_RESULT_REG)); } for (i = size ; i < 4 ; i++ ) - emitcode ("mov","%s,#0",javaRet[i]); + emitcode ("mov","%s,#0",javaRet[i]); return; } @@ -3279,15 +4063,14 @@ 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" */ if (!IC_LEFT (ic)) goto jumpret; - /* if this is a JavaNative function then return + /* if this is a JavaNative function then return value in different register */ if (IFFUNC_ISJAVANATIVE(currFunc->type)) { genJavaNativeRet(ic); @@ -3295,44 +4078,48 @@ 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)); + aopOp (IC_LEFT (ic), ic, FALSE, + (AOP_IS_STR(IC_LEFT(ic)) ? FALSE :TRUE)); size = AOP_SIZE (IC_LEFT (ic)); _startLazyDPSEvaluation (); + + if (IS_BIT(_G.currentFunc->etype)) + { + movc (aopGet (IC_LEFT (ic), 0, FALSE, FALSE, NULL)); + size = 0; + } + while (size--) { char *l; if (AOP_TYPE (IC_LEFT (ic)) == AOP_DPTR) - { - l = aopGet (AOP (IC_LEFT (ic)), offset++, - FALSE, TRUE, FALSE); - emitcode ("push", "%s", l); - pushed++; - } + { + l = aopGet (IC_LEFT (ic), offset++, + FALSE, TRUE, NULL); + emitcode ("push", "%s", l); + pushed++; + } else - { - /* Since A is the last element of fReturn, - * is is OK to clobber it in the aopGet. - */ - l = aopGet (AOP (IC_LEFT (ic)), offset, - FALSE, FALSE, TRUE); - if (strcmp (fReturn[offset], l)) - emitcode ("mov", "%s,%s", fReturn[offset++], l); - } + { + /* Since A is the last element of fReturn, + * it is OK to clobber it in the aopGet. + */ + l = aopGet (IC_LEFT (ic), offset, + FALSE, FALSE, NULL); + if (strcmp (fReturn[offset], l)) + emitcode ("mov", "%s,%s", fReturn[offset++], l); + } } _endLazyDPSEvaluation (); - if (pushed) + while (pushed) { - while (pushed) - { - pushed--; - if (strcmp (fReturn[pushed], "a")) - emitcode ("pop", fReturn[pushed]); - else - emitcode ("pop", "acc"); - } + pushed--; + if (strcmp (fReturn[pushed], "a")) + emitcode ("pop", fReturn[pushed]); + else + emitcode ("pop", "acc"); } freeAsmop (IC_LEFT (ic), NULL, ic, TRUE); @@ -3340,7 +4127,7 @@ jumpret: /* generate a jump to the return label if the next is not the return statement */ if (!(ic->next && ic->next->op == LABEL && - IC_LABEL (ic->next) == returnLabel)) + IC_LABEL (ic->next) == returnLabel)) emitcode ("ljmp", "!tlabel", (returnLabel->key + 100)); @@ -3356,10 +4143,9 @@ genLabel (iCode * ic) if (IC_LABEL (ic) == entryLabel) return; - D (emitcode (";", "genLabel "); - ); + D (emitcode (";", "genLabel")); - emitcode ("", "!tlabeldef", (IC_LABEL (ic)->key + 100)); + emitLabel (IC_LABEL (ic)); } /*-----------------------------------------------------------------*/ @@ -3368,8 +4154,8 @@ genLabel (iCode * ic) static void genGoto (iCode * ic) { - D (emitcode (";", "genGoto "); - ); + D (emitcode (";", "genGoto")); + emitcode ("ljmp", "!tlabel", (IC_LABEL (ic)->key + 100)); } @@ -3390,17 +4176,17 @@ findLabelBackwards (iCode * ic, int key) count++; /* If we have any pushes or pops, we cannot predict the distance. - I don't like this at all, this should be dealt with in the - back-end */ + I don't like this at all, this should be dealt with in the + back-end */ if (ic->op == IPUSH || ic->op == IPOP) { - return 0; + return 0; } if (ic->op == LABEL && IC_LABEL (ic)->key == key) - { - /* printf("findLabelBackwards = %d\n", count); */ - return count; - } + { + /* printf("findLabelBackwards = %d\n", count); */ + return count; + } } return 0; @@ -3429,7 +4215,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(IC_RESULT(ic),0,FALSE,FALSE,NULL)); } return TRUE; } @@ -3441,85 +4227,119 @@ 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 * jumps straight to that target. */ if (ic->next && ic->next->op == GOTO - && (labelRange = findLabelBackwards (ic, IC_LABEL (ic->next)->key)) != 0 - && labelRange <= 5) - { - emitcode (";", "tail increment optimized (range %d)", labelRange); - tlbl = IC_LABEL (ic->next); - emitTlbl = 0; - } + && (labelRange = findLabelBackwards (ic, IC_LABEL (ic->next)->key)) != 0 + && labelRange <= 5) + { + D (emitcode (";", "tail increment optimized (range %d)", labelRange)); + tlbl = IC_LABEL (ic->next); + emitTlbl = 0; + } else - { - tlbl = newiTempLabel (NULL); - emitTlbl = 1; - } - emitcode ("inc", "%s", aopGet (AOP (IC_RESULT (ic)), LSB, FALSE, FALSE, FALSE)); + { + tlbl = newiTempLabel (NULL); + emitTlbl = 1; + } + l = aopGet (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); + IS_AOP_PREG (IC_RESULT (ic))) + { + emitcode ("cjne", "%s,%s,!tlabel", l, zero, 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 ("inc", "%s", aopGet (AOP (IC_RESULT (ic)), MSB16, FALSE, FALSE, FALSE)); + { + emitcode ("clr", "a"); + emitcode ("cjne", "a,%s,!tlabel", l, tlbl->key + 100); + } + + l = aopGet (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); - - emitcode ("inc", "%s", aopGet (AOP (IC_RESULT (ic)), MSB24, FALSE, FALSE, FALSE)); - } + { + 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,%s,!tlabel", l, zero, tlbl->key + 100); + } + else + { + emitcode ("cjne", "a,%s,!tlabel", l, tlbl->key + 100); + } + + l = aopGet (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 - { - emitcode ("cjne", "a,%s,!tlabel" - ,aopGet (AOP (IC_RESULT (ic)), MSB24, FALSE, FALSE, FALSE) - ,tlbl->key + 100); - } - emitcode ("inc", "%s", aopGet (AOP (IC_RESULT (ic)), MSB32, FALSE, FALSE, FALSE)); - } + { + 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,%s,!tlabel", l, zero, tlbl->key + 100); + } + else + { + emitcode ("cjne", "a,%s,!tlabel", l, tlbl->key + 100); + } + + l = aopGet (IC_RESULT (ic), MSB32, FALSE, FALSE, NULL); + emitcode ("inc", "%s", l); + } if (emitTlbl) - { - emitcode ("", "!tlabeldef", tlbl->key + 100); - } + { + emitLabel (tlbl); + } 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 ) + { + if (IC_RESULT(ic)->isGptr) + { + emitcode ("mov", "b,%s", aopGet(IC_LEFT (ic), 3, FALSE, FALSE, NULL)); + } + switch (size) { + case 3: + emitcode ("mov", "dpx,%s", aopGet(IC_LEFT (ic), 2, FALSE, FALSE, NULL)); + case 2: + emitcode ("mov", "dph,%s", aopGet(IC_LEFT (ic), 1, FALSE, FALSE, NULL)); + case 1: + emitcode ("mov", "dpl,%s", aopGet(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 ) { emitcode ("mov","dps,#!constbyte",AOP(IC_LEFT(ic))->aopu.dptr); - while (icount--) emitcode ("inc","dptr"); - emitcode ("mov","dps,#0"); + while (icount--) + emitcode ("inc", "dptr"); + emitcode ("mov", "dps,#0"); return TRUE; } @@ -3536,23 +4356,21 @@ genPlusIncr (iCode * ic) AOP_TYPE (IC_RESULT (ic)) == AOP_REG && sameRegs (AOP (IC_LEFT (ic)), AOP (IC_RESULT (ic)))) { - if (icount > 3) - { - MOVA (aopGet (AOP (IC_LEFT (ic)), 0, FALSE, FALSE, TRUE)); - emitcode ("add", "a,#!constbyte", ((char) icount) & 0xff); - aopPut (AOP (IC_RESULT (ic)), "a", 0); - } - else - { - - _startLazyDPSEvaluation (); - while (icount--) - { - emitcode ("inc", "%s", aopGet (AOP (IC_LEFT (ic)), 0, FALSE, FALSE, FALSE)); - } - _endLazyDPSEvaluation (); - } + { + MOVA (aopGet (IC_LEFT (ic), 0, FALSE, FALSE, NULL)); + emitcode ("add", "a,#!constbyte", ((char) icount) & 0xff); + aopPut (IC_RESULT (ic), "a", 0); + } + else + { + _startLazyDPSEvaluation (); + while (icount--) + { + emitcode ("inc", "%s", aopGet (IC_LEFT (ic), 0, FALSE, FALSE, NULL)); + } + _endLazyDPSEvaluation (); + } return TRUE; } @@ -3570,13 +4388,13 @@ outBitAcc (operand * result) /* if the result is a bit */ if (AOP_TYPE (result) == AOP_CRY) { - aopPut (AOP (result), "a", 0); + aopPut (result, "a", 0); } else { emitcode ("jz", "!tlabel", tlbl->key + 100); emitcode ("mov", "a,%s", one); - emitcode ("", "!tlabeldef", tlbl->key + 100); + emitLabel (tlbl); outAcc (result); } } @@ -3587,15 +4405,15 @@ 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); emitcode ("mov", "c,%s", AOP (IC_LEFT (ic))->aopu.aop_dir); emitcode ("jnb", "%s,!tlabel", AOP (IC_RIGHT (ic))->aopu.aop_dir, (lbl->key + 100)); emitcode ("cpl", "c"); - emitcode ("", "!tlabeldef", (lbl->key + 100)); + emitLabel (lbl); outBitC (IC_RESULT (ic)); } else @@ -3604,7 +4422,7 @@ genPlusBits (iCode * ic) emitcode ("mov", "c,%s", AOP (IC_LEFT (ic))->aopu.aop_dir); emitcode ("rlc", "a"); emitcode ("mov", "c,%s", AOP (IC_RIGHT (ic))->aopu.aop_dir); - emitcode ("addc", "a,#0"); + emitcode ("addc", "a,%s", zero); outAcc (IC_RESULT (ic)); } } @@ -3616,18 +4434,18 @@ adjustArithmeticResult (iCode * ic) opIsGptr (IC_LEFT (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), - GPTRSIZE - 1); + aopPut (IC_RESULT (ic), + aopGet (IC_LEFT (ic), GPTRSIZE - 1, FALSE, FALSE, NULL), + GPTRSIZE - 1); } if (opIsGptr (IC_RESULT (ic)) && opIsGptr (IC_RIGHT (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), - GPTRSIZE - 1); + aopPut (IC_RESULT (ic), + aopGet (IC_RIGHT (ic), GPTRSIZE - 1, FALSE, FALSE, NULL), + GPTRSIZE - 1); } if (opIsGptr (IC_RESULT (ic)) && @@ -3637,43 +4455,161 @@ adjustArithmeticResult (iCode * 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); + SNPRINTF (buffer, sizeof(buffer), + "#%d", pointerTypeToGPByte (pointerCode (getSpec (operandType (IC_LEFT (ic)))), NULL, NULL)); + aopPut (IC_RESULT (ic), buffer, 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))) + { + aopOp (IC_RESULT (ic), ic, TRUE, AOP_USESDPTR2 (IC_LEFT (ic))); + return TRUE; + } + if (isOperandEqual (IC_RIGHT (ic), IC_RESULT (ic))) + { +// D (emitcode(";", "aopOp3: (left | right) & result equal")); + aopOp (IC_RESULT (ic), ic, TRUE, AOP_USESDPTR2 (IC_RIGHT (ic))); + return TRUE; + } + + // Operands may be equivalent (but not equal) if they share a spill location. If + // so, use the same DPTR or DPTR2. + if (operandsEqu (IC_LEFT (ic), IC_RESULT (ic))) + { + aopOp (IC_RESULT (ic), ic, TRUE, AOP_USESDPTR2 (IC_LEFT (ic))); + return TRUE; + } + if (operandsEqu (IC_RIGHT (ic), IC_RESULT (ic))) + { + aopOp (IC_RESULT (ic), ic, TRUE, AOP_USESDPTR2 (IC_RIGHT (ic))); + 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, +// 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) \ @@ -3688,28 +4624,28 @@ adjustArithmeticResult (iCode * ic) // // On exit from this macro, pushedSize will have been adjusted to // equal resultSize, and ACC may be trashed. -#define ADJUST_PUSHED_RESULT(pushedSize, resultSize) \ - /* If the pushed data is bigger than the result, \ - * simply discard unused bytes. Icky, but works. \ - */ \ - while (pushedSize > resultSize) \ - { \ - D (emitcode (";", "discarding unused result byte."););\ - emitcode ("pop", "acc"); \ - pushedSize--; \ - } \ - if (pushedSize < resultSize) \ - { \ - emitcode ("clr", "a"); \ - /* Conversly, we haven't pushed enough here. \ - * just zero-pad, and all is well. \ - */ \ - while (pushedSize < resultSize) \ - { \ - emitcode("push", "acc"); \ - pushedSize++; \ - } \ - } \ +#define ADJUST_PUSHED_RESULT(pushedSize, resultSize) \ + /* If the pushed data is bigger than the result, \ + * simply discard unused bytes. Icky, but works. \ + */ \ + while (pushedSize > resultSize) \ + { \ + D (emitcode (";", "discarding unused result byte.")); \ + emitcode ("pop", "acc"); \ + pushedSize--; \ + } \ + if (pushedSize < resultSize) \ + { \ + emitcode ("clr", "a"); \ + /* Conversly, we haven't pushed enough here. \ + * just zero-pad, and all is well. \ + */ \ + while (pushedSize < resultSize) \ + { \ + emitcode("push", "acc"); \ + pushedSize++; \ + } \ + } \ assert(pushedSize == resultSize); /*-----------------------------------------------------------------*/ @@ -3719,44 +4655,46 @@ static void genPlus (iCode * ic) { int size, offset = 0; - bool pushResult = FALSE; + bool pushResult; int rSize; + bool swappedLR = FALSE; - D (emitcode (";", "genPlus ");); + D (emitcode (";", "genPlus")); /* special cases :- */ - if ( IS_SYMOP(IC_LEFT(ic)) && OP_SYMBOL(IC_LEFT(ic))->ruonly && - isOperandLiteral(IC_RIGHT(ic)) && OP_SYMBOL(IC_RESULT(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"); + while (size--) emitcode ("inc","dptr"); } else { - emitcode ("mov","a,dpl"); - emitcode ("add","a,#!constbyte",size & 0xff); - emitcode ("mov","dpl,a"); - emitcode ("mov","a,dph"); - emitcode ("addc","a,#!constbyte",(size >> 8) & 0xff); - emitcode ("mov","dph,a"); - emitcode ("mov","a,dpx"); - emitcode ("addc","a,#!constbyte",(size >> 16) & 0xff); - emitcode ("mov","dpx,a"); + emitcode ("mov", "a,dpl"); + emitcode ("add", "a,#!constbyte", size & 0xff); + emitcode ("mov", "dpl,a"); + emitcode ("mov", "a,dph"); + emitcode ("addc", "a,#!constbyte", (size >> 8) & 0xff); + emitcode ("mov", "dph,a"); + emitcode ("mov", "a,dpx"); + emitcode ("addc", "a,#!constbyte", (size >> 16) & 0xff); + emitcode ("mov", "dpx,a"); } freeAsmop (IC_RIGHT (ic), NULL, ic, FALSE); return ; } - if ( IS_SYMOP(IC_LEFT(ic)) && - OP_SYMBOL(IC_LEFT(ic))->remat && - isOperandInFarSpace(IC_RIGHT(ic))) { + if ( IS_SYMOP (IC_LEFT (ic)) && + OP_SYMBOL (IC_LEFT (ic))->remat && + isOperandInFarSpace (IC_RIGHT (ic))) { operand *op = IC_RIGHT(ic); IC_RIGHT(ic) = IC_LEFT(ic); IC_LEFT(ic) = op; } - + AOP_OP_3_NOFATAL (ic, pushResult); + if (pushResult) { - D (emitcode (";", "genPlus: must push result: 3 ops in far space");); + D (emitcode (";", "genPlus: must push result: 3 ops in far space")); } if (!pushResult) @@ -3764,59 +4702,60 @@ genPlus (iCode * ic) /* if literal, literal on the right or if left requires ACC or right is already in ACC */ - if ((AOP_TYPE (IC_LEFT (ic)) == AOP_LIT) - || ((AOP_NEEDSACC (IC_LEFT (ic))) && !(AOP_NEEDSACC (IC_RIGHT (ic)))) - || AOP_TYPE (IC_RIGHT (ic)) == AOP_ACC) - { - operand *t = IC_RIGHT (ic); - IC_RIGHT (ic) = IC_LEFT (ic); - IC_LEFT (ic) = t; - emitcode (";", "Swapped plus args."); - } + if ((AOP_TYPE (IC_LEFT (ic)) == AOP_LIT) || + ((AOP_NEEDSACC (IC_LEFT (ic))) && !(AOP_NEEDSACC (IC_RIGHT (ic)))) || + AOP_TYPE (IC_RIGHT (ic)) == AOP_ACC) + { + operand *t = IC_RIGHT (ic); + IC_RIGHT (ic) = IC_LEFT (ic); + IC_LEFT (ic) = t; + swappedLR = TRUE; + D (emitcode (";", "Swapped plus args.")); + } /* if both left & right are in bit space */ if (AOP_TYPE (IC_LEFT (ic)) == AOP_CRY && - AOP_TYPE (IC_RIGHT (ic)) == AOP_CRY) - { - genPlusBits (ic); - goto release; - } + AOP_TYPE (IC_RIGHT (ic)) == AOP_CRY) + { + genPlusBits (ic); + goto release; + } /* if left in bit space & right literal */ if (AOP_TYPE (IC_LEFT (ic)) == AOP_CRY && - AOP_TYPE (IC_RIGHT (ic)) == AOP_LIT) - { - emitcode ("mov", "c,%s", AOP (IC_LEFT (ic))->aopu.aop_dir); - /* if result in bit space */ - if (AOP_TYPE (IC_RESULT (ic)) == AOP_CRY) - { - if ((unsigned long) floatFromVal (AOP (IC_RIGHT (ic))->aopu.aop_lit) != 0L) - emitcode ("cpl", "c"); - outBitC (IC_RESULT (ic)); - } - else - { - size = getDataSize (IC_RESULT (ic)); - _startLazyDPSEvaluation (); - while (size--) - { - MOVA (aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE, TRUE)); - emitcode ("addc", "a,#0"); - aopPut (AOP (IC_RESULT (ic)), "a", offset++); - } - _endLazyDPSEvaluation (); - } - goto release; - } + AOP_TYPE (IC_RIGHT (ic)) == AOP_LIT) + { + emitcode ("mov", "c,%s", AOP (IC_LEFT (ic))->aopu.aop_dir); + /* if result in bit space */ + if (AOP_TYPE (IC_RESULT (ic)) == AOP_CRY) + { + if ((unsigned long) floatFromVal (AOP (IC_RIGHT (ic))->aopu.aop_lit) != 0L) + emitcode ("cpl", "c"); + outBitC (IC_RESULT (ic)); + } + else + { + size = getDataSize (IC_RESULT (ic)); + _startLazyDPSEvaluation (); + while (size--) + { + MOVA (aopGet (IC_RIGHT (ic), offset, FALSE, FALSE, NULL)); + emitcode ("addc", "a,%s", zero); + aopPut (IC_RESULT (ic), "a", offset++); + } + _endLazyDPSEvaluation (); + } + goto release; + } /* if I can do an increment instead of add then GOOD for ME */ if (genPlusIncr (ic) == TRUE) - { - emitcode (";", "did genPlusIncr"); - goto release; - } + { + D (emitcode (";", "did genPlusIncr")); + goto release; + } } size = getDataSize (pushResult ? IC_LEFT (ic) : IC_RESULT (ic)); @@ -3825,55 +4764,57 @@ genPlus (iCode * ic) while (size--) { if (AOP_TYPE(IC_LEFT(ic)) == AOP_ACC && !AOP_NEEDSACC(IC_RIGHT(ic))) - { - MOVA (aopGet (AOP (IC_LEFT (ic)), offset, FALSE, FALSE, TRUE)); - if (offset == 0) - emitcode ("add", "a,%s", - aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE, FALSE)); - else - emitcode ("addc", "a,%s", - aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE, FALSE)); - } + { + MOVA (aopGet (IC_LEFT (ic), offset, FALSE, FALSE, NULL)); + if (offset == 0) + emitcode ("add", "a,%s", + aopGet (IC_RIGHT (ic), offset, FALSE, FALSE, NULL)); + else + emitcode ("addc", "a,%s", + aopGet (IC_RIGHT (ic), offset, FALSE, FALSE, NULL)); + } else - { - if (AOP_TYPE(IC_LEFT(ic)) == AOP_ACC && (offset == 0)) - { - /* right is going to use ACC or we would have taken the - * above branch. - */ - assert(AOP_NEEDSACC(IC_RIGHT(ic))); - TR_AP("#3"); - D(emitcode(";", "+ AOP_ACC special case.");); - emitcode("xch", "a, %s", DP2_RESULT_REG); - } - MOVA (aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE, TRUE)); - if (offset == 0) - { - if (AOP_TYPE(IC_LEFT(ic)) == AOP_ACC) - { - TR_AP("#4"); - emitcode("add", "a, %s", DP2_RESULT_REG); - } - else - { - emitcode ("add", "a,%s", - aopGet (AOP(IC_LEFT(ic)), offset, FALSE, FALSE, FALSE)); - } + { + if (AOP_TYPE(IC_LEFT(ic)) == AOP_ACC && (offset == 0)) + { + /* right is going to use ACC or we would have taken the + * above branch. + */ + assert(AOP_NEEDSACC(IC_RIGHT(ic))); + TR_AP("#3"); + D(emitcode(";", "+ AOP_ACC special case.");); + emitcode("xch", "a, %s", DP2_RESULT_REG); + } + MOVA (aopGet (IC_RIGHT (ic), offset, FALSE, FALSE, NULL)); + if (offset == 0) + { + if (AOP_TYPE(IC_LEFT(ic)) == AOP_ACC) + { + TR_AP("#4"); + emitcode("add", "a, %s", DP2_RESULT_REG); + } + else + { + emitcode ("add", "a,%s", + aopGet (IC_LEFT(ic), offset, FALSE, FALSE, + DP2_RESULT_REG)); + } } - else - { - emitcode ("addc", "a,%s", - aopGet (AOP (IC_LEFT (ic)), offset, FALSE, FALSE, FALSE)); - } - } + else + { + emitcode ("addc", "a,%s", + aopGet (IC_LEFT (ic), offset, FALSE, FALSE, + DP2_RESULT_REG)); + } + } if (!pushResult) - { - aopPut (AOP (IC_RESULT (ic)), "a", offset); - } + { + aopPut (IC_RESULT (ic), "a", offset); + } else - { - emitcode ("push", "acc"); - } + { + emitcode ("push", "acc"); + } offset++; } _endLazyDPSEvaluation (); @@ -3889,23 +4830,31 @@ genPlus (iCode * ic) _startLazyDPSEvaluation (); while (size--) - { - emitcode ("pop", "acc"); - aopPut (AOP (IC_RESULT (ic)), "a", size); - } + { + emitcode ("pop", "acc"); + aopPut (IC_RESULT (ic), "a", size); + } _endLazyDPSEvaluation (); } adjustArithmeticResult (ic); release: - freeAsmop (IC_LEFT (ic), NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); - freeAsmop (IC_RIGHT (ic), NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); freeAsmop (IC_RESULT (ic), NULL, ic, TRUE); + if (!swappedLR) + { + freeAsmop (IC_RIGHT (ic), NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); + freeAsmop (IC_LEFT (ic), NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); + } + else + { + freeAsmop (IC_LEFT (ic), NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); + freeAsmop (IC_RIGHT (ic), NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); + } } /*-----------------------------------------------------------------*/ -/* genMinusDec :- does subtraction with deccrement if possible */ +/* genMinusDec :- does subtraction with decrement if possible */ /*-----------------------------------------------------------------*/ static bool genMinusDec (iCode * ic) @@ -3927,7 +4876,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(IC_RESULT(ic),0,FALSE,FALSE,NULL)); } return TRUE; } @@ -3939,78 +4888,88 @@ 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 * jumps straight to that target. */ if (ic->next && ic->next->op == GOTO - && (labelRange = findLabelBackwards (ic, IC_LABEL (ic->next)->key)) != 0 - && labelRange <= 5) - { - emitcode (";", "tail decrement optimized (range %d)", labelRange); - tlbl = IC_LABEL (ic->next); - emitTlbl = 0; - } + && (labelRange = findLabelBackwards (ic, IC_LABEL (ic->next)->key)) != 0 + && labelRange <= 5) + { + D (emitcode (";", "tail decrement optimized (range %d)", labelRange)); + tlbl = IC_LABEL (ic->next); + emitTlbl = 0; + } else - { - tlbl = newiTempLabel (NULL); - emitTlbl = 1; - } + { + tlbl = newiTempLabel (NULL); + emitTlbl = 1; + } + + l = aopGet (IC_RESULT (ic), LSB, FALSE, FALSE, NULL); + emitcode ("dec", "%s", l); - emitcode ("dec", "%s", aopGet (AOP (IC_RESULT (ic)), LSB, FALSE, FALSE, FALSE)); 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); + 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 ("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 ("mov", "a,#!constbyte",0xff); + emitcode ("cjne", "a,%s,!tlabel", l, tlbl->key + 100); + } + l = aopGet (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 - { - emitcode ("cjne", "a,%s,!tlabel" - ,aopGet (AOP (IC_RESULT (ic)), MSB16, FALSE, FALSE, FALSE) - ,tlbl->key + 100); - } - emitcode ("dec", "%s", aopGet (AOP (IC_RESULT (ic)), MSB24, FALSE, FALSE, FALSE)); - } + { + 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 ("mov", "a,#!constbyte",0xff); + emitcode ("cjne", "a,%s,!tlabel", l, tlbl->key + 100); + } + l = aopGet (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 - { - emitcode ("cjne", "a,%s,!tlabel" - ,aopGet (AOP (IC_RESULT (ic)), MSB24, FALSE, FALSE, FALSE) - ,tlbl->key + 100); - } - emitcode ("dec", "%s", aopGet (AOP (IC_RESULT (ic)), MSB32, FALSE, FALSE, FALSE)); - } + { + 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 ("mov", "a,#!constbyte",0xff); + emitcode ("cjne", "a,%s,!tlabel", l, tlbl->key + 100); + } + l = aopGet (IC_RESULT (ic), MSB32, FALSE, FALSE, NULL); + emitcode ("dec", "%s", l); + } if (emitTlbl) - { - emitcode ("", "!tlabeldef", tlbl->key + 100); - } + { + emitLabel (tlbl); + } return TRUE; } @@ -4027,14 +4986,28 @@ genMinusDec (iCode * ic) AOP_TYPE (IC_RESULT (ic)) == AOP_REG && sameRegs (AOP (IC_LEFT (ic)), AOP (IC_RESULT (ic)))) { + char *l; + + if (aopGetUsesAcc (IC_LEFT (ic), 0)) + { + MOVA (aopGet (IC_RESULT (ic), 0, FALSE, FALSE, NULL)); + l = "a"; + } + else + { + l = aopGet (IC_RESULT (ic), 0, FALSE, FALSE, NULL); + } _startLazyDPSEvaluation (); while (icount--) - { - emitcode ("dec", "%s", aopGet (AOP (IC_RESULT (ic)), 0, FALSE, FALSE, FALSE)); - } + { + emitcode ("dec", "%s", l); + } _endLazyDPSEvaluation (); + if (AOP_NEEDSACC (IC_RESULT (ic))) + aopPut (IC_RESULT (ic), "a", 0); + return TRUE; } @@ -4052,20 +5025,20 @@ addSign (operand * result, int offset, int sign) { _startLazyDPSEvaluation(); if (sign) - { - emitcode ("rlc", "a"); - emitcode ("subb", "a,acc"); - while (size--) - { - aopPut (AOP (result), "a", offset++); - } - } + { + emitcode ("rlc", "a"); + emitcode ("subb", "a,acc"); + while (size--) + { + aopPut (result, "a", offset++); + } + } else { - while (size--) - { - aopPut (AOP (result), zero, offset++); - } + while (size--) + { + aopPut (result, zero, offset++); + } } _endLazyDPSEvaluation(); } @@ -4079,14 +5052,14 @@ genMinusBits (iCode * ic) { symbol *lbl = newiTempLabel (NULL); - D (emitcode (";", "genMinusBits ");); + D (emitcode (";", "genMinusBits")); if (AOP_TYPE (IC_RESULT (ic)) == AOP_CRY) { emitcode ("mov", "c,%s", AOP (IC_LEFT (ic))->aopu.aop_dir); emitcode ("jnb", "%s,!tlabel", AOP (IC_RIGHT (ic))->aopu.aop_dir, (lbl->key + 100)); emitcode ("cpl", "c"); - emitcode ("", "!tlabeldef", (lbl->key + 100)); + emitLabel (lbl); outBitC (IC_RESULT (ic)); } else @@ -4095,8 +5068,8 @@ genMinusBits (iCode * ic) emitcode ("subb", "a,acc"); emitcode ("jnb", "%s,!tlabel", AOP (IC_LEFT (ic))->aopu.aop_dir, (lbl->key + 100)); emitcode ("inc", "a"); - emitcode ("", "!tlabeldef", (lbl->key + 100)); - aopPut (AOP (IC_RESULT (ic)), "a", 0); + emitLabel (lbl); + aopPut (IC_RESULT (ic), "a", 0); addSign (IC_RESULT (ic), MSB16, SPEC_USIGN (getSpec (operandType (IC_RESULT (ic))))); } } @@ -4107,38 +5080,30 @@ 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 && - AOP_TYPE (IC_RIGHT (ic)) == AOP_CRY) - { - genMinusBits (ic); - goto release; - } + AOP_TYPE (IC_RIGHT (ic)) == AOP_CRY) + { + genMinusBits (ic); + goto release; + } /* if I can do an decrement instead of subtract then GOOD for ME */ if (genMinusDec (ic) == TRUE) - goto release; + goto release; } @@ -4150,49 +5115,51 @@ 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 ("subb","a,b"); - } else { - emitcode ("subb", "a,%s", - aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE, FALSE)); - } + if (AOP_USESDPTR(IC_RIGHT(ic))) { + emitcode ("mov","b,%s", + aopGet (IC_RIGHT (ic), offset, FALSE, FALSE, NULL)); + MOVA (aopGet (IC_LEFT (ic), offset, FALSE, FALSE, NULL)); + emitcode ("subb","a,b"); + } else { + MOVA (aopGet (IC_LEFT (ic), offset, FALSE, FALSE, NULL)); + emitcode ("subb", "a,%s", + aopGet (IC_RIGHT (ic), offset, FALSE, FALSE, + DP2_RESULT_REG)); + } } else { - /* first add without previous c */ - if (!offset) { - if (!size && lit==-1) { - emitcode ("dec", "a"); - } else { - emitcode ("add", "a,#!constbyte", - (unsigned int) (lit & 0x0FFL)); - } - } else { - emitcode ("addc", "a,#!constbyte", - (unsigned int) ((lit >> (offset * 8)) & 0x0FFL)); - } + MOVA (aopGet (IC_LEFT (ic), offset, FALSE, FALSE, NULL)); + /* first add without previous c */ + if (!offset) { + if (!size && lit==-1) { + emitcode ("dec", "a"); + } else { + emitcode ("add", "a,#!constbyte", + (unsigned int) (lit & 0x0FFL)); + } + } else { + emitcode ("addc", "a,#!constbyte", + (unsigned int) ((lit >> (offset * 8)) & 0x0FFL)); + } } - + if (pushResult) { - emitcode ("push", "acc"); + emitcode ("push", "acc"); } else { - aopPut (AOP (IC_RESULT (ic)), "a", offset); + aopPut (IC_RESULT (ic), "a", offset); } offset++; } _endLazyDPSEvaluation (); - + if (pushResult) { aopOp (IC_RESULT (ic), ic, TRUE, FALSE); @@ -4204,19 +5171,19 @@ genMinus (iCode * ic) _startLazyDPSEvaluation (); while (size--) - { - emitcode ("pop", "acc"); - aopPut (AOP (IC_RESULT (ic)), "a", size); - } + { + emitcode ("pop", "acc"); + aopPut (IC_RESULT (ic), "a", size); + } _endLazyDPSEvaluation (); } adjustArithmeticResult (ic); release: - freeAsmop (IC_LEFT (ic), NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); - freeAsmop (IC_RIGHT (ic), NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); freeAsmop (IC_RESULT (ic), NULL, ic, TRUE); + freeAsmop (IC_RIGHT (ic), NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); + freeAsmop (IC_LEFT (ic), NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); } @@ -4225,29 +5192,31 @@ release: /*-----------------------------------------------------------------*/ static void genMultbits (operand * left, - operand * right, - operand * result, - iCode * ic) + operand * right, + operand * result, + iCode * ic) { + D (emitcode (";", "genMultbits")); + emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir); emitcode ("anl", "c,%s", AOP (right)->aopu.aop_dir); aopOp(result, ic, TRUE, FALSE); outBitC (result); } - /*-----------------------------------------------------------------*/ /* genMultOneByte : 8*8=8/16 bit multiplication */ /*-----------------------------------------------------------------*/ static void genMultOneByte (operand * left, - operand * right, - operand * result, - iCode * ic) + operand * right, + operand * result, + iCode * ic) { - sym_link *opetype = operandType (result); symbol *lbl; - + int size; + bool runtimeSign, compiletimeSign; + bool lUnsigned, rUnsigned, pushedB; /* (if two literals: the value is computed before) */ /* if one literal, literal on the right */ @@ -4256,268 +5225,354 @@ genMultOneByte (operand * left, operand *t = right; right = left; left = t; - emitcode (";", "swapped left and right"); - } - - if (SPEC_USIGN(opetype) - // ignore the sign of left and right, what else can we do? - || (SPEC_USIGN(operandType(left)) && - SPEC_USIGN(operandType(right)))) { - // just an unsigned 8*8=8/16 multiply - //emitcode (";","unsigned"); - emitcode ("mov", "b,%s", aopGet (AOP (right), 0, FALSE, FALSE, TRUE)); - MOVA (aopGet (AOP (left), 0, FALSE, FALSE, TRUE)); - emitcode ("mul", "ab"); - - _G.accInUse++; _G.bInUse++; - aopOp(result, ic, TRUE, FALSE); - - if (AOP_SIZE(result)<1 || AOP_SIZE(result)>2) - { - // this should never happen - fprintf (stderr, "size!=1||2 (%d) in %s at line:%d \n", - AOP_SIZE(result), __FILE__, lineno); - exit (1); - } - - aopPut (AOP (result), "a", 0); - _G.accInUse--; _G.bInUse--; - if (AOP_SIZE(result)==2) - { - aopPut (AOP (result), "b", 1); + /* emitcode (";", "swapped left and right"); */ + } + /* if no literal, unsigned on the right: shorter code */ + if ( AOP_TYPE (right) != AOP_LIT + && SPEC_USIGN (getSpec (operandType (left)))) + { + operand *t = right; + right = left; + left = t; } - return; - } - // we have to do a signed multiply + lUnsigned = SPEC_USIGN (getSpec (operandType (left))); + rUnsigned = SPEC_USIGN (getSpec (operandType (right))); - emitcode (";", "signed"); - emitcode ("clr", "F0"); // reset sign flag - MOVA (aopGet (AOP (left), 0, FALSE, FALSE, TRUE)); + pushedB = pushB (); - lbl=newiTempLabel(NULL); - emitcode ("jnb", "acc.7,!tlabel", lbl->key+100); - // left side is negative, 8-bit two's complement, this fails for -128 - emitcode ("setb", "F0"); // set sign flag - emitcode ("cpl", "a"); - emitcode ("inc", "a"); + if ((lUnsigned && rUnsigned) +/* sorry, I don't know how to get size + without calling aopOp (result,...); + see Feature Request */ + /* || size == 1 */ ) /* no, this is not a bug; with a 1 byte result there's + no need to take care about the signedness! */ + { + /* just an unsigned 8 * 8 = 8 multiply + or 8u * 8u = 16u */ + /* emitcode (";","unsigned"); */ + emitcode ("mov", "b,%s", aopGet (right, 0, FALSE, FALSE, NULL)); + MOVA (aopGet (left, 0, FALSE, FALSE, NULL)); + emitcode ("mul", "ab"); - emitcode ("", "!tlabeldef", lbl->key+100); + _G.accInUse++; + aopOp (result, ic, TRUE, FALSE); + size = AOP_SIZE (result); - /* if literal */ - if (AOP_TYPE(right)==AOP_LIT) { - signed char val=floatFromVal (AOP (right)->aopu.aop_lit); - /* AND literal negative */ - if ((int) val < 0) { - emitcode ("cpl", "F0"); // complement sign flag - emitcode ("mov", "b,#!constbyte", -val); - } else { - emitcode ("mov", "b,#!constbyte", val); + if (size < 1 || size > 2) + { + /* this should never happen */ + fprintf (stderr, "size!=1||2 (%d) in %s at line:%d \n", + size, __FILE__, lineno); + exit (1); + } + + aopPut (result, "a", 0); + _G.accInUse--; + if (size == 2) + aopPut (result, "b", 1); + + popB (pushedB); + return; } - } else { - lbl=newiTempLabel(NULL); - emitcode ("mov", "b,a"); - emitcode ("mov", "a,%s", aopGet (AOP (right), 0, FALSE, FALSE, TRUE)); - emitcode ("jnb", "acc.7,!tlabel", lbl->key+100); - // right side is negative, 8-bit two's complement - emitcode ("cpl", "F0"); // complement sign flag - emitcode ("cpl", "a"); - emitcode ("inc", "a"); - emitcode ("", "!tlabeldef", lbl->key+100); - } + + /* we have to do a signed multiply */ + /* emitcode (";", "signed"); */ + + /* now sign adjust for both left & right */ + + /* let's see what's needed: */ + /* apply negative sign during runtime */ + runtimeSign = FALSE; + /* negative sign from literals */ + compiletimeSign = FALSE; + + if (!lUnsigned) + { + if (AOP_TYPE(left) == AOP_LIT) + { + /* signed literal */ + signed char val = (char) floatFromVal (AOP (left)->aopu.aop_lit); + if (val < 0) + compiletimeSign = TRUE; + } + else + /* signed but not literal */ + runtimeSign = TRUE; + } + + if (!rUnsigned) + { + if (AOP_TYPE(right) == AOP_LIT) + { + /* signed literal */ + signed char val = (char) floatFromVal (AOP (right)->aopu.aop_lit); + if (val < 0) + compiletimeSign ^= TRUE; + } + else + /* signed but not literal */ + runtimeSign = TRUE; + } + + /* initialize F0, which stores the runtime sign */ + if (runtimeSign) + { + if (compiletimeSign) + emitcode ("setb", "F0"); /* set sign flag */ + else + emitcode ("clr", "F0"); /* reset sign flag */ + } + + /* save the signs of the operands */ + if (AOP_TYPE(right) == AOP_LIT) + { + signed char val = (char) floatFromVal (AOP (right)->aopu.aop_lit); + + if (!rUnsigned && val < 0) + emitcode ("mov", "b,#!constbyte", -val); + else + emitcode ("mov", "b,#!constbyte", (unsigned char) val); + } + else /* ! literal */ + { + if (rUnsigned) /* emitcode (";", "signed"); */ + emitcode ("mov", "b,%s", aopGet (right, 0, FALSE, FALSE, NULL)); + else + { + MOVA (aopGet (right, 0, FALSE, FALSE, NULL)); + lbl = newiTempLabel (NULL); + emitcode ("jnb", "acc.7,!tlabel", lbl->key + 100); + emitcode ("cpl", "F0"); /* complement sign flag */ + emitcode ("cpl", "a"); /* 2's complement */ + emitcode ("inc", "a"); + emitLabel (lbl); + emitcode ("mov", "b,a"); + } + } + + if (AOP_TYPE(left) == AOP_LIT) + { + signed char val = (char) floatFromVal (AOP (left)->aopu.aop_lit); + + if (!lUnsigned && val < 0) + emitcode ("mov", "a,#!constbyte", -val); + else + emitcode ("mov", "a,#!constbyte", (unsigned char) val); + } + else /* ! literal */ + { + MOVA (aopGet (left, 0, FALSE, FALSE, NULL)); + + if (!lUnsigned) /* emitcode (";", "signed"); */ + { + lbl = newiTempLabel (NULL); + emitcode ("jnb", "acc.7,!tlabel", lbl->key + 100); + emitcode ("cpl", "F0"); /* complement sign flag */ + emitcode ("cpl", "a"); /* 2's complement */ + emitcode ("inc", "a"); + emitLabel (lbl); + } + } + + /* now the multiplication */ emitcode ("mul", "ab"); - - _G.accInUse++;_G.bInUse++; + _G.accInUse++; aopOp(result, ic, TRUE, FALSE); - - if (AOP_SIZE(result)<1 || AOP_SIZE(result)>2) - { - // this should never happen - fprintf (stderr, "size!=1||2 (%d) in %s at line:%d \n", - AOP_SIZE(result), __FILE__, lineno); + size = AOP_SIZE (result); + + if (size < 1 || size > 2) + { + /* this should never happen */ + fprintf (stderr, "size!=1||2 (%d) in %s at line:%d \n", + size, __FILE__, lineno); exit (1); - } - - lbl=newiTempLabel(NULL); - emitcode ("jnb", "F0,!tlabel", lbl->key+100); - // only ONE op was negative, we have to do a 8/16-bit two's complement - emitcode ("cpl", "a"); // lsb - if (AOP_SIZE(result)==1) { - emitcode ("inc", "a"); - } else { - emitcode ("add", "a,#1"); - emitcode ("xch", "a,b"); - emitcode ("cpl", "a"); // msb - emitcode ("addc", "a,#0"); - emitcode ("xch", "a,b"); - } + } - emitcode ("", "!tlabeldef", lbl->key+100); - aopPut (AOP (result), "a", 0); - _G.accInUse--;_G.bInUse--; - if (AOP_SIZE(result)==2) { - aopPut (AOP (result), "b", 1); - } + if (runtimeSign || compiletimeSign) + { + lbl = newiTempLabel (NULL); + if (runtimeSign) + emitcode ("jnb", "F0,!tlabel", lbl->key + 100); + emitcode ("cpl", "a"); /* lsb 2's complement */ + if (size != 2) + emitcode ("inc", "a"); /* inc doesn't set carry flag */ + else + { + emitcode ("add", "a,#1"); /* this sets carry flag */ + emitcode ("xch", "a,b"); + emitcode ("cpl", "a"); /* msb 2's complement */ + emitcode ("addc", "a,#0"); + emitcode ("xch", "a,b"); + } + emitLabel (lbl); + } + aopPut (result, "a", 0); + _G.accInUse--; + if (size == 2) + aopPut (result, "b", 1); + + popB (pushedB); } /*-----------------------------------------------------------------*/ /* genMultTwoByte - use the DS390 MAC unit to do 16*16 multiply */ /*-----------------------------------------------------------------*/ -static void genMultTwoByte (operand *left, operand *right, - operand *result, iCode *ic) -{ - sym_link *retype = getSpec(operandType(right)); - sym_link *letype = getSpec(operandType(left)); - int umult = SPEC_USIGN(retype) | SPEC_USIGN(letype); - symbol *lbl; - - if (AOP_TYPE (left) == AOP_LIT) { - operand *t = right; - right = left; - left = t; - } - /* save EA bit in F1 */ - lbl = newiTempLabel(NULL); - emitcode ("setb","F1"); - emitcode ("jbc","EA,!tlabel",lbl->key+100); - emitcode ("clr","F1"); - emitcode("","!tlabeldef",lbl->key+100); - - /* load up MB with right */ - if (!umult) { - emitcode("clr","F0"); - if (AOP_TYPE(right) == AOP_LIT) { - int val=floatFromVal (AOP (right)->aopu.aop_lit); - if (val < 0) { - emitcode("setb","F0"); - val = -val; - } - emitcode ("mov","mb,#!constbyte",val & 0xff); - 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 ("jnb","acc.7,!tlabel",lbl->key+100); - emitcode ("xch", "a,b"); - emitcode ("cpl","a"); - emitcode ("add", "a,#1"); - emitcode ("xch", "a,b"); - emitcode ("cpl", "a"); // msb - emitcode ("addc", "a,#0"); - emitcode ("setb","F0"); - emitcode ("","!tlabeldef",lbl->key+100); - emitcode ("mov","mb,b"); - 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)); - } - /* 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 ("jnb","acc.7,!tlabel",lbl->key+100); - emitcode ("xch", "a,b"); - emitcode ("cpl","a"); - emitcode ("add", "a,#1"); - emitcode ("xch", "a,b"); - emitcode ("cpl", "a"); // msb - emitcode ("addc","a,#0"); - emitcode ("jbc","F0,!tlabel",lbl->key+100); - emitcode ("setb","F0"); - emitcode ("","!tlabeldef",lbl->key+100); - 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)); - } - /* wait for multiplication to finish */ - lbl = newiTempLabel(NULL); - emitcode("","!tlabeldef", lbl->key+100); - emitcode("mov","a,mcnt1"); - emitcode("anl","a,#!constbyte",0x80); - emitcode("jnz","!tlabel",lbl->key+100); - - freeAsmop (left, NULL, ic, TRUE); - freeAsmop (right, NULL, ic,TRUE); - aopOp(result, ic, TRUE, FALSE); - - /* if unsigned then simple */ - if (umult) { - emitcode ("mov","a,ma"); - if (AOP_SIZE(result) >= 4) aopPut(AOP(result),"a",3); - emitcode ("mov","a,ma"); - if (AOP_SIZE(result) >= 3) aopPut(AOP(result),"a",2); - aopPut(AOP(result),"ma",1); - aopPut(AOP(result),"ma",0); - } else { - emitcode("push","ma"); - emitcode("push","ma"); - emitcode("push","ma"); - MOVA("ma"); - /* negate result if needed */ - lbl = newiTempLabel(NULL); - emitcode("jnb","F0,!tlabel",lbl->key+100); - emitcode("cpl","a"); - emitcode("add","a,#1"); - emitcode("","!tlabeldef", lbl->key+100); - if (AOP_TYPE(result) == AOP_ACC) - { - D(emitcode(";", "ACC special case.");); - /* We know result is the only live aop, and - * it's obviously not a DPTR2, so AP is available. - */ - emitcode("mov", "%s,acc", DP2_RESULT_REG); - } - else - { - aopPut(AOP(result),"a",0); - } - - emitcode("pop","acc"); - lbl = newiTempLabel(NULL); - emitcode("jnb","F0,!tlabel",lbl->key+100); - emitcode("cpl","a"); - emitcode("addc","a,#0"); - emitcode("","!tlabeldef", lbl->key+100); - aopPut(AOP(result),"a",1); - emitcode("pop","acc"); - if (AOP_SIZE(result) >= 3) { - lbl = newiTempLabel(NULL); - emitcode("jnb","F0,!tlabel",lbl->key+100); - emitcode("cpl","a"); - emitcode("addc","a,#0"); - emitcode("","!tlabeldef", lbl->key+100); - aopPut(AOP(result),"a",2); - } - emitcode("pop","acc"); - if (AOP_SIZE(result) >= 4) { - lbl = newiTempLabel(NULL); - emitcode("jnb","F0,!tlabel",lbl->key+100); - emitcode("cpl","a"); - emitcode("addc","a,#0"); - emitcode("","!tlabeldef", lbl->key+100); - aopPut(AOP(result),"a",3); - } - if (AOP_TYPE(result) == AOP_ACC) - { - /* We stashed the result away above. */ - emitcode("mov", "acc,%s", DP2_RESULT_REG); - } - - } - freeAsmop (result, NULL, ic, TRUE); - - /* restore EA bit in F1 */ - lbl = newiTempLabel(NULL); - emitcode ("jnb","F1,!tlabel",lbl->key+100); - emitcode ("setb","EA"); - emitcode("","!tlabeldef",lbl->key+100); - return ; +static void genMultTwoByte (operand *left, operand *right, + operand *result, iCode *ic) +{ + sym_link *retype = getSpec(operandType(right)); + sym_link *letype = getSpec(operandType(left)); + int umult = SPEC_USIGN(retype) | SPEC_USIGN(letype); + symbol *lbl; + + if (AOP_TYPE (left) == AOP_LIT) { + operand *t = right; + right = left; + left = t; + } + /* save EA bit in F1 */ + lbl = newiTempLabel(NULL); + emitcode ("setb","F1"); + emitcode ("jbc","EA,!tlabel",lbl->key+100); + emitcode ("clr","F1"); + emitLabel (lbl); + + /* load up MB with right */ + if (!umult) { + emitcode("clr","F0"); + if (AOP_TYPE(right) == AOP_LIT) { + int val=(int)floatFromVal (AOP (right)->aopu.aop_lit); + if (val < 0) { + emitcode("setb","F0"); + val = -val; + } + emitcode ("mov","mb,#!constbyte",val & 0xff); + emitcode ("mov","mb,#!constbyte",(val >> 8) & 0xff); + } else { + lbl = newiTempLabel(NULL); + emitcode ("mov","b,%s",aopGet(right,0,FALSE,FALSE,NULL)); + emitcode ("mov","a,%s",aopGet(right,1,FALSE,FALSE,NULL)); + emitcode ("jnb","acc.7,!tlabel",lbl->key+100); + emitcode ("xch", "a,b"); + emitcode ("cpl","a"); + emitcode ("add", "a,#1"); + emitcode ("xch", "a,b"); + emitcode ("cpl", "a"); // msb + emitcode ("addc", "a,#0"); + emitcode ("setb","F0"); + emitLabel (lbl); + emitcode ("mov","mb,b"); + emitcode ("mov","mb,a"); + } + } else { + emitcode ("mov","mb,%s",aopGet(right,0,FALSE,FALSE,NULL)); + emitcode ("mov","mb,%s",aopGet(right,1,FALSE,FALSE,NULL)); + } + /* load up MA with left */ + if (!umult) { + lbl = newiTempLabel(NULL); + emitcode ("mov","b,%s",aopGet(left,0,FALSE,FALSE,NULL)); + emitcode ("mov","a,%s",aopGet(left,1,FALSE,FALSE,NULL)); + emitcode ("jnb","acc.7,!tlabel",lbl->key+100); + emitcode ("xch", "a,b"); + emitcode ("cpl","a"); + emitcode ("add", "a,#1"); + emitcode ("xch", "a,b"); + emitcode ("cpl", "a"); // msb + emitcode ("addc","a,#0"); + emitcode ("jbc","F0,!tlabel",lbl->key+100); + emitcode ("setb","F0"); + emitLabel (lbl); + emitcode ("mov","ma,b"); + emitcode ("mov","ma,a"); + } else { + emitcode ("mov","ma,%s",aopGet(left,0,FALSE,FALSE,NULL)); + emitcode ("mov","ma,%s",aopGet(left,1,FALSE,FALSE,NULL)); + } + /* wait for multiplication to finish */ + lbl = newiTempLabel(NULL); + emitLabel (lbl); + emitcode("mov","a,mcnt1"); + emitcode("anl","a,#!constbyte",0x80); + emitcode("jnz","!tlabel",lbl->key+100); + + freeAsmop (left, NULL, ic, TRUE); + freeAsmop (right, NULL, ic,TRUE); + aopOp(result, ic, TRUE, FALSE); + + /* if unsigned then simple */ + if (umult) { + emitcode ("mov","a,ma"); + if (AOP_SIZE(result) >= 4) aopPut(result,"a",3); + emitcode ("mov","a,ma"); + if (AOP_SIZE(result) >= 3) aopPut(result,"a",2); + aopPut(result,"ma",1); + aopPut(result,"ma",0); + } else { + emitcode("push","ma"); + emitcode("push","ma"); + emitcode("push","ma"); + MOVA("ma"); + /* negate result if needed */ + lbl = newiTempLabel(NULL); + emitcode("jnb","F0,!tlabel",lbl->key+100); + emitcode("cpl","a"); + emitcode("add","a,#1"); + emitLabel (lbl); + if (AOP_TYPE(result) == AOP_ACC) + { + D (emitcode(";", "ACC special case.")); + /* We know result is the only live aop, and + * it's obviously not a DPTR2, so AP is available. + */ + emitcode("mov", "%s,acc", DP2_RESULT_REG); + } + else + { + aopPut(result,"a",0); + } + + emitcode("pop","acc"); + lbl = newiTempLabel(NULL); + emitcode("jnb","F0,!tlabel",lbl->key+100); + emitcode("cpl","a"); + emitcode("addc","a,#0"); + emitLabel (lbl); + aopPut(result,"a",1); + emitcode("pop","acc"); + if (AOP_SIZE(result) >= 3) { + lbl = newiTempLabel(NULL); + emitcode("jnb","F0,!tlabel",lbl->key+100); + emitcode("cpl","a"); + emitcode("addc","a,#0"); + emitLabel (lbl); + aopPut(result,"a",2); + } + emitcode("pop","acc"); + if (AOP_SIZE(result) >= 4) { + lbl = newiTempLabel(NULL); + emitcode("jnb","F0,!tlabel",lbl->key+100); + emitcode("cpl","a"); + emitcode("addc","a,#0"); + emitLabel (lbl); + aopPut(result,"a",3); + } + if (AOP_TYPE(result) == AOP_ACC) + { + /* We stashed the result away above. */ + emitcode("mov", "acc,%s", DP2_RESULT_REG); + } + + } + freeAsmop (result, NULL, ic, TRUE); + + /* restore EA bit in F1 */ + lbl = newiTempLabel(NULL); + emitcode ("jnb","F1,!tlabel",lbl->key+100); + emitcode ("setb","EA"); + emitLabel (lbl); + return ; } /*-----------------------------------------------------------------*/ @@ -4530,9 +5585,9 @@ genMult (iCode * ic) operand *right = IC_RIGHT (ic); operand *result = IC_RESULT (ic); - D (emitcode (";", "genMult ");); + D (emitcode (";", "genMult")); - /* assign the amsops */ + /* assign the asmops */ AOP_OP_2 (ic); /* special cases first */ @@ -4553,17 +5608,17 @@ genMult (iCode * ic) } if (AOP_SIZE (left) == 2 && AOP_SIZE(right) == 2) { - /* use the ds390 ARITHMETIC accel UNIT */ - genMultTwoByte (left, right, result, ic); - return ; + /* use the ds390 ARITHMETIC accel UNIT */ + genMultTwoByte (left, right, result, ic); + return ; } /* should have been converted to function call */ assert (0); release: - freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); - freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); freeAsmop (result, NULL, ic, TRUE); + freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); + freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); } /*-----------------------------------------------------------------*/ @@ -4571,20 +5626,26 @@ release: /*-----------------------------------------------------------------*/ static void genDivbits (operand * left, - operand * right, - operand * result, - iCode * ic) + operand * right, + operand * result, + iCode * ic) { - char *l; + bool pushedB; + + D(emitcode ("; genDivbits","")); + + pushedB = pushB (); /* the result must be bit */ LOAD_AB_FOR_DIV (left, right, l); emitcode ("div", "ab"); emitcode ("rrc", "a"); aopOp(result, ic, TRUE, FALSE); - - aopPut (AOP (result), "c", 0); + + popB (pushedB); + + aopPut (result, "c", 0); } /*-----------------------------------------------------------------*/ @@ -4592,219 +5653,309 @@ genDivbits (operand * left, /*-----------------------------------------------------------------*/ static void genDivOneByte (operand * left, - operand * right, - operand * result, - iCode * ic) + operand * right, + operand * result, + iCode * ic) { - sym_link *opetype = operandType (result); + bool lUnsigned, rUnsigned, pushedB; + bool runtimeSign, compiletimeSign; char *l; symbol *lbl; int size, offset; + D(emitcode ("; genDivOneByte","")); + offset = 1; + lUnsigned = SPEC_USIGN (getSpec (operandType (left))); + rUnsigned = SPEC_USIGN (getSpec (operandType (right))); + + pushedB = pushB (); + /* signed or unsigned */ - if (SPEC_USIGN (opetype)) - { - /* unsigned is easy */ - LOAD_AB_FOR_DIV (left, right, l); - emitcode ("div", "ab"); - - _G.accInUse++; - aopOp(result, ic, TRUE, FALSE); - aopPut (AOP (result), "a", 0); - _G.accInUse--; - - size = AOP_SIZE (result) - 1; - - while (size--) - { - aopPut (AOP (result), zero, offset++); - } + if (lUnsigned && rUnsigned) + { + /* unsigned is easy */ + LOAD_AB_FOR_DIV (left, right, l); + emitcode ("div", "ab"); + + _G.accInUse++; + aopOp (result, ic, TRUE, FALSE); + aopPut (result, "a", 0); + _G.accInUse--; + + size = AOP_SIZE (result) - 1; + + while (size--) + aopPut (result, zero, offset++); + + popB (pushedB); return; } /* signed is a little bit more difficult */ + /* now sign adjust for both left & right */ + + /* let's see what's needed: */ + /* apply negative sign during runtime */ + runtimeSign = FALSE; + /* negative sign from literals */ + compiletimeSign = FALSE; + + if (!lUnsigned) + { + if (AOP_TYPE(left) == AOP_LIT) + { + /* signed literal */ + signed char val = (char) floatFromVal (AOP (left)->aopu.aop_lit); + if (val < 0) + compiletimeSign = TRUE; + } + else + /* signed but not literal */ + runtimeSign = TRUE; + } + + if (!rUnsigned) + { + if (AOP_TYPE(right) == AOP_LIT) + { + /* signed literal */ + signed char val = (char) floatFromVal (AOP (right)->aopu.aop_lit); + if (val < 0) + compiletimeSign ^= TRUE; + } + else + /* signed but not literal */ + runtimeSign = TRUE; + } + + /* initialize F0, which stores the runtime sign */ + if (runtimeSign) + { + if (compiletimeSign) + emitcode ("setb", "F0"); /* set sign flag */ + else + emitcode ("clr", "F0"); /* reset sign flag */ + } + /* save the signs of the operands */ - l = aopGet (AOP (left), 0, FALSE, FALSE, TRUE); - MOVA (l); - emitcode ("xrl", "a,%s", aopGet (AOP (right), 0, FALSE, TRUE, FALSE)); - emitcode ("push", "acc"); /* save it on the stack */ + if (AOP_TYPE(right) == AOP_LIT) + { + signed char val = (char) floatFromVal (AOP (right)->aopu.aop_lit); - /* now sign adjust for both left & right */ - l = aopGet (AOP (right), 0, FALSE, FALSE, TRUE); - MOVA (l); - lbl = newiTempLabel (NULL); - emitcode ("jnb", "acc.7,!tlabel", (lbl->key + 100)); - emitcode ("cpl", "a"); - emitcode ("inc", "a"); - emitcode ("", "!tlabeldef", (lbl->key + 100)); - emitcode ("mov", "b,a"); + if (!rUnsigned && val < 0) + emitcode ("mov", "b,#0x%02x", -val); + else + emitcode ("mov", "b,#0x%02x", (unsigned char) val); + } + else /* ! literal */ + { + if (rUnsigned) + emitcode ("mov", "b,%s", aopGet (right, 0, FALSE, FALSE, NULL)); + else + { + MOVA (aopGet (right, 0, FALSE, FALSE, NULL)); + lbl = newiTempLabel (NULL); + emitcode ("jnb", "acc.7,!tlabel", lbl->key + 100); + emitcode ("cpl", "F0"); /* complement sign flag */ + emitcode ("cpl", "a"); /* 2's complement */ + emitcode ("inc", "a"); + emitLabel (lbl); + emitcode ("mov", "b,a"); + } + } - /* sign adjust left side */ - l = aopGet (AOP (left), 0, FALSE, FALSE, TRUE); - MOVA (l); + if (AOP_TYPE(left) == AOP_LIT) + { + signed char val = (char) floatFromVal (AOP (left)->aopu.aop_lit); - lbl = newiTempLabel (NULL); - emitcode ("jnb", "acc.7,!tlabel", (lbl->key + 100)); - emitcode ("cpl", "a"); - emitcode ("inc", "a"); - emitcode ("", "!tlabeldef", (lbl->key + 100)); + if (!lUnsigned && val < 0) + emitcode ("mov", "a,#0x%02x", -val); + else + emitcode ("mov", "a,#0x%02x", (unsigned char) val); + } + else /* ! literal */ + { + MOVA (aopGet (left, 0, FALSE, FALSE, NULL)); + + if (!lUnsigned) + { + lbl = newiTempLabel (NULL); + emitcode ("jnb", "acc.7,!tlabel", lbl->key + 100); + emitcode ("cpl", "F0"); /* complement sign flag */ + emitcode ("cpl", "a"); /* 2's complement */ + emitcode ("inc", "a"); + emitLabel (lbl); + } + } /* now the division */ emitcode ("nop", "; workaround for DS80C390 div bug."); emitcode ("div", "ab"); - /* we are interested in the lower order - only */ - emitcode ("mov", "b,a"); - lbl = newiTempLabel (NULL); - emitcode ("pop", "acc"); - /* if there was an over flow we don't - adjust the sign of the result */ - emitcode ("jb", "ov,!tlabel", (lbl->key + 100)); - emitcode ("jnb", "acc.7,!tlabel", (lbl->key + 100)); - CLRC; - emitcode ("clr", "a"); - emitcode ("subb", "a,b"); - emitcode ("mov", "b,a"); - emitcode ("", "!tlabeldef", (lbl->key + 100)); - - /* now we are done */ - _G.accInUse++; _G.bInUse++; - aopOp(result, ic, TRUE, FALSE); - - aopPut (AOP (result), "b", 0); - - size = AOP_SIZE (result) - 1; - - if (size > 0) - { - emitcode ("mov", "c,b.7"); - emitcode ("subb", "a,acc"); - } - while (size--) + + if (runtimeSign || compiletimeSign) { - aopPut (AOP (result), "a", offset++); + lbl = newiTempLabel (NULL); + if (runtimeSign) + emitcode ("jnb", "F0,!tlabel", lbl->key + 100); + emitcode ("cpl", "a"); /* lsb 2's complement */ + emitcode ("inc", "a"); + emitLabel (lbl); + + _G.accInUse++; + aopOp (result, ic, TRUE, FALSE); + size = AOP_SIZE (result) - 1; + + if (size > 0) + { + /* 123 look strange, but if (OP_SYMBOL (op)->accuse == 1) + then the result will be in b, a */ + emitcode ("mov", "b,a"); /* 1 */ + /* msb is 0x00 or 0xff depending on the sign */ + if (runtimeSign) + { + emitcode ("mov", "c,F0"); + emitcode ("subb", "a,acc"); + emitcode ("xch", "a,b"); /* 2 */ + while (size--) + aopPut (result, "b", offset++); /* write msb's */ + } + else /* compiletimeSign */ + while (size--) + aopPut (result, "#0xff", offset++); /* write msb's */ + } + aopPut (result, "a", 0); /* 3: write lsb */ } - _G.accInUse--; _G.bInUse--; + else + { + _G.accInUse++; + aopOp(result, ic, TRUE, FALSE); + size = AOP_SIZE (result) - 1; + aopPut (result, "a", 0); + while (size--) + aopPut (result, zero, offset++); + } + _G.accInUse--; + popB (pushedB); } /*-----------------------------------------------------------------*/ /* genDivTwoByte - use the DS390 MAC unit to do 16/16 divide */ /*-----------------------------------------------------------------*/ -static void genDivTwoByte (operand *left, operand *right, - operand *result, iCode *ic) -{ - sym_link *retype = getSpec(operandType(right)); - sym_link *letype = getSpec(operandType(left)); - int umult = SPEC_USIGN(retype) | SPEC_USIGN(letype); - symbol *lbl; - - /* save EA bit in F1 */ - lbl = newiTempLabel(NULL); - emitcode ("setb","F1"); - emitcode ("jbc","EA,!tlabel",lbl->key+100); - emitcode ("clr","F1"); - emitcode("","!tlabeldef",lbl->key+100); - - /* load up MA with left */ - 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 ("jnb","acc.7,!tlabel",lbl->key+100); - emitcode ("xch", "a,b"); - emitcode ("cpl","a"); - emitcode ("add", "a,#1"); - emitcode ("xch", "a,b"); - emitcode ("cpl", "a"); // msb - emitcode ("addc","a,#0"); - emitcode ("setb","F0"); - emitcode ("","!tlabeldef",lbl->key+100); - 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)); - } - - /* load up MB with right */ - if (!umult) { - if (AOP_TYPE(right) == AOP_LIT) { - int val=floatFromVal (AOP (right)->aopu.aop_lit); - if (val < 0) { - lbl = newiTempLabel(NULL); - emitcode ("jbc","F0,!tlabel",lbl->key+100); - emitcode("setb","F0"); - emitcode ("","!tlabeldef",lbl->key+100); - val = -val; - } - emitcode ("mov","mb,#!constbyte",val & 0xff); - 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 ("jnb","acc.7,!tlabel",lbl->key+100); - emitcode ("xch", "a,b"); - emitcode ("cpl","a"); - emitcode ("add", "a,#1"); - emitcode ("xch", "a,b"); - emitcode ("cpl", "a"); // msb - emitcode ("addc", "a,#0"); - emitcode ("jbc","F0,!tlabel",lbl->key+100); - emitcode ("setb","F0"); - emitcode ("","!tlabeldef",lbl->key+100); - emitcode ("mov","mb,b"); - 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)); - } - - /* wait for multiplication to finish */ - lbl = newiTempLabel(NULL); - emitcode("","!tlabeldef", lbl->key+100); - emitcode("mov","a,mcnt1"); - emitcode("anl","a,#!constbyte",0x80); - emitcode("jnz","!tlabel",lbl->key+100); - - freeAsmop (left, NULL, ic, TRUE); - freeAsmop (right, NULL, ic,TRUE); - aopOp(result, ic, TRUE, FALSE); - - /* if unsigned then simple */ - if (umult) { - aopPut(AOP(result),"ma",1); - aopPut(AOP(result),"ma",0); - } else { - emitcode("push","ma"); - MOVA("ma"); - /* negate result if needed */ - lbl = newiTempLabel(NULL); - emitcode("jnb","F0,!tlabel",lbl->key+100); - emitcode("cpl","a"); - emitcode("add","a,#1"); - emitcode("","!tlabeldef", lbl->key+100); - aopPut(AOP(result),"a",0); - emitcode("pop","acc"); - lbl = newiTempLabel(NULL); - emitcode("jnb","F0,!tlabel",lbl->key+100); - emitcode("cpl","a"); - emitcode("addc","a,#0"); - emitcode("","!tlabeldef", lbl->key+100); - aopPut(AOP(result),"a",1); - } - freeAsmop (result, NULL, ic, TRUE); - /* restore EA bit in F1 */ - lbl = newiTempLabel(NULL); - emitcode ("jnb","F1,!tlabel",lbl->key+100); - emitcode ("setb","EA"); - emitcode("","!tlabeldef",lbl->key+100); - return ; +static void genDivTwoByte (operand *left, operand *right, + operand *result, iCode *ic) +{ + sym_link *retype = getSpec(operandType(right)); + sym_link *letype = getSpec(operandType(left)); + int umult = SPEC_USIGN(retype) | SPEC_USIGN(letype); + symbol *lbl; + + /* save EA bit in F1 */ + lbl = newiTempLabel(NULL); + emitcode ("setb","F1"); + emitcode ("jbc","EA,!tlabel",lbl->key+100); + emitcode ("clr","F1"); + emitLabel (lbl); + + /* load up MA with left */ + if (!umult) { + emitcode("clr","F0"); + lbl = newiTempLabel(NULL); + emitcode ("mov","b,%s",aopGet(left,0,FALSE,FALSE,NULL)); + emitcode ("mov","a,%s",aopGet(left,1,FALSE,FALSE,NULL)); + emitcode ("jnb","acc.7,!tlabel",lbl->key+100); + emitcode ("xch", "a,b"); + emitcode ("cpl","a"); + emitcode ("add", "a,#1"); + emitcode ("xch", "a,b"); + emitcode ("cpl", "a"); // msb + emitcode ("addc","a,#0"); + emitcode ("setb","F0"); + emitLabel (lbl); + emitcode ("mov","ma,b"); + emitcode ("mov","ma,a"); + } else { + emitcode ("mov","ma,%s",aopGet(left,0,FALSE,FALSE,NULL)); + emitcode ("mov","ma,%s",aopGet(left,1,FALSE,FALSE,NULL)); + } + + /* load up MB with right */ + if (!umult) { + if (AOP_TYPE(right) == AOP_LIT) { + int val=(int)floatFromVal (AOP (right)->aopu.aop_lit); + if (val < 0) { + lbl = newiTempLabel(NULL); + emitcode ("jbc","F0,!tlabel",lbl->key+100); + emitcode("setb","F0"); + emitLabel (lbl); + val = -val; + } + emitcode ("mov","mb,#!constbyte",val & 0xff); + emitcode ("mov","mb,#!constbyte",(val >> 8) & 0xff); + } else { + lbl = newiTempLabel(NULL); + emitcode ("mov","b,%s",aopGet(right,0,FALSE,FALSE,NULL)); + emitcode ("mov","a,%s",aopGet(right,1,FALSE,FALSE,NULL)); + emitcode ("jnb","acc.7,!tlabel",lbl->key+100); + emitcode ("xch", "a,b"); + emitcode ("cpl","a"); + emitcode ("add", "a,#1"); + emitcode ("xch", "a,b"); + emitcode ("cpl", "a"); // msb + emitcode ("addc", "a,#0"); + emitcode ("jbc","F0,!tlabel",lbl->key+100); + emitcode ("setb","F0"); + emitLabel (lbl); + emitcode ("mov","mb,b"); + emitcode ("mov","mb,a"); + } + } else { + emitcode ("mov","mb,%s",aopGet(right,0,FALSE,FALSE,NULL)); + emitcode ("mov","mb,%s",aopGet(right,1,FALSE,FALSE,NULL)); + } + + /* wait for multiplication to finish */ + lbl = newiTempLabel(NULL); + emitLabel (lbl); + emitcode("mov","a,mcnt1"); + emitcode("anl","a,#!constbyte",0x80); + emitcode("jnz","!tlabel",lbl->key+100); + + freeAsmop (left, NULL, ic, TRUE); + freeAsmop (right, NULL, ic,TRUE); + aopOp(result, ic, TRUE, FALSE); + + /* if unsigned then simple */ + if (umult) { + aopPut(result,"ma",1); + aopPut(result,"ma",0); + } else { + emitcode("push","ma"); + MOVA("ma"); + /* negate result if needed */ + lbl = newiTempLabel(NULL); + emitcode("jnb","F0,!tlabel",lbl->key+100); + emitcode("cpl","a"); + emitcode("add","a,#1"); + emitLabel (lbl); + aopPut(result,"a",0); + emitcode("pop","acc"); + lbl = newiTempLabel(NULL); + emitcode("jnb","F0,!tlabel",lbl->key+100); + emitcode("cpl","a"); + emitcode("addc","a,#0"); + emitLabel (lbl); + aopPut(result,"a",1); + } + freeAsmop (result, NULL, ic, TRUE); + /* restore EA bit in F1 */ + lbl = newiTempLabel(NULL); + emitcode ("jnb","F1,!tlabel",lbl->key+100); + emitcode ("setb","EA"); + emitLabel (lbl); + return ; } /*-----------------------------------------------------------------*/ @@ -4817,7 +5968,7 @@ genDiv (iCode * ic) operand *right = IC_RIGHT (ic); operand *result = IC_RESULT (ic); - D (emitcode (";", "genDiv ");); + D (emitcode (";", "genDiv")); /* assign the amsops */ AOP_OP_2 (ic); @@ -4840,16 +5991,16 @@ genDiv (iCode * ic) } if (AOP_SIZE (left) == 2 && AOP_SIZE(right) == 2) { - /* use the ds390 ARITHMETIC accel UNIT */ - genDivTwoByte (left, right, result, ic); - return ; + /* use the ds390 ARITHMETIC accel UNIT */ + genDivTwoByte (left, right, result, ic); + return ; } /* should have been converted to function call */ assert (0); release: - freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); - freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); freeAsmop (result, NULL, ic, TRUE); + freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); + freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); } /*-----------------------------------------------------------------*/ @@ -4857,12 +6008,16 @@ release: /*-----------------------------------------------------------------*/ static void genModbits (operand * left, - operand * right, - operand * result, - iCode * ic) + operand * right, + operand * result, + iCode * ic) { - char *l; + bool pushedB; + + D (emitcode (";", "genModbits")); + + pushedB = pushB (); /* the result must be bit */ LOAD_AB_FOR_DIV (left, right, l); @@ -4870,7 +6025,10 @@ genModbits (operand * left, emitcode ("mov", "a,b"); emitcode ("rrc", "a"); aopOp(result, ic, TRUE, FALSE); - aopPut (AOP (result), "c", 0); + + popB (pushedB); + + aopPut (result, "c", 0); } /*-----------------------------------------------------------------*/ @@ -4878,168 +6036,246 @@ genModbits (operand * left, /*-----------------------------------------------------------------*/ static void genModOneByte (operand * left, - operand * right, - operand * result, - iCode * ic) + operand * right, + operand * result, + iCode * ic) { - sym_link *opetype = operandType (result); + bool lUnsigned, rUnsigned, pushedB; + bool runtimeSign, compiletimeSign; char *l; symbol *lbl; + int size, offset; + + D (emitcode (";", "genModOneByte")); + + offset = 1; + lUnsigned = SPEC_USIGN (getSpec (operandType (left))); + rUnsigned = SPEC_USIGN (getSpec (operandType (right))); + + pushedB = pushB (); /* signed or unsigned */ - if (SPEC_USIGN (opetype)) + if (lUnsigned && rUnsigned) { /* unsigned is easy */ LOAD_AB_FOR_DIV (left, right, l); emitcode ("div", "ab"); - aopOp(result, ic, TRUE, FALSE); - aopPut (AOP (result), "b", 0); + aopOp (result, ic, TRUE, FALSE); + aopPut (result, "b", 0); + + for (size = AOP_SIZE (result) - 1; size--;) + aopPut (result, zero, offset++); + + popB (pushedB); return; } /* signed is a little bit more difficult */ - /* save the signs of the operands */ - l = aopGet (AOP (left), 0, FALSE, FALSE, TRUE); - MOVA (l); + /* now sign adjust for both left & right */ - emitcode ("xrl", "a,%s", aopGet (AOP (right), 0, FALSE, FALSE, FALSE)); - emitcode ("push", "acc"); /* save it on the stack */ + /* modulus: sign of the right operand has no influence on the result! */ + if (AOP_TYPE(right) == AOP_LIT) + { + signed char val = (char) floatFromVal (AOP (right)->aopu.aop_lit); - /* now sign adjust for both left & right */ - l = aopGet (AOP (right), 0, FALSE, FALSE, TRUE); - MOVA (l); + if (!rUnsigned && val < 0) + emitcode ("mov", "b,#0x%02x", -val); + else + emitcode ("mov", "b,#0x%02x", (unsigned char) val); + } + else /* not literal */ + { + if (rUnsigned) + emitcode ("mov", "b,%s", aopGet (right, 0, FALSE, FALSE, NULL)); + else + { + MOVA (aopGet (right, 0, FALSE, FALSE, NULL)); + lbl = newiTempLabel (NULL); + emitcode ("jnb", "acc.7,!tlabel", lbl->key + 100); + emitcode ("cpl", "a"); /* 2's complement */ + emitcode ("inc", "a"); + emitLabel (lbl); + emitcode ("mov", "b,a"); + } + } - lbl = newiTempLabel (NULL); - emitcode ("jnb", "acc.7,!tlabel", (lbl->key + 100)); - emitcode ("cpl", "a"); - emitcode ("inc", "a"); - emitcode ("", "!tlabeldef", (lbl->key + 100)); - emitcode ("mov", "b,a"); + /* let's see what's needed: */ + /* apply negative sign during runtime */ + runtimeSign = FALSE; + /* negative sign from literals */ + compiletimeSign = FALSE; /* sign adjust left side */ - l = aopGet (AOP (left), 0, FALSE, FALSE, TRUE); - MOVA (l); + if (AOP_TYPE(left) == AOP_LIT) + { + signed char val = (char) floatFromVal (AOP (left)->aopu.aop_lit); - lbl = newiTempLabel (NULL); - emitcode ("jnb", "acc.7,!tlabel", (lbl->key + 100)); - emitcode ("cpl", "a"); - emitcode ("inc", "a"); - emitcode ("", "!tlabeldef", (lbl->key + 100)); + if (!lUnsigned && val < 0) + { + compiletimeSign = TRUE; /* set sign flag */ + emitcode ("mov", "a,#0x%02x", -val); + } + else + emitcode ("mov", "a,#0x%02x", (unsigned char) val); + } + else /* ! literal */ + { + MOVA (aopGet (left, 0, FALSE, FALSE, NULL)); - /* now the multiplication */ + if (!lUnsigned) + { + runtimeSign = TRUE; + emitcode ("clr", "F0"); /* clear sign flag */ + + lbl = newiTempLabel (NULL); + emitcode ("jnb", "acc.7,!tlabel", lbl->key + 100); + emitcode ("setb", "F0"); /* set sign flag */ + emitcode ("cpl", "a"); /* 2's complement */ + emitcode ("inc", "a"); + emitLabel (lbl); + } + } + + /* now the modulus */ emitcode ("nop", "; workaround for DS80C390 div bug."); emitcode ("div", "ab"); - /* we are interested in the lower order - only */ - lbl = newiTempLabel (NULL); - emitcode ("pop", "acc"); - /* if there was an over flow we don't - adjust the sign of the result */ - emitcode ("jb", "ov,!tlabel", (lbl->key + 100)); - emitcode ("jnb", "acc.7,!tlabel", (lbl->key + 100)); - CLRC; - emitcode ("clr", "a"); - emitcode ("subb", "a,b"); - emitcode ("mov", "b,a"); - emitcode ("", "!tlabeldef", (lbl->key + 100)); - - _G.bInUse++; - /* now we are done */ - aopOp(result, ic, TRUE, FALSE); - aopPut (AOP (result), "b", 0); - _G.bInUse--; + if (runtimeSign || compiletimeSign) + { + emitcode ("mov", "a,b"); + lbl = newiTempLabel (NULL); + if (runtimeSign) + emitcode ("jnb", "F0,!tlabel", lbl->key + 100); + emitcode ("cpl", "a"); /* lsb 2's complement */ + emitcode ("inc", "a"); + emitLabel (lbl); + + _G.accInUse++; + aopOp (result, ic, TRUE, FALSE); + size = AOP_SIZE (result) - 1; + + if (size > 0) + { + /* 123 look strange, but if (OP_SYMBOL (op)->accuse == 1) + then the result will be in b, a */ + emitcode ("mov", "b,a"); /* 1 */ + /* msb is 0x00 or 0xff depending on the sign */ + if (runtimeSign) + { + emitcode ("mov", "c,F0"); + emitcode ("subb", "a,acc"); + emitcode ("xch", "a,b"); /* 2 */ + while (size--) + aopPut (result, "b", offset++); /* write msb's */ + } + else /* compiletimeSign */ + while (size--) + aopPut (result, "#0xff", offset++); /* write msb's */ + } + aopPut (result, "a", 0); /* 3: write lsb */ + } + else + { + _G.accInUse++; + aopOp(result, ic, TRUE, FALSE); + size = AOP_SIZE (result) - 1; + + aopPut (result, "b", 0); + while (size--) + aopPut (result, zero, offset++); + } + _G.accInUse--; + popB (pushedB); } /*-----------------------------------------------------------------*/ /* genModTwoByte - use the DS390 MAC unit to do 16%16 modulus */ /*-----------------------------------------------------------------*/ -static void genModTwoByte (operand *left, operand *right, - operand *result, iCode *ic) -{ - sym_link *retype = getSpec(operandType(right)); - sym_link *letype = getSpec(operandType(left)); - int umult = SPEC_USIGN(retype) | SPEC_USIGN(letype); - symbol *lbl; - - /* load up MA with left */ - /* save EA bit in F1 */ - lbl = newiTempLabel(NULL); - emitcode ("setb","F1"); - emitcode ("jbc","EA,!tlabel",lbl->key+100); - emitcode ("clr","F1"); - emitcode("","!tlabeldef",lbl->key+100); - - 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 ("jnb","acc.7,!tlabel",lbl->key+100); - emitcode ("xch", "a,b"); - emitcode ("cpl","a"); - emitcode ("add", "a,#1"); - emitcode ("xch", "a,b"); - emitcode ("cpl", "a"); // msb - emitcode ("addc","a,#0"); - emitcode ("","!tlabeldef",lbl->key+100); - 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)); - } - - /* load up MB with right */ - if (!umult) { - if (AOP_TYPE(right) == AOP_LIT) { - int val=floatFromVal (AOP (right)->aopu.aop_lit); - if (val < 0) { - val = -val; - } - emitcode ("mov","mb,#!constbyte",val & 0xff); - 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 ("jnb","acc.7,!tlabel",lbl->key+100); - emitcode ("xch", "a,b"); - emitcode ("cpl","a"); - emitcode ("add", "a,#1"); - emitcode ("xch", "a,b"); - emitcode ("cpl", "a"); // msb - emitcode ("addc", "a,#0"); - emitcode ("","!tlabeldef",lbl->key+100); - emitcode ("mov","mb,b"); - 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)); - } - - /* wait for multiplication to finish */ - lbl = newiTempLabel(NULL); - emitcode("","!tlabeldef", lbl->key+100); - emitcode("mov","a,mcnt1"); - emitcode("anl","a,#!constbyte",0x80); - emitcode("jnz","!tlabel",lbl->key+100); - - freeAsmop (left, NULL, ic, TRUE); - freeAsmop (right, NULL, ic,TRUE); - aopOp(result, ic, TRUE, FALSE); - - aopPut(AOP(result),"mb",1); - aopPut(AOP(result),"mb",0); - freeAsmop (result, NULL, ic, TRUE); - - /* restore EA bit in F1 */ - lbl = newiTempLabel(NULL); - emitcode ("jnb","F1,!tlabel",lbl->key+100); - emitcode ("setb","EA"); - emitcode("","!tlabeldef",lbl->key+100); - return ; +static void genModTwoByte (operand *left, operand *right, + operand *result, iCode *ic) +{ + sym_link *retype = getSpec(operandType(right)); + sym_link *letype = getSpec(operandType(left)); + int umult = SPEC_USIGN(retype) | SPEC_USIGN(letype); + symbol *lbl; + + /* load up MA with left */ + /* save EA bit in F1 */ + lbl = newiTempLabel(NULL); + emitcode ("setb","F1"); + emitcode ("jbc","EA,!tlabel",lbl->key+100); + emitcode ("clr","F1"); + emitLabel (lbl); + + if (!umult) { + lbl = newiTempLabel(NULL); + emitcode ("mov","b,%s",aopGet(left,0,FALSE,FALSE,NULL)); + emitcode ("mov","a,%s",aopGet(left,1,FALSE,FALSE,NULL)); + emitcode ("jnb","acc.7,!tlabel",lbl->key+100); + emitcode ("xch", "a,b"); + emitcode ("cpl","a"); + emitcode ("add", "a,#1"); + emitcode ("xch", "a,b"); + emitcode ("cpl", "a"); // msb + emitcode ("addc","a,#0"); + emitLabel (lbl); + emitcode ("mov","ma,b"); + emitcode ("mov","ma,a"); + } else { + emitcode ("mov","ma,%s",aopGet(left,0,FALSE,FALSE,NULL)); + emitcode ("mov","ma,%s",aopGet(left,1,FALSE,FALSE,NULL)); + } + + /* load up MB with right */ + if (!umult) { + if (AOP_TYPE(right) == AOP_LIT) { + int val=(int)floatFromVal (AOP (right)->aopu.aop_lit); + if (val < 0) { + val = -val; + } + emitcode ("mov","mb,#!constbyte",val & 0xff); + emitcode ("mov","mb,#!constbyte",(val >> 8) & 0xff); + } else { + lbl = newiTempLabel(NULL); + emitcode ("mov","b,%s",aopGet(right,0,FALSE,FALSE,NULL)); + emitcode ("mov","a,%s",aopGet(right,1,FALSE,FALSE,NULL)); + emitcode ("jnb","acc.7,!tlabel",lbl->key+100); + emitcode ("xch", "a,b"); + emitcode ("cpl","a"); + emitcode ("add", "a,#1"); + emitcode ("xch", "a,b"); + emitcode ("cpl", "a"); // msb + emitcode ("addc", "a,#0"); + emitLabel (lbl); + emitcode ("mov","mb,b"); + emitcode ("mov","mb,a"); + } + } else { + emitcode ("mov","mb,%s",aopGet(right,0,FALSE,FALSE,NULL)); + emitcode ("mov","mb,%s",aopGet(right,1,FALSE,FALSE,NULL)); + } + + /* wait for multiplication to finish */ + lbl = newiTempLabel(NULL); + emitLabel (lbl); + emitcode("mov","a,mcnt1"); + emitcode("anl","a,#!constbyte",0x80); + emitcode("jnz","!tlabel",lbl->key+100); + + freeAsmop (left, NULL, ic, TRUE); + freeAsmop (right, NULL, ic,TRUE); + aopOp(result, ic, TRUE, FALSE); + + aopPut(result,"mb",1); + aopPut(result,"mb",0); + freeAsmop (result, NULL, ic, TRUE); + + /* restore EA bit in F1 */ + lbl = newiTempLabel(NULL); + emitcode ("jnb","F1,!tlabel",lbl->key+100); + emitcode ("setb","EA"); + emitLabel (lbl); } /*-----------------------------------------------------------------*/ @@ -5052,9 +6288,9 @@ genMod (iCode * ic) operand *right = IC_RIGHT (ic); operand *result = IC_RESULT (ic); - D (emitcode (";", "genMod "); ); + D (emitcode (";", "genMod")); - /* assign the amsops */ + /* assign the asmops */ AOP_OP_2 (ic); /* special cases first */ @@ -5075,18 +6311,18 @@ genMod (iCode * ic) } if (AOP_SIZE (left) == 2 && AOP_SIZE(right) == 2) { - /* use the ds390 ARITHMETIC accel UNIT */ - genModTwoByte (left, right, result, ic); - return ; + /* use the ds390 ARITHMETIC accel UNIT */ + genModTwoByte (left, right, result, ic); + return ; } /* should have been converted to function call */ assert (0); release: - freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); - freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); freeAsmop (result, NULL, ic, TRUE); + freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); + freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); } /*-----------------------------------------------------------------*/ @@ -5099,8 +6335,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 */ @@ -5108,21 +6343,21 @@ genIfxJump (iCode * ic, char *jval) { jlbl = IC_TRUE (ic); inst = ((strcmp (jval, "a") == 0 ? "jz" : - (strcmp (jval, "c") == 0 ? "jnc" : "jnb"))); + (strcmp (jval, "c") == 0 ? "jnc" : "jnb"))); } else { /* false label is present */ jlbl = IC_FALSE (ic); inst = ((strcmp (jval, "a") == 0 ? "jnz" : - (strcmp (jval, "c") == 0 ? "jc" : "jb"))); + (strcmp (jval, "c") == 0 ? "jc" : "jb"))); } if (strcmp (inst, "jb") == 0 || strcmp (inst, "jnb") == 0) emitcode (inst, "%s,!tlabel", jval, (tlbl->key + 100)); else emitcode (inst, "!tlabel", tlbl->key + 100); emitcode ("ljmp", "!tlabel", jlbl->key + 100); - emitcode ("", "!tlabeldef", tlbl->key + 100); + emitLabel (tlbl); /* mark the icode as generated */ ic->generated = 1; @@ -5133,14 +6368,13 @@ genIfxJump (iCode * ic, char *jval) /*-----------------------------------------------------------------*/ static void genCmp (operand * left, operand * right, - iCode * ic, iCode * ifx, int sign) + iCode * ic, iCode * ifx, int sign) { int size, offset = 0; unsigned long lit = 0L; operand *result; - D (emitcode (";", "genCmp"); - ); + D (emitcode (";", "genCmp")); result = IC_RESULT (ic); @@ -5149,7 +6383,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 { @@ -5160,116 +6394,98 @@ genCmp (operand * left, operand * 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)) - { - symbol *lbl = newiTempLabel (NULL); - emitcode ("cjne", "%s,%s,!tlabel", - aopGet (AOP (left), offset, FALSE, FALSE, FALSE), - aopGet (AOP (right), offset, FALSE, FALSE, FALSE), - lbl->key + 100); - emitcode ("", "!tlabeldef", lbl->key + 100); - } + (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 (left, offset, FALSE, FALSE, NULL), + aopGet (right, offset, FALSE, FALSE, NULL), + lbl->key + 100); + emitLabel (lbl); + } else - { - if (AOP_TYPE (right) == AOP_LIT) - { - lit = (unsigned long) floatFromVal (AOP (right)->aopu.aop_lit); - /* optimize if(x < 0) or if(x >= 0) */ - if (lit == 0L) - { - if (!sign) - { - CLRC; - } - else - { - MOVA (aopGet (AOP (left), AOP_SIZE (left) - 1, FALSE, FALSE, TRUE)); - - freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); - freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); - - aopOp (result, ic, FALSE, FALSE); - - if (!(AOP_TYPE (result) == AOP_CRY && AOP_SIZE (result)) && ifx) - { - freeAsmop (result, NULL, ic, TRUE); - genIfxJump (ifx, "acc.7"); - return; - } - else - { - emitcode ("rlc", "a"); - } - goto release_freedLR; - } - goto release; - } - } - CLRC; - while (size--) - { - //emitcode (";", "genCmp #1: %d/%d/%d", size, sign, offset); - MOVA (aopGet (AOP (left), offset, FALSE, FALSE, TRUE)); - //emitcode (";", "genCmp #2"); - if (sign && (size == 0)) - { - //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 ("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 ("xrl", "b,#!constbyte",0x80); - if (AOP_NEEDSACC (right)) - { - emitcode ("pop", "acc"); - } - emitcode ("subb", "a,b"); - } - } - else - { - 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 ("subb", "a,%s", s); - } - } - } + { + if (AOP_TYPE (right) == AOP_LIT) + { + lit = (unsigned long) floatFromVal (AOP (right)->aopu.aop_lit); + /* optimize if(x < 0) or if(x >= 0) */ + if (lit == 0L) + { + if (!sign) + { + CLRC; + } + else + { + MOVA (aopGet (left, AOP_SIZE (left) - 1, FALSE, FALSE, NULL)); + + freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); + freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); + + aopOp (result, ic, FALSE, FALSE); + + if (!(AOP_TYPE (result) == AOP_CRY && AOP_SIZE (result)) && ifx) + { + freeAsmop (result, NULL, ic, TRUE); + genIfxJump (ifx, "acc.7"); + return; + } + else + { + emitcode ("rlc", "a"); + } + goto release_freedLR; + } + goto release; + } + } + CLRC; + while (size--) + { + // emitcode (";", "genCmp #1: %d/%d/%d", size, sign, offset); + MOVA (aopGet (left, offset, FALSE, FALSE, NULL)); + // emitcode (";", "genCmp #2"); + if (sign && (size == 0)) + { + // 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 ("subb", "a,#!constbyte", + 0x80 ^ (unsigned int) ((lit >> (offset * 8)) & 0x0FFL)); + } + else + { + // emitcode (";", "genCmp #3.2"); + saveAccWarn = 0; + MOVB (aopGet (right, offset++, FALSE, FALSE, "b")); + saveAccWarn = DEFAULT_ACC_WARNING; + emitcode ("xrl", "b,#!constbyte",0x80); + emitcode ("subb", "a,b"); + } + } + else + { + const char *s; + + // emitcode (";", "genCmp #4"); + saveAccWarn = 0; + s = aopGet (right, offset++, FALSE, FALSE, "b"); + saveAccWarn = DEFAULT_ACC_WARNING; + + emitcode ("subb", "a,%s", s); + } + } + } } release: /* Don't need the left & right operands any more; do need the result. */ - freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); + freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); aopOp (result, ic, FALSE, FALSE); @@ -5285,13 +6501,13 @@ release_freedLR: ifx conditional branch then generate code a little differently */ if (ifx) - { - genIfxJump (ifx, "c"); - } + { + genIfxJump (ifx, "c"); + } else - { - outBitC (result); - } + { + outBitC (result); + } /* leave the result in acc */ } freeAsmop (result, NULL, ic, TRUE); @@ -5307,8 +6523,7 @@ genCmpGt (iCode * ic, iCode * ifx) sym_link *letype, *retype; int sign; - D (emitcode (";", "genCmpGt "); - ); + D (emitcode (";", "genCmpGt")); left = IC_LEFT (ic); right = IC_RIGHT (ic); @@ -5333,7 +6548,7 @@ genCmpLt (iCode * ic, iCode * ifx) sym_link *letype, *retype; int sign; - D (emitcode (";", "genCmpLt ");); + D (emitcode (";", "genCmpLt")); left = IC_LEFT (ic); right = IC_RIGHT (ic); @@ -5358,13 +6573,13 @@ gencjneshort (operand * left, operand * right, symbol * lbl) int offset = 0; unsigned long lit = 0L; - D (emitcode (";", "gencjneshort"); - ); + D (emitcode (";", "gencjneshort")); /* if the left side is a literal or 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; @@ -5381,8 +6596,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.");); } @@ -5391,48 +6605,47 @@ gencjneshort (operand * left, operand * right, symbol * lbl) AOP_TYPE (left) != AOP_DIR) { while (size--) - { - char *l = aopGet (AOP (left), offset, FALSE, FALSE, TRUE); - MOVA (l); - emitcode ("cjne", "a,%s,!tlabel", - aopGet (AOP (right), offset, FALSE, FALSE, FALSE), - lbl->key + 100); - offset++; - } + { + MOVA (aopGet (left, offset, FALSE, FALSE, NULL)); + emitcode ("cjne", "a,%s,!tlabel", + aopGet (right, offset, FALSE, FALSE, NULL), + lbl->key + 100); + offset++; + } } /* if the right side is in a register or in direct space or if the left is a pointer register & right is not */ else if (AOP_TYPE (right) == AOP_REG || - AOP_TYPE (right) == AOP_DIR || - (AOP_TYPE (left) == AOP_DIR && AOP_TYPE (right) == AOP_LIT) || - (IS_AOP_PREG (left) && !IS_AOP_PREG (right))) + 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)); - 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), - lbl->key + 100); - offset++; - } + { + MOVA (aopGet (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 (right, offset, FALSE, TRUE, DP2_RESULT_REG), + lbl->key + 100); + offset++; + } } else { /* 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)); - emitcode ("cjne", "a,b,!tlabel", lbl->key + 100); - offset++; - } + { + MOVB (aopGet (left, offset, FALSE, FALSE, NULL)); + MOVA (aopGet (right, offset, FALSE, FALSE, NULL)); + emitcode ("cjne", "a,b,!tlabel", lbl->key + 100); + offset++; + } } } @@ -5444,16 +6657,15 @@ gencjne (operand * left, operand * right, symbol * lbl) { symbol *tlbl = newiTempLabel (NULL); - D (emitcode (";", "gencjne"); - ); + D (emitcode (";", "gencjne")); gencjneshort (left, right, lbl); emitcode ("mov", "a,%s", one); emitcode ("sjmp", "!tlabel", tlbl->key + 100); - emitcode ("", "!tlabeldef", lbl->key + 100); + emitLabel (lbl); emitcode ("clr", "a"); - emitcode ("", "!tlabeldef", tlbl->key + 100); + emitLabel (tlbl); } /*-----------------------------------------------------------------*/ @@ -5464,8 +6676,7 @@ genCmpEq (iCode * ic, iCode * ifx) { operand *left, *right, *result; - D (emitcode (";", "genCmpEq "); - ); + D (emitcode (";", "genCmpEq")); AOP_OP_2 (ic); AOP_SET_LOCALS (ic); @@ -5481,74 +6692,74 @@ genCmpEq (iCode * ic, iCode * ifx) IC_LEFT (ic) = t; } - if (ifx && /* !AOP_SIZE(result) */ + if (ifx && /* !AOP_SIZE(result) */ OP_SYMBOL (result) && OP_SYMBOL (result)->regType == REG_CND) { symbol *tlbl; /* if they are both bit variables */ if (AOP_TYPE (left) == AOP_CRY && - ((AOP_TYPE (right) == AOP_CRY) || (AOP_TYPE (right) == AOP_LIT))) - { - if (AOP_TYPE (right) == AOP_LIT) - { - unsigned long lit = (unsigned long) floatFromVal (AOP (IC_RIGHT (ic))->aopu.aop_lit); - if (lit == 0L) - { - emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir); - emitcode ("cpl", "c"); - } - else if (lit == 1L) - { - emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir); - } - else - { - emitcode ("clr", "c"); - } - /* AOP_TYPE(right) == AOP_CRY */ - } - else - { - symbol *lbl = newiTempLabel (NULL); - emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir); - emitcode ("jb", "%s,!tlabel", AOP (right)->aopu.aop_dir, (lbl->key + 100)); - emitcode ("cpl", "c"); - emitcode ("", "!tlabeldef", (lbl->key + 100)); - } - /* if true label then we jump if condition - supplied is true */ - tlbl = newiTempLabel (NULL); - if (IC_TRUE (ifx)) - { - emitcode ("jnc", "!tlabel", tlbl->key + 100); - emitcode ("ljmp", "!tlabel", IC_TRUE (ifx)->key + 100); - } - else - { - emitcode ("jc", "!tlabel", tlbl->key + 100); - emitcode ("ljmp", "!tlabel", IC_FALSE (ifx)->key + 100); - } - emitcode ("", "!tlabeldef", tlbl->key + 100); - } + ((AOP_TYPE (right) == AOP_CRY) || (AOP_TYPE (right) == AOP_LIT))) + { + if (AOP_TYPE (right) == AOP_LIT) + { + unsigned long lit = (unsigned long) floatFromVal (AOP (IC_RIGHT (ic))->aopu.aop_lit); + if (lit == 0L) + { + emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir); + emitcode ("cpl", "c"); + } + else if (lit == 1L) + { + emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir); + } + else + { + emitcode ("clr", "c"); + } + /* AOP_TYPE(right) == AOP_CRY */ + } + else + { + symbol *lbl = newiTempLabel (NULL); + emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir); + emitcode ("jb", "%s,!tlabel", AOP (right)->aopu.aop_dir, (lbl->key + 100)); + emitcode ("cpl", "c"); + emitLabel (lbl); + } + /* if true label then we jump if condition + supplied is true */ + tlbl = newiTempLabel (NULL); + if (IC_TRUE (ifx)) + { + emitcode ("jnc", "!tlabel", tlbl->key + 100); + emitcode ("ljmp", "!tlabel", IC_TRUE (ifx)->key + 100); + } + else + { + emitcode ("jc", "!tlabel", tlbl->key + 100); + emitcode ("ljmp", "!tlabel", IC_FALSE (ifx)->key + 100); + } + emitLabel (tlbl); + } else - { - tlbl = newiTempLabel (NULL); - gencjneshort (left, right, tlbl); - if (IC_TRUE (ifx)) - { - emitcode ("ljmp", "!tlabel", IC_TRUE (ifx)->key + 100); - emitcode ("", "!tlabeldef", tlbl->key + 100); - } - else - { - symbol *lbl = newiTempLabel (NULL); - emitcode ("sjmp", "!tlabel", lbl->key + 100); - emitcode ("", "!tlabeldef", tlbl->key + 100); - emitcode ("ljmp", "!tlabel", IC_FALSE (ifx)->key + 100); - emitcode ("", "!tlabeldef", lbl->key + 100); - } - } + { + tlbl = newiTempLabel (NULL); + gencjneshort (left, right, tlbl); + if (IC_TRUE (ifx)) + { + emitcode ("ljmp", "!tlabel", IC_TRUE (ifx)->key + 100); + emitLabel (tlbl); + } + else + { + symbol *lbl = newiTempLabel (NULL); + emitcode ("sjmp", "!tlabel", lbl->key + 100); + emitLabel (tlbl); + emitcode ("ljmp", "!tlabel", IC_FALSE (ifx)->key + 100); + emitLabel (lbl); + } + } /* mark the icode as generated */ ifx->generated = 1; @@ -5562,31 +6773,31 @@ genCmpEq (iCode * ic, iCode * ifx) ((AOP_TYPE (right) == AOP_CRY) || (AOP_TYPE (right) == AOP_LIT))) { if (AOP_TYPE (right) == AOP_LIT) - { - unsigned long lit = (unsigned long) floatFromVal (AOP (IC_RIGHT (ic))->aopu.aop_lit); - if (lit == 0L) - { - emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir); - emitcode ("cpl", "c"); - } - else if (lit == 1L) - { - emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir); - } - else - { - emitcode ("clr", "c"); - } - /* AOP_TYPE(right) == AOP_CRY */ - } + { + unsigned long lit = (unsigned long) floatFromVal (AOP (IC_RIGHT (ic))->aopu.aop_lit); + if (lit == 0L) + { + emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir); + emitcode ("cpl", "c"); + } + else if (lit == 1L) + { + emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir); + } + else + { + emitcode ("clr", "c"); + } + /* AOP_TYPE(right) == AOP_CRY */ + } else - { - symbol *lbl = newiTempLabel (NULL); - emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir); - emitcode ("jb", "%s,!tlabel", AOP (right)->aopu.aop_dir, (lbl->key + 100)); - emitcode ("cpl", "c"); - emitcode ("", "!tlabeldef", (lbl->key + 100)); - } + { + symbol *lbl = newiTempLabel (NULL); + emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir); + emitcode ("jb", "%s,!tlabel", AOP (right)->aopu.aop_dir, (lbl->key + 100)); + emitcode ("cpl", "c"); + emitLabel (lbl); + } freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); @@ -5595,15 +6806,15 @@ genCmpEq (iCode * ic, iCode * ifx) /* c = 1 if egal */ if (AOP_TYPE (result) == AOP_CRY && AOP_SIZE (result)) - { - outBitC (result); - goto release; - } + { + outBitC (result); + goto release; + } if (ifx) - { - genIfxJump (ifx, "c"); - goto release; - } + { + genIfxJump (ifx, "c"); + goto release; + } /* if the result is used in an arithmetic operation then put the result in place */ outBitC (result); @@ -5618,19 +6829,19 @@ genCmpEq (iCode * ic, iCode * ifx) aopOp (result, ic, TRUE, FALSE); if (AOP_TYPE (result) == AOP_CRY && AOP_SIZE (result)) - { - aopPut (AOP (result), "a", 0); - goto release; - } + { + aopPut (result, "a", 0); + goto release; + } if (ifx) - { - genIfxJump (ifx, "a"); - goto release; - } + { + genIfxJump (ifx, "a"); + goto release; + } /* if the result is used in an arithmetic operation then put the result in place */ if (AOP_TYPE (result) != AOP_CRY) - outAcc (result); + outAcc (result); /* leave the result in acc */ } @@ -5659,6 +6870,7 @@ ifxForOp (operand * op, iCode * ic) return NULL; } + /*-----------------------------------------------------------------*/ /* hasInc - operand is incremented before any other use */ /*-----------------------------------------------------------------*/ @@ -5669,7 +6881,7 @@ hasInc (operand *op, iCode *ic, int osize) sym_link *retype = getSpec (type); iCode *lic = ic->next; int isize ; - + /* this could from a cast, e.g.: "(char xdata *) 0x7654;" */ if (!IS_SYMOP(op)) return NULL; @@ -5680,14 +6892,14 @@ hasInc (operand *op, iCode *ic, int osize) while (lic) { /* if operand of the form op = op + */ if (lic->op == '+' && isOperandEqual(IC_LEFT(lic),op) && - isOperandEqual(IC_RESULT(lic),op) && - isOperandLiteral(IC_RIGHT(lic)) && - operandLitValue(IC_RIGHT(lic)) == isize) { - return lic; + isOperandEqual(IC_RESULT(lic),op) && + isOperandLiteral(IC_RIGHT(lic)) && + operandLitValue(IC_RIGHT(lic)) == isize) { + return lic; } /* if the operand used or deffed */ - if (bitVectBitValue(OP_USES(op),lic->key) || (unsigned) lic->defKey == op->key) { - return NULL; + if (bitVectBitValue(OP_USES(op),lic->key) || lic->defKey == op->key) { + return NULL; } /* if GOTO or IFX */ if (lic->op == IFX || lic->op == GOTO || lic->op == LABEL) break; @@ -5705,7 +6917,7 @@ genAndOp (iCode * ic) operand *left, *right, *result; symbol *tlbl; - D (emitcode (";", "genAndOp ");); + D (emitcode (";", "genAndOp")); /* note here that && operations that are in an if statement are taken away by backPatchLabels @@ -5721,7 +6933,7 @@ genAndOp (iCode * ic) emitcode ("anl", "c,%s", AOP (right)->aopu.aop_dir); freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); - + aopOp (result,ic,FALSE, FALSE); outBitC (result); } @@ -5731,13 +6943,14 @@ genAndOp (iCode * ic) toBoolean (left); emitcode ("jz", "!tlabel", tlbl->key + 100); toBoolean (right); - emitcode ("", "!tlabeldef", tlbl->key + 100); + emitLabel (tlbl); freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); - + aopOp (result,ic,FALSE, FALSE); outBitAcc (result); } + freeAsmop (result, NULL, ic, TRUE); } @@ -5751,7 +6964,7 @@ genOrOp (iCode * ic) operand *left, *right, *result; symbol *tlbl; - D (emitcode (";", "genOrOp ");); + D (emitcode (";", "genOrOp")); /* note here that || operations that are in an if statement are taken away by backPatchLabels @@ -5767,9 +6980,9 @@ genOrOp (iCode * ic) emitcode ("orl", "c,%s", AOP (right)->aopu.aop_dir); freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); - + aopOp (result,ic,FALSE, FALSE); - + outBitC (result); } else @@ -5778,12 +6991,12 @@ genOrOp (iCode * ic) toBoolean (left); emitcode ("jnz", "!tlabel", tlbl->key + 100); toBoolean (right); - emitcode ("", "!tlabeldef", tlbl->key + 100); + emitLabel (tlbl); freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); - + aopOp (result,ic,FALSE, FALSE); - + outBitAcc (result); } @@ -5845,20 +7058,20 @@ jmpTrueOrFalse (iCode * ic, symbol * tlbl) { symbol *nlbl = newiTempLabel (NULL); emitcode ("sjmp", "!tlabel", nlbl->key + 100); - emitcode ("", "!tlabeldef", tlbl->key + 100); + emitLabel (tlbl); emitcode ("ljmp", "!tlabel", IC_TRUE (ic)->key + 100); - emitcode ("", "!tlabeldef", nlbl->key + 100); + emitLabel (nlbl); } else { emitcode ("ljmp", "!tlabel", IC_FALSE (ic)->key + 100); - emitcode ("", "!tlabeldef", tlbl->key + 100); + emitLabel (tlbl); } ic->generated = 1; } // Generate code to perform a bit-wise logic operation -// on two operands in far space (assumed to already have been +// on two operands in far space (assumed to already have been // aopOp'd by the AOP_OP_3_NOFATAL macro), storing the result // in far space. This requires pushing the result on the stack // then popping it into the result. @@ -5867,28 +7080,28 @@ genFarFarLogicOp(iCode *ic, char *logicOp) { int size, resultSize, compSize; int offset = 0; - + TR_AP("#5"); D(emitcode(";", "%s special case for 3 far operands.", logicOp);); - compSize = AOP_SIZE(IC_LEFT(ic)) < AOP_SIZE(IC_RIGHT(ic)) ? - AOP_SIZE(IC_LEFT(ic)) : AOP_SIZE(IC_RIGHT(ic)); - + compSize = AOP_SIZE(IC_LEFT(ic)) < AOP_SIZE(IC_RIGHT(ic)) ? + AOP_SIZE(IC_LEFT(ic)) : AOP_SIZE(IC_RIGHT(ic)); + _startLazyDPSEvaluation(); for (size = compSize; (size--); offset++) { - MOVA (aopGet (AOP (IC_LEFT(ic)), offset, FALSE, FALSE, TRUE)); - emitcode ("mov", "%s, acc", DP2_RESULT_REG); - MOVA (aopGet (AOP (IC_RIGHT(ic)), offset, FALSE, FALSE, TRUE)); - - emitcode (logicOp, "a,%s", DP2_RESULT_REG); - emitcode ("push", "acc"); + MOVA (aopGet (IC_LEFT(ic), offset, FALSE, FALSE, NULL)); + emitcode ("mov", "%s, acc", DP2_RESULT_REG); + MOVA (aopGet (IC_RIGHT(ic), offset, FALSE, FALSE, NULL)); + + emitcode (logicOp, "a,%s", DP2_RESULT_REG); + emitcode ("push", "acc"); } _endLazyDPSEvaluation(); - + freeAsmop (IC_LEFT(ic), NULL, ic, RESULTONSTACK (ic) ? FALSE : TRUE); freeAsmop (IC_RIGHT(ic), NULL, ic, RESULTONSTACK (ic) ? FALSE : TRUE); aopOp (IC_RESULT(ic),ic,TRUE, FALSE); - + resultSize = AOP_SIZE(IC_RESULT(ic)); ADJUST_PUSHED_RESULT(compSize, resultSize); @@ -5896,8 +7109,8 @@ genFarFarLogicOp(iCode *ic, char *logicOp) _startLazyDPSEvaluation(); while (compSize--) { - emitcode ("pop", "acc"); - aopPut (AOP (IC_RESULT (ic)), "a", compSize); + emitcode ("pop", "acc"); + aopPut (IC_RESULT (ic), "a", compSize); } _endLazyDPSEvaluation(); freeAsmop(IC_RESULT (ic), NULL, ic, TRUE); @@ -5917,7 +7130,7 @@ genAnd (iCode * ic, iCode * ifx) char buffer[10]; bool pushResult; - D (emitcode (";", "genAnd ");); + D (emitcode (";", "genAnd")); AOP_OP_3_NOFATAL (ic, pushResult); AOP_SET_LOCALS (ic); @@ -5926,20 +7139,20 @@ genAnd (iCode * ic, iCode * ifx) { genFarFarLogicOp(ic, "anl"); return; - } + } #ifdef DEBUG_TYPE emitcode ("", "; Type res[%d] = l[%d]&r[%d]", - AOP_TYPE (result), - AOP_TYPE (left), AOP_TYPE (right)); + AOP_TYPE (result), + AOP_TYPE (left), AOP_TYPE (right)); emitcode ("", "; Size res[%d] = l[%d]&r[%d]", - AOP_SIZE (result), - AOP_SIZE (left), AOP_SIZE (right)); + AOP_SIZE (result), + AOP_SIZE (left), AOP_SIZE (right)); #endif /* if left is a literal & right is not then exchange them */ if ((AOP_TYPE (left) == AOP_LIT && AOP_TYPE (right) != AOP_LIT) -#ifdef LOGIC_OPS_BROKEN +#ifdef LOGIC_OPS_BROKEN || AOP_NEEDSACC (left) #endif ) @@ -5949,7 +7162,7 @@ genAnd (iCode * ic, iCode * ifx) left = tmp; } - /* if result = right then exchange them */ + /* if result = right then exchange left and right */ if (sameRegs (AOP (result), AOP (right))) { operand *tmp = right; @@ -5976,54 +7189,54 @@ genAnd (iCode * ic, iCode * ifx) { // c = bit & literal; if (AOP_TYPE (right) == AOP_LIT) - { - if (lit & 1) - { - if (size && sameRegs (AOP (result), AOP (left))) - // no change - goto release; - emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir); - } - else - { - // bit(result) = 0; - if (size && (AOP_TYPE (result) == AOP_CRY)) - { - emitcode ("clr", "%s", AOP (result)->aopu.aop_dir); - goto release; - } - if ((AOP_TYPE (result) == AOP_CRY) && ifx) - { - jumpIfTrue (ifx); - goto release; - } - emitcode ("clr", "c"); - } - } + { + if (lit & 1) + { + if (size && sameRegs (AOP (result), AOP (left))) + // no change + goto release; + emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir); + } + else + { + // bit(result) = 0; + if (size && (AOP_TYPE (result) == AOP_CRY)) + { + emitcode ("clr", "%s", AOP (result)->aopu.aop_dir); + goto release; + } + if ((AOP_TYPE (result) == AOP_CRY) && ifx) + { + jumpIfTrue (ifx); + goto release; + } + emitcode ("clr", "c"); + } + } else - { - if (AOP_TYPE (right) == AOP_CRY) - { - // c = bit & bit; - emitcode ("mov", "c,%s", AOP (right)->aopu.aop_dir); - emitcode ("anl", "c,%s", AOP (left)->aopu.aop_dir); - } - else - { - // c = bit & val; - MOVA (aopGet (AOP (right), 0, FALSE, FALSE, TRUE)); - // c = lsb - emitcode ("rrc", "a"); - emitcode ("anl", "c,%s", AOP (left)->aopu.aop_dir); - } - } + { + if (AOP_TYPE (right) == AOP_CRY) + { + // c = bit & bit; + emitcode ("mov", "c,%s", AOP (right)->aopu.aop_dir); + emitcode ("anl", "c,%s", AOP (left)->aopu.aop_dir); + } + else + { + // c = bit & val; + MOVA (aopGet (right, 0, FALSE, FALSE, NULL)); + // c = lsb + emitcode ("rrc", "a"); + emitcode ("anl", "c,%s", AOP (left)->aopu.aop_dir); + } + } // bit = c // val = c if (size) - outBitC (result); + outBitC (result); // if(bit & ...) else if ((AOP_TYPE (result) == AOP_CRY) && ifx) - genIfxJump (ifx, "c"); + genIfxJump (ifx, "c"); goto release; } @@ -6036,65 +7249,78 @@ genAnd (iCode * ic, iCode * ifx) int posbit = isLiteralBit (lit); /* left & 2^n */ if (posbit) - { - posbit--; - MOVA (aopGet (AOP (left), posbit >> 3, FALSE, FALSE, TRUE)); - // bit = left & 2^n - if (size) - emitcode ("mov", "c,acc.%d", posbit & 0x07); - // if(left & 2^n) - else - { - if (ifx) - { - sprintf (buffer, "acc.%d", posbit & 0x07); - genIfxJump (ifx, buffer); - } - else - { - emitcode ("anl","a,#!constbyte",1 << (posbit & 0x07)); - } - goto release; - } - } + { + posbit--; + MOVA (aopGet (left, posbit >> 3, FALSE, FALSE, NULL)); + // bit = left & 2^n + if (size) + { + switch (posbit & 0x07) + { + case 0: emitcode ("rrc", "a"); + break; + case 7: emitcode ("rlc", "a"); + break; + default: emitcode ("mov", "c,acc.%d", posbit & 0x07); + break; + } + } + // if(left & 2^n) + else + { + if (ifx) + { + SNPRINTF (buffer, sizeof(buffer), + "acc.%d", posbit & 0x07); + genIfxJump (ifx, buffer); + } + else + { + emitcode ("anl","a,#!constbyte",1 << (posbit & 0x07)); + } + goto release; + } + } else - { - symbol *tlbl = newiTempLabel (NULL); - int sizel = AOP_SIZE (left); - if (size) - emitcode ("setb", "c"); - while (sizel--) - { - if ((bytelit = ((lit >> (offset * 8)) & 0x0FFL)) != 0x0L) - { - MOVA (aopGet (AOP (left), offset, FALSE, FALSE, TRUE)); - // byte == 2^n ? - if ((posbit = isLiteralBit (bytelit)) != 0) - emitcode ("jb", "acc.%d,!tlabel", (posbit - 1) & 0x07, tlbl->key + 100); - else - { - if (bytelit != 0x0FFL) - emitcode ("anl", "a,%s", - aopGet (AOP (right), offset, FALSE, TRUE, FALSE)); - emitcode ("jnz", "!tlabel", tlbl->key + 100); - } - } - offset++; - } - // bit = left & literal - if (size) - { - emitcode ("clr", "c"); - emitcode ("", "!tlabeldef", tlbl->key + 100); - } - // if(left & literal) - else - { - if (ifx) - jmpTrueOrFalse (ifx, tlbl); - goto release; - } - } + { + symbol *tlbl = newiTempLabel (NULL); + int sizel = AOP_SIZE (left); + if (size) + emitcode ("setb", "c"); + while (sizel--) + { + if ((bytelit = ((lit >> (offset * 8)) & 0x0FFL)) != 0x0L) + { + MOVA (aopGet (left, offset, FALSE, FALSE, NULL)); + // byte == 2^n ? + if ((posbit = isLiteralBit (bytelit)) != 0) + emitcode ("jb", "acc.%d,!tlabel", (posbit - 1) & 0x07, tlbl->key + 100); + else + { + if (bytelit != 0x0FFL) + emitcode ("anl", "a,%s", + aopGet (right, offset, FALSE, TRUE, DP2_RESULT_REG)); + emitcode ("jnz", "!tlabel", tlbl->key + 100); + } + } + offset++; + } + // bit = left & literal + if (size) + { + emitcode ("clr", "c"); + emitLabel (tlbl); + } + // if(left & literal) + else + { + if (ifx) + jmpTrueOrFalse (ifx, tlbl); + else + emitLabel (tlbl); + goto release; + } + } outBitC (result); goto release; } @@ -6103,144 +7329,229 @@ genAnd (iCode * ic, iCode * ifx) if (sameRegs (AOP (result), AOP (left))) { for (; size--; offset++) - { - if (AOP_TYPE (right) == AOP_LIT) - { - if ((bytelit = (int) ((lit >> (offset * 8)) & 0x0FFL)) == 0x0FF) - continue; - else if (bytelit == 0) - 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)); - aopPut (AOP (result), "a", offset); - } - else - emitcode ("anl", "%s,%s", - aopGet (AOP (left), offset, FALSE, TRUE, FALSE), - aopGet (AOP (right), offset, FALSE, FALSE, FALSE)); - } - else - { - if (AOP_TYPE (left) == AOP_ACC) - emitcode ("anl", "a,%s", aopGet (AOP (right), offset, FALSE, FALSE, FALSE)); - else - { - MOVA (aopGet (AOP (right), offset, FALSE, FALSE, TRUE)); - if (IS_AOP_PREG (result)) - { - emitcode ("anl", "a,%s", aopGet (AOP (left), offset, FALSE, TRUE, FALSE)); - aopPut (AOP (result), "a", offset); - - } - else - emitcode ("anl", "%s,a", - aopGet (AOP (left), offset, FALSE, TRUE, FALSE)); - } - } - } + { + if (AOP_TYPE (right) == AOP_LIT) + { + bytelit = (int) ((lit >> (offset * 8)) & 0x0FFL); + if (bytelit == 0x0FF) + { + /* dummy read of volatile operand */ + if (isOperandVolatile (left, FALSE)) + MOVA (aopGet (left, offset, FALSE, FALSE, NULL)); + else + continue; + } + else if (bytelit == 0) + { + aopPut (result, zero, offset); + } + else if (IS_AOP_PREG (result)) + { + MOVA (aopGet (left, offset, FALSE, FALSE, NULL)); + emitcode ("anl", "a,%s", + aopGet (right, offset, FALSE, TRUE, DP2_RESULT_REG)); + aopPut (result, "a", offset); + } + else + emitcode ("anl", "%s,%s", + aopGet (left, offset, FALSE, TRUE, NULL), + aopGet (right, offset, FALSE, FALSE, NULL)); + } + else + { + if (AOP_TYPE (left) == AOP_ACC) + { + if (offset) + emitcode("mov", "a,b"); + emitcode ("anl", "a,%s", aopGet (right, offset, FALSE, FALSE, DP2_RESULT_REG)); + } + else if (aopGetUsesAcc (left, offset) && aopGetUsesAcc (right, offset)) + { + MOVB (aopGet (left, offset, FALSE, FALSE, NULL)); + MOVA (aopGet (right, offset, FALSE, FALSE, DP2_RESULT_REG)); + emitcode ("anl", "a,b"); + aopPut (result, "a", offset); + } + else if (aopGetUsesAcc (left, offset)) + { + MOVA (aopGet (left, offset, FALSE, FALSE, NULL)); + emitcode ("anl", "a,%s", aopGet (right, offset, FALSE, FALSE, DP2_RESULT_REG)); + aopPut (result, "a", offset); + } + else + { + MOVA (aopGet (right, offset, FALSE, FALSE, NULL)); + if (IS_AOP_PREG (result)) + { + emitcode ("anl", "a,%s", aopGet (left, offset, FALSE, TRUE, DP2_RESULT_REG)); + aopPut (result, "a", offset); + } + else + emitcode ("anl", "%s,a", aopGet (left, offset, FALSE, TRUE, DP2_RESULT_REG)); + } + } + } } else { // left & result in different registers if (AOP_TYPE (result) == AOP_CRY) - { - // result = bit - // if(size), result in bit - // if(!size && ifx), conditional oper: if(left & right) - symbol *tlbl = newiTempLabel (NULL); - int sizer = min (AOP_SIZE (left), AOP_SIZE (right)); - if (size) - emitcode ("setb", "c"); - while (sizer--) - { - if (AOP_TYPE(right)==AOP_REG && AOP_TYPE(left)==AOP_ACC) { - emitcode ("anl", "a,%s", - aopGet (AOP (right), offset, FALSE, FALSE, FALSE)); - } else { - if (AOP_TYPE(left)==AOP_ACC) { - emitcode("mov", "b,a"); - MOVA (aopGet (AOP (right), offset, FALSE, FALSE, TRUE)); - emitcode("anl", "a,b"); - }else { - MOVA (aopGet (AOP (right), offset, FALSE, FALSE, TRUE)); - emitcode ("anl", "a,%s", - aopGet (AOP (left), offset, FALSE, FALSE, FALSE)); - } - } - emitcode ("jnz", "!tlabel", tlbl->key + 100); - offset++; - } - if (size) - { - CLRC; - emitcode ("", "!tlabeldef", tlbl->key + 100); - outBitC (result); - } - else if (ifx) - jmpTrueOrFalse (ifx, tlbl); - } - else - { - for (; (size--); offset++) - { - // normal case - // result = left & right - if (AOP_TYPE (right) == AOP_LIT) - { - if ((bytelit = (int) ((lit >> (offset * 8)) & 0x0FFL)) == 0x0FF) - { - aopPut (AOP (result), - aopGet (AOP (left), offset, FALSE, FALSE, FALSE), - offset); - continue; - } - else if (bytelit == 0) - { - aopPut (AOP (result), zero, offset); - continue; - } - D (emitcode (";", "better literal AND.");); - MOVA (aopGet (AOP (left), offset, FALSE, FALSE, TRUE)); - emitcode ("anl", "a, %s", aopGet (AOP (right), offset, - FALSE, FALSE, FALSE)); - - } - else - { - // faster than result <- left, anl result,right - // and better if result is SFR - if (AOP_TYPE (left) == AOP_ACC) - { - emitcode ("anl", "a,%s", aopGet (AOP (right), offset, - FALSE, FALSE, FALSE)); - } - else - { - char *rOp = aopGet (AOP (right), offset, FALSE, FALSE, TRUE); - if (!strcmp(rOp, "a") || !strcmp(rOp, "acc")) - { - emitcode("mov", "b,a"); - rOp = "b"; - } - - MOVA (aopGet (AOP (left), offset, FALSE, FALSE, TRUE)); - emitcode ("anl", "a,%s", rOp); - } - } - aopPut (AOP (result), "a", offset); - } - } - } - -release: - freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); - freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); + { + // result = bit + // if(size), result in bit + // if(!size && ifx), conditional oper: if(left & right) + symbol *tlbl = newiTempLabel (NULL); + int sizer = min (AOP_SIZE (left), AOP_SIZE (right)); + if (size) + emitcode ("setb", "c"); + while (sizer--) + { + if ((AOP_TYPE(right)==AOP_REG || IS_AOP_PREG(right) || AOP_TYPE(right)==AOP_DIR) + && AOP_TYPE(left)==AOP_ACC) + { + if (offset) + emitcode("mov", "a,b"); + emitcode ("anl", "a,%s", aopGet (right, offset, FALSE, FALSE, NULL)); + } + else if (AOP_TYPE(left)==AOP_ACC) + { + if (!offset) + { + bool pushedB = pushB (); + emitcode("mov", "b,a"); + MOVA (aopGet (right, offset, FALSE, FALSE, NULL)); + emitcode("anl", "a,b"); + popB (pushedB); + } + else + { + MOVA (aopGet (right, offset, FALSE, FALSE, NULL)); + emitcode("anl", "a,b"); + } + } + else if (aopGetUsesAcc (left, offset) && aopGetUsesAcc (right, offset)) + { + emitcode ("mov", "b,%s", aopGet (left, offset, FALSE, FALSE, NULL)); + MOVA (aopGet (right, offset, FALSE, FALSE, DP2_RESULT_REG)); + emitcode ("anl", "a,b"); + } + else if (aopGetUsesAcc (left, offset)) + { + MOVA (aopGet (left, offset, FALSE, FALSE, NULL)); + emitcode ("anl", "a,%s", aopGet (right, offset, FALSE, FALSE, DP2_RESULT_REG)); + } + else + { + MOVA (aopGet (right, offset, FALSE, FALSE, NULL)); + emitcode ("anl", "a,%s", aopGet (left, offset, FALSE, FALSE, DP2_RESULT_REG)); + } + + emitcode ("jnz", "!tlabel", tlbl->key + 100); + offset++; + } + if (size) + { + CLRC; + emitLabel (tlbl); + outBitC (result); + } + else if (ifx) + jmpTrueOrFalse (ifx, tlbl); + else + emitLabel (tlbl); + } + else + { + for (; (size--); offset++) + { + // normal case + // result = left & right + if (AOP_TYPE (right) == AOP_LIT) + { + bytelit = (int) ((lit >> (offset * 8)) & 0x0FFL); + if (bytelit == 0x0FF) + { + aopPut (result, + aopGet (left, offset, FALSE, FALSE, NULL), + offset); + continue; + } + else if (bytelit == 0) + { + /* dummy read of volatile operand */ + if (isOperandVolatile (left, FALSE)) + MOVA (aopGet (left, offset, FALSE, FALSE, NULL)); + aopPut (result, zero, offset); + continue; + } + else if (AOP_TYPE (left) == AOP_ACC) + { + if (!offset) + { + emitcode ("anl", "a,%s", aopGet (right, offset, FALSE, FALSE, NULL)); + aopPut (result, "a", offset); + continue; + } + else + { + emitcode ("anl", "b,%s", aopGet (right, offset, FALSE, FALSE, NULL)); + aopPut (result, "b", offset); + continue; + } + } + } + // faster than result <- left, anl result,right + // and better if result is SFR + if ((AOP_TYPE(right)==AOP_REG || IS_AOP_PREG(right) || AOP_TYPE(right)==AOP_DIR) + && AOP_TYPE(left)==AOP_ACC) + { + if (offset) + emitcode("mov", "a,b"); + emitcode ("anl", "a,%s", aopGet (right, offset, FALSE, FALSE, NULL)); + } + else if (AOP_TYPE(left)==AOP_ACC) + { + if (!offset) + { + bool pushedB = pushB (); + emitcode("mov", "b,a"); + MOVA (aopGet (right, offset, FALSE, FALSE, NULL)); + emitcode("anl", "a,b"); + popB (pushedB); + } + else + { + MOVA (aopGet (right, offset, FALSE, FALSE, NULL)); + emitcode("anl", "a,b"); + } + } + else if (aopGetUsesAcc (left, offset) && aopGetUsesAcc (right, offset)) + { + MOVB (aopGet (left, offset, FALSE, FALSE, NULL)); + MOVA (aopGet (right, offset, FALSE, FALSE, DP2_RESULT_REG)); + emitcode ("anl", "a,b"); + } + else if (aopGetUsesAcc (left, offset)) + { + MOVA (aopGet (left, offset, FALSE, FALSE, NULL)); + emitcode ("anl", "a,%s", aopGet (right, offset, FALSE, FALSE, DP2_RESULT_REG)); + } + else + { + MOVA (aopGet (right, offset, FALSE, FALSE, NULL)); + emitcode ("anl", "a,%s", aopGet (left, offset, FALSE, FALSE, DP2_RESULT_REG)); + } + aopPut (result, "a", offset); + } + } + } + +release: freeAsmop (result, NULL, ic, TRUE); + freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); + freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); } - /*-----------------------------------------------------------------*/ /* genOr - code for or */ /*-----------------------------------------------------------------*/ @@ -6250,9 +7561,10 @@ genOr (iCode * ic, iCode * ifx) operand *left, *right, *result; int size, offset = 0; unsigned long lit = 0L; - bool pushResult; + int bytelit = 0; + bool pushResult; - D (emitcode (";", "genOr ");); + D (emitcode (";", "genOr")); AOP_OP_3_NOFATAL (ic, pushResult); AOP_SET_LOCALS (ic); @@ -6266,18 +7578,18 @@ genOr (iCode * ic, iCode * ifx) #ifdef DEBUG_TYPE emitcode ("", "; Type res[%d] = l[%d]&r[%d]", - AOP_TYPE (result), - AOP_TYPE (left), AOP_TYPE (right)); + AOP_TYPE (result), + AOP_TYPE (left), AOP_TYPE (right)); emitcode ("", "; Size res[%d] = l[%d]&r[%d]", - AOP_SIZE (result), - AOP_SIZE (left), AOP_SIZE (right)); + AOP_SIZE (result), + AOP_SIZE (left), AOP_SIZE (right)); #endif /* if left is a literal & right is not then exchange them */ if ((AOP_TYPE (left) == AOP_LIT && AOP_TYPE (right) != AOP_LIT) #ifdef LOGIC_OPS_BROKEN || AOP_NEEDSACC (left) // I think this is a net loss now. -#endif +#endif ) { operand *tmp = right; @@ -6311,66 +7623,66 @@ genOr (iCode * ic, iCode * ifx) if (AOP_TYPE (left) == AOP_CRY) { if (AOP_TYPE (right) == AOP_LIT) - { - // c = bit & literal; - if (lit) - { - // lit != 0 => result = 1 - if (AOP_TYPE (result) == AOP_CRY) - { - if (size) - emitcode ("setb", "%s", AOP (result)->aopu.aop_dir); - else if (ifx) - continueIfTrue (ifx); - goto release; - } - emitcode ("setb", "c"); - } - else - { - // lit == 0 => result = left - if (size && sameRegs (AOP (result), AOP (left))) - goto release; - emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir); - } - } + { + // c = bit | literal; + if (lit) + { + // lit != 0 => result = 1 + if (AOP_TYPE (result) == AOP_CRY) + { + if (size) + emitcode ("setb", "%s", AOP (result)->aopu.aop_dir); + else if (ifx) + continueIfTrue (ifx); + goto release; + } + emitcode ("setb", "c"); + } + else + { + // lit == 0 => result = left + if (size && sameRegs (AOP (result), AOP (left))) + goto release; + emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir); + } + } else - { - if (AOP_TYPE (right) == AOP_CRY) - { - // c = bit | bit; - emitcode ("mov", "c,%s", AOP (right)->aopu.aop_dir); - emitcode ("orl", "c,%s", AOP (left)->aopu.aop_dir); - } - else - { - // c = bit | val; - symbol *tlbl = newiTempLabel (NULL); - if (!((AOP_TYPE (result) == AOP_CRY) && ifx)) - emitcode ("setb", "c"); - emitcode ("jb", "%s,!tlabel", - AOP (left)->aopu.aop_dir, tlbl->key + 100); - toBoolean (right); - emitcode ("jnz", "!tlabel", tlbl->key + 100); - if ((AOP_TYPE (result) == AOP_CRY) && ifx) - { - jmpTrueOrFalse (ifx, tlbl); - goto release; - } - else - { - CLRC; - emitcode ("", "!tlabeldef", tlbl->key + 100); - } - } - } + { + if (AOP_TYPE (right) == AOP_CRY) + { + // c = bit | bit; + emitcode ("mov", "c,%s", AOP (right)->aopu.aop_dir); + emitcode ("orl", "c,%s", AOP (left)->aopu.aop_dir); + } + else + { + // c = bit | val; + symbol *tlbl = newiTempLabel (NULL); + if (!((AOP_TYPE (result) == AOP_CRY) && ifx)) + emitcode ("setb", "c"); + emitcode ("jb", "%s,!tlabel", + AOP (left)->aopu.aop_dir, tlbl->key + 100); + toBoolean (right); + emitcode ("jnz", "!tlabel", tlbl->key + 100); + if ((AOP_TYPE (result) == AOP_CRY) && ifx) + { + jmpTrueOrFalse (ifx, tlbl); + goto release; + } + else + { + CLRC; + emitLabel (tlbl); + } + } + } // bit = c // val = c if (size) - outBitC (result); + outBitC (result); // if(bit | ...) else if ((AOP_TYPE (result) == AOP_CRY) && ifx) - genIfxJump (ifx, "c"); + genIfxJump (ifx, "c"); goto release; } @@ -6381,33 +7693,33 @@ genOr (iCode * ic, iCode * ifx) (AOP_TYPE (left) != AOP_CRY)) { if (lit) - { - // result = 1 - if (size) - emitcode ("setb", "%s", AOP (result)->aopu.aop_dir); - else - continueIfTrue (ifx); - goto release; - } + { + // result = 1 + if (size) + emitcode ("setb", "%s", AOP (result)->aopu.aop_dir); + else + continueIfTrue (ifx); + goto release; + } else - { - // lit = 0, result = boolean(left) - if (size) - emitcode ("setb", "c"); - toBoolean (right); - if (size) - { - symbol *tlbl = newiTempLabel (NULL); - emitcode ("jnz", "!tlabel", tlbl->key + 100); - CLRC; - emitcode ("", "!tlabeldef", tlbl->key + 100); - } - else - { - genIfxJump (ifx, "a"); - goto release; - } - } + { + // lit = 0, result = boolean(left) + if (size) + emitcode ("setb", "c"); + toBoolean (right); + if (size) + { + symbol *tlbl = newiTempLabel (NULL); + emitcode ("jnz", "!tlabel", tlbl->key + 100); + CLRC; + emitLabel (tlbl); + } + else + { + genIfxJump (ifx, "a"); + goto release; + } + } outBitC (result); goto release; } @@ -6416,141 +7728,220 @@ genOr (iCode * ic, iCode * ifx) if (sameRegs (AOP (result), AOP (left))) { for (; size--; offset++) - { - if (AOP_TYPE (right) == AOP_LIT) - { - if (((lit >> (offset * 8)) & 0x0FFL) == 0x00L) - { - continue; - } - else - { - if (IS_AOP_PREG (left)) - { - MOVA (aopGet (AOP (right), offset, FALSE, FALSE, TRUE)); - emitcode ("orl", "a,%s", aopGet (AOP (left), offset, FALSE, TRUE, FALSE)); - aopPut (AOP (result), "a", offset); - } - else - { - emitcode ("orl", "%s,%s", - aopGet (AOP (left), offset, FALSE, TRUE, FALSE), - aopGet (AOP (right), offset, FALSE, FALSE, FALSE)); - } - } - } - else - { - if (AOP_TYPE (left) == AOP_ACC) - { - emitcode ("orl", "a,%s", aopGet (AOP (right), offset, FALSE, FALSE, FALSE)); - } - else - { - MOVA (aopGet (AOP (right), offset, FALSE, FALSE, TRUE)); - if (IS_AOP_PREG (left)) - { - emitcode ("orl", "a,%s", aopGet (AOP (left), offset, FALSE, TRUE, FALSE)); - aopPut (AOP (result), "a", offset); - } - else - { - emitcode ("orl", "%s,a", - aopGet (AOP (left), offset, FALSE, TRUE, FALSE)); - } - } - } - } + { + if (AOP_TYPE (right) == AOP_LIT) + { + bytelit = (int) ((lit >> (offset * 8)) & 0x0FFL); + if (bytelit == 0) + { + /* dummy read of volatile operand */ + if (isOperandVolatile (left, FALSE)) + MOVA (aopGet (left, offset, FALSE, FALSE, NULL)); + else + continue; + } + else if (bytelit == 0x0FF) + { + aopPut (result, "#0xFF", offset); + } + else if (IS_AOP_PREG (left)) + { + MOVA (aopGet (right, offset, FALSE, FALSE, NULL)); + emitcode ("orl", "a,%s", + aopGet (left, offset, FALSE, TRUE, DP2_RESULT_REG)); + aopPut (result, "a", offset); + } + else + { + emitcode ("orl", "%s,%s", + aopGet (left, offset, FALSE, TRUE, NULL), + aopGet (right, offset, FALSE, FALSE, DP2_RESULT_REG)); + } + } + else + { + if (AOP_TYPE (left) == AOP_ACC) + { + if (offset) + emitcode("mov", "a,b"); + emitcode ("orl", "a,%s", aopGet (right, offset, FALSE, FALSE, DP2_RESULT_REG)); + } + else if (aopGetUsesAcc (left, offset) && aopGetUsesAcc (right, offset)) + { + emitcode ("mov", "b,%s", aopGet (left, offset, FALSE, FALSE, NULL)); + MOVA (aopGet (right, offset, FALSE, FALSE, DP2_RESULT_REG)); + emitcode ("orl", "a,b"); + aopPut (result, "a", offset); + } + else if (aopGetUsesAcc (left, offset)) + { + MOVA (aopGet (left, offset, FALSE, FALSE, NULL)); + emitcode ("orl", "a,%s", aopGet (right, offset, FALSE, FALSE, DP2_RESULT_REG)); + aopPut (result, "a", offset); + } + else + { + MOVA (aopGet (right, offset, FALSE, FALSE, NULL)); + if (IS_AOP_PREG (left)) + { + emitcode ("orl", "a,%s", + aopGet (left, offset, FALSE, TRUE, DP2_RESULT_REG)); + aopPut (result, "a", offset); + } + else + { + emitcode ("orl", "%s,a", + aopGet (left, offset, FALSE, TRUE, DP2_RESULT_REG)); + } + } + } + } } else { // left & result in different registers if (AOP_TYPE (result) == AOP_CRY) - { - // result = bit - // if(size), result in bit - // if(!size && ifx), conditional oper: if(left | right) - symbol *tlbl = newiTempLabel (NULL); - int sizer = max (AOP_SIZE (left), AOP_SIZE (right)); - if (size) - emitcode ("setb", "c"); - while (sizer--) - { - if (AOP_TYPE(right)==AOP_REG && AOP_TYPE(left)==AOP_ACC) { - emitcode ("orl", "a,%s", - aopGet (AOP (right), offset, FALSE, FALSE, FALSE)); - } else { - MOVA (aopGet (AOP (right), offset, FALSE, FALSE, TRUE)); - emitcode ("orl", "a,%s", - aopGet (AOP (left), offset, FALSE, FALSE, FALSE)); - } - emitcode ("jnz", "!tlabel", tlbl->key + 100); - offset++; - } - if (size) - { - CLRC; - emitcode ("", "!tlabeldef", tlbl->key + 100); - outBitC (result); - } - else if (ifx) - jmpTrueOrFalse (ifx, tlbl); - } + { + // result = bit + // if(size), result in bit + // if(!size && ifx), conditional oper: if(left | right) + symbol *tlbl = newiTempLabel (NULL); + int sizer = max (AOP_SIZE (left), AOP_SIZE (right)); + if (size) + emitcode ("setb", "c"); + while (sizer--) + { + if ((AOP_TYPE(right)==AOP_REG || IS_AOP_PREG(right) || AOP_TYPE(right)==AOP_DIR) + && AOP_TYPE(left)==AOP_ACC) + { + if (offset) + emitcode("mov", "a,b"); + emitcode ("orl", "a,%s", aopGet (right, offset, FALSE, FALSE, DP2_RESULT_REG)); + } + else if (AOP_TYPE(left)==AOP_ACC) + { + if (!offset) + { + bool pushedB = pushB (); + emitcode("mov", "b,a"); + MOVA (aopGet (right, offset, FALSE, FALSE, DP2_RESULT_REG)); + emitcode("orl", "a,b"); + popB (pushedB); + } + else + { + MOVA (aopGet (right, offset, FALSE, FALSE, DP2_RESULT_REG)); + emitcode("orl", "a,b"); + } + } + else if (aopGetUsesAcc (left, offset) && aopGetUsesAcc (right, offset)) + { + MOVB (aopGet (left, offset, FALSE, FALSE, NULL)); + MOVA (aopGet (right, offset, FALSE, FALSE, DP2_RESULT_REG)); + emitcode ("orl", "a,b"); + } + else if (aopGetUsesAcc (left, offset)) + { + MOVA (aopGet (left, offset, FALSE, FALSE, NULL)); + emitcode ("orl", "a,%s", aopGet (right, offset, FALSE, FALSE, DP2_RESULT_REG)); + } + else + { + MOVA (aopGet (right, offset, FALSE, FALSE, NULL)); + emitcode ("orl", "a,%s", aopGet (left, offset, FALSE, FALSE, DP2_RESULT_REG)); + } + + emitcode ("jnz", "!tlabel", tlbl->key + 100); + offset++; + } + if (size) + { + CLRC; + emitLabel (tlbl); + outBitC (result); + } + else if (ifx) + jmpTrueOrFalse (ifx, tlbl); + else + emitLabel (tlbl); + } else - { - _startLazyDPSEvaluation(); - for (; (size--); offset++) - { - // normal case - // result = left & right - if (AOP_TYPE (right) == AOP_LIT) - { - if (((lit >> (offset * 8)) & 0x0FFL) == 0x00L) - { - aopPut (AOP (result), - aopGet (AOP (left), offset, FALSE, FALSE, FALSE), - 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)); - - } - else - { - // faster than result <- left, anl result,right - // and better if result is SFR - if (AOP_TYPE (left) == AOP_ACC) - { - emitcode ("orl", "a,%s", aopGet (AOP (right), offset, - FALSE, FALSE, FALSE)); - } - else - { - char *rOp = aopGet (AOP (right), offset, FALSE, FALSE, TRUE); - - if (!strcmp(rOp, "a") || !strcmp(rOp, "acc")) - { - emitcode("mov", "b,a"); - rOp = "b"; - } - - MOVA (aopGet (AOP (left), offset, FALSE, FALSE, TRUE)); - emitcode ("orl", "a,%s", rOp); - } - } - aopPut (AOP (result), "a", offset); - } - _endLazyDPSEvaluation(); - } + { + _startLazyDPSEvaluation(); + for (; (size--); offset++) + { + // normal case + // result = left | right + if (AOP_TYPE (right) == AOP_LIT) + { + bytelit = (int) ((lit >> (offset * 8)) & 0x0FFL); + if (bytelit == 0) + { + aopPut (result, + aopGet (left, offset, FALSE, FALSE, NULL), + offset); + continue; + } + else if (bytelit == 0x0FF) + { + /* dummy read of volatile operand */ + if (isOperandVolatile (left, FALSE)) + MOVA (aopGet (left, offset, FALSE, FALSE, NULL)); + aopPut (result, "#0xFF", offset); + continue; + } + } + // faster than result <- left, orl result,right + // and better if result is SFR + if ((AOP_TYPE(right)==AOP_REG || IS_AOP_PREG(right) || AOP_TYPE(right)==AOP_DIR) + && AOP_TYPE(left)==AOP_ACC) + { + if (offset) + emitcode("mov", "a,b"); + emitcode ("orl", "a,%s", aopGet (right, offset, FALSE, FALSE, DP2_RESULT_REG)); + } + else if (AOP_TYPE(left)==AOP_ACC) + { + if (!offset) + { + bool pushedB = pushB (); + emitcode("mov", "b,a"); + MOVA (aopGet (right, offset, FALSE, FALSE, DP2_RESULT_REG)); + emitcode("orl", "a,b"); + popB (pushedB); + } + else + { + MOVA (aopGet (right, offset, FALSE, FALSE, DP2_RESULT_REG)); + emitcode("orl", "a,b"); + } + } + else if (aopGetUsesAcc (left, offset) && aopGetUsesAcc (right, offset)) + { + MOVB (aopGet (left, offset, FALSE, FALSE, NULL)); + MOVA (aopGet (right, offset, FALSE, FALSE, DP2_RESULT_REG)); + emitcode ("orl", "a,b"); + } + else if (aopGetUsesAcc (left, offset)) + { + MOVA (aopGet (left, offset, FALSE, FALSE, NULL)); + emitcode ("orl", "a,%s", aopGet (right, offset, FALSE, FALSE, DP2_RESULT_REG)); + } + else + { + MOVA (aopGet (right, offset, FALSE, FALSE, NULL)); + emitcode ("orl", "a,%s", aopGet (left, offset, FALSE, FALSE, DP2_RESULT_REG)); + } + aopPut (result, "a", offset); + } + _endLazyDPSEvaluation(); + } } release: - freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); - freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); freeAsmop (result, NULL, ic, TRUE); + freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); + freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); } /*-----------------------------------------------------------------*/ @@ -6562,9 +7953,10 @@ genXor (iCode * ic, iCode * ifx) operand *left, *right, *result; int size, offset = 0; unsigned long lit = 0L; + int bytelit = 0; bool pushResult; - D (emitcode (";", "genXor ");); + D (emitcode (";", "genXor")); AOP_OP_3_NOFATAL (ic, pushResult); AOP_SET_LOCALS (ic); @@ -6573,21 +7965,21 @@ genXor (iCode * ic, iCode * ifx) { genFarFarLogicOp(ic, "xrl"); return; - } + } #ifdef DEBUG_TYPE emitcode ("", "; Type res[%d] = l[%d]&r[%d]", - AOP_TYPE (result), - AOP_TYPE (left), AOP_TYPE (right)); + AOP_TYPE (result), + AOP_TYPE (left), AOP_TYPE (right)); emitcode ("", "; Size res[%d] = l[%d]&r[%d]", - AOP_SIZE (result), - AOP_SIZE (left), AOP_SIZE (right)); + AOP_SIZE (result), + AOP_SIZE (left), AOP_SIZE (right)); #endif /* if left is a literal & right is not || if left needs acc & right does not */ - if ((AOP_TYPE (left) == AOP_LIT && AOP_TYPE (right) != AOP_LIT) -#ifdef LOGIC_OPS_BROKEN + if ((AOP_TYPE (left) == AOP_LIT && AOP_TYPE (right) != AOP_LIT) +#ifdef LOGIC_OPS_BROKEN || (AOP_NEEDSACC (left) && !AOP_NEEDSACC (right)) #endif ) @@ -6623,229 +8015,280 @@ genXor (iCode * ic, iCode * ifx) if (AOP_TYPE (left) == AOP_CRY) { if (AOP_TYPE (right) == AOP_LIT) - { - // c = bit & literal; - if (lit >> 1) - { - // lit>>1 != 0 => result = 1 - if (AOP_TYPE (result) == AOP_CRY) - { - if (size) - emitcode ("setb", "%s", AOP (result)->aopu.aop_dir); - else if (ifx) - continueIfTrue (ifx); - goto release; - } - emitcode ("setb", "c"); - } - else - { - // lit == (0 or 1) - if (lit == 0) - { - // lit == 0, result = left - if (size && sameRegs (AOP (result), AOP (left))) - goto release; - emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir); - } - else - { - // lit == 1, result = not(left) - if (size && sameRegs (AOP (result), AOP (left))) - { - emitcode ("cpl", "%s", AOP (result)->aopu.aop_dir); - goto release; - } - else - { - emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir); - emitcode ("cpl", "c"); - } - } - } - - } + { + // c = bit & literal; + if (lit >> 1) + { + // lit>>1 != 0 => result = 1 + if (AOP_TYPE (result) == AOP_CRY) + { + if (size) + emitcode ("setb", "%s", AOP (result)->aopu.aop_dir); + else if (ifx) + continueIfTrue (ifx); + goto release; + } + emitcode ("setb", "c"); + } + else + { + // lit == (0 or 1) + if (lit == 0) + { + // lit == 0, result = left + if (size && sameRegs (AOP (result), AOP (left))) + goto release; + emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir); + } + else + { + // lit == 1, result = not(left) + if (size && sameRegs (AOP (result), AOP (left))) + { + emitcode ("cpl", "%s", AOP (result)->aopu.aop_dir); + goto release; + } + else + { + emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir); + emitcode ("cpl", "c"); + } + } + } + } else - { - // right != literal - symbol *tlbl = newiTempLabel (NULL); - if (AOP_TYPE (right) == AOP_CRY) - { - // c = bit ^ bit; - emitcode ("mov", "c,%s", AOP (right)->aopu.aop_dir); - } - else - { - int sizer = AOP_SIZE (right); - // c = bit ^ val - // if val>>1 != 0, result = 1 - emitcode ("setb", "c"); - while (sizer) - { - MOVA (aopGet (AOP (right), sizer - 1, FALSE, FALSE, TRUE)); - if (sizer == 1) - // test the msb of the lsb - emitcode ("anl", "a,#!constbyte",0xfe); - emitcode ("jnz", "!tlabel", tlbl->key + 100); - sizer--; - } - // val = (0,1) - emitcode ("rrc", "a"); - } - emitcode ("jnb", "%s,!tlabel", AOP (left)->aopu.aop_dir, (tlbl->key + 100)); - emitcode ("cpl", "c"); - emitcode ("", "!tlabeldef", (tlbl->key + 100)); - } + { + // right != literal + symbol *tlbl = newiTempLabel (NULL); + if (AOP_TYPE (right) == AOP_CRY) + { + // c = bit ^ bit; + emitcode ("mov", "c,%s", AOP (right)->aopu.aop_dir); + } + else + { + int sizer = AOP_SIZE (right); + // c = bit ^ val + // if val>>1 != 0, result = 1 + emitcode ("setb", "c"); + while (sizer) + { + MOVA (aopGet (right, sizer - 1, FALSE, FALSE, NULL)); + if (sizer == 1) + // test the msb of the lsb + emitcode ("anl", "a,#!constbyte",0xfe); + emitcode ("jnz", "!tlabel", tlbl->key + 100); + sizer--; + } + // val = (0,1) + emitcode ("rrc", "a"); + } + emitcode ("jnb", "%s,!tlabel", AOP (left)->aopu.aop_dir, (tlbl->key + 100)); + emitcode ("cpl", "c"); + emitLabel (tlbl); + } // bit = c // val = c if (size) - outBitC (result); + outBitC (result); // if(bit | ...) else if ((AOP_TYPE (result) == AOP_CRY) && ifx) - genIfxJump (ifx, "c"); + genIfxJump (ifx, "c"); goto release; } + /* if left is same as result */ if (sameRegs (AOP (result), AOP (left))) { - /* if left is same as result */ for (; size--; offset++) - { - if (AOP_TYPE (right) == AOP_LIT) - { - if (((lit >> (offset * 8)) & 0x0FFL) == 0x00L) - 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)); - aopPut (AOP (result), "a", offset); - } - else - emitcode ("xrl", "%s,%s", - aopGet (AOP (left), offset, FALSE, TRUE, FALSE), - aopGet (AOP (right), offset, FALSE, FALSE, FALSE)); - } - else - { - if (AOP_TYPE (left) == AOP_ACC) - emitcode ("xrl", "a,%s", aopGet (AOP (right), offset, FALSE, FALSE, FALSE)); - else - { - MOVA (aopGet (AOP (right), offset, FALSE, FALSE, TRUE)); - if (IS_AOP_PREG (left)) - { - emitcode ("xrl", "a,%s", aopGet (AOP (left), offset, FALSE, TRUE, FALSE)); - aopPut (AOP (result), "a", offset); - } - else - emitcode ("xrl", "%s,a", - aopGet (AOP (left), offset, FALSE, TRUE, FALSE)); - } - } - } + { + if (AOP_TYPE (right) == AOP_LIT) + { + bytelit = (int) ((lit >> (offset * 8)) & 0x0FFL); + if (bytelit == 0) + { + /* dummy read of volatile operand */ + if (isOperandVolatile (left, FALSE)) + MOVA (aopGet (left, offset, FALSE, FALSE, NULL)); + else + continue; + } + else if (IS_AOP_PREG (left)) + { + MOVA (aopGet (left, offset, FALSE, FALSE, NULL)); + emitcode ("xrl", "a,%s", + aopGet (right, offset, FALSE, TRUE, DP2_RESULT_REG)); + aopPut (result, "a", offset); + } + else + { + emitcode ("xrl", "%s,%s", + aopGet (left, offset, FALSE, TRUE, NULL), + aopGet (right, offset, FALSE, FALSE, DP2_RESULT_REG)); + } + } + else + { + if (AOP_TYPE (left) == AOP_ACC) + { + if (offset) + emitcode("mov", "a,b"); + emitcode ("xrl", "a,%s", aopGet (right, offset, FALSE, FALSE, DP2_RESULT_REG)); + } + else if (aopGetUsesAcc (left, offset) && aopGetUsesAcc (right, offset)) + { + MOVB (aopGet (left, offset, FALSE, FALSE, NULL)); + MOVA (aopGet (right, offset, FALSE, FALSE, DP2_RESULT_REG)); + emitcode ("xrl", "a,b"); + aopPut (result, "a", offset); + } + else if (aopGetUsesAcc (left, offset)) + { + MOVA (aopGet (left, offset, FALSE, FALSE, NULL)); + emitcode ("xrl", "a,%s", aopGet (right, offset, FALSE, FALSE, DP2_RESULT_REG)); + aopPut (result, "a", offset); + } + else + { + MOVA (aopGet (right, offset, FALSE, FALSE, NULL)); + if (IS_AOP_PREG (left)) + { + emitcode ("xrl", "a,%s", + aopGet (left, offset, FALSE, TRUE, DP2_RESULT_REG)); + aopPut (result, "a", offset); + } + else + emitcode ("xrl", "%s,a", + aopGet (left, offset, FALSE, TRUE, DP2_RESULT_REG)); + } + } + } } else { // left & result in different registers if (AOP_TYPE (result) == AOP_CRY) - { - // result = bit - // if(size), result in bit - // if(!size && ifx), conditional oper: if(left ^ right) - symbol *tlbl = newiTempLabel (NULL); - int sizer = max (AOP_SIZE (left), AOP_SIZE (right)); - - if (size) - emitcode ("setb", "c"); - while (sizer--) - { - if ((AOP_TYPE (right) == AOP_LIT) && - (((lit >> (offset * 8)) & 0x0FFL) == 0x00L)) - { - MOVA (aopGet (AOP (left), offset, FALSE, FALSE, TRUE)); - } - else - { - if (AOP_TYPE(right)==AOP_REG && AOP_TYPE(left)==AOP_ACC) { - emitcode ("xrl", "a,%s", - aopGet (AOP (right), offset, FALSE, FALSE, FALSE)); - } else { - char *rOp = aopGet (AOP (right), offset, FALSE, FALSE, TRUE); - if (!strcmp(rOp, "a") || !strcmp(rOp, "acc")) - { - emitcode("mov", "b,a"); - rOp = "b"; - } - - MOVA (aopGet (AOP (left), offset, FALSE, FALSE, TRUE)); - emitcode ("xrl", "a,%s", rOp); - } - } - emitcode ("jnz", "!tlabel", tlbl->key + 100); - offset++; - } - if (size) - { - CLRC; - emitcode ("", "!tlabeldef", tlbl->key + 100); - outBitC (result); - } - else if (ifx) - jmpTrueOrFalse (ifx, tlbl); - } + { + // result = bit + // if(size), result in bit + // if(!size && ifx), conditional oper: if(left ^ right) + symbol *tlbl = newiTempLabel (NULL); + int sizer = max (AOP_SIZE (left), AOP_SIZE (right)); + + if (size) + emitcode ("setb", "c"); + while (sizer--) + { + if ((AOP_TYPE (right) == AOP_LIT) && + (((lit >> (offset * 8)) & 0x0FFL) == 0x00L)) + { + MOVA (aopGet (left, offset, FALSE, FALSE, NULL)); + } + else if ((AOP_TYPE(right)==AOP_REG || IS_AOP_PREG(right) || AOP_TYPE(right)==AOP_DIR) + && AOP_TYPE(left)==AOP_ACC) + { + if (offset) + emitcode("mov", "a,b"); + emitcode ("xrl", "a,%s", aopGet (right, offset, FALSE, FALSE, DP2_RESULT_REG)); + } + else if (AOP_TYPE(left)==AOP_ACC) + { + if (!offset) + { + bool pushedB = pushB (); + emitcode("mov", "b,a"); + MOVA (aopGet (right, offset, FALSE, FALSE, DP2_RESULT_REG)); + emitcode("xrl", "a,b"); + popB (pushedB); + } + else + { + MOVA (aopGet (right, offset, FALSE, FALSE, DP2_RESULT_REG)); + emitcode("xrl", "a,b"); + } + } + else if (aopGetUsesAcc (left, offset) && aopGetUsesAcc (right, offset)) + { + MOVB (aopGet (left, offset, FALSE, FALSE, NULL)); + MOVA (aopGet (right, offset, FALSE, FALSE, DP2_RESULT_REG)); + emitcode ("xrl", "a,b"); + } + else if (aopGetUsesAcc (left, offset)) + { + MOVA (aopGet (left, offset, FALSE, FALSE, NULL)); + emitcode ("xrl", "a,%s", aopGet (right, offset, FALSE, FALSE, DP2_RESULT_REG)); + } + else + { + MOVA (aopGet (right, offset, FALSE, FALSE, NULL)); + emitcode ("xrl", "a,%s", aopGet (left, offset, FALSE, TRUE, DP2_RESULT_REG)); + } + + emitcode ("jnz", "!tlabel", tlbl->key + 100); + offset++; + } + if (size) + { + CLRC; + emitLabel (tlbl); + outBitC (result); + } + else if (ifx) + jmpTrueOrFalse (ifx, tlbl); + } else - { - for (; (size--); offset++) - { - // normal case - // result = left & right - if (AOP_TYPE (right) == AOP_LIT) - { - if (((lit >> (offset * 8)) & 0x0FFL) == 0x00L) - { - aopPut (AOP (result), - aopGet (AOP (left), offset, FALSE, FALSE, FALSE), - 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)); - } - else - { - // faster than result <- left, anl result,right - // and better if result is SFR - if (AOP_TYPE (left) == AOP_ACC) - { - emitcode ("xrl", "a,%s", aopGet (AOP (right), offset, - FALSE, FALSE, FALSE)); - } - else - { - char *rOp = aopGet (AOP (right), offset, FALSE, FALSE, TRUE); - if (!strcmp(rOp, "a") || !strcmp(rOp, "acc")) - { - emitcode("mov", "b,a"); - rOp = "b"; - } - - MOVA (aopGet (AOP (left), offset, FALSE, FALSE, TRUE)); - emitcode ("xrl", "a,%s", rOp); - } - } - aopPut (AOP (result), "a", offset); - } - } - + { + for (; (size--); offset++) + { + // normal case + // result = left ^ right + if (AOP_TYPE (right) == AOP_LIT) + { + bytelit = (int) ((lit >> (offset * 8)) & 0x0FFL); + if (bytelit == 0) + { + aopPut (result, + aopGet (left, offset, FALSE, FALSE, NULL), + offset); + continue; + } + D (emitcode (";", "better literal XOR.")); + MOVA (aopGet (left, offset, FALSE, FALSE, NULL)); + emitcode ("xrl", "a, %s", + aopGet (right, offset, FALSE, FALSE, DP2_RESULT_REG)); + } + else + { + // faster than result <- left, anl result,right + // and better if result is SFR + if (AOP_TYPE (left) == AOP_ACC) + { + emitcode ("xrl", "a,%s", + aopGet (right, offset, + FALSE, FALSE, DP2_RESULT_REG)); + } + else + { + char *rOp = aopGet (right, offset, FALSE, FALSE, NULL); + if (!strcmp(rOp, "a") || !strcmp(rOp, "acc")) + { + emitcode("mov", "b,a"); + rOp = "b"; + } + + MOVA (aopGet (left, offset, FALSE, FALSE, NULL)); + emitcode ("xrl", "a,%s", rOp); + } + } + aopPut (result, "a", offset); + } + } } release: - freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); - freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); freeAsmop (result, NULL, ic, TRUE); + freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); + freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); } /*-----------------------------------------------------------------*/ @@ -6856,36 +8299,35 @@ 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 = bp = bp1 = Safe_strdup(IC_INLINE(ic)); /* emit each line as a code */ while (*bp) { if (*bp == '\n') - { - *bp++ = '\0'; - emitcode (bp1, ""); - bp1 = bp; - } + { + *bp++ = '\0'; + emitcode (bp1, ""); + bp1 = bp; + } else - { - if (*bp == ':') - { - bp++; - *bp = '\0'; - bp++; - emitcode (bp1, ""); - bp1 = bp; - } - else - bp++; - } + { + /* Add \n for labels, not dirs such as c:\mydir */ + if ( (*bp == ':') && (isspace((unsigned char)bp[1])) ) + { + bp++; + *bp = '\0'; + bp++; + emitcode (bp1, ""); + bp1 = bp; + } + else + bp++; + } } if (bp1 != bp) emitcode (bp1, ""); @@ -6900,17 +8342,16 @@ static void genRRC (iCode * ic) { operand *left, *result; - int size, offset = 0; + int size, offset; char *l; - 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); @@ -6920,11 +8361,11 @@ genRRC (iCode * ic) _startLazyDPSEvaluation (); while (size--) { - l = aopGet (AOP (left), offset, FALSE, FALSE, TRUE); + l = aopGet (left, offset, FALSE, FALSE, NULL); MOVA (l); emitcode ("rrc", "a"); if (AOP_SIZE (result) > 1) - aopPut (AOP (result), "a", offset--); + aopPut (result, "a", offset--); } _endLazyDPSEvaluation (); @@ -6932,13 +8373,13 @@ 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); + l = aopGet (result, AOP_SIZE (result) - 1, FALSE, FALSE, NULL); MOVA (l); } emitcode ("mov", "acc.7,c"); - aopPut (AOP (result), "a", AOP_SIZE (result) - 1); - freeAsmop (left, NULL, ic, TRUE); + aopPut (result, "a", AOP_SIZE (result) - 1); freeAsmop (result, NULL, ic, TRUE); + freeAsmop (left, NULL, ic, TRUE); } /*-----------------------------------------------------------------*/ @@ -6948,53 +8389,52 @@ 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 (left, offset, FALSE, FALSE, NULL); MOVA (l); emitcode ("add", "a,acc"); if (AOP_SIZE (result) > 1) - { - aopPut (AOP (result), "a", offset++); - } + { + aopPut (result, "a", offset++); + } _startLazyDPSEvaluation (); while (size--) - { - l = aopGet (AOP (left), offset, FALSE, FALSE, TRUE); - MOVA (l); - emitcode ("rlc", "a"); - if (AOP_SIZE (result) > 1) - aopPut (AOP (result), "a", offset++); - } + { + l = aopGet (left, offset, FALSE, FALSE, NULL); + MOVA (l); + emitcode ("rlc", "a"); + if (AOP_SIZE (result) > 1) + aopPut (result, "a", offset++); + } _endLazyDPSEvaluation (); } /* now we need to put the carry into the highest order byte of the result */ if (AOP_SIZE (result) > 1) { - l = aopGet (AOP (result), 0, FALSE, FALSE, TRUE); + l = aopGet (result, 0, FALSE, FALSE, NULL); MOVA (l); } emitcode ("mov", "acc.0,c"); - aopPut (AOP (result), "a", 0); - freeAsmop (left, NULL, ic, TRUE); + aopPut (result, "a", 0); freeAsmop (result, NULL, ic, TRUE); + freeAsmop (left, NULL, ic, TRUE); } /*-----------------------------------------------------------------*/ @@ -7004,16 +8444,16 @@ static void genGetHbit (iCode * ic) { operand *left, *result; + + D (emitcode (";", "genGetHbit")); + left = IC_LEFT (ic); result = IC_RESULT (ic); aopOp (left, ic, FALSE, FALSE); - aopOp (result, ic, FALSE, AOP_TYPE (left) == AOP_DPTR); - - D (emitcode (";", "genGetHbit "); - ); + aopOp (result, ic, FALSE, AOP_USESDPTR(left)); /* get the highest order byte into a */ - MOVA (aopGet (AOP (left), AOP_SIZE (left) - 1, FALSE, FALSE, TRUE)); + MOVA (aopGet (left, AOP_SIZE (left) - 1, FALSE, FALSE, NULL)); if (AOP_TYPE (result) == AOP_CRY) { emitcode ("rlc", "a"); @@ -7027,8 +8467,72 @@ genGetHbit (iCode * ic) } + freeAsmop (result, NULL, ic, TRUE); freeAsmop (left, 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 (left, 0, FALSE, FALSE, NULL)); + emitcode ("swap", "a"); + aopPut (result, "a", 0); + break; + case 2: /* swap bytes in word */ + if (AOP_TYPE(left) == AOP_REG && sameRegs(AOP(left), AOP(result))) + { + MOVA (aopGet (left, 0, FALSE, FALSE, NULL)); + aopPut (result, aopGet (left, 1, FALSE, FALSE, NULL), 0); + aopPut (result, "a", 1); + } + else if (operandsEqu (left, result)) + { + char * reg = "a"; + bool pushedB = FALSE, leftInB = FALSE; + + MOVA (aopGet (left, 0, FALSE, FALSE, NULL)); + if (AOP_NEEDSACC (left) || AOP_NEEDSACC (result)) + { + pushedB = pushB (); + emitcode ("mov", "b,a"); + reg = "b"; + leftInB = TRUE; + } + aopPut (result, aopGet (left, 1, FALSE, FALSE, NULL), 0); + aopPut (result, reg, 1); + + if (leftInB) + popB (pushedB); + } + else + { + aopPut (result, aopGet (left, 1, FALSE, FALSE, NULL), 0); + aopPut (result, aopGet (left, 0, FALSE, FALSE, NULL), 1); + } + break; + default: + wassertl(FALSE, "unsupported SWAP operand size"); + } + _endLazyDPSEvaluation (); + freeAsmop (result, NULL, ic, TRUE); + freeAsmop (left, NULL, ic, TRUE); } /*-----------------------------------------------------------------*/ @@ -7037,7 +8541,7 @@ genGetHbit (iCode * ic) static void AccRol (int shCount) { - shCount &= 0x0007; // shCount : 0..7 + shCount &= 0x0007; // shCount : 0..7 switch (shCount) { @@ -7080,19 +8584,19 @@ AccLsh (int shCount) if (shCount != 0) { if (shCount == 1) - emitcode ("add", "a,acc"); + emitcode ("add", "a,acc"); else if (shCount == 2) - { - emitcode ("add", "a,acc"); - emitcode ("add", "a,acc"); - } + { + emitcode ("add", "a,acc"); + emitcode ("add", "a,acc"); + } else - { - /* rotate left accumulator */ - AccRol (shCount); - /* and kill the lower order bits */ - emitcode ("anl", "a,#!constbyte", SLMask[shCount]); - } + { + /* rotate left accumulator */ + AccRol (shCount); + /* and kill the lower order bits */ + emitcode ("anl", "a,#!constbyte", SLMask[shCount]); + } } } @@ -7105,17 +8609,17 @@ AccRsh (int shCount) if (shCount != 0) { if (shCount == 1) - { - CLRC; - emitcode ("rrc", "a"); - } + { + CLRC; + emitcode ("rrc", "a"); + } else - { - /* rotate right accumulator */ - AccRol (8 - shCount); - /* and kill the higher order bits */ - emitcode ("anl", "a,#!constbyte", SRMask[shCount]); - } + { + /* rotate right accumulator */ + AccRol (8 - shCount); + /* and kill the higher order bits */ + emitcode ("anl", "a,#!constbyte", SRMask[shCount]); + } } } @@ -7130,29 +8634,29 @@ AccSRsh (int shCount) if (shCount != 0) { if (shCount == 1) - { - emitcode ("mov", "c,acc.7"); - emitcode ("rrc", "a"); - } + { + emitcode ("mov", "c,acc.7"); + emitcode ("rrc", "a"); + } else if (shCount == 2) - { - emitcode ("mov", "c,acc.7"); - emitcode ("rrc", "a"); - emitcode ("mov", "c,acc.7"); - emitcode ("rrc", "a"); - } + { + emitcode ("mov", "c,acc.7"); + emitcode ("rrc", "a"); + emitcode ("mov", "c,acc.7"); + emitcode ("rrc", "a"); + } else - { - tlbl = newiTempLabel (NULL); - /* rotate right accumulator */ - AccRol (8 - shCount); - /* and kill the higher order bits */ - emitcode ("anl", "a,#!constbyte", SRMask[shCount]); - emitcode ("jnb", "acc.%d,!tlabel", 7 - shCount, tlbl->key + 100); - emitcode ("orl", "a,#!constbyte", - (unsigned char) ~SRMask[shCount]); - emitcode ("", "!tlabeldef", tlbl->key + 100); - } + { + tlbl = newiTempLabel (NULL); + /* rotate right accumulator */ + AccRol (8 - shCount); + /* and kill the higher order bits */ + emitcode ("anl", "a,#!constbyte", SRMask[shCount]); + emitcode ("jnb", "acc.%d,!tlabel", 7 - shCount, tlbl->key + 100); + emitcode ("orl", "a,#!constbyte", + (unsigned char) ~SRMask[shCount]); + emitLabel (tlbl); + } } } #endif @@ -7163,16 +8667,16 @@ AccSRsh (int shCount) /*-----------------------------------------------------------------*/ static void shiftR1Left2Result (operand * left, int offl, - operand * result, int offr, - int shCount, int sign) + operand * result, int offr, + int shCount, int sign) { - MOVA (aopGet (AOP (left), offl, FALSE, FALSE, TRUE)); + MOVA (aopGet (left, offl, FALSE, FALSE, NULL)); /* shift right accumulator */ if (sign) AccSRsh (shCount); else AccRsh (shCount); - aopPut (AOP (result), "a", offr); + aopPut (result, "a", offr); } #endif @@ -7182,12 +8686,14 @@ shiftR1Left2Result (operand * left, int offl, /*-----------------------------------------------------------------*/ static void shiftL1Left2Result (operand * left, int offl, - operand * result, int offr, int shCount) + operand * result, int offr, int shCount) { - MOVA(aopGet (AOP (left), offl, FALSE, FALSE, TRUE)); + char *l; + l = aopGet (left, offl, FALSE, FALSE, NULL); + MOVA (l); /* shift left accumulator */ AccLsh (shCount); - aopPut (AOP (result), "a", offr); + aopPut (result, "a", offr); } #endif @@ -7197,33 +8703,33 @@ shiftL1Left2Result (operand * left, int offl, /*-----------------------------------------------------------------*/ static void movLeft2Result (operand * left, int offl, - operand * result, int offr, int sign) + operand * result, int offr, int sign) { char *l; if (!sameRegs (AOP (left), AOP (result)) || (offl != offr)) { - l = aopGet (AOP (left), offl, FALSE, FALSE, TRUE); + l = aopGet (left, offl, FALSE, FALSE, NULL); if (*l == '@' && (IS_AOP_PREG (result))) { - emitcode ("mov", "a,%s", l); - aopPut (AOP (result), "a", offr); + emitcode ("mov", "a,%s", l); + aopPut (result, "a", offr); } else { - if (!sign) - { - aopPut (AOP (result), l, offr); - } - else - { - /* MSB sign in acc.7 ! */ - if (getDataSize (left) == offl + 1) - { - emitcode ("mov", "a,%s", l); - aopPut (AOP (result), "a", offr); - } - } + if (!sign) + { + aopPut (result, l, offr); + } + else + { + /* MSB sign in acc.7 ! */ + if (getDataSize (left) == offl + 1) + { + MOVA (l); + aopPut (result, "a", offr); + } + } } } } @@ -7231,26 +8737,28 @@ movLeft2Result (operand * left, int offl, #ifdef BETTER_LITERAL_SHIFT /*-----------------------------------------------------------------*/ -/* AccAXRrl1 - right rotate c->a:x->c by 1 */ +/* AccAXRrl1 - right rotate a:x by 1 */ /*-----------------------------------------------------------------*/ static void AccAXRrl1 (char *x) { - emitcode ("rrc", "a"); + emitcode ("mov", "c,acc.0"); emitcode ("xch", "a,%s", x); emitcode ("rrc", "a"); emitcode ("xch", "a,%s", x); + emitcode ("rrc", "a"); } #endif #ifdef BETTER_LITERAL_SHIFT //REMOVE ME!!! /*-----------------------------------------------------------------*/ -/* AccAXLrl1 - left rotate c<-a:x<-c by 1 */ +/* AccAXLrl1 - left rotate a:x by 1 */ /*-----------------------------------------------------------------*/ static void AccAXLrl1 (char *x) { + emitcode ("mov", "c,acc.7"); emitcode ("xch", "a,%s", x); emitcode ("rlc", "a"); emitcode ("xch", "a,%s", x); @@ -7258,6 +8766,20 @@ AccAXLrl1 (char *x) } #endif +#ifdef BETTER_LITERAL_SHIFT +/*-----------------------------------------------------------------*/ +/* AccAXRsh1 - right shift c->a:x->c by 1 */ +/*-----------------------------------------------------------------*/ +static void +AccAXRsh1 (char *x) +{ + emitcode ("rrc", "a"); + emitcode ("xch", "a,%s", x); + emitcode ("rrc", "a"); + emitcode ("xch", "a,%s", x); +} +#endif + #ifdef BETTER_LITERAL_SHIFT /*-----------------------------------------------------------------*/ /* AccAXLsh1 - left shift a:x<-0 by 1 */ @@ -7292,62 +8814,61 @@ AccAXLsh (char *x, int shCount) break; case 3: case 4: - case 5: // AAAAABBB:CCCCCDDD + case 5: // AAAAABBB:CCCCCDDD - AccRol (shCount); // BBBAAAAA:CCCCCDDD + AccRol (shCount); // BBBAAAAA:CCCCCDDD emitcode ("anl", "a,#!constbyte", - SLMask[shCount]); // BBB00000:CCCCCDDD + SLMask[shCount]); // BBB00000:CCCCCDDD - emitcode ("xch", "a,%s", x); // CCCCCDDD:BBB00000 + emitcode ("xch", "a,%s", x); // CCCCCDDD:BBB00000 - AccRol (shCount); // DDDCCCCC:BBB00000 + AccRol (shCount); // DDDCCCCC:BBB00000 - emitcode ("xch", "a,%s", x); // BBB00000:DDDCCCCC + emitcode ("xch", "a,%s", x); // BBB00000:DDDCCCCC - emitcode ("xrl", "a,%s", x); // (BBB^DDD)CCCCC:DDDCCCCC + emitcode ("xrl", "a,%s", x); // (BBB^DDD)CCCCC:DDDCCCCC - emitcode ("xch", "a,%s", x); // DDDCCCCC:(BBB^DDD)CCCCC + emitcode ("xch", "a,%s", x); // DDDCCCCC:(BBB^DDD)CCCCC emitcode ("anl", "a,#!constbyte", - SLMask[shCount]); // DDD00000:(BBB^DDD)CCCCC + SLMask[shCount]); // DDD00000:(BBB^DDD)CCCCC - emitcode ("xch", "a,%s", x); // (BBB^DDD)CCCCC:DDD00000 + emitcode ("xch", "a,%s", x); // (BBB^DDD)CCCCC:DDD00000 - emitcode ("xrl", "a,%s", x); // BBBCCCCC:DDD00000 + emitcode ("xrl", "a,%s", x); // BBBCCCCC:DDD00000 break; - case 6: // AAAAAABB:CCCCCCDD + case 6: // AAAAAABB:CCCCCCDD emitcode ("anl", "a,#!constbyte", - SRMask[shCount]); // 000000BB:CCCCCCDD - emitcode ("mov", "c,acc.0"); // c = B - emitcode ("xch", "a,%s", x); // CCCCCCDD:000000BB -#if 0 - AccAXRrl1 (x); // BCCCCCCD:D000000B - AccAXRrl1 (x); // BBCCCCCC:DD000000 + SRMask[shCount]); // 000000BB:CCCCCCDD +#if 1 + AccAXRrl1 (x); // D000000B:BCCCCCCD + AccAXRrl1 (x); // DD000000:BBCCCCCC + emitcode ("xch", "a,%s", x); // BBCCCCCC:DD000000 #else - emitcode("rrc","a"); - emitcode("xch","a,%s", x); - emitcode("rrc","a"); - emitcode("mov","c,acc.0"); //<< get correct bit - emitcode("xch","a,%s", x); - - emitcode("rrc","a"); - emitcode("xch","a,%s", x); - emitcode("rrc","a"); - emitcode("xch","a,%s", x); + emitcode ("mov", "c,acc.0"); // c = B + emitcode ("xch", "a,%s", x); // CCCCCCDD:000000BB + emitcode("rrc","a"); + emitcode("xch","a,%s", x); + emitcode("rrc","a"); + emitcode("mov","c,acc.0"); //<< get correct bit + emitcode("xch","a,%s", x); + + emitcode("rrc","a"); + emitcode("xch","a,%s", x); + emitcode("rrc","a"); + emitcode("xch","a,%s", x); #endif break; - case 7: // a:x <<= 7 + case 7: // a:x <<= 7 emitcode ("anl", "a,#!constbyte", - SRMask[shCount]); // 0000000B:CCCCCCCD - - emitcode ("mov", "c,acc.0"); // c = B + SRMask[shCount]); // 0000000B:CCCCCCCD - emitcode ("xch", "a,%s", x); // CCCCCCCD:0000000B + AccAXRrl1 (x); // D0000000:BCCCCCCC - AccAXRrl1 (x); // BCCCCCCC:D0000000 + emitcode ("xch", "a,%s", x); // BCCCCCCC:D0000000 break; default: @@ -7370,67 +8891,63 @@ AccAXRsh (char *x, int shCount) break; case 1: CLRC; - AccAXRrl1 (x); // 0->a:x + AccAXRsh1 (x); // 0->a:x break; case 2: CLRC; - AccAXRrl1 (x); // 0->a:x + AccAXRsh1 (x); // 0->a:x CLRC; - AccAXRrl1 (x); // 0->a:x + AccAXRsh1 (x); // 0->a:x break; case 3: case 4: - case 5: // AAAAABBB:CCCCCDDD = a:x + case 5: // AAAAABBB:CCCCCDDD = a:x - AccRol (8 - shCount); // BBBAAAAA:DDDCCCCC + AccRol (8 - shCount); // BBBAAAAA:DDDCCCCC - emitcode ("xch", "a,%s", x); // CCCCCDDD:BBBAAAAA + emitcode ("xch", "a,%s", x); // CCCCCDDD:BBBAAAAA - AccRol (8 - shCount); // DDDCCCCC:BBBAAAAA + AccRol (8 - shCount); // DDDCCCCC:BBBAAAAA emitcode ("anl", "a,#!constbyte", - SRMask[shCount]); // 000CCCCC:BBBAAAAA + SRMask[shCount]); // 000CCCCC:BBBAAAAA - emitcode ("xrl", "a,%s", x); // BBB(CCCCC^AAAAA):BBBAAAAA + emitcode ("xrl", "a,%s", x); // BBB(CCCCC^AAAAA):BBBAAAAA - emitcode ("xch", "a,%s", x); // BBBAAAAA:BBB(CCCCC^AAAAA) + emitcode ("xch", "a,%s", x); // BBBAAAAA:BBB(CCCCC^AAAAA) emitcode ("anl", "a,#!constbyte", - SRMask[shCount]); // 000AAAAA:BBB(CCCCC^AAAAA) + SRMask[shCount]); // 000AAAAA:BBB(CCCCC^AAAAA) - emitcode ("xch", "a,%s", x); // BBB(CCCCC^AAAAA):000AAAAA + emitcode ("xch", "a,%s", x); // BBB(CCCCC^AAAAA):000AAAAA - emitcode ("xrl", "a,%s", x); // BBBCCCCC:000AAAAA + emitcode ("xrl", "a,%s", x); // BBBCCCCC:000AAAAA - emitcode ("xch", "a,%s", x); // 000AAAAA:BBBCCCCC + emitcode ("xch", "a,%s", x); // 000AAAAA:BBBCCCCC break; - case 6: // AABBBBBB:CCDDDDDD + case 6: // AABBBBBB:CCDDDDDD - emitcode ("mov", "c,acc.7"); - AccAXLrl1 (x); // ABBBBBBC:CDDDDDDA - - AccAXLrl1 (x); // BBBBBBCC:DDDDDDAA + AccAXLrl1 (x); // ABBBBBBC:CDDDDDDE + AccAXLrl1 (x); // BBBBBBCC:DDDDDDAA - emitcode ("xch", "a,%s", x); // DDDDDDAA:BBBBBBCC + emitcode ("xch", "a,%s", x); // DDDDDDAA:BBBBBBCC emitcode ("anl", "a,#!constbyte", - SRMask[shCount]); // 000000AA:BBBBBBCC + SRMask[shCount]); // 000000AA:BBBBBBCC break; - case 7: // ABBBBBBB:CDDDDDDD + case 7: // ABBBBBBB:CDDDDDDD - emitcode ("mov", "c,acc.7"); // c = A + AccAXLrl1 (x); // BBBBBBBC:DDDDDDDA - AccAXLrl1 (x); // BBBBBBBC:DDDDDDDA - - emitcode ("xch", "a,%s", x); // DDDDDDDA:BBBBBBCC + emitcode ("xch", "a,%s", x); // DDDDDDDA:BBBBBBCC emitcode ("anl", "a,#!constbyte", - SRMask[shCount]); // 0000000A:BBBBBBBC + SRMask[shCount]); // 0000000A:BBBBBBBC break; default: @@ -7453,87 +8970,85 @@ AccAXRshS (char *x, int shCount) break; case 1: emitcode ("mov", "c,acc.7"); - AccAXRrl1 (x); // s->a:x + AccAXRsh1 (x); // s->a:x break; case 2: emitcode ("mov", "c,acc.7"); - AccAXRrl1 (x); // s->a:x + AccAXRsh1 (x); // s->a:x emitcode ("mov", "c,acc.7"); - AccAXRrl1 (x); // s->a:x + AccAXRsh1 (x); // s->a:x break; case 3: case 4: - case 5: // AAAAABBB:CCCCCDDD = a:x + case 5: // AAAAABBB:CCCCCDDD = a:x tlbl = newiTempLabel (NULL); - AccRol (8 - shCount); // BBBAAAAA:CCCCCDDD + AccRol (8 - shCount); // BBBAAAAA:CCCCCDDD - emitcode ("xch", "a,%s", x); // CCCCCDDD:BBBAAAAA + emitcode ("xch", "a,%s", x); // CCCCCDDD:BBBAAAAA - AccRol (8 - shCount); // DDDCCCCC:BBBAAAAA + AccRol (8 - shCount); // DDDCCCCC:BBBAAAAA emitcode ("anl", "a,#!constbyte", - SRMask[shCount]); // 000CCCCC:BBBAAAAA + SRMask[shCount]); // 000CCCCC:BBBAAAAA - emitcode ("xrl", "a,%s", x); // BBB(CCCCC^AAAAA):BBBAAAAA + emitcode ("xrl", "a,%s", x); // BBB(CCCCC^AAAAA):BBBAAAAA - emitcode ("xch", "a,%s", x); // BBBAAAAA:BBB(CCCCC^AAAAA) + emitcode ("xch", "a,%s", x); // BBBAAAAA:BBB(CCCCC^AAAAA) emitcode ("anl", "a,#!constbyte", - SRMask[shCount]); // 000AAAAA:BBB(CCCCC^AAAAA) + SRMask[shCount]); // 000AAAAA:BBB(CCCCC^AAAAA) - emitcode ("xch", "a,%s", x); // BBB(CCCCC^AAAAA):000AAAAA + emitcode ("xch", "a,%s", x); // BBB(CCCCC^AAAAA):000AAAAA - emitcode ("xrl", "a,%s", x); // BBBCCCCC:000AAAAA + emitcode ("xrl", "a,%s", x); // BBBCCCCC:000AAAAA - emitcode ("xch", "a,%s", x); // 000SAAAA:BBBCCCCC + emitcode ("xch", "a,%s", x); // 000SAAAA:BBBCCCCC emitcode ("jnb", "acc.%d,!tlabel", 7 - shCount, tlbl->key + 100); emitcode ("orl", "a,#!constbyte", - (unsigned char) ~SRMask[shCount]); // 111AAAAA:BBBCCCCC + (unsigned char) ~SRMask[shCount]); // 111AAAAA:BBBCCCCC - emitcode ("", "!tlabeldef", tlbl->key + 100); - break; // SSSSAAAA:BBBCCCCC + emitLabel (tlbl); + break; // SSSSAAAA:BBBCCCCC - case 6: // AABBBBBB:CCDDDDDD + case 6: // AABBBBBB:CCDDDDDD tlbl = newiTempLabel (NULL); - emitcode ("mov", "c,acc.7"); - AccAXLrl1 (x); // ABBBBBBC:CDDDDDDA - AccAXLrl1 (x); // BBBBBBCC:DDDDDDAA + AccAXLrl1 (x); // ABBBBBBC:CDDDDDDA + AccAXLrl1 (x); // BBBBBBCC:DDDDDDAA - emitcode ("xch", "a,%s", x); // DDDDDDAA:BBBBBBCC + emitcode ("xch", "a,%s", x); // DDDDDDAA:BBBBBBCC emitcode ("anl", "a,#!constbyte", - SRMask[shCount]); // 000000AA:BBBBBBCC + SRMask[shCount]); // 000000AA:BBBBBBCC emitcode ("jnb", "acc.%d,!tlabel", 7 - shCount, tlbl->key + 100); emitcode ("orl", "a,#!constbyte", - (unsigned char) ~SRMask[shCount]); // 111111AA:BBBBBBCC + (unsigned char) ~SRMask[shCount]); // 111111AA:BBBBBBCC - emitcode ("", "!tlabeldef", tlbl->key + 100); + emitLabel (tlbl); break; - case 7: // ABBBBBBB:CDDDDDDD + case 7: // ABBBBBBB:CDDDDDDD tlbl = newiTempLabel (NULL); - emitcode ("mov", "c,acc.7"); // c = A - AccAXLrl1 (x); // BBBBBBBC:DDDDDDDA + AccAXLrl1 (x); // BBBBBBBC:DDDDDDDA - emitcode ("xch", "a,%s", x); // DDDDDDDA:BBBBBBCC + emitcode ("xch", "a,%s", x); // DDDDDDDA:BBBBBBCC emitcode ("anl", "a,#!constbyte", - SRMask[shCount]); // 0000000A:BBBBBBBC + SRMask[shCount]); // 0000000A:BBBBBBBC emitcode ("jnb", "acc.%d,!tlabel", 7 - shCount, tlbl->key + 100); emitcode ("orl", "a,#!constbyte", - (unsigned char) ~SRMask[shCount]); // 1111111A:BBBBBBBC + (unsigned char) ~SRMask[shCount]); // 1111111A:BBBBBBBC - emitcode ("", "!tlabeldef", tlbl->key + 100); + emitLabel (tlbl); break; default: break; @@ -7543,11 +9058,11 @@ AccAXRshS (char *x, int shCount) #ifdef BETTER_LITERAL_SHIFT static void -_loadLeftIntoAx(char **lsb, - operand *left, - operand *result, - int offl, - int offr) +_loadLeftIntoAx(char **lsb, + operand *left, + operand *result, + int offl, + int offr) { // Get the initial value from left into a pair of registers. // MSB must be in A, LSB can be any register. @@ -7561,29 +9076,29 @@ _loadLeftIntoAx(char **lsb, if (AOP_NEEDSACC(result)) { char *leftByte; - + _startLazyDPSEvaluation(); if (AOP_TYPE(left) == AOP_DPTR2) { // Get MSB in A. - MOVA(aopGet(AOP(left), offl + MSB16, FALSE, FALSE, TRUE)); - // get LSB in DP2_RESULT_REG. - leftByte = aopGet(AOP(left), offl, FALSE, FALSE, FALSE); - assert(!strcmp(leftByte, DP2_RESULT_REG)); + MOVA (aopGet (left, offl + MSB16, FALSE, FALSE, NULL)); + // get LSB in DP2_RESULT_REG. + leftByte = aopGet (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 (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); - assert(strcmp(leftByte, DP2_RESULT_REG)); - MOVA(leftByte); + } + // And MSB in A. + leftByte = aopGet (left, offl + MSB16, FALSE, FALSE, NULL); + assert(strcmp(leftByte, DP2_RESULT_REG)); + MOVA (leftByte); } _endLazyDPSEvaluation(); *lsb = DP2_RESULT_REG; @@ -7591,40 +9106,40 @@ _loadLeftIntoAx(char **lsb, else { if (sameRegs (AOP (result), AOP (left)) && - ((offl + MSB16) == offr)) + ((offl + MSB16) == offr)) { - /* don't crash result[offr] */ - MOVA(aopGet(AOP(left), offl, FALSE, FALSE, TRUE)); - emitcode ("xch", "a,%s", - aopGet(AOP(left), offl + MSB16, FALSE, FALSE, FALSE)); + /* don't crash result[offr] */ + MOVA (aopGet (left, offl, FALSE, FALSE, NULL)); + emitcode ("xch", "a,%s", + aopGet (left, offl + MSB16, FALSE, FALSE, DP2_RESULT_REG)); } else { - movLeft2Result (left, offl, result, offr, 0); - MOVA (aopGet (AOP (left), offl + MSB16, FALSE, FALSE, TRUE)); + movLeft2Result (left, offl, result, offr, 0); + MOVA (aopGet (left, offl + MSB16, FALSE, FALSE, NULL)); } - *lsb = aopGet(AOP (result), offr, FALSE, FALSE, FALSE); - assert(strcmp(*lsb,"a")); + *lsb = aopGet (result, offr, FALSE, FALSE, DP2_RESULT_REG); + assert(strcmp(*lsb,"a")); } } static void -_storeAxResults(char *lsb, - operand *result, - int offr) +_storeAxResults(char *lsb, + operand *result, + int offr) { _startLazyDPSEvaluation(); if (AOP_NEEDSACC(result)) { /* We have to explicitly update the result LSB. */ - emitcode("xch","a,%s", lsb); - aopPut(AOP(result), "a", offr); - emitcode("mov","a,%s", lsb); + emitcode ("xch","a,%s", lsb); + aopPut (result, "a", offr); + emitcode ("mov","a,%s", lsb); } if (getDataSize (result) > 1) { - aopPut (AOP (result), "a", offr + MSB16); + aopPut (result, "a", offr + MSB16); } _endLazyDPSEvaluation(); } @@ -7634,14 +9149,14 @@ _storeAxResults(char *lsb, /*-----------------------------------------------------------------*/ static void shiftL2Left2Result (operand * left, int offl, - operand * result, int offr, int shCount) + operand * result, int offr, int shCount) { char *lsb; _loadLeftIntoAx(&lsb, left, result, offl, offr); - + AccAXLsh (lsb, shCount); - + _storeAxResults(lsb, result, offr); } #endif @@ -7652,13 +9167,13 @@ shiftL2Left2Result (operand * left, int offl, /*-----------------------------------------------------------------*/ static void shiftR2Left2Result (operand * left, int offl, - operand * result, int offr, - int shCount, int sign) + operand * result, int offr, + int shCount, int sign) { char *lsb; - + _loadLeftIntoAx(&lsb, left, result, offl, offr); - + /* a:x >> shCount (x = lsb(result)) */ if (sign) { @@ -7668,29 +9183,27 @@ shiftR2Left2Result (operand * left, int offl, { AccAXRsh(lsb, shCount); } - + _storeAxResults(lsb, result, offr); } #endif -#if 0 -//REMOVE ME!!! /*-----------------------------------------------------------------*/ /* shiftLLeftOrResult - shift left one byte from left, or to result */ /*-----------------------------------------------------------------*/ static void shiftLLeftOrResult (operand * left, int offl, - operand * result, int offr, int shCount) + operand * result, int offr, int shCount) { - MOVA (aopGet (AOP (left), offl, FALSE, FALSE, TRUE)); + MOVA (aopGet (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 (result, offr, FALSE, FALSE, DP2_RESULT_REG)); /* back to result */ - aopPut (AOP (result), "a", offr); + aopPut (result, "a", offr); } -#endif #if 0 //REMOVE ME!!! @@ -7699,15 +9212,16 @@ shiftLLeftOrResult (operand * left, int offl, /*-----------------------------------------------------------------*/ static void shiftRLeftOrResult (operand * left, int offl, - operand * result, int offr, int shCount) + operand * result, int offr, int shCount) { - MOVA (aopGet (AOP (left), offl, FALSE, FALSE, TRUE)); + MOVA (aopGet (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 (result, offr, FALSE, FALSE, DP2_RESULT_REG)); /* back to result */ - aopPut (AOP (result), "a", offr); + aopPut (result, "a", offr); } #endif @@ -7718,7 +9232,8 @@ shiftRLeftOrResult (operand * left, int offl, static void genlshOne (operand * result, operand * left, int shCount) { - D (emitcode (";", "genlshOne ");); + D (emitcode (";", "genlshOne")); + shiftL1Left2Result (left, LSB, result, LSB, shCount); } #endif @@ -7732,7 +9247,7 @@ genlshTwo (operand * result, operand * left, int shCount) { int size; - D (emitcode (";", "genlshTwo ");); + D (emitcode (";", "genlshTwo")); size = getDataSize (result); @@ -7744,38 +9259,34 @@ genlshTwo (operand * result, operand * left, int shCount) _startLazyDPSEvaluation(); if (size > 1) - { - if (shCount) - { - _endLazyDPSEvaluation(); - shiftL1Left2Result (left, LSB, result, MSB16, shCount); - aopPut (AOP (result), zero, LSB); - } - else - { - movLeft2Result (left, LSB, result, MSB16, 0); - aopPut (AOP (result), zero, LSB); - _endLazyDPSEvaluation(); - } - } - else - { - aopPut (AOP (result), zero, LSB); - _endLazyDPSEvaluation(); - } + { + if (shCount) + { + _endLazyDPSEvaluation(); + shiftL1Left2Result (left, LSB, result, MSB16, shCount); + aopPut (result, zero, LSB); + } + else + { + movLeft2Result (left, LSB, result, MSB16, 0); + aopPut (result, zero, LSB); + _endLazyDPSEvaluation(); + } + } + else + { + aopPut (result, zero, LSB); + _endLazyDPSEvaluation(); + } } /* 1 <= shCount <= 7 */ else { if (size == 1) - { - shiftL1Left2Result (left, LSB, result, LSB, shCount); - } + shiftL1Left2Result (left, LSB, result, LSB, shCount); else - { - shiftL2Left2Result (left, LSB, result, LSB, shCount); - } + shiftL2Left2Result (left, LSB, result, LSB, shCount); } } #endif @@ -7794,61 +9305,61 @@ shiftLLong (operand * left, operand * result, int offr) if (size >= LSB + offr) { - l = aopGet (AOP (left), LSB, FALSE, FALSE, TRUE); + l = aopGet (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)); + size >= MSB16 + offr && offr != LSB) + emitcode ("xch", "a,%s", + aopGet (left, LSB + offr, FALSE, FALSE, DP2_RESULT_REG)); else - aopPut (AOP (result), "a", LSB + offr); + aopPut (result, "a", LSB + offr); } if (size >= MSB16 + offr) { if (!(sameRegs (AOP (result), AOP (left)) && size >= MSB16 + offr && offr != LSB)) - { - l = aopGet (AOP (left), MSB16, FALSE, FALSE, TRUE); - MOVA (l); - } + { + l = aopGet (left, MSB16, FALSE, FALSE, TRUE); + MOVA (l); + } 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)); + size >= MSB24 + offr && offr != LSB) + emitcode ("xch", "a,%s", + aopGet (left, MSB16 + offr, FALSE, FALSE, DP2_RESULT_REG)); else - aopPut (AOP (result), "a", MSB16 + offr); + aopPut (result, "a", MSB16 + offr); } if (size >= MSB24 + offr) { - if (!(sameRegs (AOP (left), AOP (left)) && size >= MSB24 + offr && offr != LSB)) - { - l = aopGet (AOP (left), MSB24, FALSE, FALSE, TRUE); - MOVA (l); - } + if (!(sameRegs (AOP (result), AOP (left)) && size >= MSB24 + offr && offr != LSB)) + { + l = aopGet (left, MSB24, FALSE, FALSE, NULL); + MOVA (l); + } 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)); + size >= MSB32 + offr && offr != LSB) + emitcode ("xch", "a,%s", + aopGet (left, MSB24 + offr, FALSE, FALSE, DP2_RESULT_REG)); else - aopPut (AOP (result), "a", MSB24 + offr); + aopPut (result, "a", MSB24 + offr); } if (size > MSB32 + offr) { if (!(sameRegs (AOP (result), AOP (left)) && size >= MSB32 + offr && offr != LSB)) - { - l = aopGet (AOP (left), MSB32, FALSE, FALSE, TRUE); - MOVA (l); - } + { + l = aopGet (left, MSB32, FALSE, FALSE, NULL); + MOVA (l); + } emitcode ("rlc", "a"); - aopPut (AOP (result), "a", MSB32 + offr); + aopPut (result, "a", MSB32 + offr); } if (offr != LSB) - aopPut (AOP (result), zero, LSB); + aopPut (result, zero, LSB); } #endif @@ -7862,8 +9373,7 @@ genlshFour (operand * result, operand * left, int shCount) { int size; - D (emitcode (";", "genlshFour "); - ); + D (emitcode (";", "genlshFour")); size = AOP_SIZE (result); @@ -7872,14 +9382,14 @@ genlshFour (operand * result, operand * left, int shCount) { shCount -= 24; if (shCount) - /* lowest order of left goes to the highest - order of the destination */ - shiftL1Left2Result (left, LSB, result, MSB32, shCount); + /* lowest order of left goes to the highest + order of the destination */ + shiftL1Left2Result (left, LSB, result, MSB32, shCount); else - movLeft2Result (left, LSB, result, MSB32, 0); - aopPut (AOP (result), zero, LSB); - aopPut (AOP (result), zero, MSB16); - aopPut (AOP (result), zero, MSB24); + movLeft2Result (left, LSB, result, MSB32, 0); + aopPut (result, zero, LSB); + aopPut (result, zero, MSB16); + aopPut (result, zero, MSB24); return; } @@ -7890,14 +9400,14 @@ genlshFour (operand * result, operand * left, int shCount) shCount -= 16; /* if some more remaining */ if (shCount) - shiftL2Left2Result (left, LSB, result, MSB24, shCount); + shiftL2Left2Result (left, LSB, result, MSB24, shCount); else - { - movLeft2Result (left, MSB16, result, MSB32, 0); - movLeft2Result (left, LSB, result, MSB24, 0); - } - aopPut (AOP (result), zero, MSB16); - aopPut (AOP (result), zero, LSB); + { + movLeft2Result (left, MSB16, result, MSB32, 0); + movLeft2Result (left, LSB, result, MSB24, 0); + } + aopPut (result, zero, MSB16); + aopPut (result, zero, LSB); return; } @@ -7907,31 +9417,31 @@ genlshFour (operand * result, operand * left, int shCount) /* lower order three bytes goes to higher order three bytes */ shCount -= 8; if (size == 2) - { - if (shCount) - shiftL1Left2Result (left, LSB, result, MSB16, shCount); - else - movLeft2Result (left, LSB, result, MSB16, 0); - } + { + if (shCount) + shiftL1Left2Result (left, LSB, result, MSB16, shCount); + else + movLeft2Result (left, LSB, result, MSB16, 0); + } else - { /* size = 4 */ - if (shCount == 0) - { - movLeft2Result (left, MSB24, result, MSB32, 0); - movLeft2Result (left, MSB16, result, MSB24, 0); - movLeft2Result (left, LSB, result, MSB16, 0); - aopPut (AOP (result), zero, LSB); - } - else if (shCount == 1) - shiftLLong (left, result, MSB16); - else - { - shiftL2Left2Result (left, MSB16, result, MSB24, shCount); - shiftL1Left2Result (left, LSB, result, MSB16, shCount); - shiftRLeftOrResult (left, LSB, result, MSB24, 8 - shCount); - aopPut (AOP (result), zero, LSB); - } - } + { /* size = 4 */ + if (shCount == 0) + { + movLeft2Result (left, MSB24, result, MSB32, 0); + movLeft2Result (left, MSB16, result, MSB24, 0); + movLeft2Result (left, LSB, result, MSB16, 0); + aopPut (result, zero, LSB); + } + else if (shCount == 1) + shiftLLong (left, result, MSB16); + else + { + shiftL2Left2Result (left, MSB16, result, MSB24, shCount); + shiftL1Left2Result (left, LSB, result, MSB16, shCount); + shiftRLeftOrResult (left, LSB, result, MSB24, 8 - shCount); + aopPut (result, zero, LSB); + } + } } /* 1 <= shCount <= 7 */ @@ -7939,7 +9449,7 @@ genlshFour (operand * result, operand * left, int shCount) { shiftLLong (left, result, LSB); if (shCount == 2) - shiftLLong (result, result, LSB); + shiftLLong (result, result, LSB); } /* 3 <= shCount <= 7, optimize */ else @@ -7957,16 +9467,16 @@ genlshFour (operand * result, operand * left, int shCount) /*-----------------------------------------------------------------*/ static bool genLeftShiftLiteral (operand * left, - operand * right, - operand * result, - iCode * ic) + operand * right, + operand * result, + iCode * ic) { int shCount = (int) floatFromVal (AOP (right)->aopu.aop_lit); int size; size = getSize (operandType (result)); - D(emitcode (";", "genLeftShiftLiteral (%d), size %d", shCount, size);); + D (emitcode (";", "genLeftShiftLiteral (%d), size %d", shCount, size);); /* We only handle certain easy cases so far. */ if ((shCount != 0) @@ -7974,81 +9484,82 @@ genLeftShiftLiteral (operand * left, && (size != 1) && (size != 2)) { - D(emitcode (";", "genLeftShiftLiteral wimping out");); + D(emitcode (";", "genLeftShiftLiteral 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 0 // debug spew if (IS_SYMOP(left) && OP_SYMBOL(left)->aop) { - emitcode(";", "left (%s) is %d", OP_SYMBOL(left)->rname, AOP_TYPE(left)); - if (!IS_TRUE_SYMOP(left) && OP_SYMBOL(left)->usl.spillLoc) - { - emitcode(";", "\taka %s", OP_SYMBOL(left)->usl.spillLoc->rname); - } + emitcode(";", "left (%s) is %d", OP_SYMBOL(left)->rname, AOP_TYPE(left)); + if (!IS_TRUE_SYMOP(left) && OP_SYMBOL(left)->usl.spillLoc) + { + emitcode(";", "\taka %s", OP_SYMBOL(left)->usl.spillLoc->rname); + } } if (IS_SYMOP(result) && OP_SYMBOL(result)->aop) { - emitcode(";", "result (%s) is %d", OP_SYMBOL(result)->rname, AOP_TYPE(result)); - if (!IS_TRUE_SYMOP(result) && OP_SYMBOL(result)->usl.spillLoc) - { - emitcode(";", "\taka %s", OP_SYMBOL(result)->usl.spillLoc->rname); - } - } + emitcode(";", "result (%s) is %d", OP_SYMBOL(result)->rname, AOP_TYPE(result)); + if (!IS_TRUE_SYMOP(result) && OP_SYMBOL(result)->usl.spillLoc) + { + emitcode(";", "\taka %s", OP_SYMBOL(result)->usl.spillLoc->rname); + } + } #endif - + #if VIEW_SIZE emitcode ("; shift left ", "result %d, left %d", size, - AOP_SIZE (left)); + AOP_SIZE (left)); #endif /* I suppose that the left size >= result size */ if (shCount == 0) { - _startLazyDPSEvaluation(); - while (size--) - { - movLeft2Result (left, size, result, size, 0); - } - _endLazyDPSEvaluation(); + _startLazyDPSEvaluation(); + while (size--) + { + movLeft2Result (left, size, result, size, 0); + } + _endLazyDPSEvaluation(); } else if (shCount >= (size * 8)) { _startLazyDPSEvaluation(); while (size--) { - aopPut (AOP (result), zero, size); + aopPut (result, zero, size); } _endLazyDPSEvaluation(); } else { switch (size) - { - case 1: - genlshOne (result, left, shCount); - break; - - case 2: - genlshTwo (result, left, shCount); - break; + { + case 1: + genlshOne (result, left, shCount); + break; + + case 2: + genlshTwo (result, left, shCount); + break; #if 0 - case 4: - genlshFour (result, left, shCount); - break; + case 4: + genlshFour (result, left, shCount); + break; #endif - default: - fprintf(stderr, "*** ack! mystery literal shift!\n"); - break; - } + default: + werror (E_INTERNAL_ERROR, __FILE__, __LINE__, + "*** ack! mystery literal shift!\n"); + break; + } } - freeAsmop (left, NULL, ic, TRUE); freeAsmop (result, NULL, ic, TRUE); + freeAsmop (left, NULL, ic, TRUE); return TRUE; } #endif @@ -8063,8 +9574,9 @@ genLeftShift (iCode * ic) int size, offset; char *l; symbol *tlbl, *tlbl1; + bool pushedB; - D (emitcode (";", "genLeftShift ");); + D (emitcode (";", "genLeftShift")); right = IC_RIGHT (ic); left = IC_LEFT (ic); @@ -8080,7 +9592,7 @@ genLeftShift (iCode * ic) { if (genLeftShiftLiteral (left, right, result, ic)) { - return; + return; } } #endif @@ -8091,6 +9603,7 @@ genLeftShift (iCode * ic) more that 32 bits make no sense anyway, ( the largest size of an object can be only 32 bits ) */ + pushedB = pushB (); if (AOP_TYPE (right) == AOP_LIT) { /* Really should be handled by genLeftShiftLiteral, @@ -8098,19 +9611,18 @@ genLeftShift (iCode * ic) * some small improvement. */ emitcode("mov", "b,#!constbyte", - ((int) floatFromVal (AOP (right)->aopu.aop_lit)) + 1); + ((int) floatFromVal (AOP (right)->aopu.aop_lit)) + 1); } else { - emitcode ("mov", "b,%s", aopGet (AOP (right), 0, FALSE, FALSE, FALSE)); - emitcode ("inc", "b"); + MOVB (aopGet (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 */ + /* now move the left to the result if they are not the same */ if (!sameRegs (AOP (left), AOP (result)) && AOP_SIZE (result) > 1) { @@ -8119,18 +9631,18 @@ genLeftShift (iCode * ic) offset = 0; _startLazyDPSEvaluation (); while (size--) - { - l = aopGet (AOP (left), offset, FALSE, TRUE, FALSE); - if (*l == '@' && (IS_AOP_PREG (result))) - { - - emitcode ("mov", "a,%s", l); - aopPut (AOP (result), "a", offset); - } - else - aopPut (AOP (result), l, offset); - offset++; - } + { + l = aopGet (left, offset, FALSE, TRUE, NULL); + if (*l == '@' && (IS_AOP_PREG (result))) + { + + emitcode ("mov", "a,%s", l); + aopPut (result, "a", offset); + } + else + aopPut (result, l, offset); + offset++; + } _endLazyDPSEvaluation (); } @@ -8144,41 +9656,43 @@ genLeftShift (iCode * ic) { symbol *tlbl1 = newiTempLabel (NULL); - l = aopGet (AOP (left), 0, FALSE, FALSE, TRUE); + l = aopGet (left, 0, FALSE, FALSE, NULL); MOVA (l); emitcode ("sjmp", "!tlabel", tlbl1->key + 100); - emitcode ("", "!tlabeldef", tlbl->key + 100); + emitLabel (tlbl); emitcode ("add", "a,acc"); - emitcode ("", "!tlabeldef", tlbl1->key + 100); + emitLabel (tlbl1); emitcode ("djnz", "b,!tlabel", tlbl->key + 100); - aopPut (AOP (result), "a", 0); + popB (pushedB); + aopPut (result, "a", 0); goto release; } reAdjustPreg (AOP (result)); emitcode ("sjmp", "!tlabel", tlbl1->key + 100); - emitcode ("", "!tlabeldef", tlbl->key + 100); - l = aopGet (AOP (result), offset, FALSE, FALSE, TRUE); + emitLabel (tlbl); + l = aopGet (result, offset, FALSE, FALSE, NULL); MOVA (l); emitcode ("add", "a,acc"); - aopPut (AOP (result), "a", offset++); + aopPut (result, "a", offset++); _startLazyDPSEvaluation (); while (--size) { - l = aopGet (AOP (result), offset, FALSE, FALSE, TRUE); + l = aopGet (result, offset, FALSE, FALSE, NULL); MOVA (l); emitcode ("rlc", "a"); - aopPut (AOP (result), "a", offset++); + aopPut (result, "a", offset++); } _endLazyDPSEvaluation (); reAdjustPreg (AOP (result)); - emitcode ("", "!tlabeldef", tlbl1->key + 100); + emitLabel (tlbl1); emitcode ("djnz", "b,!tlabel", tlbl->key + 100); + popB (pushedB); release: - freeAsmop (left, NULL, ic, TRUE); freeAsmop (result, NULL, ic, TRUE); + freeAsmop (left, NULL, ic, TRUE); } #ifdef BETTER_LITERAL_SHIFT @@ -8187,9 +9701,10 @@ release: /*-----------------------------------------------------------------*/ static void genrshOne (operand * result, operand * left, - int shCount, int sign) + int shCount, int sign) { - D (emitcode (";", "genrshOne");); + D (emitcode (";", "genrshOne")); + shiftR1Left2Result (left, LSB, result, LSB, shCount, sign); } #endif @@ -8200,9 +9715,9 @@ genrshOne (operand * result, operand * left, /*-----------------------------------------------------------------*/ static void genrshTwo (operand * result, operand * left, - int shCount, int sign) + int shCount, int sign) { - D (emitcode (";", "genrshTwo");); + D (emitcode (";", "genrshTwo")); /* if shCount >= 8 */ if (shCount >= 8) @@ -8210,162 +9725,184 @@ genrshTwo (operand * result, operand * left, shCount -= 8; _startLazyDPSEvaluation(); if (shCount) - { - shiftR1Left2Result (left, MSB16, result, LSB, - shCount, sign); - } + shiftR1Left2Result (left, MSB16, result, LSB, shCount, sign); else - { - movLeft2Result (left, MSB16, result, LSB, sign); - } + movLeft2Result (left, MSB16, result, LSB, sign); addSign (result, MSB16, sign); _endLazyDPSEvaluation(); } /* 1 <= shCount <= 7 */ else - { shiftR2Left2Result (left, LSB, result, LSB, shCount, sign); - } } #endif -#if 0 -//REMOVE ME!!! /*-----------------------------------------------------------------*/ /* shiftRLong - shift right one long from left to result */ /* offl = LSB or MSB16 */ /*-----------------------------------------------------------------*/ static void shiftRLong (operand * left, int offl, - operand * result, int sign) + operand * result, int sign) { - int isSameRegs=sameRegs(AOP(left),AOP(result)); + bool overlapping = regsInCommon (left, result) || operandsEqu(left, result); - if (isSameRegs && offl>1) { - // we are in big trouble, but this shouldn't happen - werror(E_INTERNAL_ERROR, __FILE__, __LINE__); - } + if (overlapping && offl>1) + { + // we are in big trouble, but this shouldn't happen + werror(E_INTERNAL_ERROR, __FILE__, __LINE__); + } - MOVA (aopGet (AOP (left), MSB32, FALSE, FALSE)); - - 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)); - } else { - aopPut (AOP(result), zero, MSB32); + MOVA (aopGet (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(left, MSB32, FALSE, FALSE, DP2_RESULT_REG)); + } + else + { + aopPut (result, zero, MSB32); + } } - } - if (!sign) { - emitcode ("clr", "c"); - } else { - emitcode ("mov", "c,acc.7"); - } + if (!sign) + { + emitcode ("clr", "c"); + } + else + { + emitcode ("mov", "c,acc.7"); + } emitcode ("rrc", "a"); - if (isSameRegs && offl==MSB16) { - emitcode ("xch", "a,%s",aopGet (AOP (left), MSB24, FALSE, FALSE)); - } else { - aopPut (AOP (result), "a", MSB32); - MOVA (aopGet (AOP (left), MSB24, FALSE, FALSE)); - } + if (overlapping && offl==MSB16) + { + emitcode ("xch", "a,%s", aopGet (left, MSB24, FALSE, FALSE, DP2_RESULT_REG)); + } + else + { + aopPut (result, "a", MSB32 - offl); + MOVA (aopGet (left, MSB24, FALSE, FALSE, NULL)); + } emitcode ("rrc", "a"); - if (isSameRegs && offl==1) { - emitcode ("xch", "a,%s",aopGet (AOP (left), MSB16, FALSE, FALSE)); - } else { - aopPut (AOP (result), "a", MSB24); - MOVA (aopGet (AOP (left), MSB16, FALSE, FALSE)); - } - emitcode ("rrc", "a"); - aopPut (AOP (result), "a", MSB16 - offl); - if (offl == LSB) + if (overlapping && offl==MSB16) + { + emitcode ("xch", "a,%s", aopGet (left, MSB16, FALSE, FALSE, DP2_RESULT_REG)); + } + else + { + aopPut (result, "a", MSB24 - offl); + MOVA (aopGet (left, MSB16, FALSE, FALSE, NULL)); + } + + emitcode ("rrc", "a"); + if (offl != LSB) + { + aopPut (result, "a", MSB16 - offl); + } + else { - MOVA (aopGet (AOP (left), LSB, FALSE, FALSE)); + if (overlapping && offl==MSB16) + { + emitcode ("xch", "a,%s", aopGet (left, LSB, FALSE, FALSE, DP2_RESULT_REG)); + } + else + { + aopPut (result, "a", MSB16 - offl); + MOVA (aopGet (left, LSB, FALSE, FALSE, NULL)); + } emitcode ("rrc", "a"); - aopPut (AOP (result), "a", LSB); + aopPut (result, "a", LSB); } } -#endif -#if 0 -//REMOVE ME!!! /*-----------------------------------------------------------------*/ /* genrshFour - shift four byte by a known amount != 0 */ /*-----------------------------------------------------------------*/ static void genrshFour (operand * result, operand * left, - int shCount, int sign) + 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); + shiftR1Left2Result (left, MSB32, result, LSB, shCount, sign); else - movLeft2Result (left, MSB32, result, LSB, sign); + 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); + shiftR2Left2Result (left, MSB24, result, LSB, shCount, sign); else - { - movLeft2Result (left, MSB24, result, LSB, 0); - movLeft2Result (left, MSB32, result, MSB16, sign); - } + { + movLeft2Result (left, MSB24, result, LSB, 0); + 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); - movLeft2Result (left, MSB24, result, MSB16, 0); - movLeft2Result (left, MSB32, result, MSB24, sign); - addSign (result, MSB32, sign); - } + { + movLeft2Result (left, MSB16, result, LSB, 0); + movLeft2Result (left, MSB24, result, MSB16, 0); + movLeft2Result (left, MSB32, result, MSB24, sign); + addSign (result, MSB32, sign); + } else - { - shiftR2Left2Result (left, MSB16, result, LSB, shCount, 0); - shiftLLeftOrResult (left, MSB32, result, MSB16, 8 - shCount); - /* the last shift is signed */ - shiftR1Left2Result (left, MSB32, result, MSB24, shCount, sign); - addSign (result, MSB32, sign); - } + { + shiftR2Left2Result (left, MSB16, result, LSB, shCount, 0); + shiftLLeftOrResult (left, MSB32, result, MSB16, 8 - shCount); + /* the last shift is signed */ + 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); - if (shCount == 2) - shiftRLong (result, LSB, result, sign); - } + { + shiftRLong (left, LSB, result, sign); + if (shCount == 2) + shiftRLong (result, LSB, result, sign); + } else - { - shiftR2Left2Result (left, LSB, result, LSB, shCount, 0); - shiftLLeftOrResult (left, MSB24, result, MSB16, 8 - shCount); - shiftR2Left2Result (left, MSB24, result, MSB24, shCount, sign); - } + { + shiftR2Left2Result (left, LSB, result, LSB, shCount, 0); + shiftLLeftOrResult (left, MSB24, result, MSB16, 8 - shCount); + shiftR2Left2Result (left, MSB24, result, MSB24, shCount, sign); + } } } -#endif #ifdef BETTER_LITERAL_SHIFT /*-----------------------------------------------------------------*/ @@ -8373,10 +9910,10 @@ genrshFour (operand * result, operand * left, /*-----------------------------------------------------------------*/ static bool genRightShiftLiteral (operand * left, - operand * right, - operand * result, - iCode * ic, - int sign) + operand * right, + operand * result, + iCode * ic, + int sign) { int shCount = (int) floatFromVal (AOP (right)->aopu.aop_lit); int size; @@ -8389,20 +9926,21 @@ 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), - AOP_SIZE (left)); + AOP_SIZE (left)); #endif /* test the LEFT size !!! */ @@ -8413,44 +9951,42 @@ genRightShiftLiteral (operand * left, size = getDataSize (result); _startLazyDPSEvaluation(); while (size--) - { - movLeft2Result (left, size, result, size, 0); - } + movLeft2Result (left, size, result, size, 0); _endLazyDPSEvaluation(); } else if (shCount >= (size * 8)) { if (sign) - { - /* get sign in acc.7 */ - MOVA (aopGet (AOP (left), size - 1, FALSE, FALSE, TRUE)); - } + { + /* get sign in acc.7 */ + MOVA (aopGet (left, size - 1, FALSE, FALSE, NULL)); + } addSign (result, LSB, sign); } else { switch (size) - { - case 1: - genrshOne (result, left, shCount, sign); - break; - - case 2: - genrshTwo (result, left, shCount, sign); - break; -#if 0 - case 4: - genrshFour (result, left, shCount, sign); - break; -#endif - default: - break; - } + { + case 1: + genrshOne (result, left, shCount, sign); + break; - freeAsmop (left, NULL, ic, TRUE); - freeAsmop (result, NULL, ic, TRUE); + case 2: + genrshTwo (result, left, shCount, sign); + break; +#if 1 + case 4: + genrshFour (result, left, shCount, sign); + break; +#endif + default: + break; + } } - return TRUE; + freeAsmop (result, NULL, ic, TRUE); + freeAsmop (left, NULL, ic, TRUE); + + return TRUE; } #endif @@ -8464,8 +10000,9 @@ genSignedRightShift (iCode * ic) int size, offset; char *l; symbol *tlbl, *tlbl1; + bool pushedB; - D (emitcode (";", "genSignedRightShift ");); + D (emitcode (";", "genSignedRightShift")); /* we do it the hard way put the shift count in b and loop thru preserving the sign */ @@ -8481,7 +10018,7 @@ genSignedRightShift (iCode * ic) { if (genRightShiftLiteral (left, right, result, ic, 1)) { - return; + return; } } #endif @@ -8491,6 +10028,7 @@ genSignedRightShift (iCode * ic) more that 32 bits make no sense anyway, ( the largest size of an object can be only 32 bits ) */ + pushedB = pushB (); if (AOP_TYPE (right) == AOP_LIT) { /* Really should be handled by genRightShiftLiteral, @@ -8498,16 +10036,16 @@ genSignedRightShift (iCode * ic) * some small improvement. */ emitcode("mov", "b,#!constbyte", - ((int) floatFromVal (AOP (right)->aopu.aop_lit)) + 1); + ((int) floatFromVal (AOP (right)->aopu.aop_lit)) + 1); } else { - emitcode ("mov", "b,%s", aopGet (AOP (right), 0, FALSE, FALSE, FALSE)); - emitcode ("inc", "b"); + MOVB (aopGet (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 */ @@ -8519,18 +10057,18 @@ genSignedRightShift (iCode * ic) offset = 0; _startLazyDPSEvaluation (); while (size--) - { - l = aopGet (AOP (left), offset, FALSE, TRUE, FALSE); - if (*l == '@' && IS_AOP_PREG (result)) - { - - emitcode ("mov", "a,%s", l); - aopPut (AOP (result), "a", offset); - } - else - aopPut (AOP (result), l, offset); - offset++; - } + { + l = aopGet (left, offset, FALSE, TRUE, NULL); + if (*l == '@' && IS_AOP_PREG (result)) + { + + emitcode ("mov", "a,%s", l); + aopPut (result, "a", offset); + } + else + aopPut (result, l, offset); + offset++; + } _endLazyDPSEvaluation (); } @@ -8540,44 +10078,46 @@ genSignedRightShift (iCode * ic) size = AOP_SIZE (result); offset = size - 1; - emitcode ("mov", "a,%s", aopGet (AOP (left), offset, FALSE, FALSE, FALSE)); + MOVA (aopGet (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); + l = aopGet (left, 0, FALSE, FALSE, NULL); MOVA (l); emitcode ("sjmp", "!tlabel", tlbl1->key + 100); - emitcode ("", "!tlabeldef", tlbl->key + 100); + emitLabel (tlbl); emitcode ("mov", "c,ov"); emitcode ("rrc", "a"); - emitcode ("", "!tlabeldef", tlbl1->key + 100); + emitLabel (tlbl1); emitcode ("djnz", "b,!tlabel", tlbl->key + 100); - aopPut (AOP (result), "a", 0); + popB (pushedB); + aopPut (result, "a", 0); goto release; } reAdjustPreg (AOP (result)); emitcode ("sjmp", "!tlabel", tlbl1->key + 100); - emitcode ("", "!tlabeldef", tlbl->key + 100); + emitLabel (tlbl); emitcode ("mov", "c,ov"); _startLazyDPSEvaluation (); while (size--) { - l = aopGet (AOP (result), offset, FALSE, FALSE, TRUE); + l = aopGet (result, offset, FALSE, FALSE, NULL); MOVA (l); emitcode ("rrc", "a"); - aopPut (AOP (result), "a", offset--); + aopPut (result, "a", offset--); } _endLazyDPSEvaluation (); reAdjustPreg (AOP (result)); - emitcode ("", "!tlabeldef", tlbl1->key + 100); + emitLabel (tlbl1); emitcode ("djnz", "b,!tlabel", tlbl->key + 100); + popB (pushedB); release: - freeAsmop (left, NULL, ic, TRUE); freeAsmop (result, NULL, ic, TRUE); + freeAsmop (left, NULL, ic, TRUE); } /*-----------------------------------------------------------------*/ @@ -8587,18 +10127,19 @@ static void genRightShift (iCode * ic) { operand *right, *left, *result; - sym_link *retype; + sym_link *letype; int size, offset; char *l; symbol *tlbl, *tlbl1; + bool pushedB; - D (emitcode (";", "genRightShift ");); + D (emitcode (";", "genRightShift")); /* if signed then we do it the hard way preserve the sign bit moving it inwards */ - retype = getSpec (operandType (IC_RESULT (ic))); + letype = getSpec (operandType (IC_LEFT (ic))); - if (!SPEC_USIGN (retype)) + if (!SPEC_USIGN (letype)) { genSignedRightShift (ic); return; @@ -8624,7 +10165,7 @@ genRightShift (iCode * ic) { if (genRightShiftLiteral (left, right, result, ic, 0)) { - return; + return; } } #endif @@ -8634,7 +10175,8 @@ genRightShift (iCode * ic) only the lower order byte since shifting more that 32 bits make no sense anyway, ( the largest size of an object can be only 32 bits ) */ - + + pushedB = pushB (); if (AOP_TYPE (right) == AOP_LIT) { /* Really should be handled by genRightShiftLiteral, @@ -8642,39 +10184,38 @@ genRightShift (iCode * ic) * some small improvement. */ emitcode("mov", "b,#!constbyte", - ((int) floatFromVal (AOP (right)->aopu.aop_lit)) + 1); + ((int) floatFromVal (AOP (right)->aopu.aop_lit)) + 1); } else { - emitcode ("mov", "b,%s", aopGet (AOP (right), 0, FALSE, FALSE, FALSE)); - emitcode ("inc", "b"); + MOVB (aopGet (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 */ if (!sameRegs (AOP (left), AOP (result)) && AOP_SIZE (result) > 1) { - size = AOP_SIZE (result); offset = 0; _startLazyDPSEvaluation (); while (size--) - { - l = aopGet (AOP (left), offset, FALSE, TRUE, FALSE); - if (*l == '@' && IS_AOP_PREG (result)) - { - - emitcode ("mov", "a,%s", l); - aopPut (AOP (result), "a", offset); - } - else - aopPut (AOP (result), l, offset); - offset++; - } + { + l = aopGet (left, offset, FALSE, TRUE, NULL); + if (*l == '@' && IS_AOP_PREG (result)) + { + + emitcode ("mov", "a,%s", l); + aopPut (result, "a", offset); + } + else + aopPut (result, l, offset); + offset++; + } _endLazyDPSEvaluation (); } @@ -8686,153 +10227,214 @@ genRightShift (iCode * ic) /* if it is only one byte then */ if (size == 1) { - l = aopGet (AOP (left), 0, FALSE, FALSE, TRUE); + l = aopGet (left, 0, FALSE, FALSE, NULL); MOVA (l); emitcode ("sjmp", "!tlabel", tlbl1->key + 100); - emitcode ("", "!tlabeldef", tlbl->key + 100); + emitLabel (tlbl); CLRC; emitcode ("rrc", "a"); - emitcode ("", "!tlabeldef", tlbl1->key + 100); + emitLabel (tlbl1); emitcode ("djnz", "b,!tlabel", tlbl->key + 100); - aopPut (AOP (result), "a", 0); + popB (pushedB); + aopPut (result, "a", 0); goto release; } reAdjustPreg (AOP (result)); emitcode ("sjmp", "!tlabel", tlbl1->key + 100); - emitcode ("", "!tlabeldef", tlbl->key + 100); + emitLabel (tlbl); CLRC; _startLazyDPSEvaluation (); while (size--) { - l = aopGet (AOP (result), offset, FALSE, FALSE, TRUE); + l = aopGet (result, offset, FALSE, FALSE, NULL); MOVA (l); emitcode ("rrc", "a"); - aopPut (AOP (result), "a", offset--); + aopPut (result, "a", offset--); } _endLazyDPSEvaluation (); reAdjustPreg (AOP (result)); - emitcode ("", "!tlabeldef", tlbl1->key + 100); + emitLabel (tlbl1); emitcode ("djnz", "b,!tlabel", tlbl->key + 100); + popB (pushedB); release: - freeAsmop (left, NULL, ic, TRUE); freeAsmop (result, NULL, ic, TRUE); + freeAsmop (left, 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) - { + case PPOINTER: + MOVA (src); + emitcode ("movx", "@%s,a", rname); + break; - switch (ptype) - { - case POINTER: - case IPOINTER: - emitcode ("inc", "%s", rname); - emitcode ("mov", "a,@%s", rname); - break; + case FPOINTER: + MOVA (src); + emitcode ("movx", "@dptr,a"); + break; - case PPOINTER: - emitcode ("inc", "%s", rname); - emitcode ("movx", "a,@%s", rname); - break; + case GPOINTER: + MOVA (src); + emitcode ("lcall", "__gptrput"); + break; + } +} - case FPOINTER: - emitcode ("inc", "dptr"); - emitcode ("movx", "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 CPOINTER: - emitcode ("clr", "a"); - emitcode ("inc", "dptr"); - emitcode ("movc", "a,@a+dptr"); - break; + D(emitcode ("; genUnpackBits","")); - case GPOINTER: - emitcode ("inc", "dptr"); - emitcode ("lcall", "__gptrget"); - break; - } + etype = getSpec (operandType (result)); + rsize = getSize (operandType (result)); + blen = SPEC_BLEN (etype); + bstr = SPEC_BSTR (etype); - rlen -= 8; - /* if we are done */ - if (rlen < 8) - break; + /* If the bitfield length is less than a byte */ + if (blen < 8) + { + emitPtrByteGet (rname, ptype, FALSE); + AccRol (8 - bstr); + emitcode ("anl", "a,#!constbyte", ((unsigned char) -1) >> (8 - blen)); + if (!SPEC_USIGN (etype)) + { + /* signed bitfield */ + symbol *tlbl = newiTempLabel (NULL); - aopPut (AOP (result), "a", offset++); + emitcode ("jnb", "acc.%d,%05d$", blen - 1, tlbl->key + 100); + emitcode ("orl", "a,#0x%02x", (unsigned char) (0xff << blen)); + emitLabel (tlbl); + } + aopPut (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 (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)); + if (!SPEC_USIGN (etype)) + { + /* signed bitfield */ + symbol *tlbl = newiTempLabel (NULL); + + emitcode ("jnb", "acc.%d,%05d$", rlen - 1, tlbl->key + 100); + emitcode ("orl", "a,#0x%02x", (unsigned char) (0xff << rlen)); + emitLabel (tlbl); + } + aopPut (result, "a", offset++); } - return; +finish: + if (offset < rsize) + { + char *source; + + if (SPEC_USIGN (etype)) + source = zero; + else + { + /* signed bitfield: sign extension with 0x00 or 0xff */ + emitcode ("rlc", "a"); + emitcode ("subb", "a,acc"); + + source = "a"; + } + rsize -= offset; + while (rsize--) + aopPut (result, source, offset++); + } } @@ -8841,8 +10443,8 @@ genUnpackBits (operand * result, char *rname, int ptype) /*-----------------------------------------------------------------*/ static void genDataPointerGet (operand * left, - operand * result, - iCode * ic) + operand * result, + iCode * ic) { char *l; char buffer[256]; @@ -8850,21 +10452,27 @@ genDataPointerGet (operand * left, aopOp (result, ic, TRUE, FALSE); /* get the string representation of the name */ - l = aopGet (AOP (left), 0, FALSE, TRUE, FALSE); + l = aopGet (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 (buffer, sizeof(buffer), + "(%s + %d)", l + 1, offset); + } + else + { + SNPRINTF (buffer, sizeof(buffer), + "%s", l + 1); + } + aopPut (result, buffer, offset++); } _endLazyDPSEvaluation (); - freeAsmop (left, NULL, ic, TRUE); freeAsmop (result, NULL, ic, TRUE); + freeAsmop (left, NULL, ic, TRUE); } /*-----------------------------------------------------------------*/ @@ -8872,12 +10480,12 @@ genDataPointerGet (operand * left, /*-----------------------------------------------------------------*/ static void genNearPointerGet (operand * left, - operand * result, - iCode * ic, - iCode *pi) + operand * result, + iCode * ic, + iCode *pi) { asmop *aop = NULL; - regs *preg = NULL; + regs *preg; char *rname; sym_link *rtype, *retype, *letype; sym_link *ltype = operandType (left); @@ -8890,12 +10498,12 @@ genNearPointerGet (operand * left, aopOp (left, ic, FALSE, FALSE); /* if left is rematerialisable and - result is not bit variable type and + result is not bitfield variable type and the left is pointer to data space i.e lower 128 bytes of space */ if (AOP_TYPE (left) == AOP_IMMD && - !IS_BITVAR (retype) && - !IS_BITVAR (letype) && + !IS_BITFIELD (retype) && + !IS_BITFIELD (letype) && DCL_TYPE (ltype) == POINTER) { genDataPointerGet (left, result, ic); @@ -8910,18 +10518,18 @@ genNearPointerGet (operand * left, aop = newAsmop (0); preg = getFreePtr (ic, &aop, FALSE); emitcode ("mov", "%s,%s", - preg->name, - aopGet (AOP (left), 0, FALSE, TRUE, FALSE)); + preg->name, + aopGet (left, 0, FALSE, TRUE, DP2_RESULT_REG)); rname = preg->name; } else - rname = aopGet (AOP (left), 0, FALSE, FALSE, FALSE); + rname = aopGet (left, 0, FALSE, FALSE, DP2_RESULT_REG); freeAsmop (left, NULL, ic, TRUE); aopOp (result, ic, FALSE, FALSE); /* if bitfield then unpack the bits */ - if (IS_BITVAR (retype) || IS_BITVAR (letype)) + if (IS_BITFIELD (retype) || IS_BITFIELD (letype)) genUnpackBits (result, rname, POINTER); else { @@ -8930,30 +10538,29 @@ genNearPointerGet (operand * left, int offset = 0; while (size--) - { - if (IS_AOP_PREG (result) || AOP_TYPE (result) == AOP_STK) - { - - emitcode ("mov", "a,@%s", rname); - aopPut (AOP (result), "a", offset); - } - else - { - sprintf (buffer, "@%s", rname); - aopPut (AOP (result), buffer, offset); - } - offset++; - if (size || pi) - emitcode ("inc", "%s", rname); - } + { + if (IS_AOP_PREG (result) || AOP_TYPE (result) == AOP_STK) + { + + emitcode ("mov", "a,@%s", rname); + aopPut (result, "a", offset); + } + else + { + SNPRINTF (buffer, sizeof(buffer), "@%s", rname); + aopPut (result, buffer, offset); + } + offset++; + if (size || pi) + emitcode ("inc", "%s", rname); + } } /* now some housekeeping stuff */ - if (aop) + if (aop) /* we had to allocate for this iCode */ { - /* we had to allocate for this iCode */ if (pi) { /* post increment present */ - aopPut(AOP ( left ),rname,0); + aopPut (left, rname, 0); } freeAsmop (NULL, aop, ic, TRUE); } @@ -8965,15 +10572,15 @@ genNearPointerGet (operand * left, we have to point it back to where it belongs */ if (AOP_SIZE (result) > 1 && - !OP_SYMBOL (left)->remat && - (OP_SYMBOL (left)->liveTo > ic->seq || - ic->depth) && - !pi) - { - int size = AOP_SIZE (result) - 1; - while (size--) - emitcode ("dec", "%s", rname); - } + !OP_SYMBOL (left)->remat && + (OP_SYMBOL (left)->liveTo > ic->seq || + ic->depth) && + !pi) + { + int size = AOP_SIZE (result) - 1; + while (size--) + emitcode ("dec", "%s", rname); + } } /* done */ @@ -8986,12 +10593,12 @@ genNearPointerGet (operand * left, /*-----------------------------------------------------------------*/ static void genPagedPointerGet (operand * left, - operand * result, - iCode * ic, - iCode * pi) + operand * result, + iCode * ic, + iCode * pi) { asmop *aop = NULL; - regs *preg = NULL; + regs *preg; char *rname; sym_link *rtype, *retype, *letype; @@ -9008,18 +10615,18 @@ genPagedPointerGet (operand * left, aop = newAsmop (0); preg = getFreePtr (ic, &aop, FALSE); emitcode ("mov", "%s,%s", - preg->name, - aopGet (AOP (left), 0, FALSE, TRUE, FALSE)); + preg->name, + aopGet (left, 0, FALSE, TRUE, NULL)); rname = preg->name; } else - rname = aopGet (AOP (left), 0, FALSE, FALSE, FALSE); + rname = aopGet (left, 0, FALSE, FALSE, NULL); freeAsmop (left, NULL, ic, TRUE); aopOp (result, ic, FALSE, FALSE); /* if bitfield then unpack the bits */ - if (IS_BITVAR (retype) || IS_BITVAR (letype)) + if (IS_BITFIELD (retype) || IS_BITFIELD (letype)) genUnpackBits (result, rname, PPOINTER); else { @@ -9028,23 +10635,23 @@ genPagedPointerGet (operand * left, int offset = 0; while (size--) - { + { - emitcode ("movx", "a,@%s", rname); - aopPut (AOP (result), "a", offset); + emitcode ("movx", "a,@%s", rname); + aopPut (result, "a", offset); - offset++; + offset++; - if (size || pi) - emitcode ("inc", "%s", rname); - } + if (size || pi) + emitcode ("inc", "%s", rname); + } } /* now some housekeeping stuff */ - if (aop) + if (aop) /* we had to allocate for this iCode */ { - /* we had to allocate for this iCode */ - if (pi) aopPut ( AOP (left), rname, 0); + if (pi) + aopPut (left, rname, 0); freeAsmop (NULL, aop, ic, TRUE); } else @@ -9055,15 +10662,15 @@ genPagedPointerGet (operand * left, we have to point it back to where it belongs */ if (AOP_SIZE (result) > 1 && - !OP_SYMBOL (left)->remat && - (OP_SYMBOL (left)->liveTo > ic->seq || - ic->depth) && - !pi) - { - int size = AOP_SIZE (result) - 1; - while (size--) - emitcode ("dec", "%s", rname); - } + !OP_SYMBOL (left)->remat && + (OP_SYMBOL (left)->liveTo > ic->seq || + ic->depth) && + !pi) + { + int size = AOP_SIZE (result) - 1; + while (size--) + emitcode ("dec", "%s", rname); + } } /* done */ @@ -9072,17 +10679,16 @@ genPagedPointerGet (operand * left, } /*-----------------------------------------------------------------*/ -/* genFarPointerGet - gget value from far space */ +/* genFarPointerGet - get value from far space */ /*-----------------------------------------------------------------*/ static void genFarPointerGet (operand * left, - operand * result, iCode * ic, iCode *pi) + operand * result, iCode * ic, iCode *pi) { - int size, offset, dopi=1; + 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,49 +10696,48 @@ genFarPointerGet (operand * left, then we do nothing else we move the value to dptr */ if (AOP_TYPE (left) != AOP_STR && !AOP_INDPTRn(left) ) { - /* if this is remateriazable */ + /* if this is rematerializable */ if (AOP_TYPE (left) == AOP_IMMD) - { - emitcode ("mov", "dptr,%s", aopGet (AOP (left), 0, TRUE, FALSE, FALSE)); - } + { + emitcode ("mov", "dptr,%s", aopGet (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)); - if (options.model == MODEL_FLAT24) - emitcode ("mov", "dpx,%s", aopGet (AOP (left), 2, FALSE, FALSE, TRUE)); - } - 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)); - if (options.model == MODEL_FLAT24) - emitcode ("mov", "dpx,%s", aopGet (AOP (left), 2, FALSE, FALSE, TRUE)); - emitcode ("pop", "dph"); - emitcode ("pop", "dpl"); - dopi =0; - } - _endLazyDPSEvaluation (); - } - } - /* so dptr know contains the address */ + { + /* we need to get it byte by byte */ + _startLazyDPSEvaluation (); + if (AOP_TYPE (left) != AOP_DPTR) + { + emitcode ("mov", "dpl,%s", aopGet (left, 0, FALSE, FALSE, NULL)); + emitcode ("mov", "dph,%s", aopGet (left, 1, FALSE, FALSE, NULL)); + if (options.model == MODEL_FLAT24) + emitcode ("mov", "dpx,%s", aopGet (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 (left, 0, FALSE, TRUE, NULL)); + emitcode ("push", "%s", aopGet (left, 1, FALSE, TRUE, NULL)); + if (options.model == MODEL_FLAT24) + emitcode ("mov", "dpx,%s", aopGet (left, 2, FALSE, FALSE, NULL)); + emitcode ("pop", "dph"); + emitcode ("pop", "dpl"); + dopi =0; + } + _endLazyDPSEvaluation (); + } + } + /* so dptr now contains the address */ aopOp (result, ic, FALSE, (AOP_INDPTRn(left) ? FALSE : TRUE)); /* if bit then unpack */ - if (IS_BITVAR (retype) || IS_BITVAR (letype)) { + if (IS_BITFIELD (retype) || IS_BITFIELD (letype)) { if (AOP_INDPTRn(left)) { - genSetDPTR(AOP(left)->aopu.dptr); + genSetDPTR(AOP(left)->aopu.dptr); } genUnpackBits (result, "dptr", FPOINTER); if (AOP_INDPTRn(left)) { - genSetDPTR(0); + genSetDPTR(0); } } else { @@ -9140,65 +10745,68 @@ genFarPointerGet (operand * left, offset = 0; if (AOP_INDPTRn(left) && AOP_USESDPTR(result)) { - while (size--) { - genSetDPTR(AOP(left)->aopu.dptr); - emitcode ("movx", "a,@dptr"); - if (size || (dopi && pi && AOP_TYPE (left) != AOP_IMMD)) - emitcode ("inc", "dptr"); - genSetDPTR (0); - aopPut (AOP (result), "a", offset++); - } + while (size--) { + genSetDPTR(AOP(left)->aopu.dptr); + emitcode ("movx", "a,@dptr"); + if (size || (dopi && pi && AOP_TYPE (left) != AOP_IMMD)) + emitcode ("inc", "dptr"); + genSetDPTR (0); + aopPut (result, "a", offset++); + } } else { - _startLazyDPSEvaluation (); - while (size--) { - if (AOP_INDPTRn(left)) { - genSetDPTR(AOP(left)->aopu.dptr); - } else { - genSetDPTR (0); - } - _flushLazyDPS (); - - emitcode ("movx", "a,@dptr"); - if (size || (dopi && pi && AOP_TYPE (left) != AOP_IMMD)) - emitcode ("inc", "dptr"); - - aopPut (AOP (result), "a", offset++); - } - _endLazyDPSEvaluation (); + _startLazyDPSEvaluation (); + while (size--) { + if (AOP_INDPTRn(left)) { + genSetDPTR(AOP(left)->aopu.dptr); + } else { + genSetDPTR (0); + } + _flushLazyDPS (); + + emitcode ("movx", "a,@dptr"); + if (size || (dopi && pi && AOP_TYPE (left) != AOP_IMMD)) + emitcode ("inc", "dptr"); + + aopPut (result, "a", offset++); + } + _endLazyDPSEvaluation (); } } if (dopi && pi && AOP_TYPE (left) != AOP_IMMD) { if (!AOP_INDPTRn(left)) { - aopPut ( AOP (left), "dpl", 0); - aopPut ( AOP (left), "dph", 1); - if (options.model == MODEL_FLAT24) - aopPut ( AOP (left), "dpx", 2); + _startLazyDPSEvaluation (); + aopPut (left, "dpl", 0); + aopPut (left, "dph", 1); + if (options.model == MODEL_FLAT24) + aopPut (left, "dpx", 2); + _endLazyDPSEvaluation (); } pi->generated = 1; - } else if ((OP_SYMBOL(left)->ruonly || AOP_INDPTRn(left)) && - AOP_SIZE(result) > 1 && - (OP_SYMBOL (left)->liveTo > ic->seq || ic->depth)) { - + } else if ((AOP_IS_STR(left) || AOP_INDPTRn(left)) && + AOP_SIZE(result) > 1 && + IS_SYMOP(left) && + (OP_SYMBOL(left)->liveTo > ic->seq || ic->depth)) { + size = AOP_SIZE (result) - 1; if (AOP_INDPTRn(left)) { - genSetDPTR(AOP(left)->aopu.dptr); + genSetDPTR(AOP(left)->aopu.dptr); } while (size--) emitcode ("lcall","__decdptr"); if (AOP_INDPTRn(left)) { - genSetDPTR(0); + genSetDPTR(0); } } - freeAsmop (left, NULL, ic, TRUE); freeAsmop (result, NULL, ic, TRUE); + freeAsmop (left, NULL, ic, TRUE); } /*-----------------------------------------------------------------*/ -/* emitcodePointerGet - gget value from code space */ +/* genCodePointerGet - get value from code space */ /*-----------------------------------------------------------------*/ static void -emitcodePointerGet (operand * left, - operand * result, iCode * ic, iCode *pi) +genCodePointerGet (operand * left, + operand * result, iCode * ic, iCode *pi) { int size, offset, dopi=1; sym_link *retype = getSpec (operandType (result)); @@ -9209,209 +10817,227 @@ emitcodePointerGet (operand * left, then we do nothing else we move the value to dptr */ if (AOP_TYPE (left) != AOP_STR && !AOP_INDPTRn(left)) { - /* if this is remateriazable */ + /* if this is rematerializable */ if (AOP_TYPE (left) == AOP_IMMD) - { - emitcode ("mov", "dptr,%s", aopGet (AOP (left), 0, TRUE, FALSE, FALSE)); - } + { + emitcode ("mov", "dptr,%s", aopGet (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)); - if (options.model == MODEL_FLAT24) - emitcode ("mov", "dpx,%s", aopGet (AOP (left), 2, FALSE, FALSE, TRUE)); - } - 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)); - if (options.model == MODEL_FLAT24) - emitcode ("mov", "dpx,%s", aopGet (AOP (left), 2, FALSE, FALSE, TRUE)); - emitcode ("pop", "dph"); - emitcode ("pop", "dpl"); - dopi=0; - } - _endLazyDPSEvaluation (); - } - } - /* so dptr know contains the address */ + { /* we need to get it byte by byte */ + _startLazyDPSEvaluation (); + if (AOP_TYPE (left) != AOP_DPTR) + { + emitcode ("mov", "dpl,%s", aopGet (left, 0, FALSE, FALSE, NULL)); + emitcode ("mov", "dph,%s", aopGet (left, 1, FALSE, FALSE, NULL)); + if (options.model == MODEL_FLAT24) + emitcode ("mov", "dpx,%s", aopGet (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 (left, 0, FALSE, TRUE, NULL)); + emitcode ("push", "%s", aopGet (left, 1, FALSE, TRUE, NULL)); + if (options.model == MODEL_FLAT24) + emitcode ("mov", "dpx,%s", aopGet (left, 2, FALSE, FALSE, NULL)); + emitcode ("pop", "dph"); + emitcode ("pop", "dpl"); + dopi=0; + } + _endLazyDPSEvaluation (); + } + } + /* so dptr now contains the address */ aopOp (result, ic, FALSE, (AOP_INDPTRn(left) ? FALSE : TRUE)); /* if bit then unpack */ - if (IS_BITVAR (retype)) { + if (IS_BITFIELD (retype)) { if (AOP_INDPTRn(left)) { - genSetDPTR(AOP(left)->aopu.dptr); + genSetDPTR(AOP(left)->aopu.dptr); } genUnpackBits (result, "dptr", CPOINTER); if (AOP_INDPTRn(left)) { - genSetDPTR(0); + genSetDPTR(0); } } else { size = AOP_SIZE (result); offset = 0; if (AOP_INDPTRn(left) && AOP_USESDPTR(result)) { - while (size--) { - genSetDPTR(AOP(left)->aopu.dptr); - emitcode ("clr", "a"); - emitcode ("movc", "a,@a+dptr"); - if (size || (dopi && pi && AOP_TYPE (left) != AOP_IMMD)) - emitcode ("inc", "dptr"); - genSetDPTR (0); - aopPut (AOP (result), "a", offset++); - } + while (size--) { + genSetDPTR(AOP(left)->aopu.dptr); + emitcode ("clr", "a"); + emitcode ("movc", "a,@a+dptr"); + if (size || (dopi && pi && AOP_TYPE (left) != AOP_IMMD)) + emitcode ("inc", "dptr"); + genSetDPTR (0); + aopPut (result, "a", offset++); + } } else { - _startLazyDPSEvaluation (); - while (size--) - { - if (AOP_INDPTRn(left)) { - genSetDPTR(AOP(left)->aopu.dptr); - } else { - genSetDPTR (0); - } - _flushLazyDPS (); - - emitcode ("clr", "a"); - emitcode ("movc", "a,@a+dptr"); - if (size || (dopi && pi && AOP_TYPE (left) != AOP_IMMD)) - emitcode ("inc", "dptr"); - aopPut (AOP (result), "a", offset++); - } - _endLazyDPSEvaluation (); + _startLazyDPSEvaluation (); + while (size--) + { + if (AOP_INDPTRn(left)) { + genSetDPTR(AOP(left)->aopu.dptr); + } else { + genSetDPTR (0); + } + _flushLazyDPS (); + + emitcode ("clr", "a"); + emitcode ("movc", "a,@a+dptr"); + if (size || (dopi && pi && AOP_TYPE (left) != AOP_IMMD)) + emitcode ("inc", "dptr"); + aopPut (result, "a", offset++); + } + _endLazyDPSEvaluation (); } } if (dopi && pi && AOP_TYPE (left) != AOP_IMMD) { if (!AOP_INDPTRn(left)) { - aopPut ( AOP (left), "dpl", 0); - aopPut ( AOP (left), "dph", 1); - if (options.model == MODEL_FLAT24) - aopPut ( AOP (left), "dpx", 2); + _startLazyDPSEvaluation (); + + aopPut (left, "dpl", 0); + aopPut (left, "dph", 1); + if (options.model == MODEL_FLAT24) + aopPut (left, "dpx", 2); + + _endLazyDPSEvaluation (); } pi->generated = 1; - } else if ((OP_SYMBOL(left)->ruonly || AOP_INDPTRn(left)) && - AOP_SIZE(result) > 1 && - (OP_SYMBOL (left)->liveTo > ic->seq || ic->depth)) { - + } else if (IS_SYMOP(left) && + (OP_SYMBOL(left)->ruonly || AOP_INDPTRn(left)) && + AOP_SIZE(result) > 1 && + (OP_SYMBOL (left)->liveTo > ic->seq || ic->depth)) { + size = AOP_SIZE (result) - 1; if (AOP_INDPTRn(left)) { - genSetDPTR(AOP(left)->aopu.dptr); + genSetDPTR(AOP(left)->aopu.dptr); } while (size--) emitcode ("lcall","__decdptr"); if (AOP_INDPTRn(left)) { - genSetDPTR(0); + genSetDPTR(0); } } - - freeAsmop (left, NULL, ic, TRUE); + freeAsmop (result, NULL, ic, TRUE); + freeAsmop (left, NULL, ic, TRUE); } /*-----------------------------------------------------------------*/ -/* genGenPointerGet - gget value from generic pointer space */ +/* genGenPointerGet - get value from generic pointer space */ /*-----------------------------------------------------------------*/ static void genGenPointerGet (operand * left, - operand * result, iCode * ic, iCode * pi) + operand * result, iCode * ic, iCode * pi) { int size, offset; + bool pushedB; sym_link *retype = getSpec (operandType (result)); sym_link *letype = getSpec (operandType (left)); - D (emitcode (";", "genGenPointerGet "); ); + D (emitcode (";", "genGenPointerGet")); - aopOp (left, ic, FALSE, (OP_SYMBOL(left)->ruonly ? FALSE : TRUE)); + aopOp (left, ic, FALSE, (AOP_IS_STR(left) ? FALSE : TRUE)); + pushedB = pushB (); /* if the operand is already in dptr then we do nothing else we move the value to dptr */ if (AOP_TYPE (left) != AOP_STR) { - /* if this is remateriazable */ + /* if this is rematerializable */ if (AOP_TYPE (left) == AOP_IMMD) - { - emitcode ("mov", "dptr,%s", aopGet (AOP (left), 0, TRUE, FALSE, FALSE)); - 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)); - } + { + emitcode ("mov", "dptr,%s", aopGet (left, 0, TRUE, FALSE, NULL)); + if (AOP(left)->aopu.aop_immd.from_cast_remat) + { + MOVB (aopGet (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)); - 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)); - } else { - emitcode ("mov", "b,%s", aopGet (AOP(left),2,FALSE,FALSE,TRUE)); - } - } - _endLazyDPSEvaluation (); - } - } - /* so dptr know contains the address */ + { /* we need to get it byte by byte */ + _startLazyDPSEvaluation (); + emitcode ("mov", "dpl,%s", aopGet (left,0,FALSE,FALSE,NULL)); + emitcode ("mov", "dph,%s", aopGet (left,1,FALSE,FALSE,NULL)); + if (options.model == MODEL_FLAT24) { + emitcode ("mov", "dpx,%s", aopGet (left,2,FALSE,FALSE,NULL)); + emitcode ("mov", "b,%s", aopGet (left,3,FALSE,FALSE,NULL)); + } else { + emitcode ("mov", "b,%s", aopGet (left,2,FALSE,FALSE,NULL)); + } + _endLazyDPSEvaluation (); + } + } + + /* so dptr-b now contains the address */ aopOp (result, ic, FALSE, TRUE); /* if bit then unpack */ - if (IS_BITVAR (retype) || IS_BITVAR (letype)) + if (IS_BITFIELD (retype) || IS_BITFIELD (letype)) + { genUnpackBits (result, "dptr", GPOINTER); + } else { - size = AOP_SIZE (result); - offset = 0; + size = AOP_SIZE (result); + offset = 0; - while (size--) - { - emitcode ("lcall", "__gptrget"); - aopPut (AOP (result), "a", offset++); - if (size || (pi && AOP_TYPE (left) != AOP_IMMD)) - emitcode ("inc", "dptr"); - } + while (size--) + { + 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 (result, DP2_RESULT_REG, offset++); + aopPut (result, "a", offset++); + size--; + } + else + { + // Only one byte to get. + emitcode ("lcall", "__gptrget"); + aopPut (result, "a", offset++); + } + + if (size || (pi && AOP_TYPE (left) != AOP_IMMD)) + { + emitcode ("inc", "dptr"); + } + } } if (pi && AOP_TYPE (left) != AOP_IMMD) { - aopPut ( AOP (left), "dpl", 0); - aopPut ( AOP (left), "dph", 1); + _startLazyDPSEvaluation (); + + aopPut (left, "dpl", 0); + aopPut (left, "dph", 1); if (options.model == MODEL_FLAT24) { - aopPut ( AOP (left), "dpx", 2); - aopPut ( AOP (left), "b", 3); - } else aopPut ( AOP (left), "b", 2); + aopPut (left, "dpx", 2); + aopPut (left, "b", 3); + } else aopPut (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)) { - + (OP_SYMBOL (left)->liveTo > ic->seq || ic->depth)) { + size = AOP_SIZE (result) - 1; while (size--) emitcode ("lcall","__decdptr"); } + popB (pushedB); - freeAsmop (left, NULL, ic, TRUE); freeAsmop (result, NULL, ic, TRUE); + freeAsmop (left, NULL, ic, TRUE); } /*-----------------------------------------------------------------*/ @@ -9424,8 +11050,7 @@ genPointerGet (iCode * ic, iCode *pi) sym_link *type, *etype; int p_type; - D (emitcode (";", "genPointerGet "); - ); + D (emitcode (";", "genPointerGet")); left = IC_LEFT (ic); result = IC_RESULT (ic); @@ -9442,13 +11067,15 @@ genPointerGet (iCode * ic, iCode *pi) /* we have to go by the storage class */ p_type = PTR_TYPE (SPEC_OCLS (etype)); } + /* special case when cast remat */ 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); - p_type = DCL_TYPE (type); - } + IS_CAST_ICODE(OP_SYMBOL(left)->rematiCode)) + { + left = IC_RIGHT(OP_SYMBOL(left)->rematiCode); + type = operandType (left); + p_type = DCL_TYPE (type); + } /* now that we have the pointer type we assign the pointer values */ switch (p_type) @@ -9468,211 +11095,179 @@ genPointerGet (iCode * ic, iCode *pi) break; case CPOINTER: - emitcodePointerGet (left, result, ic, pi); + genCodePointerGet (left, result, ic, pi); break; case GPOINTER: genGenPointerGet (left, result, ic, pi); break; } - } + /*-----------------------------------------------------------------*/ /* genPackBits - generates code for packed bit storage */ /*-----------------------------------------------------------------*/ static void genPackBits (sym_link * etype, - operand * right, - char *rname, int p_type) + 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) + /* If the bitfield length is less than a byte */ + if (blen < 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; + mask = ((unsigned char) (0xFF << (blen + bstr)) | + (unsigned char) (0xFF >> (8 - bstr))); - case GPOINTER: - emitcode ("push", "b"); - emitcode ("push", "acc"); - emitcode ("lcall", "__gptrget"); - emitcode ("pop", "b"); - 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 (right, 0, FALSE, FALSE, NULL)); + emitcode ("rrc","a"); + } + emitPtrByteGet (rname, p_type, FALSE); + emitcode ("mov","acc.%d,c",bstr); + } + else + { + bool pushedB; + /* Case with a bitfield length < 8 and arbitrary source + */ + MOVA (aopGet (right, 0, FALSE, FALSE, NULL)); + /* shift and mask source value */ + AccLsh (bstr); + emitcode ("anl", "a,#!constbyte", (~mask) & 0xff); + + pushedB = pushB (); + /* 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"); + + popB (pushedB); + } + } - 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"); - } + emitPtrByteSet (rname, p_type, "a"); + return; } - switch (p_type) + /* 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) { - case POINTER: - emitcode ("mov", "@%s,a", rname); - break; - - case FPOINTER: - emitcode ("movx", "@dptr,a"); - break; - - case GPOINTER: - emitcode ("lcall", "__gptrput"); - break; + emitPtrByteSet (rname, p_type, + aopGet (right, offset++, FALSE, TRUE, NULL) ); + if (rlen>8) + emitcode ("inc", "%s", rname); } - /* 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) + /* If there was a partial byte at the end */ + if (rlen) { + mask = (((unsigned char) -1 << rlen) & 0xff); - 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); - } - - MOVA (l); - - /* last last was not complete */ - 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"); + 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 + { + bool pushedB; + /* Case with partial byte and arbitrary source + */ + MOVA (aopGet (right, offset++, FALSE, FALSE, NULL)); + emitcode ("anl", "a,#!constbyte", (~mask) & 0xff); + + pushedB = pushB (); + /* 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"); + + popB (pushedB); + } + 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 */ /*-----------------------------------------------------------------*/ static void genDataPointerSet (operand * right, - operand * result, - iCode * ic) + operand * result, + iCode * ic) { int size, offset = 0; char *l, buffer[256]; + D (emitcode (";", "genDataPointerSet")); + aopOp (right, ic, FALSE, FALSE); - l = aopGet (AOP (result), 0, FALSE, TRUE, FALSE); + l = aopGet (result, 0, FALSE, TRUE, NULL); size = AOP_SIZE (right); while (size--) { if (offset) - sprintf (buffer, "(%s + %d)", l + 1, offset); + SNPRINTF (buffer, sizeof(buffer), "(%s + %d)", l + 1, offset); else - sprintf (buffer, "%s", l + 1); + SNPRINTF (buffer, sizeof(buffer), "%s", l + 1); emitcode ("mov", "%s,%s", buffer, - aopGet (AOP (right), offset++, FALSE, FALSE, FALSE)); + aopGet (right, offset++, FALSE, FALSE, NULL)); } - freeAsmop (right, NULL, ic, TRUE); freeAsmop (result, NULL, ic, TRUE); + freeAsmop (right, NULL, ic, TRUE); } /*-----------------------------------------------------------------*/ @@ -9680,16 +11275,17 @@ genDataPointerSet (operand * right, /*-----------------------------------------------------------------*/ static void genNearPointerSet (operand * right, - operand * result, - iCode * ic, - iCode * pi) + operand * result, + iCode * ic, + iCode * pi) { asmop *aop = NULL; - regs *preg = NULL; char *rname, *l; sym_link *retype, *letype; sym_link *ptype = operandType (result); + D (emitcode (";", "genNearPointerSet")); + retype = getSpec (operandType (right)); letype = getSpec (ptype); @@ -9711,48 +11307,52 @@ 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)); + preg->name, + aopGet (result, 0, FALSE, TRUE, NULL)); rname = preg->name; } else - rname = aopGet (AOP (result), 0, FALSE, FALSE, FALSE); + { + rname = aopGet (result, 0, FALSE, FALSE, NULL); + } aopOp (right, ic, FALSE, FALSE); /* if bitfield then unpack the bits */ - if (IS_BITVAR (retype) || IS_BITVAR (letype)) - genPackBits ((IS_BITVAR (retype) ? retype : letype), right, rname, POINTER); + if (IS_BITFIELD (retype) || IS_BITFIELD (letype)) + genPackBits ((IS_BITFIELD (retype) ? retype : letype), right, rname, POINTER); else { - /* we have can just get the values */ + /* we can just get the values */ int size = AOP_SIZE (right); int offset = 0; while (size--) - { - l = aopGet (AOP (right), offset, FALSE, TRUE, FALSE); - if (*l == '@') - { - MOVA (l); - emitcode ("mov", "@%s,a", rname); - } - else - emitcode ("mov", "@%s,%s", rname, l); - if (size || pi) - emitcode ("inc", "%s", rname); - offset++; - } + { + l = aopGet (right, offset, FALSE, TRUE, NULL); + if ((*l == '@') || (strcmp (l, "acc") == 0)) + { + MOVA (l); + emitcode ("mov", "@%s,a", rname); + } + else + emitcode ("mov", "@%s,%s", rname, l); + if (size || pi) + emitcode ("inc", "%s", rname); + offset++; + } } /* now some housekeeping stuff */ - if (aop) + if (aop) /* we had to allocate for this iCode */ { - /* we had to allocate for this iCode */ - if (pi) aopPut (AOP (result),rname,0); + if (pi) + aopPut (result, rname, 0); freeAsmop (NULL, aop, ic, TRUE); } else @@ -9763,23 +11363,21 @@ genNearPointerSet (operand * right, we have to point it back to where it belongs */ if (AOP_SIZE (right) > 1 && - !OP_SYMBOL (result)->remat && - (OP_SYMBOL (result)->liveTo > ic->seq || - ic->depth) && - !pi) - { - int size = AOP_SIZE (right) - 1; - while (size--) - emitcode ("dec", "%s", rname); - } + !OP_SYMBOL (result)->remat && + (OP_SYMBOL (result)->liveTo > ic->seq || + ic->depth) && + !pi) + { + int size = AOP_SIZE (right) - 1; + while (size--) + emitcode ("dec", "%s", rname); + } } /* done */ if (pi) pi->generated = 1; freeAsmop (result, NULL, ic, TRUE); freeAsmop (right, NULL, ic, TRUE); - - } /*-----------------------------------------------------------------*/ @@ -9787,15 +11385,16 @@ genNearPointerSet (operand * right, /*-----------------------------------------------------------------*/ static void genPagedPointerSet (operand * right, - operand * result, - iCode * ic, - iCode *pi) + operand * result, + iCode * ic, + iCode *pi) { asmop *aop = NULL; - regs *preg = NULL; char *rname, *l; sym_link *retype, *letype; + D (emitcode (";", "genPagedPointerSet")); + retype = getSpec (operandType (right)); letype = getSpec (operandType (result)); @@ -9806,21 +11405,23 @@ 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)); + preg->name, + aopGet (result, 0, FALSE, TRUE, NULL)); rname = preg->name; } else - rname = aopGet (AOP (result), 0, FALSE, FALSE, FALSE); + rname = aopGet (result, 0, FALSE, FALSE, NULL); aopOp (right, ic, FALSE, FALSE); /* if bitfield then unpack the bits */ - if (IS_BITVAR (retype) || IS_BITVAR (letype)) - genPackBits ((IS_BITVAR (retype) ? retype : letype), right, rname, PPOINTER); + if (IS_BITFIELD (retype) || IS_BITFIELD (letype)) + genPackBits ((IS_BITFIELD (retype) ? retype : letype), right, rname, PPOINTER); else { /* we have can just get the values */ @@ -9828,23 +11429,23 @@ genPagedPointerSet (operand * right, int offset = 0; while (size--) - { - l = aopGet (AOP (right), offset, FALSE, TRUE, TRUE); - - MOVA (l); - emitcode ("movx", "@%s,a", rname); + { + l = aopGet (right, offset, FALSE, TRUE, NULL); + MOVA (l); + emitcode ("movx", "@%s,a", rname); - if (size || pi) - emitcode ("inc", "%s", rname); + if (size || pi) + emitcode ("inc", "%s", rname); - offset++; - } + offset++; + } } /* now some housekeeping stuff */ if (aop) { - if (pi) aopPut (AOP (result),rname,0); + if (pi) + aopPut (result, rname, 0); /* we had to allocate for this iCode */ freeAsmop (NULL, aop, ic, TRUE); } @@ -9856,23 +11457,21 @@ genPagedPointerSet (operand * right, we have to point it back to where it belongs */ if (AOP_SIZE (right) > 1 && - !OP_SYMBOL (result)->remat && - (OP_SYMBOL (result)->liveTo > ic->seq || - ic->depth) && - !pi) - { - int size = AOP_SIZE (right) - 1; - while (size--) - emitcode ("dec", "%s", rname); - } + !OP_SYMBOL (result)->remat && + (OP_SYMBOL (result)->liveTo > ic->seq || + ic->depth) && + !pi) + { + int size = AOP_SIZE (right) - 1; + while (size--) + emitcode ("dec", "%s", rname); + } } /* done */ if (pi) pi->generated = 1; freeAsmop (result, NULL, ic, TRUE); freeAsmop (right, NULL, ic, TRUE); - - } /*-----------------------------------------------------------------*/ @@ -9880,7 +11479,7 @@ genPagedPointerSet (operand * right, /*-----------------------------------------------------------------*/ static void genFarPointerSet (operand * right, - operand * result, iCode * ic, iCode *pi) + operand * result, iCode * ic, iCode *pi) { int size, offset, dopi=1; sym_link *retype = getSpec (operandType (right)); @@ -9894,100 +11493,104 @@ 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 (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)); - if (options.model == MODEL_FLAT24) - emitcode ("mov", "dpx,%s", aopGet (AOP (result), 2, FALSE, FALSE, TRUE)); - } - 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)); - if (options.model == MODEL_FLAT24) - emitcode ("mov", "dpx,%s", aopGet (AOP (result), 2, FALSE, FALSE, TRUE)); - emitcode ("pop", "dph"); - emitcode ("pop", "dpl"); - dopi=0; - } - _endLazyDPSEvaluation (); - } - } - /* so dptr know contains the address */ + { + /* we need to get it byte by byte */ + _startLazyDPSEvaluation (); + if (AOP_TYPE (result) != AOP_DPTR) + { + emitcode ("mov", "dpl,%s", aopGet (result, 0, FALSE, FALSE, NULL)); + emitcode ("mov", "dph,%s", aopGet (result, 1, FALSE, FALSE, NULL)); + if (options.model == MODEL_FLAT24) + emitcode ("mov", "dpx,%s", aopGet (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 (result, 0, FALSE, TRUE, NULL)); + emitcode ("push", "%s", aopGet (result, 1, FALSE, TRUE, NULL)); + if (options.model == MODEL_FLAT24) + emitcode ("mov", "dpx,%s", aopGet (result, 2, FALSE, FALSE, NULL)); + emitcode ("pop", "dph"); + emitcode ("pop", "dpl"); + dopi=0; + } + _endLazyDPSEvaluation (); + } + } + /* so dptr now contains the address */ aopOp (right, ic, FALSE, (AOP_INDPTRn(result) ? FALSE : TRUE)); /* if bit then unpack */ - if (IS_BITVAR (retype) || IS_BITVAR (letype)) { + if (IS_BITFIELD (retype) || IS_BITFIELD (letype)) + { if (AOP_INDPTRn(result)) { - genSetDPTR(AOP(result)->aopu.dptr); + genSetDPTR(AOP(result)->aopu.dptr); } - genPackBits ((IS_BITVAR (retype) ? retype : letype), right, "dptr", FPOINTER); + genPackBits ((IS_BITFIELD (retype) ? retype : letype), right, "dptr", FPOINTER); if (AOP_INDPTRn(result)) { - genSetDPTR(0); + genSetDPTR(0); } } else { size = AOP_SIZE (right); offset = 0; if (AOP_INDPTRn(result) && AOP_USESDPTR(right)) { - while (size--) { - char *l = aopGet (AOP (right), offset++, FALSE, FALSE, TRUE); - MOVA (l); - - genSetDPTR(AOP(result)->aopu.dptr); - emitcode ("movx", "@dptr,a"); - if (size || (dopi && pi && AOP_TYPE (result) != AOP_IMMD)) - emitcode ("inc", "dptr"); - genSetDPTR (0); - } + while (size--) { + MOVA (aopGet (right, offset++, FALSE, FALSE, NULL)); + + genSetDPTR(AOP(result)->aopu.dptr); + emitcode ("movx", "@dptr,a"); + if (size || (dopi && pi && AOP_TYPE (result) != AOP_IMMD)) + emitcode ("inc", "dptr"); + genSetDPTR (0); + } } else { - _startLazyDPSEvaluation (); - while (size--) { - char *l = aopGet (AOP (right), offset++, FALSE, FALSE, TRUE); - MOVA (l); - - if (AOP_INDPTRn(result)) { - genSetDPTR(AOP(result)->aopu.dptr); - } else { - genSetDPTR (0); - } - _flushLazyDPS (); - - emitcode ("movx", "@dptr,a"); - if (size || (dopi && pi && AOP_TYPE (result) != AOP_IMMD)) - emitcode ("inc", "dptr"); - } - _endLazyDPSEvaluation (); + _startLazyDPSEvaluation (); + while (size--) { + MOVA (aopGet (right, offset++, FALSE, FALSE, NULL)); + + if (AOP_INDPTRn(result)) { + genSetDPTR(AOP(result)->aopu.dptr); + } else { + genSetDPTR (0); + } + _flushLazyDPS (); + + emitcode ("movx", "@dptr,a"); + if (size || (dopi && pi && AOP_TYPE (result) != AOP_IMMD)) + emitcode ("inc", "dptr"); + } + _endLazyDPSEvaluation (); } } - + if (dopi && pi && AOP_TYPE (result) != AOP_IMMD) { if (!AOP_INDPTRn(result)) { - aopPut (AOP(result),"dpl",0); - aopPut (AOP(result),"dph",1); - if (options.model == MODEL_FLAT24) - aopPut (AOP(result),"dpx",2); + _startLazyDPSEvaluation (); + + aopPut (result,"dpl",0); + aopPut (result,"dph",1); + if (options.model == MODEL_FLAT24) + aopPut (result,"dpx",2); + + _endLazyDPSEvaluation (); } pi->generated=1; - } else if ((OP_SYMBOL(result)->ruonly || AOP_INDPTRn(result)) && - AOP_SIZE(right) > 1 && - (OP_SYMBOL (result)->liveTo > ic->seq || ic->depth)) { - + } else if ((OP_SYMBOL(result)->ruonly || AOP_INDPTRn(result)) && + AOP_SIZE(right) > 1 && + (OP_SYMBOL (result)->liveTo > ic->seq || ic->depth)) { + size = AOP_SIZE (right) - 1; if (AOP_INDPTRn(result)) { - genSetDPTR(AOP(result)->aopu.dptr); - } + genSetDPTR(AOP(result)->aopu.dptr); + } while (size--) emitcode ("lcall","__decdptr"); if (AOP_INDPTRn(result)) { - genSetDPTR(0); + genSetDPTR(0); } } freeAsmop (result, NULL, ic, TRUE); @@ -9999,14 +11602,16 @@ genFarPointerSet (operand * right, /*-----------------------------------------------------------------*/ static void genGenPointerSet (operand * right, - operand * result, iCode * ic, iCode *pi) + operand * result, iCode * ic, iCode *pi) { int size, offset; + bool pushedB; 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); + pushedB = pushB (); /* if the operand is already in dptr then we do nothing else we move the value to dptr */ if (AOP_TYPE (result) != AOP_STR) @@ -10014,69 +11619,104 @@ genGenPointerSet (operand * right, _startLazyDPSEvaluation (); /* if this is remateriazable */ if (AOP_TYPE (result) == AOP_IMMD) - { - emitcode ("mov", "dptr,%s", aopGet (AOP (result), 0, TRUE, FALSE, FALSE)); - if (AOP(result)->aopu.aop_immd.from_cast_remat) - emitcode ("mov", "b,%s",aopGet(AOP (result), AOP_SIZE(result)-1, FALSE, FALSE, FALSE)); - else - emitcode ("mov", "b,%s + 1", aopGet (AOP (result), 0, TRUE, FALSE, FALSE)); - } + { + emitcode ("mov", "dptr,%s", aopGet (result, 0, TRUE, FALSE, NULL)); + if (AOP(result)->aopu.aop_immd.from_cast_remat) + { + MOVB (aopGet (result, AOP_SIZE(result)-1, FALSE, FALSE, NULL)); + } + else + { + emitcode ("mov", + "b,%s + 1", aopGet (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)); - 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)); - } else { - emitcode ("mov", "b,%s", aopGet (AOP (result), 2, FALSE, FALSE, TRUE)); - } - } + { /* we need to get it byte by byte */ + emitcode ("mov", "dpl,%s", aopGet (result, 0, FALSE, FALSE, NULL)); + emitcode ("mov", "dph,%s", aopGet (result, 1, FALSE, FALSE, NULL)); + if (options.model == MODEL_FLAT24) { + emitcode ("mov", "dpx,%s", aopGet (result, 2, FALSE, FALSE, NULL)); + emitcode ("mov", "b,%s", aopGet (result, 3, FALSE, FALSE, NULL)); + } else { + emitcode ("mov", "b,%s", aopGet (result, 2, FALSE, FALSE, NULL)); + } + } _endLazyDPSEvaluation (); } - /* so dptr know contains the address */ + /* so dptr + b now contains the address */ aopOp (right, ic, FALSE, TRUE); /* if bit then unpack */ - if (IS_BITVAR (retype) || IS_BITVAR (letype)) - genPackBits ((IS_BITVAR (retype) ? retype : letype), right, "dptr", GPOINTER); + if (IS_BITFIELD (retype) || IS_BITFIELD (letype)) + { + genPackBits ((IS_BITFIELD (retype) ? retype : letype), right, "dptr", GPOINTER); + } else { - size = AOP_SIZE (right); - offset = 0; - - _startLazyDPSEvaluation (); - while (size--) - { - char *l = aopGet (AOP (right), offset++, FALSE, FALSE, TRUE); - MOVA (l); - - genSetDPTR (0); - _flushLazyDPS (); + size = AOP_SIZE (right); + offset = 0; - emitcode ("lcall", "__gptrput"); - if (size || (pi && AOP_TYPE (result) != AOP_IMMD)) - emitcode ("inc", "dptr"); - } - _endLazyDPSEvaluation (); + _startLazyDPSEvaluation (); + while (size--) + { + 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 (right, offset++, FALSE, FALSE, NULL)); + MOVA (aopGet (right, offset++, FALSE, FALSE, NULL)); + + genSetDPTR (0); + _flushLazyDPS (); + emitcode ("lcall", "__gptrputWord"); + size--; + } + else + { + // Only one byte to put. + MOVA (aopGet (right, offset++, FALSE, FALSE, NULL)); + + genSetDPTR (0); + _flushLazyDPS (); + emitcode ("lcall", "__gptrput"); + } + + if (size || (pi && AOP_TYPE (result) != AOP_IMMD)) + { + emitcode ("inc", "dptr"); + } + } + _endLazyDPSEvaluation (); } if (pi && AOP_TYPE (result) != AOP_IMMD) { - aopPut (AOP(result),"dpl",0); - aopPut (AOP(result),"dph",1); + _startLazyDPSEvaluation (); + + aopPut (result, "dpl",0); + aopPut (result, "dph",1); if (options.model == MODEL_FLAT24) { - aopPut (AOP(result),"dpx",2); - aopPut (AOP(result),"b",3); + aopPut (result, "dpx",2); + aopPut (result, "b",3); } else { - aopPut (AOP(result),"b",2); + aopPut (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)) { - + (OP_SYMBOL (result)->liveTo > ic->seq || ic->depth)) { + size = AOP_SIZE (right) - 1; while (size--) emitcode ("lcall","__decdptr"); } + popB (pushedB); + freeAsmop (result, NULL, ic, TRUE); freeAsmop (right, NULL, ic, TRUE); } @@ -10091,8 +11731,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); @@ -10111,12 +11750,13 @@ genPointerSet (iCode * ic, iCode *pi) /* we have to go by the storage class */ p_type = PTR_TYPE (SPEC_OCLS (etype)); } + /* special case when cast remat */ 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); - p_type = DCL_TYPE (type); + result = IC_RIGHT(OP_SYMBOL(result)->rematiCode); + type = operandType (result); + p_type = DCL_TYPE (type); } /* now that we have the pointer type we assign @@ -10140,8 +11780,11 @@ genPointerSet (iCode * ic, iCode *pi) case GPOINTER: genGenPointerSet (right, result, ic, pi); break; - } + default: + werror (E_INTERNAL_ERROR, __FILE__, __LINE__, + "genPointerSet: illegal pointer type"); + } } /*-----------------------------------------------------------------*/ @@ -10152,26 +11795,35 @@ genIfx (iCode * ic, iCode * popIc) { operand *cond = IC_COND (ic); int isbit = 0; + char *dup = NULL; - D (emitcode (";", "genIfx ");); + D (emitcode (";", "genIfx")); aopOp (cond, ic, FALSE, FALSE); /* get the value into acc */ if (AOP_TYPE (cond) != AOP_CRY) - toBoolean (cond); + { + toBoolean (cond); + } else - isbit = 1; - /* the result is now in the accumulator */ + { + isbit = 1; + if (AOP(cond)->aopu.aop_dir) + dup = Safe_strdup(AOP(cond)->aopu.aop_dir); + } + + /* the result is now in the accumulator or a directly addressable bit */ freeAsmop (cond, NULL, ic, TRUE); /* if there was something to be popped then do it */ if (popIc) genIpop (popIc); - /* if the condition is a bit variable */ - if (isbit && IS_ITEMP (cond) && - SPIL_LOC (cond)) + /* if the condition is a bit variable */ + if (isbit && dup) + genIfxJump (ic, dup); + else if (isbit && IS_ITEMP (cond) && SPIL_LOC (cond)) genIfxJump (ic, SPIL_LOC (cond)->rname); else if (isbit && !IS_ITEMP (cond)) genIfxJump (ic, OP_SYMBOL (cond)->rname); @@ -10190,71 +11842,82 @@ genAddrOf (iCode * ic) symbol *sym = OP_SYMBOL (IC_LEFT (ic)); int size, offset; - D (emitcode (";", "genAddrOf "); - ); + D (emitcode (";", "genAddrOf")); aopOp (IC_RESULT (ic), ic, FALSE, FALSE); /* if the operand is on the stack then we need to get the stack offset of this variable */ - if (sym->onStack) { - + if (sym->onStack) + { + /* if 10 bit stack */ if (options.stack10bit) { - char buff[10]; - tsprintf(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); - if (sym->stack) { - emitcode ("mov", "a,_bpx"); - emitcode ("add", "a,#!constbyte", ((sym->stack < 0) ? - ((char) (sym->stack - _G.nRegsSaved)) : - ((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); - aopPut (AOP (IC_RESULT (ic)), "b", 0); - aopPut (AOP (IC_RESULT (ic)), "a", 1); - aopPut (AOP (IC_RESULT (ic)), buff, 2); - } else { - /* we can just move _bp */ - aopPut (AOP (IC_RESULT (ic)), "_bpx", 0); - aopPut (AOP (IC_RESULT (ic)), "_bpx+1", 1); - aopPut (AOP (IC_RESULT (ic)), buff, 2); - } + char buff[10]; + 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); */ + if (sym->stack) { + emitcode ("mov", "a,_bpx"); + emitcode ("add", "a,#!constbyte", ((sym->stack < 0) ? + ((char) (sym->stack - _G.nRegsSaved)) : + ((char) sym->stack )) & 0xff); + emitcode ("mov", "b,a"); + emitcode ("mov", "a,_bpx+1"); + + offset = (((sym->stack < 0) ? + ((short) (sym->stack - _G.nRegsSaved)) : + ((short) sym->stack )) >> 8) & 0xff; + + emitcode ("addc","a,#!constbyte", offset); + + aopPut (IC_RESULT (ic), "b", 0); + aopPut (IC_RESULT (ic), "a", 1); + aopPut (IC_RESULT (ic), buff, 2); + } else { + /* we can just move _bp */ + aopPut (IC_RESULT (ic), "_bpx", 0); + aopPut (IC_RESULT (ic), "_bpx+1", 1); + aopPut (IC_RESULT (ic), buff, 2); + } } else { - /* if it has an offset then we need to compute it */ - if (sym->stack) { - emitcode ("mov", "a,_bp"); - emitcode ("add", "a,#!constbyte", ((char) sym->stack & 0xff)); - aopPut (AOP (IC_RESULT (ic)), "a", 0); - } else { - /* we can just move _bp */ - aopPut (AOP (IC_RESULT (ic)), "_bp", 0); - } - /* fill the result with zero */ - size = AOP_SIZE (IC_RESULT (ic)) - 1; - - - if (options.stack10bit && size < (FPTRSIZE - 1)) { - fprintf (stderr, - "*** warning: pointer to stack var truncated.\n"); - } - - offset = 1; - while (size--) { - aopPut (AOP (IC_RESULT (ic)), zero, offset++); - } + /* if it has an offset then we need to compute it */ + if (sym->stack) + { + emitcode ("mov", "a,_bp"); + emitcode ("add", "a,#!constbyte", ((char) sym->stack & 0xff)); + aopPut (IC_RESULT (ic), "a", 0); + } + else + { + /* we can just move _bp */ + aopPut (IC_RESULT (ic), "_bp", 0); + } + /* fill the result with zero */ + size = AOP_SIZE (IC_RESULT (ic)) - 1; + + + if (options.stack10bit && size < (FPTRSIZE - 1)) { + fprintf (stderr, + "*** warning: pointer to stack var truncated.\n"); + } + + offset = 1; + while (size--) + { + aopPut (IC_RESULT (ic), zero, offset++); + } } goto release; } @@ -10267,24 +11930,28 @@ genAddrOf (iCode * ic) { char s[SDCC_NAME_MAX]; if (offset) { - switch (offset) { - case 1: - tsprintf(s,"!his",sym->rname); - break; - case 2: - tsprintf(s,"!hihis",sym->rname); - break; - case 3: - tsprintf(s,"!hihihis",sym->rname); - break; - default: /* should not need this (just in case) */ - sprintf (s, "#(%s >> %d)", - sym->rname, - offset * 8); - } - } else - sprintf (s, "#%s", sym->rname); - aopPut (AOP (IC_RESULT (ic)), s, offset++); + switch (offset) { + case 1: + tsprintf(s, sizeof(s), "#!his",sym->rname); + break; + case 2: + tsprintf(s, sizeof(s), "#!hihis",sym->rname); + break; + case 3: + tsprintf(s, sizeof(s), "#!hihihis",sym->rname); + break; + default: /* should not need this (just in case) */ + SNPRINTF (s, sizeof(s), "#(%s >> %d)", + sym->rname, + offset * 8); + } + } + else + { + SNPRINTF (s, sizeof(s), "#%s", sym->rname); + } + + aopPut (IC_RESULT (ic), s, offset++); } release: @@ -10292,6 +11959,7 @@ release: } +#if 0 // obsolete, and buggy for != xdata /*-----------------------------------------------------------------*/ /* genArrayInit - generates code for address of */ /*-----------------------------------------------------------------*/ @@ -10304,102 +11972,103 @@ genArrayInit (iCode * ic) unsigned val, lastVal; sym_link *type; operand *left=IC_LEFT(ic); - - D (emitcode (";", "genArrayInit ");); + + D (emitcode (";", "genArrayInit")); aopOp (IC_LEFT(ic), ic, FALSE, FALSE); - + if (AOP_TYPE(IC_LEFT(ic)) == AOP_IMMD) { - // Load immediate value into DPTR. - emitcode("mov", "dptr, %s", - aopGet(AOP(IC_LEFT(ic)), 0, TRUE, FALSE, TRUE)); + // Load immediate value into DPTR. + emitcode("mov", "dptr, %s", + aopGet (IC_LEFT(ic), 0, TRUE, FALSE, NULL)); } else if (AOP_TYPE(IC_LEFT(ic)) != AOP_DPTR) { #if 0 werror (E_INTERNAL_ERROR, __FILE__, __LINE__, - "Unexpected operand to genArrayInit.\n"); + "Unexpected operand to genArrayInit.\n"); 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 (left, 0, FALSE, FALSE, NULL)); + emitcode ("mov", "dph,%s", aopGet (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 (left, 2, FALSE, FALSE, NULL)); #endif } - + type = operandType(IC_LEFT(ic)); - + if (type && type->next) { - elementSize = getSize(type->next); + elementSize = getSize(type->next); } else { - werror (E_INTERNAL_ERROR, __FILE__, __LINE__, - "can't determine element size in genArrayInit.\n"); - exit(1); + werror (E_INTERNAL_ERROR, __FILE__, __LINE__, + "can't determine element size in genArrayInit.\n"); + exit(1); } - + iLoop = IC_ARRAYILIST(ic); lastVal = 0xffff; - + while (iLoop) { - bool firstpass = TRUE; - - emitcode(";", "store %d x 0x%x to DPTR (element size %d)", - iLoop->count, (int)iLoop->literalValue, elementSize); - - ix = iLoop->count; - - while (ix) - { - symbol *tlbl = NULL; - - count = ix > 256 ? 256 : ix; - - if (count > 1) - { - tlbl = newiTempLabel (NULL); - if (firstpass || (count & 0xff)) - { - emitcode("mov", "b, #!constbyte", count & 0xff); - } - - emitcode ("", "!tlabeldef", tlbl->key + 100); - } - - firstpass = FALSE; - - for (eIndex = 0; eIndex < elementSize; eIndex++) - { - val = (((int)iLoop->literalValue) >> (eIndex * 8)) & 0xff; - if (val != lastVal) - { - emitcode("mov", "a, #!constbyte", val); - lastVal = val; - } - - emitcode("movx", "@dptr, a"); - emitcode("inc", "dptr"); - } - - if (count > 1) - { - emitcode("djnz", "b, !tlabel", tlbl->key + 100); - } - - ix -= count; - } - - iLoop = iLoop->next; - } - + bool firstpass = TRUE; + + emitcode(";", "store %d x 0x%x to DPTR (element size %d)", + iLoop->count, (int)iLoop->literalValue, elementSize); + + ix = iLoop->count; + + while (ix) + { + symbol *tlbl = NULL; + + count = ix > 256 ? 256 : ix; + + if (count > 1) + { + tlbl = newiTempLabel (NULL); + if (firstpass || (count & 0xff)) + { + emitcode("mov", "b, #!constbyte", count & 0xff); + } + + emitLabel (tlbl); + } + + firstpass = FALSE; + + for (eIndex = 0; eIndex < elementSize; eIndex++) + { + val = (((int)iLoop->literalValue) >> (eIndex * 8)) & 0xff; + if (val != lastVal) + { + emitcode("mov", "a, #!constbyte", val); + lastVal = val; + } + + emitcode("movx", "@dptr, a"); + emitcode("inc", "dptr"); + } + + if (count > 1) + { + emitcode("djnz", "b, !tlabel", tlbl->key + 100); + } + + ix -= count; + } + + iLoop = iLoop->next; + } + freeAsmop (IC_LEFT(ic), NULL, ic, TRUE); } +#endif /*-----------------------------------------------------------------*/ /* genFarFarAssign - assignment when both are in far space */ @@ -10414,38 +12083,38 @@ genFarFarAssign (operand * result, operand * right, iCode * ic) if (size == 1) { /* quick & easy case. */ - D(emitcode(";","genFarFarAssign (1 byte case)");); - MOVA(aopGet(AOP(right), 0, FALSE, FALSE, TRUE)); + D (emitcode(";","genFarFarAssign (1 byte case)")); + MOVA (aopGet (right, 0, FALSE, FALSE, NULL)); freeAsmop (right, NULL, ic, FALSE); /* now assign DPTR to result */ _G.accInUse++; aopOp(result, ic, FALSE, FALSE); _G.accInUse--; - aopPut(AOP(result), "a", 0); + aopPut (result, "a", 0); freeAsmop(result, NULL, ic, FALSE); return; } - + /* See if we've got an underlying symbol to abuse. */ if (IS_SYMOP(result) && OP_SYMBOL(result)) { if (IS_TRUE_SYMOP(result)) { - rSym = OP_SYMBOL(result); + rSym = OP_SYMBOL(result); } else if (IS_ITEMP(result) && OP_SYMBOL(result)->isspilt && OP_SYMBOL(result)->usl.spillLoc) { - rSym = OP_SYMBOL(result)->usl.spillLoc; + rSym = OP_SYMBOL(result)->usl.spillLoc; } } - + if (size > 1 && rSym && rSym->rname && !rSym->onStack) { /* We can use the '390 auto-toggle feature to good effect here. */ - - D(emitcode(";","genFarFarAssign (390 auto-toggle fun)");); - emitcode("mov", "dps,#!constbyte",0x21); /* Select DPTR2 & auto-toggle. */ - emitcode ("mov", "dptr,#%s", rSym->rname); + + D (emitcode(";", "genFarFarAssign (390 auto-toggle fun)")); + emitcode("mov", "dps,#!constbyte",0x21); /* Select DPTR2 & auto-toggle. */ + emitcode ("mov", "dptr,#%s", rSym->rname); /* DP2 = result, DP1 = right, DP1 is current. */ while (size) { @@ -10462,9 +12131,9 @@ genFarFarAssign (operand * result, operand * right, iCode * ic) #if 0 some alternative code for processors without auto-toggle no time to test now, so later well put in...kpb - D(emitcode(";","genFarFarAssign (dual-dptr fun)");); - emitcode("mov", "dps,#1"); /* Select DPTR2. */ - emitcode ("mov", "dptr,#%s", rSym->rname); + D (emitcode(";", "genFarFarAssign (dual-dptr fun)")); + emitcode("mov", "dps,#1"); /* Select DPTR2. */ + emitcode ("mov", "dptr,#%s", rSym->rname); /* DP2 = result, DP1 = right, DP1 is current. */ while (size) { @@ -10484,17 +12153,17 @@ no time to test now, so later well put in...kpb } else { - D (emitcode (";", "genFarFarAssign");); + D (emitcode (";", "genFarFarAssign")); aopOp (result, ic, TRUE, TRUE); _startLazyDPSEvaluation (); - + while (size--) - { - aopPut (AOP (result), - aopGet (AOP (right), offset, FALSE, FALSE, FALSE), offset); - offset++; - } + { + aopPut (result, + aopGet (right, offset, FALSE, FALSE, NULL), offset); + offset++; + } _endLazyDPSEvaluation (); freeAsmop (result, NULL, ic, FALSE); freeAsmop (right, NULL, ic, FALSE); @@ -10511,8 +12180,7 @@ genAssign (iCode * ic) int size, offset; unsigned long lit = 0L; - D (emitcode (";", "genAssign "); - ); + D (emitcode (";", "genAssign")); result = IC_RESULT (ic); right = IC_RIGHT (ic); @@ -10524,8 +12192,8 @@ genAssign (iCode * ic) aopOp (right, ic, FALSE, FALSE); emitcode (";", "genAssign: resultIsFar = %s", - isOperandInFarSpace (result) ? - "TRUE" : "FALSE"); + isOperandInFarSpace (result) ? + "TRUE" : "FALSE"); /* special case both in far space */ if ((AOP_TYPE (right) == AOP_DPTR || @@ -10549,25 +12217,25 @@ genAssign (iCode * ic) /* if the right size is a literal then we know what the value is */ if (AOP_TYPE (right) == AOP_LIT) - { - if (((int) operandLitValue (right))) - aopPut (AOP (result), one, 0); - else - aopPut (AOP (result), zero, 0); - goto release; - } + { + if (((int) operandLitValue (right))) + aopPut (result, one, 0); + else + aopPut (result, zero, 0); + goto release; + } /* the right is also a bit variable */ if (AOP_TYPE (right) == AOP_CRY) - { - emitcode ("mov", "c,%s", AOP (right)->aopu.aop_dir); - aopPut (AOP (result), "c", 0); - goto release; - } + { + emitcode ("mov", "c,%s", AOP (right)->aopu.aop_dir); + aopPut (result, "c", 0); + goto release; + } /* we need to or */ toBoolean (right); - aopPut (AOP (result), "a", 0); + aopPut (result, "a", 0); goto release; } @@ -10585,40 +12253,40 @@ genAssign (iCode * ic) { _startLazyDPSEvaluation (); while (size && ((unsigned int) (lit >> (offset * 8)) != 0)) - { - aopPut (AOP (result), - aopGet (AOP (right), offset, FALSE, FALSE, TRUE), - offset); - offset++; - size--; - } + { + aopPut (result, + aopGet (right, offset, FALSE, FALSE, NULL), + offset); + offset++; + size--; + } /* And now fill the rest with zeros. */ if (size) - { - emitcode ("clr", "a"); - } + { + emitcode ("clr", "a"); + } while (size--) - { - aopPut (AOP (result), "a", offset++); - } + { + aopPut (result, "a", offset++); + } _endLazyDPSEvaluation (); } else { _startLazyDPSEvaluation (); while (size--) - { - aopPut (AOP (result), - aopGet (AOP (right), offset, FALSE, FALSE, FALSE), - offset); - offset++; - } + { + aopPut (result, + aopGet (right, offset, FALSE, FALSE, NULL), + offset); + offset++; + } _endLazyDPSEvaluation (); } release: - freeAsmop (right, NULL, ic, FALSE); freeAsmop (result, NULL, ic, TRUE); + freeAsmop (right, NULL, ic, TRUE); } /*-----------------------------------------------------------------*/ @@ -10630,12 +12298,11 @@ genJumpTab (iCode * ic) symbol *jtab; char *l; - D (emitcode (";", "genJumpTab "); - ); + D (emitcode (";", "genJumpTab")); aopOp (IC_JTCOND (ic), ic, FALSE, FALSE); /* get the condition into accumulator */ - l = aopGet (AOP (IC_JTCOND (ic)), 0, FALSE, FALSE, TRUE); + l = aopGet (IC_JTCOND (ic), 0, FALSE, FALSE, NULL); MOVA (l); /* multiply by four! */ emitcode ("add", "a,acc"); @@ -10645,7 +12312,7 @@ genJumpTab (iCode * ic) jtab = newiTempLabel (NULL); emitcode ("mov", "dptr,#!tlabel", jtab->key + 100); emitcode ("jmp", "@a+dptr"); - emitcode ("", "!tlabeldef", jtab->key + 100); + emitLabel (jtab); /* now generate the jump labels */ for (jtab = setFirstItem (IC_JTLABELS (ic)); jtab; jtab = setNextItem (IC_JTLABELS (ic))) @@ -10665,43 +12332,41 @@ 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 (right, ic, FALSE, AOP_IS_STR (result)); + 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 the result is a bit (and not a bitfield) */ + if (IS_BIT (OP_SYMBOL (result)->type)) { /* if the right size is a literal then we know what the value is */ if (AOP_TYPE (right) == AOP_LIT) - { - if (((int) operandLitValue (right))) - aopPut (AOP (result), one, 0); - else - aopPut (AOP (result), zero, 0); + { + if (((int) operandLitValue (right))) + aopPut (result, one, 0); + else + aopPut (result, zero, 0); - goto release; - } + goto release; + } /* the right is also a bit variable */ if (AOP_TYPE (right) == AOP_CRY) - { - emitcode ("mov", "c,%s", AOP (right)->aopu.aop_dir); - aopPut (AOP (result), "c", 0); - goto release; - } + { + emitcode ("mov", "c,%s", AOP (right)->aopu.aop_dir); + aopPut (result, "c", 0); + goto release; + } /* we need to or */ toBoolean (right); - aopPut (AOP (result), "a", 0); + aopPut (result, "a", 0); goto release; } @@ -10711,24 +12376,23 @@ genCast (iCode * ic) /* if they are in the same place */ if (sameRegs (AOP (right), AOP (result))) - goto release; + goto release; /* if they in different places then copy */ size = AOP_SIZE (result); offset = 0; _startLazyDPSEvaluation (); while (size--) - { - aopPut (AOP (result), - aopGet (AOP (right), offset, FALSE, FALSE, FALSE), - offset); - offset++; - } + { + aopPut (result, + aopGet (right, offset, FALSE, FALSE, NULL), + offset); + offset++; + } _endLazyDPSEvaluation (); goto release; } - /* if the result is of type pointer */ if (IS_PTR (ctype)) { @@ -10738,105 +12402,93 @@ genCast (iCode * ic) /* pointer to generic pointer */ if (IS_GENPTR (ctype)) - { - char *l = zero; - - if (IS_PTR (type)) - { - p_type = DCL_TYPE (type); - } - else - { + { + if (IS_PTR (type)) + { + p_type = DCL_TYPE (type); + } + else + { #if OLD_CAST_BEHAVIOR - /* KV: we are converting a non-pointer type to - * a generic pointer. This (ifdef'd out) code - * says that the resulting generic pointer - * should have the same class as the storage - * location of the non-pointer variable. - * - * For example, converting an int (which happens - * to be stored in DATA space) to a pointer results - * in a DATA generic pointer; if the original int - * in XDATA space, so will be the resulting pointer. - * - * I don't like that behavior, and thus this change: - * all such conversions will be forced to XDATA and - * throw a warning. If you want some non-XDATA - * type, or you want to suppress the warning, you - * must go through an intermediate cast, like so: - * - * char _generic *gp = (char _xdata *)(intVar); - */ - sym_link *etype = getSpec (type); - - /* we have to go by the storage class */ - if (SPEC_OCLS (etype) != generic) - { - p_type = PTR_TYPE (SPEC_OCLS (etype)); - } - else + /* KV: we are converting a non-pointer type to + * a generic pointer. This (ifdef'd out) code + * says that the resulting generic pointer + * should have the same class as the storage + * location of the non-pointer variable. + * + * For example, converting an int (which happens + * to be stored in DATA space) to a pointer results + * in a DATA generic pointer; if the original int + * in XDATA space, so will be the resulting pointer. + * + * I don't like that behavior, and thus this change: + * all such conversions will be forced to XDATA and + * throw a warning. If you want some non-XDATA + * type, or you want to suppress the warning, you + * must go through an intermediate cast, like so: + * + * char _generic *gp = (char _xdata *)(intVar); + */ + sym_link *etype = getSpec (type); + + /* we have to go by the storage class */ + if (SPEC_OCLS (etype) != generic) + { + p_type = PTR_TYPE (SPEC_OCLS (etype)); + } + else #endif - { - /* Converting unknown class (i.e. register variable) - * to generic pointer. This is not good, but - * we'll make a guess (and throw a warning). - */ - p_type = FPOINTER; - werror (W_INT_TO_GEN_PTR_CAST); - } - } - - /* the first two bytes are known */ - size = GPTRSIZE - 1; - offset = 0; - _startLazyDPSEvaluation (); - while (size--) - { - aopPut (AOP (result), - aopGet (AOP (right), offset, FALSE, FALSE, FALSE), - 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); - } - aopPut (AOP (result), l, GPTRSIZE - 1); - goto release; - } + { + /* Converting unknown class (i.e. register variable) + * to generic pointer. This is not good, but + * we'll make a guess (and throw a warning). + */ + p_type = FPOINTER; + werror (W_INT_TO_GEN_PTR_CAST); + } + } + + /* the first two bytes are known */ + size = GPTRSIZE - 1; + offset = 0; + _startLazyDPSEvaluation (); + while (size--) + { + aopPut (result, + aopGet (right, offset, FALSE, FALSE, NULL), + offset); + offset++; + } + _endLazyDPSEvaluation (); + + /* the last byte depending on type */ + { + int gpVal = pointerTypeToGPByte(p_type, NULL, NULL); + char gpValStr[10]; + + if (gpVal == -1) + { + // pointerTypeToGPByte will have bitched. + exit(1); + } + + SNPRINTF(gpValStr, sizeof(gpValStr), "#0x%x", gpVal); + aopPut (result, gpValStr, GPTRSIZE - 1); + } + goto release; + } /* just copy the pointers */ size = AOP_SIZE (result); offset = 0; _startLazyDPSEvaluation (); while (size--) - { - aopPut (AOP (result), - aopGet (AOP (right), offset, FALSE, FALSE, FALSE), - offset); - offset++; - } + { + aopPut (result, + aopGet (right, offset, FALSE, FALSE, NULL), + offset); + offset++; + } _endLazyDPSEvaluation (); goto release; } @@ -10849,9 +12501,9 @@ genCast (iCode * ic) _startLazyDPSEvaluation (); while (size--) { - aopPut (AOP (result), - aopGet (AOP (right), offset, FALSE, FALSE, FALSE), - offset); + aopPut (result, + aopGet (right, offset, FALSE, FALSE, NULL), + offset); offset++; } _endLazyDPSEvaluation (); @@ -10862,23 +12514,22 @@ 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--) - { - aopPut (AOP (result), zero, offset++); - } + { + aopPut (result, zero, offset++); + } } else { /* we need to extend the sign :{ */ - char *l = aopGet (AOP (right), AOP_SIZE (right) - 1, - FALSE, FALSE, TRUE); - MOVA (l); + MOVA (aopGet (right, AOP_SIZE (right) - 1, + FALSE, FALSE, NULL)); emitcode ("rlc", "a"); emitcode ("subb", "a,acc"); while (size--) - aopPut (AOP (result), "a", offset++); + aopPut (result, "a", offset++); } /* we are done hurray !!!! */ @@ -10890,258 +12541,116 @@ release: } /*-----------------------------------------------------------------*/ -/* genDjnz - generate decrement & jump if not zero instrucion */ +/* genMemcpyX2X - gen code for memcpy xdata to xdata */ /*-----------------------------------------------------------------*/ -static int -genDjnz (iCode * ic, iCode * ifx) +static void genMemcpyX2X( iCode *ic, int nparms, operand **parms, int fromc) { - symbol *lbl, *lbl1; - if (!ifx) - return 0; + operand *from , *to , *count; + symbol *lbl; + bitVect *rsave; + int i; - /* if the if condition has a false label - then we cannot save */ - if (IC_FALSE (ifx)) - return 0; + /* we know it has to be 3 parameters */ + assert (nparms == 3); - /* if the minus is not of the form - a = a - 1 */ - if (!isOperandEqual (IC_RESULT (ic), IC_LEFT (ic)) || - !IS_OP_LITERAL (IC_RIGHT (ic))) - return 0; + rsave = newBitVect(16); + /* save DPTR if it needs to be saved */ + for (i = DPL_IDX ; i <= B_IDX ; i++ ) { + if (bitVectBitValue(ic->rMask,i)) + rsave = bitVectSetBit(rsave,i); + } + rsave = bitVectIntersect(rsave,bitVectCplAnd (bitVectCopy (ic->rMask), + ds390_rUmaskForOp (IC_RESULT(ic)))); + savermask(rsave); - if (operandLitValue (IC_RIGHT (ic)) != 1) - return 0; + to = parms[0]; + from = parms[1]; + count = parms[2]; - /* if the size of this greater than one then no - saving */ - if (getSize (operandType (IC_RESULT (ic))) > 1) - return 0; + aopOp (from, ic->next, FALSE, FALSE); - /* otherwise we can save BIG */ - D(emitcode(";", "genDjnz");); + /* get from into DPTR1 */ + emitcode ("mov", "dpl1,%s", aopGet (from, 0, FALSE, FALSE, NULL)); + emitcode ("mov", "dph1,%s", aopGet (from, 1, FALSE, FALSE, NULL)); + if (options.model == MODEL_FLAT24) { + emitcode ("mov", "dpx1,%s", aopGet (from, 2, FALSE, FALSE, NULL)); + } - lbl = newiTempLabel (NULL); - lbl1 = newiTempLabel (NULL); - - aopOp (IC_RESULT (ic), ic, FALSE, FALSE); - - if (AOP_NEEDSACC(IC_RESULT(ic))) - { - /* If the result is accessed indirectly via - * the accumulator, we must explicitly write - * it back after the decrement. - */ - char *rByte = aopGet(AOP(IC_RESULT(ic)), 0, FALSE, FALSE, TRUE); - - if (strcmp(rByte, "a")) - { - /* Something is hopelessly wrong */ - fprintf(stderr, "*** warning: internal error at %s:%d\n", - __FILE__, __LINE__); - /* We can just give up; the generated code will be inefficient, - * but what the hey. - */ - freeAsmop (IC_RESULT (ic), NULL, ic, TRUE); - return 0; - } - emitcode ("dec", "%s", rByte); - aopPut(AOP(IC_RESULT(ic)), rByte, 0); - emitcode ("jnz", "!tlabel", lbl->key + 100); - } - 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)); - emitcode ("jnz", "!tlabel", lbl->key + 100); - } - else - { - emitcode ("djnz", "%s,!tlabel", aopGet (AOP (IC_RESULT (ic)), 0, FALSE, TRUE, FALSE), - lbl->key + 100); - } - emitcode ("sjmp", "!tlabel", lbl1->key + 100); - emitcode ("", "!tlabeldef", lbl->key + 100); - emitcode ("ljmp", "!tlabel", IC_TRUE (ifx)->key + 100); - emitcode ("", "!tlabeldef", lbl1->key + 100); - - freeAsmop (IC_RESULT (ic), NULL, ic, TRUE); - ifx->generated = 1; - return 1; -} - -/*-----------------------------------------------------------------*/ -/* genReceive - generate code for a receive iCode */ -/*-----------------------------------------------------------------*/ -static void -genReceive (iCode * ic) -{ - - int size = getSize (operandType (IC_RESULT (ic))); - int offset = 0; - int rb1off ; - - 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 - 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); -} - -/*-----------------------------------------------------------------*/ -/* genMemcpyX2X - gen code for memcpy xdata to xdata */ -/*-----------------------------------------------------------------*/ -static void genMemcpyX2X( iCode *ic, int nparms, operand **parms, int fromc) -{ - operand *from , *to , *count; - symbol *lbl; - bitVect *rsave; - int i; - - /* we know it has to be 3 parameters */ - assert (nparms == 3); - - rsave = newBitVect(16); - /* save DPTR if it needs to be saved */ - for (i = DPL_IDX ; i <= B_IDX ; i++ ) { - if (bitVectBitValue(ic->rMask,i)) - rsave = bitVectSetBit(rsave,i); - } - rsave = bitVectIntersect(rsave,bitVectCplAnd (bitVectCopy (ic->rMask), - ds390_rUmaskForOp (IC_RESULT(ic)))); - savermask(rsave); - - to = parms[0]; - from = parms[1]; - count = parms[2]; - - 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)); - if (options.model == MODEL_FLAT24) { - emitcode ("mov", "dpx1,%s", aopGet (AOP (from), 2, FALSE, FALSE, TRUE)); - } - - freeAsmop (from, NULL, ic, FALSE); - aopOp (to, ic, FALSE, FALSE); - /* get "to" into DPTR */ - /* if the operand is already in dptr - then we do nothing else we move the value to dptr */ - 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)); - if (options.model == MODEL_FLAT24) - emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, TRUE)); - 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)); - } 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)); - if (options.model == MODEL_FLAT24) { - emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, TRUE)); - } - } - _endLazyDPSEvaluation (); - } - } - freeAsmop (to, NULL, ic, FALSE); - - aopOp (count, ic->next->next, FALSE,FALSE); - lbl =newiTempLabel(NULL); + freeAsmop (from, NULL, ic, FALSE); + aopOp (to, ic, FALSE, FALSE); + /* get "to" into DPTR */ + /* if the operand is already in dptr + then we do nothing else we move the value to dptr */ + 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 (to, 0, FALSE, TRUE, NULL)); + emitcode ("push", "%s", aopGet (to, 1, FALSE, TRUE, NULL)); + if (options.model == MODEL_FLAT24) + emitcode ("mov", "dpx,%s", aopGet (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 (to, 0, TRUE, FALSE, NULL)); + } else { /* we need to get it byte by byte */ + emitcode ("mov", "dpl,%s", aopGet (to, 0, FALSE, FALSE, NULL)); + emitcode ("mov", "dph,%s", aopGet (to, 1, FALSE, FALSE, NULL)); + if (options.model == MODEL_FLAT24) { + emitcode ("mov", "dpx,%s", aopGet (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); - 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); + if (AOP_TYPE(count) == AOP_LIT && + (int)floatFromVal (AOP(count)->aopu.aop_lit) <= 256) { + emitcode ("mov", "b,%s",aopGet(count,0,FALSE,FALSE,NULL)); + if (fromc) { + 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", "dps,#!constbyte",0x21); /* Select DPTR2 & auto-toggle. */ - emitcode ("","!tlabeldef",lbl->key+100); - 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 ("mov","a,b"); - emitcode ("orl","a,_ap"); - emitcode ("jz","!tlabel",lbl1->key+100); - emitcode ("mov","a,_ap"); - emitcode ("add","a,#!constbyte",0xFF); - emitcode ("mov","_ap,a"); - emitcode ("mov","a,b"); - emitcode ("addc","a,#!constbyte",0xFF); - emitcode ("mov","b,a"); - emitcode ("sjmp","!tlabel",lbl->key+100); - emitcode ("","!tlabeldef",lbl1->key+100); - } - emitcode ("mov", "dps,#0"); - freeAsmop (count, NULL, ic, FALSE); + symbol *lbl1 = newiTempLabel(NULL); + + emitcode (";"," Auto increment but no djnz"); + emitcode ("mov","_ap,%s",aopGet (count, 0, FALSE, TRUE, NULL)); + emitcode ("mov","b,%s",aopGet (count, 1, FALSE, TRUE, NULL)); + freeAsmop (count, NULL, ic, FALSE); + emitcode ("mov", "dps,#!constbyte",0x21); /* Select DPTR2 & auto-toggle. */ + emitLabel (lbl); + 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 ("mov","a,b"); + emitcode ("orl","a,_ap"); + emitcode ("jz","!tlabel",lbl1->key+100); + emitcode ("mov","a,_ap"); + emitcode ("add","a,#!constbyte",0xFF); + emitcode ("mov","_ap,a"); + emitcode ("mov","a,b"); + emitcode ("addc","a,#!constbyte",0xFF); + emitcode ("mov","b,a"); + emitcode ("sjmp","!tlabel",lbl->key+100); + emitLabel (lbl1); + } + emitcode ("mov", "dps,#0"); + _G.dptrInUse = _G.dptr1InUse = 0; unsavermask(rsave); } @@ -11158,17 +12667,17 @@ static void genMemcmpX2X( iCode *ic, int nparms, operand **parms, int fromc) /* we know it has to be 3 parameters */ assert (nparms == 3); - + rsave = newBitVect(16); /* save DPTR if it needs to be saved */ for (i = DPL_IDX ; i <= B_IDX ; i++ ) { - if (bitVectBitValue(ic->rMask,i)) - rsave = bitVectSetBit(rsave,i); + if (bitVectBitValue(ic->rMask,i)) + rsave = bitVectSetBit(rsave,i); } rsave = bitVectIntersect(rsave,bitVectCplAnd (bitVectCopy (ic->rMask), - ds390_rUmaskForOp (IC_RESULT(ic)))); + ds390_rUmaskForOp (IC_RESULT(ic)))); savermask(rsave); - + to = parms[0]; from = parms[1]; count = parms[2]; @@ -11176,10 +12685,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 (from, 0, FALSE, FALSE, NULL)); + emitcode ("mov", "dph1,%s", aopGet (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 (from, 2, FALSE, FALSE, NULL)); } freeAsmop (from, NULL, ic, FALSE); @@ -11188,98 +12697,89 @@ static void genMemcmpX2X( iCode *ic, int nparms, operand **parms, int fromc) /* if the operand is already in dptr then we do nothing else we move the value to dptr */ 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)); - if (options.model == MODEL_FLAT24) - emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, TRUE)); - 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)); - } 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)); - if (options.model == MODEL_FLAT24) { - emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, TRUE)); - } - } - _endLazyDPSEvaluation (); - } + /* if already in DPTR then we need to push */ + if (AOP_TYPE(to) == AOP_DPTR) { + emitcode ("push", "%s", aopGet (to, 0, FALSE, TRUE, NULL)); + emitcode ("push", "%s", aopGet (to, 1, FALSE, TRUE, NULL)); + if (options.model == MODEL_FLAT24) + emitcode ("mov", "dpx,%s", aopGet (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 (to, 0, TRUE, FALSE, NULL)); + } else { /* we need to get it byte by byte */ + emitcode ("mov", "dpl,%s", aopGet (to, 0, FALSE, FALSE, NULL)); + emitcode ("mov", "dph,%s", aopGet (to, 1, FALSE, FALSE, NULL)); + if (options.model == MODEL_FLAT24) { + emitcode ("mov", "dpx,%s", aopGet (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"); + if (AOP_TYPE(count) == AOP_LIT && + (int)floatFromVal (AOP(count)->aopu.aop_lit) <= 256) { + emitcode ("mov", "b,%s",aopGet(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(IC_RESULT(ic),"a",0); + freeAsmop (IC_RESULT(ic), 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", "dps,#!constbyte",0x21); /* Select DPTR2 & auto-toggle. */ - 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 ("mov","a,b"); - emitcode ("orl","a,_ap"); - emitcode ("jz","!tlabel",lbl1->key+100); - emitcode ("mov","a,_ap"); - emitcode ("add","a,#!constbyte",0xFF); - emitcode ("mov","_ap,a"); - emitcode ("mov","a,b"); - emitcode ("addc","a,#!constbyte",0xFF); - emitcode ("mov","b,a"); - emitcode ("sjmp","!tlabel",lbl->key+100); - emitcode ("","!tlabeldef",lbl1->key+100); - emitcode ("clr","a"); - } - 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"); - + symbol *lbl1 = newiTempLabel(NULL); + + emitcode("push","ar0"); + emitcode (";"," Auto increment but no djnz"); + emitcode ("mov","_ap,%s",aopGet (count, 0, FALSE, TRUE, NULL)); + emitcode ("mov","b,%s",aopGet (count, 1, FALSE, TRUE, NULL)); + freeAsmop (count, NULL, ic, FALSE); + emitcode ("mov", "dps,#!constbyte",0x21); /* Select DPTR2 & auto-toggle. */ + emitLabel (lbl); + 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 ("mov","a,b"); + emitcode ("orl","a,_ap"); + emitcode ("jz","!tlabel",lbl1->key+100); + emitcode ("mov","a,_ap"); + emitcode ("add","a,#!constbyte",0xFF); + emitcode ("mov","_ap,a"); + emitcode ("mov","a,b"); + emitcode ("addc","a,#!constbyte",0xFF); + emitcode ("mov","b,a"); + emitcode ("sjmp","!tlabel",lbl->key+100); + emitLabel (lbl1); + emitcode ("clr","a"); + emitLabel (lbl2); + aopOp (IC_RESULT(ic), ic, FALSE,FALSE); + aopPut(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); } @@ -11298,17 +12798,17 @@ static void genInp( iCode *ic, int nparms, operand **parms) /* we know it has to be 3 parameters */ assert (nparms == 3); - + rsave = newBitVect(16); /* save DPTR if it needs to be saved */ for (i = DPL_IDX ; i <= B_IDX ; i++ ) { - if (bitVectBitValue(ic->rMask,i)) - rsave = bitVectSetBit(rsave,i); + if (bitVectBitValue(ic->rMask,i)) + rsave = bitVectSetBit(rsave,i); } rsave = bitVectIntersect(rsave,bitVectCplAnd (bitVectCopy (ic->rMask), - ds390_rUmaskForOp (IC_RESULT(ic)))); + ds390_rUmaskForOp (IC_RESULT(ic)))); savermask(rsave); - + to = parms[0]; from = parms[1]; count = parms[2]; @@ -11316,10 +12816,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 (from, 0, FALSE, FALSE, NULL)); + emitcode ("mov", "dph1,%s", aopGet (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 (from, 2, FALSE, FALSE, NULL)); } freeAsmop (from, NULL, ic, FALSE); @@ -11328,76 +12828,79 @@ static void genInp( iCode *ic, int nparms, operand **parms) /* if the operand is already in dptr then we do nothing else we move the value to dptr */ 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)); - if (options.model == MODEL_FLAT24) - emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, TRUE)); - 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)); - } 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)); - if (options.model == MODEL_FLAT24) { - emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, TRUE)); - } - } - _endLazyDPSEvaluation (); - } + /* if already in DPTR then we need to push */ + if (AOP_TYPE(to) == AOP_DPTR) { + emitcode ("push", "%s", aopGet (to, 0, FALSE, TRUE, NULL)); + emitcode ("push", "%s", aopGet (to, 1, FALSE, TRUE, NULL)); + if (options.model == MODEL_FLAT24) + emitcode ("mov", "dpx,%s", aopGet (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 (to, 0, TRUE, FALSE, NULL)); + } else { /* we need to get it byte by byte */ + emitcode ("mov", "dpl,%s", aopGet (to, 0, FALSE, FALSE, NULL)); + emitcode ("mov", "dph,%s", aopGet (to, 1, FALSE, FALSE, NULL)); + if (options.model == MODEL_FLAT24) { + emitcode ("mov", "dpx,%s", aopGet (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",0x1); /* Select DPTR2 */ - emitcode ("mov", "b,%s",aopGet(AOP(count),0,FALSE,FALSE,FALSE)); - emitcode ("","!tlabeldef",lbl->key+100); - emitcode ("movx", "a,@dptr"); /* read data from port */ - emitcode ("dec","dps"); /* switch to DPTR */ - emitcode ("movx", "@dptr,a"); /* save into location */ - emitcode ("inc", "dptr"); /* point to next area */ - emitcode ("inc","dps"); /* switch to DPTR2 */ - emitcode ("djnz","b,!tlabel",lbl->key+100); + 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",0x1); /* Select DPTR2 */ + emitcode ("mov", "b,%s",aopGet(count,0,FALSE,FALSE,NULL)); + freeAsmop (count, NULL, ic, FALSE); + emitLabel (lbl); + emitcode ("movx", "a,@dptr"); /* read data from port */ + emitcode ("dec","dps"); /* switch to DPTR */ + emitcode ("movx", "@dptr,a"); /* save into location */ + emitcode ("inc", "dptr"); /* point to next area */ + emitcode ("inc","dps"); /* switch to DPTR2 */ + emitcode ("djnz","b,!tlabel",lbl->key+100); } 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", "dps,#!constbyte",0x1); /* Select DPTR2 */ - emitcode ("","!tlabeldef",lbl->key+100); - emitcode ("movx", "a,@dptr"); - emitcode ("dec","dps"); /* switch to DPTR */ - emitcode ("movx", "@dptr,a"); - emitcode ("inc", "dptr"); - emitcode ("inc","dps"); /* switch to DPTR2 */ -/* emitcode ("djnz","b,!tlabel",lbl->key+100); */ -/* emitcode ("djnz","_ap,!tlabel",lbl->key+100); */ - emitcode ("mov","a,b"); - emitcode ("orl","a,_ap"); - emitcode ("jz","!tlabel",lbl1->key+100); - emitcode ("mov","a,_ap"); - emitcode ("add","a,#!constbyte",0xFF); - emitcode ("mov","_ap,a"); - emitcode ("mov","a,b"); - emitcode ("addc","a,#!constbyte",0xFF); - emitcode ("mov","b,a"); - emitcode ("sjmp","!tlabel",lbl->key+100); - emitcode ("","!tlabeldef",lbl1->key+100); - } - emitcode ("mov", "dps,#0"); - freeAsmop (count, NULL, ic, FALSE); + symbol *lbl1 = newiTempLabel(NULL); + + emitcode (";"," Auto increment but no djnz"); + emitcode ("mov","_ap,%s",aopGet (count, 0, FALSE, TRUE, NULL)); + emitcode ("mov","b,%s",aopGet (count, 1, FALSE, TRUE, NULL)); + freeAsmop (count, NULL, ic, FALSE); + emitcode ("mov", "dps,#!constbyte",0x1); /* Select DPTR2 */ + emitLabel (lbl); + emitcode ("movx", "a,@dptr"); + emitcode ("dec","dps"); /* switch to DPTR */ + emitcode ("movx", "@dptr,a"); + emitcode ("inc", "dptr"); + emitcode ("inc","dps"); /* switch to DPTR2 */ +/* emitcode ("djnz","b,!tlabel",lbl->key+100); */ +/* emitcode ("djnz","_ap,!tlabel",lbl->key+100); */ + emitcode ("mov","a,b"); + emitcode ("orl","a,_ap"); + emitcode ("jz","!tlabel",lbl1->key+100); + emitcode ("mov","a,_ap"); + emitcode ("add","a,#!constbyte",0xFF); + emitcode ("mov","_ap,a"); + emitcode ("mov","a,b"); + emitcode ("addc","a,#!constbyte",0xFF); + emitcode ("mov","b,a"); + emitcode ("sjmp","!tlabel",lbl->key+100); + emitLabel (lbl1); + } + emitcode ("mov", "dps,#0"); + _G.dptrInUse = _G.dptr1InUse = 0; unsavermask(rsave); } @@ -11416,17 +12919,17 @@ static void genOutp( iCode *ic, int nparms, operand **parms) /* we know it has to be 3 parameters */ assert (nparms == 3); - + rsave = newBitVect(16); /* save DPTR if it needs to be saved */ for (i = DPL_IDX ; i <= B_IDX ; i++ ) { - if (bitVectBitValue(ic->rMask,i)) - rsave = bitVectSetBit(rsave,i); + if (bitVectBitValue(ic->rMask,i)) + rsave = bitVectSetBit(rsave,i); } rsave = bitVectIntersect(rsave,bitVectCplAnd (bitVectCopy (ic->rMask), - ds390_rUmaskForOp (IC_RESULT(ic)))); + ds390_rUmaskForOp (IC_RESULT(ic)))); savermask(rsave); - + to = parms[0]; from = parms[1]; count = parms[2]; @@ -11434,10 +12937,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 (from, 0, FALSE, FALSE, NULL)); + emitcode ("mov", "dph1,%s", aopGet (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 (from, 2, FALSE, FALSE, NULL)); } freeAsmop (from, NULL, ic, FALSE); @@ -11446,78 +12949,77 @@ static void genOutp( iCode *ic, int nparms, operand **parms) /* if the operand is already in dptr then we do nothing else we move the value to dptr */ 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)); - if (options.model == MODEL_FLAT24) - emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, TRUE)); - 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)); - } 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)); - if (options.model == MODEL_FLAT24) { - emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, TRUE)); - } - } - _endLazyDPSEvaluation (); - } + /* if already in DPTR then we need to push */ + if (AOP_TYPE(to) == AOP_DPTR) { + emitcode ("push", "%s", aopGet (to, 0, FALSE, TRUE, NULL)); + emitcode ("push", "%s", aopGet (to, 1, FALSE, TRUE, NULL)); + if (options.model == MODEL_FLAT24) + emitcode ("mov", "dpx,%s", aopGet (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 (to, 0, TRUE, FALSE, NULL)); + } else { /* we need to get it byte by byte */ + emitcode ("mov", "dpl,%s", aopGet (to, 0, FALSE, FALSE, NULL)); + emitcode ("mov", "dph,%s", aopGet (to, 1, FALSE, FALSE, NULL)); + if (options.model == MODEL_FLAT24) { + emitcode ("mov", "dpx,%s", aopGet (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",0x0); /* Select DPTR */ - emitcode ("mov", "b,%s",aopGet(AOP(count),0,FALSE,FALSE,FALSE)); - emitcode ("","!tlabeldef",lbl->key+100); - emitcode ("movx", "a,@dptr"); /* read data from port */ - emitcode ("inc","dps"); /* switch to DPTR2 */ - emitcode ("movx", "@dptr,a"); /* save into location */ - emitcode ("inc", "dptr"); /* point to next area */ - emitcode ("dec","dps"); /* switch to DPTR */ - emitcode ("djnz","b,!tlabel",lbl->key+100); + 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",0x0); /* Select DPTR */ + emitcode ("mov", "b,%s",aopGet(count,0,FALSE,FALSE,NULL)); + emitLabel (lbl); + emitcode ("movx", "a,@dptr"); /* read data from port */ + emitcode ("inc","dps"); /* switch to DPTR2 */ + emitcode ("movx", "@dptr,a"); /* save into location */ + 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", "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); - emitcode ("mov","a,_ap"); - emitcode ("add","a,#!constbyte",0xFF); - emitcode ("mov","_ap,a"); - emitcode ("mov","a,b"); - emitcode ("addc","a,#!constbyte",0xFF); - emitcode ("mov","b,a"); - emitcode ("sjmp","!tlabel",lbl->key+100); - emitcode ("","!tlabeldef",lbl1->key+100); - } - emitcode ("mov", "dps,#0"); - freeAsmop (count, NULL, ic, FALSE); + symbol *lbl1 = newiTempLabel(NULL); + + emitcode (";"," Auto increment but no djnz"); + emitcode ("mov","_ap,%s",aopGet (count, 0, FALSE, TRUE, NULL)); + emitcode ("mov","b,%s",aopGet (count, 1, FALSE, TRUE, NULL)); + freeAsmop (count, NULL, ic, FALSE); + emitcode ("mov", "dps,#!constbyte",0x0); /* Select DPTR */ + emitLabel (lbl); + emitcode ("movx", "a,@dptr"); + emitcode ("inc", "dptr"); + emitcode ("inc","dps"); /* switch to DPTR2 */ + emitcode ("movx", "@dptr,a"); + emitcode ("dec","dps"); /* switch to DPTR */ + emitcode ("mov","a,b"); + emitcode ("orl","a,_ap"); + emitcode ("jz","!tlabel",lbl1->key+100); + emitcode ("mov","a,_ap"); + emitcode ("add","a,#!constbyte",0xFF); + emitcode ("mov","_ap,a"); + emitcode ("mov","a,b"); + emitcode ("addc","a,#!constbyte",0xFF); + emitcode ("mov","b,a"); + emitcode ("sjmp","!tlabel",lbl->key+100); + emitLabel (lbl1); + } + emitcode ("mov", "dps,#0"); + _G.dptrInUse = _G.dptr1InUse = 0; unsavermask(rsave); } @@ -11537,16 +13039,16 @@ 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(src,0,FALSE,FALSE,NULL)); _G.accInUse++; - emitcode ("mov","b,%s",aopGet(AOP(src),1,FALSE,FALSE,FALSE)); + MOVB(aopGet(src,1,FALSE,FALSE,"b")); _G.accInUse--; freeAsmop (src, NULL, ic, FALSE); - + aopOp (dest,ic, FALSE, FALSE); - aopPut(AOP(dest),"b",0); - aopPut(AOP(dest),"a",1); - freeAsmop (dest, NULL, ic, FALSE); + aopPut(dest,"b",0); + aopPut(dest,"a",1); + freeAsmop (dest, NULL, ic, FALSE); } /*-----------------------------------------------------------------*/ @@ -11558,23 +13060,23 @@ 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); - + to = parms[0]; val = parms[1]; count = parms[2]; - + /* save DPTR if it needs to be saved */ rsave = newBitVect(16); for (i = DPL_IDX ; i <= B_IDX ; i++ ) { - if (bitVectBitValue(ic->rMask,i)) - rsave = bitVectSetBit(rsave,i); + if (bitVectBitValue(ic->rMask,i)) + rsave = bitVectSetBit(rsave,i); } rsave = bitVectIntersect(rsave,bitVectCplAnd (bitVectCopy (ic->rMask), - ds390_rUmaskForOp (IC_RESULT(ic)))); + ds390_rUmaskForOp (IC_RESULT(ic)))); savermask(rsave); aopOp (to, ic, FALSE, FALSE); @@ -11582,65 +13084,64 @@ static void genMemsetX(iCode *ic, int nparms, operand **parms) /* if the operand is already in dptr then we do nothing else we move the value to dptr */ 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)); - if (options.model == MODEL_FLAT24) - emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, TRUE)); - 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)); - } 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)); - if (options.model == MODEL_FLAT24) { - emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, TRUE)); - } - } - _endLazyDPSEvaluation (); - } + /* if already in DPTR then we need to push */ + if (AOP_TYPE(to) == AOP_DPTR) { + emitcode ("push", "%s", aopGet (to, 0, FALSE, TRUE, NULL)); + emitcode ("push", "%s", aopGet (to, 1, FALSE, TRUE, NULL)); + if (options.model == MODEL_FLAT24) + emitcode ("mov", "dpx,%s", aopGet (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 (to, 0, TRUE, FALSE, NULL)); + } else { /* we need to get it byte by byte */ + emitcode ("mov", "dpl,%s", aopGet (to, 0, FALSE, FALSE, NULL)); + emitcode ("mov", "dph,%s", aopGet (to, 1, FALSE, FALSE, NULL)); + if (options.model == MODEL_FLAT24) { + emitcode ("mov", "dpx,%s", aopGet (to, 2, FALSE, FALSE, NULL)); + } + } + _endLazyDPSEvaluation (); + } } freeAsmop (to, NULL, ic, FALSE); aopOp (val, ic->next->next, FALSE,FALSE); - aopOp (count, ic->next->next, FALSE,FALSE); + 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) { - l = aopGet(AOP (val), 0, FALSE, FALSE, TRUE); - emitcode ("mov", "b,%s",aopGet(AOP(count),0,FALSE,FALSE,FALSE)); - MOVA(l); - emitcode ("","!tlabeldef",lbl->key+100); - emitcode ("movx", "@dptr,a"); - emitcode ("inc", "dptr"); - emitcode ("djnz","b,!tlabel",lbl->key+100); + if (AOP_TYPE(count) == AOP_LIT && + (int)floatFromVal (AOP(count)->aopu.aop_lit) <= 256) { + l = aopGet(val, 0, FALSE, FALSE, NULL); + emitcode ("mov", "b,%s",aopGet(count,0,FALSE,FALSE,NULL)); + MOVA(l); + emitLabel (lbl); + emitcode ("movx", "@dptr,a"); + emitcode ("inc", "dptr"); + emitcode ("djnz","b,!tlabel",lbl->key+100); } 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 ("","!tlabeldef",lbl->key+100); - l = aopGet(AOP (val), 0, FALSE, FALSE, TRUE); - MOVA(l); - emitcode ("movx", "@dptr,a"); - emitcode ("inc", "dptr"); - emitcode ("mov","a,b"); - emitcode ("orl","a,_ap"); - emitcode ("jz","!tlabel",lbl1->key+100); - emitcode ("mov","a,_ap"); - emitcode ("add","a,#!constbyte",0xFF); - emitcode ("mov","_ap,a"); - emitcode ("mov","a,b"); - emitcode ("addc","a,#!constbyte",0xFF); - emitcode ("mov","b,a"); - emitcode ("sjmp","!tlabel",lbl->key+100); - emitcode ("","!tlabeldef",lbl1->key+100); + symbol *lbl1 = newiTempLabel(NULL); + + emitcode ("mov","_ap,%s",aopGet (count, 0, FALSE, TRUE, NULL)); + emitcode ("mov","b,%s",aopGet (count, 1, FALSE, TRUE, NULL)); + emitLabel (lbl); + MOVA (aopGet(val, 0, FALSE, FALSE, NULL)); + emitcode ("movx", "@dptr,a"); + emitcode ("inc", "dptr"); + emitcode ("mov","a,b"); + emitcode ("orl","a,_ap"); + emitcode ("jz","!tlabel",lbl1->key+100); + emitcode ("mov","a,_ap"); + emitcode ("add","a,#!constbyte",0xFF); + emitcode ("mov","_ap,a"); + emitcode ("mov","a,b"); + emitcode ("addc","a,#!constbyte",0xFF); + emitcode ("mov","b,a"); + emitcode ("sjmp","!tlabel",lbl->key+100); + emitLabel (lbl1); } freeAsmop (count, NULL, ic, FALSE); unsavermask(rsave); @@ -11651,36 +13152,37 @@ static void genMemsetX(iCode *ic, int nparms, operand **parms) /*-----------------------------------------------------------------*/ static void genNatLibLoadPrimitive(iCode *ic, int nparms, operand **parms,int size) { - bitVect *rsave ; - operand *pnum, *result; - int i; - - assert (nparms==1); - /* save registers that need to be saved */ - savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask), - ds390_rUmaskForOp (IC_RESULT(ic)))); - - pnum = parms[0]; - aopOp (pnum, ic, FALSE, FALSE); - emitcode ("mov","a,%s",aopGet(AOP(pnum),0,FALSE,FALSE,FALSE)); - freeAsmop (pnum, NULL, ic, FALSE); - emitcode ("lcall","NatLib_LoadPrimitive"); - aopOp (result=IC_RESULT(ic), ic, FALSE, FALSE); - if (aopHasRegs(AOP(result),R0_IDX,R1_IDX) || - aopHasRegs(AOP(result),R2_IDX,R3_IDX) ) { - for (i = (size-1) ; i >= 0 ; i-- ) { - emitcode ("push","a%s",javaRet[i]); - } - for (i=0; i < size ; i++ ) { - emitcode ("pop","a%s",aopGet(AOP(result),i,FALSE,FALSE,FALSE)); - } - } else { - for (i = 0 ; i < size ; i++ ) { - aopPut(AOP(result),javaRet[i],i); - } - } - freeAsmop (result, NULL, ic, FALSE); - unsavermask(rsave); + bitVect *rsave ; + operand *pnum, *result; + int i; + + assert (nparms==1); + /* save registers that need to be saved */ + savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask), + ds390_rUmaskForOp (IC_RESULT(ic)))); + + pnum = parms[0]; + aopOp (pnum, ic, FALSE, FALSE); + emitcode ("mov","a,%s",aopGet(pnum,0,FALSE,FALSE,DP2_RESULT_REG)); + freeAsmop (pnum, NULL, ic, FALSE); + emitcode ("lcall","NatLib_LoadPrimitive"); + aopOp (result=IC_RESULT(ic), ic, FALSE, FALSE); + if (aopHasRegs(AOP(result),R0_IDX,R1_IDX) || + aopHasRegs(AOP(result),R2_IDX,R3_IDX) ) { + for (i = (size-1) ; i >= 0 ; i-- ) { + emitcode ("push","a%s",javaRet[i]); + } + for (i=0; i < size ; i++ ) { + emitcode ("pop","a%s", + aopGet(result,i,FALSE,FALSE,DP2_RESULT_REG)); + } + } else { + for (i = 0 ; i < size ; i++ ) { + aopPut(result,javaRet[i],i); + } + } + freeAsmop (result, NULL, ic, FALSE); + unsavermask(rsave); } /*-----------------------------------------------------------------*/ @@ -11688,86 +13190,87 @@ static void genNatLibLoadPrimitive(iCode *ic, int nparms, operand **parms,int si /*-----------------------------------------------------------------*/ static void genNatLibLoadPointer(iCode *ic, int nparms, operand **parms) { - bitVect *rsave ; - operand *pnum, *result; - int size = 3; - int i; - - assert (nparms==1); - /* save registers that need to be saved */ - savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask), - ds390_rUmaskForOp (IC_RESULT(ic)))); - - pnum = parms[0]; - aopOp (pnum, ic, FALSE, FALSE); - emitcode ("mov","a,%s",aopGet(AOP(pnum),0,FALSE,FALSE,FALSE)); - freeAsmop (pnum, NULL, ic, FALSE); - emitcode ("lcall","NatLib_LoadPointer"); - aopOp (result=IC_RESULT(ic), ic, FALSE, FALSE); - if (AOP_TYPE(result)!=AOP_STR) { - for (i = 0 ; i < size ; i++ ) { - aopPut(AOP(result),fReturn[i],i); - } - } - freeAsmop (result, NULL, ic, FALSE); - unsavermask(rsave); -} - -/*-----------------------------------------------------------------*/ -/* genNatLibInstallStateBlock - */ -/*-----------------------------------------------------------------*/ -static void genNatLibInstallStateBlock(iCode *ic, int nparms, - operand **parms, const char *name) -{ - bitVect *rsave ; - operand *psb, *handle; - assert (nparms==2); - - /* save registers that need to be saved */ - savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask), - ds390_rUmaskForOp (IC_RESULT(ic)))); - psb = parms[0]; - handle = parms[1]; - - /* put pointer to state block into DPTR1 */ - 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","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)); - } - freeAsmop (psb, NULL, ic, FALSE); - - /* put libraryID into DPTR */ - emitcode ("mov","dptr,#LibraryID"); - - /* 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 ("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)); - } - freeAsmop (psb, NULL, ic, FALSE); - - /* make the call */ - emitcode ("lcall","NatLib_Install%sStateBlock",name); - - /* put return value into place*/ - _G.accInUse++; - aopOp (IC_RESULT(ic), ic, FALSE, FALSE); - _G.accInUse--; - aopPut(AOP(IC_RESULT(ic)),"a",0); - freeAsmop (IC_RESULT(ic), NULL, ic, FALSE); - unsavermask(rsave); + bitVect *rsave ; + operand *pnum, *result; + int size = 3; + int i; + + assert (nparms==1); + /* save registers that need to be saved */ + savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask), + ds390_rUmaskForOp (IC_RESULT(ic)))); + + pnum = parms[0]; + aopOp (pnum, ic, FALSE, FALSE); + emitcode ("mov","a,%s",aopGet(pnum,0,FALSE,FALSE,DP2_RESULT_REG)); + freeAsmop (pnum, NULL, ic, FALSE); + emitcode ("lcall","NatLib_LoadPointer"); + aopOp (result=IC_RESULT(ic), ic, FALSE, FALSE); + if (AOP_TYPE(result)!=AOP_STR) { + for (i = 0 ; i < size ; i++ ) { + aopPut(result,fReturn[i],i); + } + } + freeAsmop (result, NULL, ic, FALSE); + unsavermask(rsave); +} + +/*-----------------------------------------------------------------*/ +/* genNatLibInstallStateBlock - */ +/*-----------------------------------------------------------------*/ +static void genNatLibInstallStateBlock(iCode *ic, int nparms, + operand **parms, const char *name) +{ + bitVect *rsave ; + operand *psb, *handle; + assert (nparms==2); + + /* save registers that need to be saved */ + savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask), + ds390_rUmaskForOp (IC_RESULT(ic)))); + psb = parms[0]; + handle = parms[1]; + + /* put pointer to state block into DPTR1 */ + aopOp (psb, ic, FALSE, FALSE); + if (AOP_TYPE (psb) == AOP_IMMD) { + emitcode ("mov","dps,#1"); + emitcode ("mov", "dptr,%s", + aopGet (psb, 0, TRUE, FALSE, DP2_RESULT_REG)); + emitcode ("mov","dps,#0"); + } else { + emitcode ("mov","dpl1,%s",aopGet(psb,0,FALSE,FALSE,DP2_RESULT_REG)); + emitcode ("mov","dph1,%s",aopGet(psb,1,FALSE,FALSE,DP2_RESULT_REG)); + emitcode ("mov","dpx1,%s",aopGet(psb,2,FALSE,FALSE,DP2_RESULT_REG)); + } + freeAsmop (psb, NULL, ic, FALSE); + + /* put libraryID into DPTR */ + emitcode ("mov","dptr,#LibraryID"); + + /* put handle into r3:r2 */ + aopOp (handle, ic, FALSE, FALSE); + if (aopHasRegs(AOP(handle),R2_IDX,R3_IDX)) { + emitcode ("push","%s",aopGet(handle,0,FALSE,TRUE,DP2_RESULT_REG)); + emitcode ("push","%s",aopGet(handle,1,FALSE,TRUE,DP2_RESULT_REG)); + emitcode ("pop","ar3"); + emitcode ("pop","ar2"); + } else { + emitcode ("mov","r2,%s",aopGet(handle,0,FALSE,TRUE,DP2_RESULT_REG)); + emitcode ("mov","r3,%s",aopGet(handle,1,FALSE,TRUE,DP2_RESULT_REG)); + } + freeAsmop (psb, NULL, ic, FALSE); + + /* make the call */ + emitcode ("lcall","NatLib_Install%sStateBlock",name); + + /* put return value into place*/ + _G.accInUse++; + aopOp (IC_RESULT(ic), ic, FALSE, FALSE); + _G.accInUse--; + aopPut(IC_RESULT(ic),"a",0); + freeAsmop (IC_RESULT(ic), NULL, ic, FALSE); + unsavermask(rsave); } /*-----------------------------------------------------------------*/ @@ -11775,117 +13278,121 @@ static void genNatLibInstallStateBlock(iCode *ic, int nparms, /*-----------------------------------------------------------------*/ static void genNatLibRemoveStateBlock(iCode *ic,int nparms,const char *name) { - bitVect *rsave ; + bitVect *rsave ; - assert(nparms==0); + assert(nparms==0); - /* save registers that need to be saved */ - savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask), - ds390_rUmaskForOp (IC_RESULT(ic)))); + /* save registers that need to be saved */ + savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask), + ds390_rUmaskForOp (IC_RESULT(ic)))); - /* put libraryID into DPTR */ - emitcode ("mov","dptr,#LibraryID"); - /* make the call */ - emitcode ("lcall","NatLib_Remove%sStateBlock",name); - unsavermask(rsave); + /* put libraryID into DPTR */ + emitcode ("mov","dptr,#LibraryID"); + /* make the call */ + emitcode ("lcall","NatLib_Remove%sStateBlock",name); + unsavermask(rsave); } /*-----------------------------------------------------------------*/ /* genNatLibGetStateBlock - */ /*-----------------------------------------------------------------*/ static void genNatLibGetStateBlock(iCode *ic,int nparms, - operand **parms,const char *name) -{ - bitVect *rsave ; - symbol *lbl = newiTempLabel(NULL); - - assert(nparms==0); - /* save registers that need to be saved */ - savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask), - ds390_rUmaskForOp (IC_RESULT(ic)))); - - /* put libraryID into DPTR */ - emitcode ("mov","dptr,#LibraryID"); - /* make the call */ - emitcode ("lcall","NatLib_Remove%sStateBlock",name); - emitcode ("jnz","!tlabel",lbl->key+100); - - /* put return value into place */ - aopOp(IC_RESULT(ic),ic,FALSE,FALSE); - 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)); - } else { - aopPut(AOP(IC_RESULT(ic)),"r2",0); - aopPut(AOP(IC_RESULT(ic)),"r3",1); - } - freeAsmop (IC_RESULT(ic), NULL, ic, FALSE); - emitcode ("","!tlabeldef",lbl->key+100); - unsavermask(rsave); + operand **parms,const char *name) +{ + bitVect *rsave ; + symbol *lbl = newiTempLabel(NULL); + + assert(nparms==0); + /* save registers that need to be saved */ + savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask), + ds390_rUmaskForOp (IC_RESULT(ic)))); + + /* put libraryID into DPTR */ + emitcode ("mov","dptr,#LibraryID"); + /* make the call */ + emitcode ("lcall","NatLib_Remove%sStateBlock",name); + emitcode ("jnz","!tlabel",lbl->key+100); + + /* put return value into place */ + aopOp(IC_RESULT(ic),ic,FALSE,FALSE); + if (aopHasRegs(AOP(IC_RESULT(ic)),R2_IDX,R3_IDX)) { + emitcode ("push","ar3"); + emitcode ("push","ar2"); + emitcode ("pop","%s", + aopGet(IC_RESULT(ic),0,FALSE,TRUE,DP2_RESULT_REG)); + emitcode ("pop","%s", + aopGet(IC_RESULT(ic),1,FALSE,TRUE,DP2_RESULT_REG)); + } else { + aopPut(IC_RESULT(ic),"r2",0); + aopPut(IC_RESULT(ic),"r3",1); + } + freeAsmop (IC_RESULT(ic), NULL, ic, FALSE); + emitLabel (lbl); + unsavermask(rsave); } /*-----------------------------------------------------------------*/ /* genMMMalloc - */ /*-----------------------------------------------------------------*/ static void genMMMalloc (iCode *ic,int nparms, operand **parms, - int size, const char *name) -{ - bitVect *rsave ; - operand *bsize; - symbol *rsym; - symbol *lbl = newiTempLabel(NULL); - - assert (nparms == 1); - /* save registers that need to be saved */ - savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask), - ds390_rUmaskForOp (IC_RESULT(ic)))); - - bsize=parms[0]; - aopOp (bsize,ic,FALSE,FALSE); - - /* 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)); - if (size==3) { - emitcode("push","%s",aopGet(AOP(bsize),2,FALSE,TRUE,FALSE)); - 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)); - if (size==3) { - emitcode("mov","r4,%s",aopGet(AOP(bsize),2,FALSE,TRUE,FALSE)); - } - } - freeAsmop (bsize, NULL, ic, FALSE); - - /* make the call */ - emitcode ("lcall","MM_%s",name); - emitcode ("jz","!tlabel",lbl->key+100); - emitcode ("mov","r2,#!constbyte",0xff); - emitcode ("mov","r3,#!constbyte",0xff); - emitcode ("","!tlabeldef",lbl->key+100); - /* we don't care about the pointer : we just save the handle */ - rsym = OP_SYMBOL(IC_RESULT(ic)); - if (rsym->liveFrom != rsym->liveTo) { - aopOp(IC_RESULT(ic),ic,FALSE,FALSE); - 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)); - } else { - aopPut(AOP(IC_RESULT(ic)),"r2",0); - aopPut(AOP(IC_RESULT(ic)),"r3",1); - } - freeAsmop (IC_RESULT(ic), NULL, ic, FALSE); - } - unsavermask(rsave); + int size, const char *name) +{ + bitVect *rsave ; + operand *bsize; + symbol *rsym; + symbol *lbl = newiTempLabel(NULL); + + assert (nparms == 1); + /* save registers that need to be saved */ + savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask), + ds390_rUmaskForOp (IC_RESULT(ic)))); + + bsize=parms[0]; + aopOp (bsize,ic,FALSE,FALSE); + + /* put the size in R4-R2 */ + if (aopHasRegs(AOP(bsize),R2_IDX, (size==3 ? R4_IDX: R3_IDX))) { + emitcode("push","%s",aopGet(bsize,0,FALSE,TRUE,DP2_RESULT_REG)); + emitcode("push","%s",aopGet(bsize,1,FALSE,TRUE,DP2_RESULT_REG)); + if (size==3) { + emitcode("push","%s",aopGet(bsize,2,FALSE,TRUE,DP2_RESULT_REG)); + emitcode("pop","ar4"); + } + emitcode("pop","ar3"); + emitcode("pop","ar2"); + } else { + emitcode ("mov","r2,%s",aopGet(bsize,0,FALSE,TRUE,DP2_RESULT_REG)); + emitcode ("mov","r3,%s",aopGet(bsize,1,FALSE,TRUE,DP2_RESULT_REG)); + if (size==3) { + emitcode("mov","r4,%s",aopGet(bsize,2,FALSE,TRUE,DP2_RESULT_REG)); + } + } + freeAsmop (bsize, NULL, ic, FALSE); + + /* make the call */ + emitcode ("lcall","MM_%s",name); + emitcode ("jz","!tlabel",lbl->key+100); + emitcode ("mov","r2,#!constbyte",0xff); + emitcode ("mov","r3,#!constbyte",0xff); + emitLabel (lbl); + /* we don't care about the pointer : we just save the handle */ + rsym = OP_SYMBOL(IC_RESULT(ic)); + if (rsym->liveFrom != rsym->liveTo) { + aopOp(IC_RESULT(ic),ic,FALSE,FALSE); + if (aopHasRegs(AOP(IC_RESULT(ic)),R2_IDX,R3_IDX)) { + emitcode ("push","ar3"); + emitcode ("push","ar2"); + emitcode ("pop","%s", + aopGet(IC_RESULT(ic),0,FALSE,TRUE,DP2_RESULT_REG)); + emitcode ("pop","%s", + aopGet(IC_RESULT(ic),1,FALSE,TRUE,DP2_RESULT_REG)); + } else { + aopPut(IC_RESULT(ic),"r2",0); + aopPut(IC_RESULT(ic),"r3",1); + } + freeAsmop (IC_RESULT(ic), NULL, ic, FALSE); + } + unsavermask(rsave); } /*-----------------------------------------------------------------*/ @@ -11893,45 +13400,54 @@ static void genMMMalloc (iCode *ic,int nparms, operand **parms, /*-----------------------------------------------------------------*/ static void genMMDeref (iCode *ic,int nparms, operand **parms) { - bitVect *rsave ; - operand *handle; - - assert (nparms == 1); - /* save registers that need to be saved */ - savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask), - ds390_rUmaskForOp (IC_RESULT(ic)))); - - handle=parms[0]; - aopOp (handle,ic,FALSE,FALSE); - - /* 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("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)); - } - freeAsmop (handle, NULL, ic, FALSE); - - /* make the call */ - emitcode ("lcall","MM_Deref"); - - { - symbol *rsym = OP_SYMBOL(IC_RESULT(ic)); - if (rsym->liveFrom != rsym->liveTo) { - aopOp (IC_RESULT(ic),ic,FALSE,FALSE); - if (AOP_TYPE(IC_RESULT(ic)) != AOP_STR) { - aopPut(AOP(IC_RESULT(ic)),"dpl",0); - aopPut(AOP(IC_RESULT(ic)),"dph",1); - aopPut(AOP(IC_RESULT(ic)),"dpx",2); - } - } - } - freeAsmop (IC_RESULT(ic), NULL, ic, FALSE); - unsavermask(rsave); + bitVect *rsave ; + operand *handle; + + assert (nparms == 1); + /* save registers that need to be saved */ + savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask), + ds390_rUmaskForOp (IC_RESULT(ic)))); + + handle=parms[0]; + aopOp (handle,ic,FALSE,FALSE); + + /* put the size in R4-R2 */ + if (aopHasRegs(AOP(handle),R2_IDX,R3_IDX)) { + emitcode("push","%s", + aopGet(handle,0,FALSE,TRUE,DP2_RESULT_REG)); + emitcode("push","%s", + aopGet(handle,1,FALSE,TRUE,DP2_RESULT_REG)); + emitcode("pop","ar3"); + emitcode("pop","ar2"); + } else { + emitcode ("mov","r2,%s", + aopGet(handle,0,FALSE,TRUE,DP2_RESULT_REG)); + emitcode ("mov","r3,%s", + aopGet(handle,1,FALSE,TRUE,DP2_RESULT_REG)); + } + freeAsmop (handle, NULL, ic, FALSE); + + /* make the call */ + emitcode ("lcall","MM_Deref"); + + { + symbol *rsym = OP_SYMBOL(IC_RESULT(ic)); + if (rsym->liveFrom != rsym->liveTo) { + aopOp (IC_RESULT(ic),ic,FALSE,FALSE); + if (AOP_TYPE(IC_RESULT(ic)) != AOP_STR) { + _startLazyDPSEvaluation (); + + aopPut(IC_RESULT(ic),"dpl",0); + aopPut(IC_RESULT(ic),"dph",1); + aopPut(IC_RESULT(ic),"dpx",2); + + _endLazyDPSEvaluation (); + + } + } + } + freeAsmop (IC_RESULT(ic), NULL, ic, FALSE); + unsavermask(rsave); } /*-----------------------------------------------------------------*/ @@ -11939,41 +13455,45 @@ static void genMMDeref (iCode *ic,int nparms, operand **parms) /*-----------------------------------------------------------------*/ static void genMMUnrestrictedPersist(iCode *ic,int nparms, operand **parms) { - bitVect *rsave ; - operand *handle; - - assert (nparms == 1); - /* save registers that need to be saved */ - savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask), - ds390_rUmaskForOp (IC_RESULT(ic)))); - - handle=parms[0]; - aopOp (handle,ic,FALSE,FALSE); - - /* 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("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)); - } - freeAsmop (handle, NULL, ic, FALSE); - - /* make the call */ - emitcode ("lcall","MM_UnrestrictedPersist"); - - { - symbol *rsym = OP_SYMBOL(IC_RESULT(ic)); - if (rsym->liveFrom != rsym->liveTo) { - aopOp (IC_RESULT(ic),ic,FALSE,FALSE); - aopPut(AOP(IC_RESULT(ic)),"a",0); - freeAsmop (IC_RESULT(ic), NULL, ic, FALSE); - } - } - unsavermask(rsave); + bitVect *rsave ; + operand *handle; + + assert (nparms == 1); + /* save registers that need to be saved */ + savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask), + ds390_rUmaskForOp (IC_RESULT(ic)))); + + handle=parms[0]; + aopOp (handle,ic,FALSE,FALSE); + + /* put the size in R3-R2 */ + if (aopHasRegs(AOP(handle),R2_IDX,R3_IDX)) { + emitcode("push","%s", + aopGet(handle,0,FALSE,TRUE,DP2_RESULT_REG)); + emitcode("push","%s", + aopGet(handle,1,FALSE,TRUE,DP2_RESULT_REG)); + emitcode("pop","ar3"); + emitcode("pop","ar2"); + } else { + emitcode ("mov","r2,%s", + aopGet(handle,0,FALSE,TRUE,DP2_RESULT_REG)); + emitcode ("mov","r3,%s", + aopGet(handle,1,FALSE,TRUE,DP2_RESULT_REG)); + } + freeAsmop (handle, NULL, ic, FALSE); + + /* make the call */ + emitcode ("lcall","MM_UnrestrictedPersist"); + + { + symbol *rsym = OP_SYMBOL(IC_RESULT(ic)); + if (rsym->liveFrom != rsym->liveTo) { + aopOp (IC_RESULT(ic),ic,FALSE,FALSE); + aopPut(IC_RESULT(ic),"a",0); + freeAsmop (IC_RESULT(ic), NULL, ic, FALSE); + } + } + unsavermask(rsave); } /*-----------------------------------------------------------------*/ @@ -11981,89 +13501,98 @@ static void genMMUnrestrictedPersist(iCode *ic,int nparms, operand **parms) /*-----------------------------------------------------------------*/ static void genSystemExecJavaProcess(iCode *ic,int nparms, operand **parms) { - bitVect *rsave ; - operand *handle, *pp; - - assert (nparms==2); - /* save registers that need to be saved */ - savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask), - ds390_rUmaskForOp (IC_RESULT(ic)))); - - pp = parms[0]; - handle = parms[1]; - - /* 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("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)); - } - 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)); - } 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)); - } - freeAsmop (handle, NULL, ic, FALSE); - - /* make the call */ - emitcode ("lcall","System_ExecJavaProcess"); - - /* put result in place */ - { - symbol *rsym = OP_SYMBOL(IC_RESULT(ic)); - if (rsym->liveFrom != rsym->liveTo) { - aopOp (IC_RESULT(ic),ic,FALSE,FALSE); - aopPut(AOP(IC_RESULT(ic)),"a",0); - freeAsmop (IC_RESULT(ic), NULL, ic, FALSE); - } - } - - unsavermask(rsave); + bitVect *rsave ; + operand *handle, *pp; + + assert (nparms==2); + /* save registers that need to be saved */ + savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask), + ds390_rUmaskForOp (IC_RESULT(ic)))); + + pp = parms[0]; + handle = parms[1]; + + /* put the handle in R3-R2 */ + aopOp (handle,ic,FALSE,FALSE); + if (aopHasRegs(AOP(handle),R2_IDX,R3_IDX)) { + emitcode("push","%s", + aopGet(handle,0,FALSE,TRUE,DP2_RESULT_REG)); + emitcode("push","%s", + aopGet(handle,1,FALSE,TRUE,DP2_RESULT_REG)); + emitcode("pop","ar3"); + emitcode("pop","ar2"); + } else { + emitcode ("mov","r2,%s", + aopGet(handle,0,FALSE,TRUE,DP2_RESULT_REG)); + emitcode ("mov","r3,%s", + aopGet(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 (pp, 0, TRUE, FALSE, NULL)); + } else if (AOP_TYPE(pp) != AOP_STR) { /* not already in dptr */ + emitcode ("mov","dpl,%s",aopGet(pp,0,FALSE,FALSE,NULL)); + emitcode ("mov","dph,%s",aopGet(pp,1,FALSE,FALSE,NULL)); + emitcode ("mov","dpx,%s",aopGet(pp,2,FALSE,FALSE,NULL)); + } + freeAsmop (handle, NULL, ic, FALSE); + + /* make the call */ + emitcode ("lcall","System_ExecJavaProcess"); + + /* put result in place */ + { + symbol *rsym = OP_SYMBOL(IC_RESULT(ic)); + if (rsym->liveFrom != rsym->liveTo) { + aopOp (IC_RESULT(ic),ic,FALSE,FALSE); + aopPut(IC_RESULT(ic),"a",0); + freeAsmop (IC_RESULT(ic), NULL, ic, FALSE); + } + } + + unsavermask(rsave); } /*-----------------------------------------------------------------*/ /* genSystemRTCRegisters - */ /*-----------------------------------------------------------------*/ static void genSystemRTCRegisters(iCode *ic,int nparms, operand **parms, - char *name) -{ - bitVect *rsave ; - operand *pp; - - assert (nparms==1); - /* save registers that need to be saved */ - savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask), - ds390_rUmaskForOp (IC_RESULT(ic)))); - - pp=parms[0]; - /* put pointer in DPTR */ - 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","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)); - } - freeAsmop (pp, NULL, ic, FALSE); + char *name) +{ + bitVect *rsave ; + operand *pp; + + assert (nparms==1); + /* save registers that need to be saved */ + savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask), + ds390_rUmaskForOp (IC_RESULT(ic)))); + + pp=parms[0]; + /* put pointer in DPTR */ + aopOp (pp,ic,FALSE,FALSE); + if (AOP_TYPE (pp) == AOP_IMMD) { + emitcode ("mov","dps,#1"); + emitcode ("mov", "dptr,%s", + aopGet (pp, 0, TRUE, FALSE, NULL)); + emitcode ("mov","dps,#0"); + } else { + emitcode ("mov","dpl1,%s", + aopGet(pp,0,FALSE,FALSE,DP2_RESULT_REG)); + emitcode ("mov","dph1,%s", + aopGet(pp,1,FALSE,FALSE,DP2_RESULT_REG)); + emitcode ("mov","dpx1,%s", + aopGet(pp,2,FALSE,FALSE,DP2_RESULT_REG)); + } + freeAsmop (pp, NULL, ic, FALSE); - /* make the call */ - emitcode ("lcall","System_%sRTCRegisters",name); + /* make the call */ + emitcode ("lcall","System_%sRTCRegisters",name); - unsavermask(rsave); + unsavermask(rsave); } /*-----------------------------------------------------------------*/ @@ -12071,44 +13600,53 @@ static void genSystemRTCRegisters(iCode *ic,int nparms, operand **parms, /*-----------------------------------------------------------------*/ static void genSystemThreadSleep(iCode *ic,int nparms, operand **parms, char *name) { - bitVect *rsave ; - operand *to, *s; - - assert (nparms==1); - /* save registers that need to be saved */ - savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask), - ds390_rUmaskForOp (IC_RESULT(ic)))); - - to = parms[0]; - 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 ("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)); - } - 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)); - freeAsmop (s, NULL, ic, FALSE); - - /* make the call */ - emitcode ("lcall","System_%s",name); - - unsavermask(rsave); + bitVect *rsave ; + operand *to, *s; + + assert (nparms==1); + /* save registers that need to be saved */ + savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask), + ds390_rUmaskForOp (IC_RESULT(ic)))); + + to = parms[0]; + aopOp(to,ic,FALSE,FALSE); + if (aopHasRegs(AOP(to),R2_IDX,R3_IDX) || + aopHasRegs(AOP(to),R0_IDX,R1_IDX) ) { + emitcode ("push","%s", + aopGet(to,0,FALSE,TRUE,DP2_RESULT_REG)); + emitcode ("push","%s", + aopGet(to,1,FALSE,TRUE,DP2_RESULT_REG)); + emitcode ("push","%s", + aopGet(to,2,FALSE,TRUE,DP2_RESULT_REG)); + emitcode ("push","%s", + aopGet(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(to,0,FALSE,TRUE,DP2_RESULT_REG)); + emitcode ("mov","r1,%s", + aopGet(to,1,FALSE,TRUE,DP2_RESULT_REG)); + emitcode ("mov","r2,%s", + aopGet(to,2,FALSE,TRUE,DP2_RESULT_REG)); + emitcode ("mov","r3,%s", + aopGet(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(s,0,FALSE,TRUE,NULL)); + freeAsmop (s, NULL, ic, FALSE); + + /* make the call */ + emitcode ("lcall","System_%s",name); + + unsavermask(rsave); } /*-----------------------------------------------------------------*/ @@ -12116,39 +13654,41 @@ static void genSystemThreadSleep(iCode *ic,int nparms, operand **parms, char *na /*-----------------------------------------------------------------*/ static void genSystemThreadResume(iCode *ic,int nparms, operand **parms) { - bitVect *rsave ; - operand *tid,*pid; - - assert (nparms==2); - /* save registers that need to be saved */ - savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask), - ds390_rUmaskForOp (IC_RESULT(ic)))); - - tid = parms[0]; - pid = parms[1]; - - /* PID in R0 */ - aopOp(pid,ic,FALSE,FALSE); - emitcode ("mov","r0,%s",aopGet(AOP(pid),0,FALSE,TRUE,FALSE)); - freeAsmop (pid, NULL, ic, FALSE); - - /* tid into ACC */ - aopOp(tid,ic,FALSE,FALSE); - emitcode ("mov","a,%s",aopGet(AOP(tid),0,FALSE,TRUE,FALSE)); - freeAsmop (tid, NULL, ic, FALSE); - - emitcode ("lcall","System_ThreadResume"); - - /* put result into place */ - { - symbol *rsym = OP_SYMBOL(IC_RESULT(ic)); - if (rsym->liveFrom != rsym->liveTo) { - aopOp (IC_RESULT(ic),ic,FALSE,FALSE); - aopPut(AOP(IC_RESULT(ic)),"a",0); - freeAsmop (IC_RESULT(ic), NULL, ic, FALSE); - } - } - unsavermask(rsave); + bitVect *rsave ; + operand *tid,*pid; + + assert (nparms==2); + /* save registers that need to be saved */ + savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask), + ds390_rUmaskForOp (IC_RESULT(ic)))); + + tid = parms[0]; + pid = parms[1]; + + /* PID in R0 */ + aopOp(pid,ic,FALSE,FALSE); + emitcode ("mov","r0,%s", + aopGet(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(tid,0,FALSE,TRUE,DP2_RESULT_REG)); + freeAsmop (tid, NULL, ic, FALSE); + + emitcode ("lcall","System_ThreadResume"); + + /* put result into place */ + { + symbol *rsym = OP_SYMBOL(IC_RESULT(ic)); + if (rsym->liveFrom != rsym->liveTo) { + aopOp (IC_RESULT(ic),ic,FALSE,FALSE); + aopPut(IC_RESULT(ic),"a",0); + freeAsmop (IC_RESULT(ic), NULL, ic, FALSE); + } + } + unsavermask(rsave); } /*-----------------------------------------------------------------*/ @@ -12156,24 +13696,25 @@ static void genSystemThreadResume(iCode *ic,int nparms, operand **parms) /*-----------------------------------------------------------------*/ static void genSystemProcessResume(iCode *ic,int nparms, operand **parms) { - bitVect *rsave ; - operand *pid; + bitVect *rsave ; + operand *pid; + + assert (nparms==1); + /* save registers that need to be saved */ + savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask), + ds390_rUmaskForOp (IC_RESULT(ic)))); - assert (nparms==1); - /* save registers that need to be saved */ - savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask), - ds390_rUmaskForOp (IC_RESULT(ic)))); - - pid = parms[0]; - - /* pid into ACC */ - aopOp(pid,ic,FALSE,FALSE); - emitcode ("mov","a,%s",aopGet(AOP(pid),0,FALSE,TRUE,FALSE)); - freeAsmop (pid, NULL, ic, FALSE); - - emitcode ("lcall","System_ProcessResume"); + pid = parms[0]; - unsavermask(rsave); + /* pid into ACC */ + aopOp(pid,ic,FALSE,FALSE); + emitcode ("mov","a,%s", + aopGet(pid,0,FALSE,TRUE,DP2_RESULT_REG)); + freeAsmop (pid, NULL, ic, FALSE); + + emitcode ("lcall","System_ProcessResume"); + + unsavermask(rsave); } /*-----------------------------------------------------------------*/ @@ -12181,9 +13722,9 @@ static void genSystemProcessResume(iCode *ic,int nparms, operand **parms) /*-----------------------------------------------------------------*/ static void genSystem (iCode *ic,int nparms,char *name) { - assert(nparms == 0); + assert(nparms == 0); - emitcode ("lcall","System_%s",name); + emitcode ("lcall","System_%s",name); } /*-----------------------------------------------------------------*/ @@ -12191,37 +13732,41 @@ static void genSystem (iCode *ic,int nparms,char *name) /*-----------------------------------------------------------------*/ static void genSystemPoll(iCode *ic,int nparms, operand **parms,char *name) { - bitVect *rsave ; - operand *fp; - - assert (nparms==1); - /* save registers that need to be saved */ - savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask), - ds390_rUmaskForOp (IC_RESULT(ic)))); - - 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)); - } 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)); - } - freeAsmop (fp, NULL, ic, FALSE); + bitVect *rsave ; + operand *fp; + + assert (nparms==1); + /* save registers that need to be saved */ + savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask), + ds390_rUmaskForOp (IC_RESULT(ic)))); + + fp = parms[0]; + aopOp (fp,ic,FALSE,FALSE); + if (AOP_TYPE (fp) == AOP_IMMD) { + emitcode ("mov", "dptr,%s", + aopGet (fp, 0, TRUE, FALSE, DP2_RESULT_REG)); + } else if (AOP_TYPE(fp) != AOP_STR) { /* not already in dptr */ + emitcode ("mov","dpl,%s", + aopGet(fp,0,FALSE,FALSE,DP2_RESULT_REG)); + emitcode ("mov","dph,%s", + aopGet(fp,1,FALSE,FALSE,DP2_RESULT_REG)); + emitcode ("mov","dpx,%s", + aopGet(fp,2,FALSE,FALSE,DP2_RESULT_REG)); + } + freeAsmop (fp, NULL, ic, FALSE); - emitcode ("lcall","System_%sPoll",name); + emitcode ("lcall","System_%sPoll",name); - /* put result into place */ - { - symbol *rsym = OP_SYMBOL(IC_RESULT(ic)); - if (rsym->liveFrom != rsym->liveTo) { - aopOp (IC_RESULT(ic),ic,FALSE,FALSE); - aopPut(AOP(IC_RESULT(ic)),"a",0); - freeAsmop (IC_RESULT(ic), NULL, ic, FALSE); - } - } - unsavermask(rsave); + /* put result into place */ + { + symbol *rsym = OP_SYMBOL(IC_RESULT(ic)); + if (rsym->liveFrom != rsym->liveTo) { + aopOp (IC_RESULT(ic),ic,FALSE,FALSE); + aopPut(IC_RESULT(ic),"a",0); + freeAsmop (IC_RESULT(ic), NULL, ic, FALSE); + } + } + unsavermask(rsave); } /*-----------------------------------------------------------------*/ @@ -12229,128 +13774,401 @@ static void genSystemPoll(iCode *ic,int nparms, operand **parms,char *name) /*-----------------------------------------------------------------*/ static void genSystemGetCurrentID(iCode *ic,int nparms, operand **parms,char *name) { - assert (nparms==0); + assert (nparms==0); + + emitcode ("lcall","System_GetCurrent%sId",name); + /* put result into place */ + { + symbol *rsym = OP_SYMBOL(IC_RESULT(ic)); + if (rsym->liveFrom != rsym->liveTo) { + aopOp (IC_RESULT(ic),ic,FALSE,FALSE); + aopPut(IC_RESULT(ic),"a",0); + freeAsmop (IC_RESULT(ic), NULL, ic, FALSE); + } + } +} + +/*-----------------------------------------------------------------*/ +/* genDjnz - generate decrement & jump if not zero instrucion */ +/*-----------------------------------------------------------------*/ +static int +genDjnz (iCode * ic, iCode * ifx) +{ + symbol *lbl, *lbl1; + if (!ifx) + return 0; + + /* if the if condition has a false label + then we cannot save */ + if (IC_FALSE (ifx)) + return 0; + + /* if the minus is not of the form a = a - 1 */ + if (!isOperandEqual (IC_RESULT (ic), IC_LEFT (ic)) || + !IS_OP_LITERAL (IC_RIGHT (ic))) + return 0; + + if (operandLitValue (IC_RIGHT (ic)) != 1) + return 0; + + /* if the size of this greater than one then no + saving */ + if (getSize (operandType (IC_RESULT (ic))) > 1) + return 0; + + /* otherwise we can save BIG */ + + D (emitcode (";", "genDjnz")); + + lbl = newiTempLabel (NULL); + lbl1 = newiTempLabel (NULL); + + aopOp (IC_RESULT (ic), ic, FALSE, FALSE); + + if (AOP_NEEDSACC(IC_RESULT(ic))) + { + /* If the result is accessed indirectly via + * the accumulator, we must explicitly write + * it back after the decrement. + */ + char *rByte = aopGet (IC_RESULT(ic), 0, FALSE, FALSE, NULL); + + if (strcmp(rByte, "a")) + { + /* Something is hopelessly wrong */ + fprintf(stderr, "*** warning: internal error at %s:%d\n", + __FILE__, __LINE__); + /* We can just give up; the generated code will be inefficient, + * but what the hey. + */ + freeAsmop (IC_RESULT (ic), NULL, ic, TRUE); + return 0; + } + emitcode ("dec", "%s", rByte); + aopPut (IC_RESULT (ic), rByte, 0); + emitcode ("jnz", "!tlabel", lbl->key + 100); + } + else if (IS_AOP_PREG (IC_RESULT (ic))) + { + emitcode ("dec", "%s", + aopGet (IC_RESULT (ic), 0, FALSE, FALSE, NULL)); + MOVA (aopGet (IC_RESULT (ic), 0, FALSE, FALSE, NULL)); + freeAsmop (IC_RESULT (ic), NULL, ic, TRUE); + ifx->generated = 1; + emitcode ("jnz", "!tlabel", lbl->key + 100); + } + else + { + emitcode ("djnz", "%s,!tlabel", aopGet (IC_RESULT (ic), 0, FALSE, TRUE, NULL), + lbl->key + 100); + } + emitcode ("sjmp", "!tlabel", lbl1->key + 100); + emitLabel (lbl); + emitcode ("ljmp", "!tlabel", IC_TRUE (ifx)->key + 100); + emitLabel (lbl1); + + if (!ifx->generated) + freeAsmop (IC_RESULT (ic), NULL, ic, TRUE); + ifx->generated = 1; + return 1; +} + +/*-----------------------------------------------------------------*/ +/* genReceive - generate code for a receive iCode */ +/*-----------------------------------------------------------------*/ +static void +genReceive (iCode * ic) +{ + int size = getSize (operandType (IC_RESULT (ic))); + int offset = 0; + int rb1off ; + + D (emitcode (";", "genReceive")); + + 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), NULL); + } + } + else if (ic->argreg > 12) + { /* bit parameters */ + if (OP_SYMBOL (IC_RESULT (ic))->regs[0]->rIdx != ic->argreg-5) + { + aopOp (IC_RESULT (ic), ic, FALSE, FALSE); + emitcode ("mov", "c,%s", rb1regs[ic->argreg-5]); + outBitC(IC_RESULT (ic)); + } + } + else + { + /* second receive onwards */ + /* this gets a little tricky since unused receives 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 (IC_RESULT (ic), rb1regs[rb1off++ -5], offset++); + } + } + freeAsmop (IC_RESULT (ic), NULL, ic, TRUE); +} + +/*-----------------------------------------------------------------*/ +/* genDummyRead - generate code for dummy read of volatiles */ +/*-----------------------------------------------------------------*/ +static void +genDummyRead (iCode * ic) +{ + operand *op; + int size, offset; + + D (emitcode(";", "genDummyRead")); - emitcode ("lcall","System_GetCurrent%sId",name); - /* put result into place */ - { - symbol *rsym = OP_SYMBOL(IC_RESULT(ic)); - if (rsym->liveFrom != rsym->liveTo) { - aopOp (IC_RESULT(ic),ic,FALSE,FALSE); - aopPut(AOP(IC_RESULT(ic)),"a",0); - freeAsmop (IC_RESULT(ic), NULL, ic, FALSE); - } - } + 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 (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 (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); + aopPut (IC_RESULT (ic), one, 0); /* save old ea in an operand */ + emitcode ("jbc", "ea,%05d$", (tlbl->key + 100)); /* atomic test & clear */ + aopPut (IC_RESULT (ic), zero, 0); + emitLabel (tlbl); + freeAsmop (IC_RESULT (ic), NULL, ic, TRUE); + } + else + { + emitcode ("setb", "c"); + emitcode ("jbc", "ea,%05d$", (tlbl->key + 100)); /* atomic test & clear */ + emitcode ("clr", "c"); + emitLabel (tlbl); + emitcode ("push", "psw"); /* save old ea via c in psw on top of stack*/ + } +} + +/*-----------------------------------------------------------------*/ +/* 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 (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 */ +/* for a built in function */ /*-----------------------------------------------------------------*/ static void genBuiltIn (iCode *ic) { - operand *bi_parms[MAX_BUILTIN_ARGS]; - int nbi_parms; - iCode *bi_iCode; - symbol *bif; - - /* get all the arguments for a built in function */ - bi_iCode = getBuiltinParms(ic,&nbi_parms,bi_parms); - - /* which function is it */ - bif = OP_SYMBOL(IC_LEFT(bi_iCode)); - if (strcmp(bif->name,"__builtin_memcpy_x2x")==0) { - genMemcpyX2X(bi_iCode,nbi_parms,bi_parms,0); - } else if (strcmp(bif->name,"__builtin_memcpy_c2x")==0) { - genMemcpyX2X(bi_iCode,nbi_parms,bi_parms,1); - } else if (strcmp(bif->name,"__builtin_memcmp_x2x")==0) { - genMemcmpX2X(bi_iCode,nbi_parms,bi_parms,0); - } else if (strcmp(bif->name,"__builtin_memcmp_c2x")==0) { - genMemcmpX2X(bi_iCode,nbi_parms,bi_parms,1); - } else if (strcmp(bif->name,"__builtin_memset_x")==0) { - genMemsetX(bi_iCode,nbi_parms,bi_parms); - } else if (strcmp(bif->name,"__builtin_inp")==0) { - genInp(bi_iCode,nbi_parms,bi_parms); - } else if (strcmp(bif->name,"__builtin_outp")==0) { - genOutp(bi_iCode,nbi_parms,bi_parms); - } else if (strcmp(bif->name,"__builtin_swapw")==0) { - genSwapW(bi_iCode,nbi_parms,bi_parms); - /* JavaNative builtIns */ - } else if (strcmp(bif->name,"NatLib_LoadByte")==0) { - genNatLibLoadPrimitive(bi_iCode,nbi_parms,bi_parms,1); - } else if (strcmp(bif->name,"NatLib_LoadShort")==0) { - genNatLibLoadPrimitive(bi_iCode,nbi_parms,bi_parms,2); - } else if (strcmp(bif->name,"NatLib_LoadInt")==0) { - genNatLibLoadPrimitive(bi_iCode,nbi_parms,bi_parms,4); - } else if (strcmp(bif->name,"NatLib_LoadPointer")==0) { - genNatLibLoadPointer(bi_iCode,nbi_parms,bi_parms); - } else if (strcmp(bif->name,"NatLib_InstallImmutableStateBlock")==0) { - genNatLibInstallStateBlock(bi_iCode,nbi_parms,bi_parms,"Immutable"); - } else if (strcmp(bif->name,"NatLib_InstallEphemeralStateBlock")==0) { - genNatLibInstallStateBlock(bi_iCode,nbi_parms,bi_parms,"Ephemeral"); - } else if (strcmp(bif->name,"NatLib_RemoveImmutableStateBlock")==0) { - genNatLibRemoveStateBlock(bi_iCode,nbi_parms,"Immutable"); - } else if (strcmp(bif->name,"NatLib_RemoveEphemeralStateBlock")==0) { - genNatLibRemoveStateBlock(bi_iCode,nbi_parms,"Ephemeral"); - } else if (strcmp(bif->name,"NatLib_GetImmutableStateBlock")==0) { - genNatLibGetStateBlock(bi_iCode,nbi_parms,bi_parms,"Immutable"); - } else if (strcmp(bif->name,"NatLib_GetEphemeralStateBlock")==0) { - genNatLibGetStateBlock(bi_iCode,nbi_parms,bi_parms,"Ephemeral"); - } else if (strcmp(bif->name,"MM_XMalloc")==0) { - genMMMalloc(bi_iCode,nbi_parms,bi_parms,3,"XMalloc"); - } else if (strcmp(bif->name,"MM_Malloc")==0) { - genMMMalloc(bi_iCode,nbi_parms,bi_parms,2,"Malloc"); - } else if (strcmp(bif->name,"MM_ApplicationMalloc")==0) { - genMMMalloc(bi_iCode,nbi_parms,bi_parms,2,"ApplicationMalloc"); - } else if (strcmp(bif->name,"MM_Free")==0) { - genMMMalloc(bi_iCode,nbi_parms,bi_parms,2,"Free"); - } else if (strcmp(bif->name,"MM_Deref")==0) { - genMMDeref(bi_iCode,nbi_parms,bi_parms); - } else if (strcmp(bif->name,"MM_UnrestrictedPersist")==0) { - genMMUnrestrictedPersist(bi_iCode,nbi_parms,bi_parms); - } else if (strcmp(bif->name,"System_ExecJavaProcess")==0) { - genSystemExecJavaProcess(bi_iCode,nbi_parms,bi_parms); - } else if (strcmp(bif->name,"System_GetRTCRegisters")==0) { - genSystemRTCRegisters(bi_iCode,nbi_parms,bi_parms,"Get"); - } else if (strcmp(bif->name,"System_SetRTCRegisters")==0) { - genSystemRTCRegisters(bi_iCode,nbi_parms,bi_parms,"Set"); - } else if (strcmp(bif->name,"System_ThreadSleep")==0) { - genSystemThreadSleep(bi_iCode,nbi_parms,bi_parms,"ThreadSleep"); - } else if (strcmp(bif->name,"System_ThreadSleep_ExitCriticalSection")==0) { - genSystemThreadSleep(bi_iCode,nbi_parms,bi_parms,"ThreadSleep_ExitCriticalSection"); - } else if (strcmp(bif->name,"System_ProcessSleep")==0) { - genSystemThreadSleep(bi_iCode,nbi_parms,bi_parms,"ProcessSleep"); - } else if (strcmp(bif->name,"System_ProcessSleep_ExitCriticalSection")==0) { - genSystemThreadSleep(bi_iCode,nbi_parms,bi_parms,"ProcessSleep_ExitCriticalSection"); - } else if (strcmp(bif->name,"System_ThreadResume")==0) { - genSystemThreadResume(bi_iCode,nbi_parms,bi_parms); - } else if (strcmp(bif->name,"System_SaveThread")==0) { - genSystemThreadResume(bi_iCode,nbi_parms,bi_parms); - } else if (strcmp(bif->name,"System_ThreadResume")==0) { - genSystemThreadResume(bi_iCode,nbi_parms,bi_parms); - } else if (strcmp(bif->name,"System_ProcessResume")==0) { - genSystemProcessResume(bi_iCode,nbi_parms,bi_parms); - } else if (strcmp(bif->name,"System_SaveJavaThreadState")==0) { - genSystem(bi_iCode,nbi_parms,"SaveJavaThreadState"); - } else if (strcmp(bif->name,"System_RestoreJavaThreadState")==0) { - genSystem(bi_iCode,nbi_parms,"RestoreJavaThreadState"); - } else if (strcmp(bif->name,"System_ProcessYield")==0) { - genSystem(bi_iCode,nbi_parms,"ProcessYield"); - } else if (strcmp(bif->name,"System_ProcessSuspend")==0) { - genSystem(bi_iCode,nbi_parms,"ProcessSuspend"); - } else if (strcmp(bif->name,"System_RegisterPoll")==0) { - genSystemPoll(bi_iCode,nbi_parms,bi_parms,"Register"); - } else if (strcmp(bif->name,"System_RemovePoll")==0) { - genSystemPoll(bi_iCode,nbi_parms,bi_parms,"Remove"); - } else if (strcmp(bif->name,"System_GetCurrentThreadId")==0) { - genSystemGetCurrentID(bi_iCode,nbi_parms,bi_parms,"Thread"); - } else if (strcmp(bif->name,"System_GetCurrentProcessId")==0) { - genSystemGetCurrentID(bi_iCode,nbi_parms,bi_parms,"Process"); - } else { - werror(E_INTERNAL_ERROR,__FILE__,__LINE__,"unknown builtin function encountered\n"); - return ; - } - return ; + operand *bi_parms[MAX_BUILTIN_ARGS]; + int nbi_parms; + iCode *bi_iCode; + symbol *bif; + + /* get all the arguments for a built in function */ + bi_iCode = getBuiltinParms(ic,&nbi_parms,bi_parms); + + /* which function is it */ + bif = OP_SYMBOL(IC_LEFT(bi_iCode)); + if (strcmp(bif->name,"__builtin_memcpy_x2x")==0) { + genMemcpyX2X(bi_iCode,nbi_parms,bi_parms,0); + } else if (strcmp(bif->name,"__builtin_memcpy_c2x")==0) { + genMemcpyX2X(bi_iCode,nbi_parms,bi_parms,1); + } else if (strcmp(bif->name,"__builtin_memcmp_x2x")==0) { + genMemcmpX2X(bi_iCode,nbi_parms,bi_parms,0); + } else if (strcmp(bif->name,"__builtin_memcmp_c2x")==0) { + genMemcmpX2X(bi_iCode,nbi_parms,bi_parms,1); + } else if (strcmp(bif->name,"__builtin_memset_x")==0) { + genMemsetX(bi_iCode,nbi_parms,bi_parms); + } else if (strcmp(bif->name,"__builtin_inp")==0) { + genInp(bi_iCode,nbi_parms,bi_parms); + } else if (strcmp(bif->name,"__builtin_outp")==0) { + genOutp(bi_iCode,nbi_parms,bi_parms); + } else if (strcmp(bif->name,"__builtin_swapw")==0) { + genSwapW(bi_iCode,nbi_parms,bi_parms); + /* JavaNative builtIns */ + } else if (strcmp(bif->name,"NatLib_LoadByte")==0) { + genNatLibLoadPrimitive(bi_iCode,nbi_parms,bi_parms,1); + } else if (strcmp(bif->name,"NatLib_LoadShort")==0) { + genNatLibLoadPrimitive(bi_iCode,nbi_parms,bi_parms,2); + } else if (strcmp(bif->name,"NatLib_LoadInt")==0) { + genNatLibLoadPrimitive(bi_iCode,nbi_parms,bi_parms,4); + } else if (strcmp(bif->name,"NatLib_LoadPointer")==0) { + genNatLibLoadPointer(bi_iCode,nbi_parms,bi_parms); + } else if (strcmp(bif->name,"NatLib_InstallImmutableStateBlock")==0) { + genNatLibInstallStateBlock(bi_iCode,nbi_parms,bi_parms,"Immutable"); + } else if (strcmp(bif->name,"NatLib_InstallEphemeralStateBlock")==0) { + genNatLibInstallStateBlock(bi_iCode,nbi_parms,bi_parms,"Ephemeral"); + } else if (strcmp(bif->name,"NatLib_RemoveImmutableStateBlock")==0) { + genNatLibRemoveStateBlock(bi_iCode,nbi_parms,"Immutable"); + } else if (strcmp(bif->name,"NatLib_RemoveEphemeralStateBlock")==0) { + genNatLibRemoveStateBlock(bi_iCode,nbi_parms,"Ephemeral"); + } else if (strcmp(bif->name,"NatLib_GetImmutableStateBlock")==0) { + genNatLibGetStateBlock(bi_iCode,nbi_parms,bi_parms,"Immutable"); + } else if (strcmp(bif->name,"NatLib_GetEphemeralStateBlock")==0) { + genNatLibGetStateBlock(bi_iCode,nbi_parms,bi_parms,"Ephemeral"); + } else if (strcmp(bif->name,"MM_XMalloc")==0) { + genMMMalloc(bi_iCode,nbi_parms,bi_parms,3,"XMalloc"); + } else if (strcmp(bif->name,"MM_Malloc")==0) { + genMMMalloc(bi_iCode,nbi_parms,bi_parms,2,"Malloc"); + } else if (strcmp(bif->name,"MM_ApplicationMalloc")==0) { + genMMMalloc(bi_iCode,nbi_parms,bi_parms,2,"ApplicationMalloc"); + } else if (strcmp(bif->name,"MM_Free")==0) { + genMMMalloc(bi_iCode,nbi_parms,bi_parms,2,"Free"); + } else if (strcmp(bif->name,"MM_Deref")==0) { + genMMDeref(bi_iCode,nbi_parms,bi_parms); + } else if (strcmp(bif->name,"MM_UnrestrictedPersist")==0) { + genMMUnrestrictedPersist(bi_iCode,nbi_parms,bi_parms); + } else if (strcmp(bif->name,"System_ExecJavaProcess")==0) { + genSystemExecJavaProcess(bi_iCode,nbi_parms,bi_parms); + } else if (strcmp(bif->name,"System_GetRTCRegisters")==0) { + genSystemRTCRegisters(bi_iCode,nbi_parms,bi_parms,"Get"); + } else if (strcmp(bif->name,"System_SetRTCRegisters")==0) { + genSystemRTCRegisters(bi_iCode,nbi_parms,bi_parms,"Set"); + } else if (strcmp(bif->name,"System_ThreadSleep")==0) { + genSystemThreadSleep(bi_iCode,nbi_parms,bi_parms,"ThreadSleep"); + } else if (strcmp(bif->name,"System_ThreadSleep_ExitCriticalSection")==0) { + genSystemThreadSleep(bi_iCode,nbi_parms,bi_parms,"ThreadSleep_ExitCriticalSection"); + } else if (strcmp(bif->name,"System_ProcessSleep")==0) { + genSystemThreadSleep(bi_iCode,nbi_parms,bi_parms,"ProcessSleep"); + } else if (strcmp(bif->name,"System_ProcessSleep_ExitCriticalSection")==0) { + genSystemThreadSleep(bi_iCode,nbi_parms,bi_parms,"ProcessSleep_ExitCriticalSection"); + } else if (strcmp(bif->name,"System_ThreadResume")==0) { + genSystemThreadResume(bi_iCode,nbi_parms,bi_parms); + } else if (strcmp(bif->name,"System_SaveThread")==0) { + genSystemThreadResume(bi_iCode,nbi_parms,bi_parms); + } else if (strcmp(bif->name,"System_ThreadResume")==0) { + genSystemThreadResume(bi_iCode,nbi_parms,bi_parms); + } else if (strcmp(bif->name,"System_ProcessResume")==0) { + genSystemProcessResume(bi_iCode,nbi_parms,bi_parms); + } else if (strcmp(bif->name,"System_SaveJavaThreadState")==0) { + genSystem(bi_iCode,nbi_parms,"SaveJavaThreadState"); + } else if (strcmp(bif->name,"System_RestoreJavaThreadState")==0) { + genSystem(bi_iCode,nbi_parms,"RestoreJavaThreadState"); + } else if (strcmp(bif->name,"System_ProcessYield")==0) { + genSystem(bi_iCode,nbi_parms,"ProcessYield"); + } else if (strcmp(bif->name,"System_ProcessSuspend")==0) { + genSystem(bi_iCode,nbi_parms,"ProcessSuspend"); + } else if (strcmp(bif->name,"System_RegisterPoll")==0) { + genSystemPoll(bi_iCode,nbi_parms,bi_parms,"Register"); + } else if (strcmp(bif->name,"System_RemovePoll")==0) { + genSystemPoll(bi_iCode,nbi_parms,bi_parms,"Remove"); + } else if (strcmp(bif->name,"System_GetCurrentThreadId")==0) { + genSystemGetCurrentID(bi_iCode,nbi_parms,bi_parms,"Thread"); + } else if (strcmp(bif->name,"System_GetCurrentProcessId")==0) { + genSystemGetCurrentID(bi_iCode,nbi_parms,bi_parms,"Process"); + } else { + werror(E_INTERNAL_ERROR,__FILE__,__LINE__,"unknown builtin function encountered\n"); + return ; + } + return ; } /*-----------------------------------------------------------------*/ @@ -12362,11 +14180,12 @@ gen390Code (iCode * lic) iCode *ic; int cln = 0; + _G.currentFunc = NULL; lineHead = lineCurr = NULL; dptrn[1][0] = "dpl1"; dptrn[1][1] = "dph1"; dptrn[1][2] = "dpx1"; - + if (options.model == MODEL_FLAT24) { fReturnSizeDS390 = 5; fReturn = fReturn24; @@ -12377,19 +14196,13 @@ gen390Code (iCode * lic) } #if 1 /* print the allocation information */ - if (allocInfo) - printAllocInfo (currFunc, codeOutFile); + if (allocInfo && currFunc) + printAllocInfo (currFunc, codeOutBuf); #endif /* if debug information required */ if (options.debug && currFunc) { - cdbSymbol (currFunc, cdbFile, FALSE, TRUE); - _G.debugLine = 1; - if (IS_STATIC (currFunc->etype)) - emitcode ("", "F%s$%s$0$0 ==.", moduleName, currFunc->name); - else - emitcode ("", "G$%s$0$0 ==.", currFunc->name); - _G.debugLine = 0; + debugFile->writeFunction (currFunc, lic); } /* stack pointer name */ if (options.useXstack) @@ -12400,220 +14213,248 @@ gen390Code (iCode * lic) for (ic = lic; ic; ic = ic->next) { + _G.current_iCode = ic; if (ic->lineno && cln != ic->lineno) - { - if (options.debug) - { - _G.debugLine = 1; - emitcode ("", "C$%s$%d$%d$%d ==.", - FileBaseName (ic->filename), ic->lineno, - ic->level, ic->block); - _G.debugLine = 0; - } - emitcode ("", ";\t%s:%d: %s", ic->filename, ic->lineno, - printCLine(ic->filename, ic->lineno)); - cln = ic->lineno; - } + { + if (options.debug) + { + debugFile->writeCLine (ic); + } + if (!options.noCcodeInAsm) { + emitcode ("", ";\t%s:%d: %s", ic->filename, ic->lineno, + printCLine(ic->filename, ic->lineno)); + } + cln = ic->lineno; + } + if (options.iCodeInAsm) { + char *iLine = printILine(ic); + emitcode("", ";ic:%d: %s", ic->key, iLine); + dbuf_free(iLine); + } /* if the result is marked as spilt and rematerializable or code for this has already been generated then do nothing */ if (resultRemat (ic) || ic->generated) - continue; + continue; /* depending on the operation */ switch (ic->op) - { - case '!': - genNot (ic); - break; - - case '~': - genCpl (ic); - break; - - case UNARYMINUS: - genUminus (ic); - break; - - case IPUSH: - genIpush (ic); - break; - - case IPOP: - /* IPOP happens only when trying to restore a - spilt live range, if there is an ifx statement - following this pop then the if statement might - be using some of the registers being popped which - would destory the contents of the register so - we need to check for this condition and handle it */ - if (ic->next && - ic->next->op == IFX && - regsInCommon (IC_LEFT (ic), IC_COND (ic->next))) - genIfx (ic->next, ic); - else - genIpop (ic); - break; - - case CALL: - genCall (ic); - break; - - case PCALL: - genPcall (ic); - break; - - case FUNCTION: - genFunction (ic); - break; - - case ENDFUNCTION: - genEndFunction (ic); - break; - - case RETURN: - genRet (ic); - break; - - case LABEL: - genLabel (ic); - break; - - case GOTO: - genGoto (ic); - break; - - case '+': - genPlus (ic); - break; - - case '-': - if (!genDjnz (ic, ifxForOp (IC_RESULT (ic), ic))) - genMinus (ic); - break; - - case '*': - genMult (ic); - break; - - case '/': - genDiv (ic); - break; - - case '%': - genMod (ic); - break; - - case '>': - genCmpGt (ic, ifxForOp (IC_RESULT (ic), ic)); - break; - - case '<': - genCmpLt (ic, ifxForOp (IC_RESULT (ic), ic)); - break; - - case LE_OP: - case GE_OP: - case NE_OP: - - /* note these two are xlated by algebraic equivalence - during parsing SDCC.y */ - werror (E_INTERNAL_ERROR, __FILE__, __LINE__, - "got '>=' or '<=' shouldn't have come here"); - break; - - case EQ_OP: - genCmpEq (ic, ifxForOp (IC_RESULT (ic), ic)); - break; - - case AND_OP: - genAndOp (ic); - break; - - case OR_OP: - genOrOp (ic); - break; - - case '^': - genXor (ic, ifxForOp (IC_RESULT (ic), ic)); - break; - - case '|': - genOr (ic, ifxForOp (IC_RESULT (ic), ic)); - break; - - case BITWISEAND: - genAnd (ic, ifxForOp (IC_RESULT (ic), ic)); - break; - - case INLINEASM: - genInline (ic); - break; - - case RRC: - genRRC (ic); - break; - - case RLC: - genRLC (ic); - break; - - case GETHBIT: - genGetHbit (ic); - break; - - case LEFT_OP: - genLeftShift (ic); - break; - - case RIGHT_OP: - genRightShift (ic); - break; - - case GET_VALUE_AT_ADDRESS: - genPointerGet (ic,hasInc(IC_LEFT(ic),ic, getSize(operandType(IC_RESULT(ic))))); - break; - - case '=': - if (POINTER_SET (ic)) - genPointerSet (ic,hasInc(IC_RESULT(ic),ic,getSize(operandType(IC_RIGHT(ic))))); - else - genAssign (ic); - break; - - case IFX: - genIfx (ic, NULL); - break; - - case ADDRESS_OF: - genAddrOf (ic); - break; - - case JUMPTABLE: - genJumpTab (ic); - break; - - case CAST: - genCast (ic); - break; - - case RECEIVE: - genReceive (ic); - break; - - case SEND: - if (ic->builtinSEND) genBuiltIn(ic); - else addSet (&_G.sendSet, ic); - break; + { + case '!': + genNot (ic); + break; + + case '~': + genCpl (ic); + break; + + case UNARYMINUS: + genUminus (ic); + break; + + case IPUSH: + genIpush (ic); + break; + + case IPOP: + /* IPOP happens only when trying to restore a + spilt live range, if there is an ifx statement + following this pop then the if statement might + be using some of the registers being popped which + would destory the contents of the register so + we need to check for this condition and handle it */ + if (ic->next && + ic->next->op == IFX && + regsInCommon (IC_LEFT (ic), IC_COND (ic->next))) + genIfx (ic->next, ic); + else + genIpop (ic); + break; + + case CALL: + genCall (ic); + break; + + case PCALL: + genPcall (ic); + break; + + case FUNCTION: + genFunction (ic); + break; + + case ENDFUNCTION: + genEndFunction (ic); + break; + + case RETURN: + genRet (ic); + break; + + case LABEL: + genLabel (ic); + break; + + case GOTO: + genGoto (ic); + break; + + case '+': + genPlus (ic); + break; + + case '-': + if (!genDjnz (ic, ifxForOp (IC_RESULT (ic), ic))) + genMinus (ic); + break; + + case '*': + genMult (ic); + break; + + case '/': + genDiv (ic); + break; + + case '%': + genMod (ic); + break; + + case '>': + genCmpGt (ic, ifxForOp (IC_RESULT (ic), ic)); + break; + + case '<': + genCmpLt (ic, ifxForOp (IC_RESULT (ic), ic)); + break; + + case LE_OP: + case GE_OP: + case NE_OP: + + /* note these two are xlated by algebraic equivalence + during parsing SDCC.y */ + werror (E_INTERNAL_ERROR, __FILE__, __LINE__, + "got '>=' or '<=' shouldn't have come here"); + break; + + case EQ_OP: + genCmpEq (ic, ifxForOp (IC_RESULT (ic), ic)); + break; + + case AND_OP: + genAndOp (ic); + break; + + case OR_OP: + genOrOp (ic); + break; + + case '^': + genXor (ic, ifxForOp (IC_RESULT (ic), ic)); + break; + + case '|': + genOr (ic, ifxForOp (IC_RESULT (ic), ic)); + break; + + case BITWISEAND: + genAnd (ic, ifxForOp (IC_RESULT (ic), ic)); + break; + + case INLINEASM: + genInline (ic); + break; + + case RRC: + genRRC (ic); + break; + + case RLC: + genRLC (ic); + break; + + case GETHBIT: + genGetHbit (ic); + break; + + case LEFT_OP: + genLeftShift (ic); + break; + + case RIGHT_OP: + genRightShift (ic); + break; + + case GET_VALUE_AT_ADDRESS: + genPointerGet (ic, + hasInc (IC_LEFT (ic), ic, + getSize (operandType (IC_RESULT (ic))))); + break; + + case '=': + if (POINTER_SET (ic)) + genPointerSet (ic, + hasInc (IC_RESULT (ic), ic, + getSize (operandType (IC_RIGHT (ic))))); + else + genAssign (ic); + break; + + case IFX: + genIfx (ic, NULL); + break; + + case ADDRESS_OF: + genAddrOf (ic); + break; + + case JUMPTABLE: + genJumpTab (ic); + break; + + case CAST: + genCast (ic); + break; + + case RECEIVE: + genReceive (ic); + break; + + case SEND: + if (ic->builtinSEND) + genBuiltIn(ic); + 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 - case ARRAYINIT: - genArrayInit(ic); - break; - - default: - ic = ic; - } + default: + ic = ic; + } } @@ -12623,6 +14464,6 @@ gen390Code (iCode * lic) peepHole (&lineHead); /* now do the actual printing */ - printLine (lineHead, codeOutFile); + printLine (lineHead, codeOutBuf); return; }