X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fz80%2Fgen.c;h=98d02c801e98b6ab36a4c256bfea41597671d781;hb=88911079e8f9eb7fb3dfb08c32e805bb7b5e62c1;hp=63b547861e840edfcc949892e862068359c0e87b;hpb=3665f75dcd3011e6367f5343b7a3f2cfbf50ecea;p=fw%2Fsdcc diff --git a/src/z80/gen.c b/src/z80/gen.c index 63b54786..98d02c80 100644 --- a/src/z80/gen.c +++ b/src/z80/gen.c @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- gen.c - Z80 specific code generator. - + Michael Hope 2000 Based on the mcs51 generator - Sandeep Dutta . sandeep.dutta@usa.net (1998) @@ -50,22 +50,22 @@ No asm strings Includes long mul/div in code 2. Optimised memcpy for acc use 32102 102 226B - 3. Optimised strcpy for acc use 27819 117 2237 + 3. Optimised strcpy for acc use 27819 117 2237 3a Optimised memcpy fun - 4. Optimised strcmp fun 21999 149 2294 - 5. Optimised strcmp further 21660 151 228C - 6. Optimised memcpy by unroling 20885 157 2201 - 7. After turning loop induction on 19862 165 236D - 8. Same as 7 but with more info - 9. With asm optimised strings 17030 192 2223 + 4. Optimised strcmp fun 21999 149 2294 + 5. Optimised strcmp further 21660 151 228C + 6. Optimised memcpy by unroling 20885 157 2201 + 7. After turning loop induction on 19862 165 236D + 8. Same as 7 but with more info + 9. With asm optimised strings 17030 192 2223 10 and below are with asm strings off. - 10 Mucho optimisations 13562 201 1FCC + 10 Mucho optimisations 13562 201 1FCC Apparent advantage of turning on regparams: 1. Cost of push - Decent case is push of a constant + Decent case is push of a constant - ld hl,#n; push hl: (10+11)*nargs 2. Cost of pull from stack Using asm with ld hl, etc @@ -74,8 +74,8 @@ 3. Cost of fixing stack - pop hl*nargs 10*nargs - - So cost is (10+11+7+6+7+10)*nargs+10+11 + + So cost is (10+11+7+6+7+10)*nargs+10+11 = 51*nargs+21 = 123 for mul, div, strcmp, strcpy Saving of (98298+32766+32766+32766)*123 = 24181308 @@ -121,7 +121,7 @@ area. ix-0 is the top most local variable. */ -enum +enum { /* Set to enable debugging trace statements in the output assembly code. */ DISABLE_DEBUG = 0 @@ -175,9 +175,9 @@ static struct }; // PENDING -#define ACC_NAME _pairs[PAIR_AF].h +#define ACC_NAME _pairs[PAIR_AF].h -enum +enum { LSB, MSB16, @@ -187,18 +187,18 @@ enum /** Code generator persistent data. */ -static struct +static struct { /** Used to optimised setting up of a pair by remebering what it contains and adjusting instead of reloading where possible. */ - struct + struct { AOP_TYPE last_type; const char *base; int offset; } pairs[NUM_PAIRS]; - struct + struct { int last; int pushed; @@ -214,11 +214,14 @@ static struct int pushedDE; } calleeSaves; + bool omitFramePtr; int frameId; int receiveOffset; bool flushStatics; bool in_home; const char *lastFunctionName; + iCode *current_iCode; + bool preserveCarry; set *sendSet; @@ -228,11 +231,12 @@ static struct bool saved; } saves; - struct + struct { lineNode *head; lineNode *current; int isInline; + int isDebug; allocTrace trace; } lines; @@ -260,7 +264,8 @@ static const char *aopNames[] = { "AOP_HLREG", "AOP_SIMPLELIT", "AOP_EXSTK", - "AOP_PAIRPT" + "AOP_PAIRPT", + "AOP_DUMMY" }; static bool @@ -328,9 +333,9 @@ static bool isPairInUseNotInRet(PAIR_ID id, iCode *ic) { bitVect *rInUse; - + rInUse = bitVectCplAnd (bitVectCopy (ic->rMask), ic->rUsed); - + if (id == PAIR_DE) { return bitVectBitValue (rInUse, D_IDX) || bitVectBitValue(rInUse, E_IDX); @@ -357,7 +362,7 @@ getFreePairId (iCode *ic) { return PAIR_INVALID; } -} +} static void _tidyUp (char *buf) @@ -396,16 +401,19 @@ _newLineNode (char *line) static void _vemit2 (const char *szFormat, va_list ap) { - char buffer[256]; + char buffer[INITIAL_INLINEASM]; tvsprintf (buffer, sizeof(buffer), szFormat, ap); _tidyUp (buffer); _G.lines.current = (_G.lines.current ? - connectLine (_G.lines.current, _newLineNode (buffer)) : - (_G.lines.head = _newLineNode (buffer))); + connectLine (_G.lines.current, _newLineNode (buffer)) : + (_G.lines.head = _newLineNode (buffer))); _G.lines.current->isInline = _G.lines.isInline; + _G.lines.current->isDebug = _G.lines.isDebug; + _G.lines.current->ic = _G.current_iCode; + _G.lines.current->isComment = (*buffer == ';'); } static void @@ -426,15 +434,28 @@ emitDebug (const char *szFormat,...) if (!DISABLE_DEBUG) { va_list ap; - + va_start (ap, szFormat); - + _vemit2 (szFormat, ap); - + va_end (ap); } } +/*-----------------------------------------------------------------*/ +/* z80_emitDebuggerSymbol - associate the current code location */ +/* with a debugger symbol */ +/*-----------------------------------------------------------------*/ +void +z80_emitDebuggerSymbol (char * debugSym) +{ + _G.lines.isDebug = 1; + emit2 ("%s !equ .", debugSym); + emit2 ("!global", debugSym); + _G.lines.isDebug = 0; +} + /*-----------------------------------------------------------------*/ /* emit2 - writes the code into a file : for now it is simple */ /*-----------------------------------------------------------------*/ @@ -465,17 +486,18 @@ _emit2 (const char *inst, const char *fmt,...) (_G.lines.head = _newLineNode (lb))); } _G.lines.current->isInline = _G.lines.isInline; + _G.lines.current->ic = _G.current_iCode; va_end (ap); } static void _emitMove(const char *to, const char *from) { - if (STRCASECMP(to, from) != 0) + if (STRCASECMP(to, from) != 0) { emit2("ld %s,%s", to, from); } - else + else { // Optimise it out. // Could leave this to the peephole, but sometimes the peephole is inhibited. @@ -485,12 +507,26 @@ _emitMove(const char *to, const char *from) void aopDump(const char *plabel, asmop *aop) { + int i; + char regbuf[9]; + char *rbp = regbuf; + emitDebug("; Dump of %s: type %s size %u", plabel, aopNames[aop->type], aop->size); switch (aop->type) { + case AOP_EXSTK: case AOP_STK: emitDebug("; aop_stk %d", aop->aopu.aop_stk); break; + case AOP_REG: + for (i=aop->size-1;i>=0;i--) + *rbp++ = *(aop->aopu.aop_reg[i]->name); + *rbp = '\0'; + emitDebug("; reg = %s", regbuf); + break; + case AOP_PAIRPTR: + emitDebug("; pairptr = (%s)", _pairs[aop->aopu.aop_pairId].name); + default: /* No information. */ break; @@ -516,17 +552,17 @@ getPairName (asmop * aop) if (aop->type == AOP_REG) { switch (aop->aopu.aop_reg[0]->rIdx) - { - case C_IDX: - return "bc"; - break; - case E_IDX: - return "de"; - break; - case L_IDX: - return "hl"; - break; - } + { + case C_IDX: + return "bc"; + break; + case E_IDX: + return "de"; + break; + case L_IDX: + return "hl"; + break; + } } else if (aop->type == AOP_STR || aop->type == AOP_HLREG) { @@ -549,22 +585,22 @@ getPairId (asmop * aop) if (aop->size == 2) { if (aop->type == AOP_REG) - { - if ((aop->aopu.aop_reg[0]->rIdx == C_IDX) && (aop->aopu.aop_reg[1]->rIdx == B_IDX)) - { - return PAIR_BC; - } - if ((aop->aopu.aop_reg[0]->rIdx == E_IDX) && (aop->aopu.aop_reg[1]->rIdx == D_IDX)) - { - return PAIR_DE; - } - if ((aop->aopu.aop_reg[0]->rIdx == L_IDX) && (aop->aopu.aop_reg[1]->rIdx == H_IDX)) - { - return PAIR_HL; - } - } + { + if ((aop->aopu.aop_reg[0]->rIdx == C_IDX) && (aop->aopu.aop_reg[1]->rIdx == B_IDX)) + { + return PAIR_BC; + } + if ((aop->aopu.aop_reg[0]->rIdx == E_IDX) && (aop->aopu.aop_reg[1]->rIdx == D_IDX)) + { + return PAIR_DE; + } + if ((aop->aopu.aop_reg[0]->rIdx == L_IDX) && (aop->aopu.aop_reg[1]->rIdx == H_IDX)) + { + return PAIR_HL; + } + } else if (aop->type == AOP_STR || aop->type == AOP_HLREG) - { + { int i; for (i = 0; i < NUM_PAIRS; i++) { @@ -585,6 +621,22 @@ isPair (asmop * aop) return (getPairId (aop) != PAIR_INVALID); } +/** Returns TRUE if the registers used in aop cannot be split into high + and low halves */ +bool +isUnsplitable (asmop * aop) +{ + switch (getPairId (aop)) + { + case PAIR_IX: + case PAIR_IY: + return TRUE; + default: + return FALSE; + } + return FALSE; +} + bool isPtrPair (asmop * aop) { @@ -607,6 +659,30 @@ spillPair (PAIR_ID pairId) _G.pairs[pairId].base = NULL; } +/* Given a register name, spill the pair (if any) the register is part of */ +static void +spillPairReg (const char *regname) +{ + if (strlen(regname)==1) + { + switch (*regname) + { + case 'h': + case 'l': + spillPair(PAIR_HL); + break; + case 'd': + case 'e': + spillPair(PAIR_DE); + break; + case 'b': + case 'c': + spillPair(PAIR_BC); + break; + } + } +} + /** Push a register pair onto the stack */ void genPairPush (asmop * aop) @@ -629,6 +705,39 @@ _pop (PAIR_ID pairId) spillPair (pairId); } +void +genMovePairPair (PAIR_ID srcPair, PAIR_ID dstPair) +{ + switch (dstPair) + { + case PAIR_IX: + case PAIR_IY: + case PAIR_AF: + _push(srcPair); + _pop(dstPair); + break; + case PAIR_BC: + case PAIR_DE: + case PAIR_HL: + if (srcPair == PAIR_IX || srcPair == PAIR_IY) + { + _push(srcPair); + _pop(dstPair); + } + else + { + emit2("ld %s,%s",_pairs[dstPair].l,_pairs[srcPair].l); + emit2("ld %s,%s",_pairs[dstPair].h,_pairs[srcPair].h); + } + default: + wassertl (0, "Tried to move a nonphysical pair"); + } + _G.pairs[dstPair].last_type = _G.pairs[srcPair].last_type; + _G.pairs[dstPair].base = _G.pairs[srcPair].base; + _G.pairs[dstPair].offset = _G.pairs[srcPair].offset; +} + + /*-----------------------------------------------------------------*/ /* newAsmop - creates a new asmOp */ /*-----------------------------------------------------------------*/ @@ -670,7 +779,7 @@ aopForSym (iCode * ic, symbol * sym, bool result, bool requires_a) Normally everything is AOP_STK, but for offsets of < -128 or > 127 on the Z80 an extended stack pointer is used. */ - if (IS_Z80 && (options.ommitFramePtr || sym->stack < INT8MIN || sym->stack > (int)(INT8MAX-getSize (sym->type)))) + if (IS_Z80 && (_G.omitFramePtr || sym->stack < INT8MIN || sym->stack > (int)(INT8MAX-getSize (sym->type)))) { emitDebug ("; AOP_EXSTK for %s", sym->rname); sym->aop = aop = newAsmop (AOP_EXSTK); @@ -695,18 +804,34 @@ aopForSym (iCode * ic, symbol * sym, bool result, bool requires_a) return aop; } - if (IS_GB) + if( IN_REGSP( space )) + { /*.p.t.20030716 minor restructure to add SFR support to the Z80 */ + if (IS_GB) { /* if it is in direct space */ - if (IN_REGSP (space) && !requires_a) - { - sym->aop = aop = newAsmop (AOP_SFR); - aop->aopu.aop_dir = sym->rname; - aop->size = getSize (sym->type); - emitDebug ("; AOP_SFR for %s", sym->rname); - return aop; - } + if( !requires_a ) + { + sym->aop = aop = newAsmop (AOP_SFR); + aop->aopu.aop_dir = sym->rname; + aop->size = getSize (sym->type); + emitDebug ("; AOP_SFR for %s", sym->rname); + return aop; + } + } + else + { /*.p.t.20030716 adding SFR support to the Z80 port */ + aop = newAsmop (AOP_SFR); + sym->aop = aop; + aop->aopu.aop_dir = sym->rname; + aop->size = getSize( sym->type ); + aop->paged = FUNC_REGBANK(sym->type); + aop->bcInUse = isPairInUse( PAIR_BC, ic ); + aop->deInUse = isPairInUse( PAIR_DE, ic ); + emitDebug( ";Z80 AOP_SFR for %s banked:%d bc:%d de:%d", sym->rname, FUNC_REGBANK(sym->type), aop->bcInUse, aop->deInUse ); + + return( aop ); } + } /* only remaining is far space */ /* in which case DPTR gets the address */ @@ -743,14 +868,14 @@ aopForRemat (symbol * sym) { /* if plus or minus print the right hand side */ if (ic->op == '+' || ic->op == '-') - { - /* PENDING: for re-target */ - sprintf (s, "0x%04x %c ", (int) operandLitValue (IC_RIGHT (ic)), - ic->op); - s += strlen (s); - ic = OP_SYMBOL (IC_LEFT (ic))->rematiCode; - continue; - } + { + /* PENDING: for re-target */ + sprintf (s, "0x%04x %c ", (int) operandLitValue (IC_RIGHT (ic)), + ic->op); + s += strlen (s); + ic = OP_SYMBOL (IC_LEFT (ic))->rematiCode; + continue; + } /* we reached the end */ sprintf (s, "%s", OP_SYMBOL (IC_LEFT (ic))->rname); break; @@ -783,16 +908,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; @@ -823,10 +948,10 @@ operandsEqu (operand * op1, operand * op2) if (sym1 == sym2) return 1; - if (strcmp (sym1->rname, sym2->rname) == 0) + if (sym1->rname[0] && sym2->rname[0] + && strcmp (sym1->rname, sym2->rname) == 0) return 2; - /* if left is a tmp & right is not */ if (IS_ITEMP (op1) && !IS_ITEMP (op2) && @@ -868,7 +993,7 @@ sameRegs (asmop * aop1, asmop * aop2) for (i = 0; i < aop1->size; i++) if (aop1->aopu.aop_reg[i] != - aop2->aopu.aop_reg[i]) + aop2->aopu.aop_reg[i]) return FALSE; return TRUE; @@ -899,6 +1024,11 @@ aopOp (operand * op, iCode * ic, bool result, bool requires_a) /* if already has a asmop then continue */ if (op->aop) { + if (op->aop->type == AOP_SFR) + { + op->aop->bcInUse = isPairInUse( PAIR_BC, ic ); + op->aop->deInUse = isPairInUse( PAIR_DE, ic ); + } return; } @@ -906,6 +1036,11 @@ aopOp (operand * op, iCode * ic, bool result, bool requires_a) if (IS_SYMOP (op) && OP_SYMBOL (op)->aop) { op->aop = OP_SYMBOL (op)->aop; + if (op->aop->type == AOP_SFR) + { + op->aop->bcInUse = isPairInUse( PAIR_BC, ic ); + op->aop->deInUse = isPairInUse( PAIR_DE, ic ); + } return; } @@ -941,64 +1076,79 @@ aopOp (operand * op, iCode * ic, bool result, bool requires_a) { /* 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->ruonly) - { - int i; - aop = op->aop = sym->aop = newAsmop (AOP_STR); - aop->size = getSize (sym->type); - for (i = 0; i < 4; i++) - aop->aopu.aop_str[i] = _fReturn[i]; - return; - } + { + int i; + aop = op->aop = sym->aop = newAsmop (AOP_STR); + aop->size = getSize (sym->type); + for (i = 0; i < 4; i++) + aop->aopu.aop_str[i] = _fReturn[i]; + return; + } if (sym->accuse) - { - if (sym->accuse == ACCUSE_A) - { - aop = op->aop = sym->aop = newAsmop (AOP_ACC); - aop->size = getSize (sym->type); + { + if (sym->accuse == ACCUSE_A) + { + aop = op->aop = sym->aop = newAsmop (AOP_ACC); + aop->size = getSize (sym->type); wassertl(aop->size == 1, "Internal error: Caching in A, but too big to fit in A"); aop->aopu.aop_str[0] = _pairs[PAIR_AF].h; - } - else if (sym->accuse == ACCUSE_SCRATCH) - { - aop = op->aop = sym->aop = newAsmop (AOP_HLREG); - aop->size = getSize (sym->type); + } + else if (sym->accuse == ACCUSE_SCRATCH) + { + aop = op->aop = sym->aop = newAsmop (AOP_HLREG); + aop->size = getSize (sym->type); wassertl(aop->size <= 2, "Internal error: Caching in HL, but too big to fit in HL"); aop->aopu.aop_str[0] = _pairs[PAIR_HL].l; aop->aopu.aop_str[1] = _pairs[PAIR_HL].h; - } + } else if (sym->accuse == ACCUSE_IY) { - aop = op->aop = sym->aop = newAsmop (AOP_HLREG); - aop->size = getSize (sym->type); + aop = op->aop = sym->aop = newAsmop (AOP_HLREG); + aop->size = getSize (sym->type); wassertl(aop->size <= 2, "Internal error: Caching in IY, but too big to fit in IY"); aop->aopu.aop_str[0] = _pairs[PAIR_IY].l; aop->aopu.aop_str[1] = _pairs[PAIR_IY].h; } - else + else { wassertl (0, "Marked as being allocated into A or HL but is actually in neither"); } - return; - } + 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, requires_a); - wassertl (aop->size >= getSize (sym->type), "Operand doesn't fit in the spill location"); + 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, requires_a); + 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; } @@ -1047,12 +1197,12 @@ 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; + } } } @@ -1084,31 +1234,31 @@ aopGetLitWordLong (asmop * aop, int offset, bool with_hash) /* PENDING: for re-target */ if (with_hash) { - tsprintf (buffer, sizeof(buffer), - "!hashedstr + %d", aop->aopu.aop_immd, offset); + tsprintf (buffer, sizeof(buffer), + "!hashedstr + %d", aop->aopu.aop_immd, offset); } else if (offset == 0) { tsprintf (buffer, sizeof(buffer), - "%s", aop->aopu.aop_immd); + "%s", aop->aopu.aop_immd); } else { - tsprintf (buffer, sizeof(buffer), - "%s + %d", aop->aopu.aop_immd, offset); + tsprintf (buffer, sizeof(buffer), + "%s + %d", aop->aopu.aop_immd, offset); } return traceAlloc(&_G.trace.aops, Safe_strdup(buffer)); case AOP_LIT: { - value *val = aop->aopu.aop_lit; - /* if it is a float then it gets tricky */ - /* otherwise it is fairly simple */ - if (!IS_FLOAT (val->type)) - { - unsigned long v = (unsigned long) floatFromVal (val); - - if (offset == 2) + value *val = aop->aopu.aop_lit; + /* if it is a float then it gets tricky */ + /* otherwise it is fairly simple */ + if (!IS_FLOAT (val->type)) + { + unsigned long v = (unsigned long) floatFromVal (val); + + if (offset == 2) { v >>= 16; } @@ -1116,20 +1266,20 @@ aopGetLitWordLong (asmop * aop, int offset, bool with_hash) { // OK } - else + else { wassertl(0, "Encountered an invalid offset while fetching a literal"); } - if (with_hash) - tsprintf (buffer, sizeof(buffer), "!immedword", v); - else - tsprintf (buffer, sizeof(buffer), "!constword", v); + if (with_hash) + tsprintf (buffer, sizeof(buffer), "!immedword", v); + else + tsprintf (buffer, sizeof(buffer), "!constword", v); return traceAlloc(&_G.trace.aops, Safe_strdup(buffer)); - } - else - { + } + else + { union { float f; unsigned char c[4]; @@ -1145,13 +1295,13 @@ aopGetLitWordLong (asmop * aop, int offset, bool with_hash) #else i = fl.c[offset] | (fl.c[offset+1]<<8); #endif - if (with_hash) - tsprintf (buffer, sizeof(buffer), "!immedword", i); - else - tsprintf (buffer, sizeof(buffer), "!constword", i); + if (with_hash) + tsprintf (buffer, sizeof(buffer), "!immedword", i); + else + tsprintf (buffer, sizeof(buffer), "!constword", i); return traceAlloc(&_G.trace.aops, Safe_strdup(buffer)); - } + } } default: return NULL; @@ -1228,23 +1378,23 @@ fetchLitPair (PAIR_ID pairId, asmop * left, int offset) if (isPtr (pair)) { if (pairId == PAIR_HL || pairId == PAIR_IY) - { - if (_G.pairs[pairId].last_type == left->type) - { - if (_G.pairs[pairId].base && !strcmp (_G.pairs[pairId].base, base)) - { - if (pairId == PAIR_HL && abs (_G.pairs[pairId].offset - offset) < 3) - { - adjustPair (pair, &_G.pairs[pairId].offset, offset); - return; - } - if (pairId == PAIR_IY && (offset >= INT8MIN && offset <= INT8MAX)) - { - return; - } - } - } - } + { + if (_G.pairs[pairId].last_type == left->type) + { + if (_G.pairs[pairId].base && !strcmp (_G.pairs[pairId].base, base)) + { + if (pairId == PAIR_HL && abs (_G.pairs[pairId].offset - offset) < 3) + { + adjustPair (pair, &_G.pairs[pairId].offset, offset); + return; + } + if (pairId == PAIR_IY && (offset >= INT8MIN && offset <= INT8MAX)) + { + return; + } + } + } + } _G.pairs[pairId].last_type = left->type; _G.pairs[pairId].base = traceAlloc(&_G.trace.aops, Safe_strdup (base)); _G.pairs[pairId].offset = offset; @@ -1288,7 +1438,7 @@ fetchPairLong (PAIR_ID pairId, asmop * aop, iCode *ic, int offset) if (isLitWord (aop)) { fetchLitPair (pairId, aop, offset); } - else + else { if (getPairId (aop) == pairId) { @@ -1347,7 +1497,12 @@ fetchPairLong (PAIR_ID pairId, asmop * aop, iCode *ic, int offset) _pop (id); } } - else + else if (isUnsplitable(aop)) + { + emit2("push %s", _pairs[getPairId(aop)].name); + emit2("pop %s", _pairs[pairId].name); + } + else { emit2 ("ld %s,%s", _pairs[pairId].l, aopGet (aop, offset, FALSE)); emit2 ("ld %s,%s", _pairs[pairId].h, aopGet (aop, offset + 1, FALSE)); @@ -1375,6 +1530,12 @@ setupPairFromSP (PAIR_ID id, int offset) { wassertl (id == PAIR_HL, "Setup relative to SP only implemented for HL"); + if (_G.preserveCarry) + { + _push (PAIR_AF); + offset += 2; + } + if (offset < INT8MIN || offset > INT8MAX) { emit2 ("ld hl,!immedword", offset); @@ -1382,7 +1543,13 @@ setupPairFromSP (PAIR_ID id, int offset) } else { - emit2 ("!ldahlsp", offset); + emit2 ("!ldahlsp", offset); + } + + if (_G.preserveCarry) + { + _pop (PAIR_AF); + offset -= 2; } } @@ -1398,7 +1565,7 @@ setupPair (PAIR_ID pairId, asmop * aop, int offset) case AOP_HL: wassertl (pairId == PAIR_HL, "AOP_HL must be in HL"); - + fetchLitPair (pairId, aop, offset); _G.pairs[pairId].offset = offset; break; @@ -1408,7 +1575,7 @@ setupPair (PAIR_ID pairId, asmop * aop, int offset) wassertl (pairId == PAIR_IY || pairId == PAIR_HL, "The Z80 extended stack must be in IY or HL"); { - int offset = aop->aopu.aop_stk + _G.stack.offset; + int offset = aop->aopu.aop_stk + _G.stack.offset; if (_G.pairs[pairId].last_type == aop->type && _G.pairs[pairId].offset == offset) @@ -1418,42 +1585,48 @@ setupPair (PAIR_ID pairId, asmop * aop, int offset) else { /* PENDING: Do this better. */ + if (_G.preserveCarry) + _push (PAIR_AF); sprintf (buffer, "%d", offset + _G.stack.pushed); emit2 ("ld %s,!hashedstr", _pairs[pairId].name, buffer); emit2 ("add %s,sp", _pairs[pairId].name); _G.pairs[pairId].last_type = aop->type; _G.pairs[pairId].offset = offset; + if (_G.preserveCarry) + _pop (PAIR_AF); } } break; case AOP_STK: { - /* Doesnt include _G.stack.pushed */ - int abso = aop->aopu.aop_stk + offset + _G.stack.offset; - - if (aop->aopu.aop_stk > 0) - { - abso += _G.stack.param_offset; - } - assert (pairId == PAIR_HL); - /* In some cases we can still inc or dec hl */ - if (_G.pairs[pairId].last_type == AOP_STK && abs (_G.pairs[pairId].offset - abso) < 3) - { - adjustPair (_pairs[pairId].name, &_G.pairs[pairId].offset, abso); - } - else - { + /* Doesnt include _G.stack.pushed */ + int abso = aop->aopu.aop_stk + offset + _G.stack.offset; + + if (aop->aopu.aop_stk > 0) + { + abso += _G.stack.param_offset; + } + assert (pairId == PAIR_HL); + /* In some cases we can still inc or dec hl */ + if (_G.pairs[pairId].last_type == AOP_STK && abs (_G.pairs[pairId].offset - abso) < 3) + { + adjustPair (_pairs[pairId].name, &_G.pairs[pairId].offset, abso); + } + else + { setupPairFromSP (PAIR_HL, abso + _G.stack.pushed); - } - _G.pairs[pairId].offset = abso; - break; + } + _G.pairs[pairId].offset = abso; + break; } case AOP_PAIRPTR: + if (pairId != aop->aopu.aop_pairId) + genMovePairPair(aop->aopu.aop_pairId, pairId); adjustPair (_pairs[pairId].name, &_G.pairs[pairId].offset, offset); break; - + default: wassert (0); } @@ -1464,6 +1637,7 @@ static void emitLabel (int key) { emit2 ("!tlabeldef", key); + _G.lines.current->isLabel = 1; spillCached (); } @@ -1478,7 +1652,7 @@ aopGet (asmop * aop, int offset, bool bit16) /* offset is greater than size then zero */ /* PENDING: this seems a bit screwed in some pointer cases. */ if (offset > (aop->size - 1) && - aop->type != AOP_LIT) + aop->type != AOP_LIT) { tsprintf (buffer, sizeof(buffer), "!zero"); return traceAlloc(&_G.trace.aops, Safe_strdup(buffer)); @@ -1487,25 +1661,29 @@ aopGet (asmop * aop, int offset, bool bit16) /* depending on type */ switch (aop->type) { + case AOP_DUMMY: + tsprintf (buffer, sizeof(buffer), "!zero"); + return traceAlloc(&_G.trace.aops, Safe_strdup(buffer)); + case AOP_IMMD: /* PENDING: re-target */ if (bit16) - tsprintf (buffer, sizeof(buffer), "!immedwords", aop->aopu.aop_immd); + tsprintf (buffer, sizeof(buffer), "!immedwords", aop->aopu.aop_immd); else - switch (offset) - { - case 2: - tsprintf (buffer, sizeof(buffer), "!bankimmeds", aop->aopu.aop_immd); - break; - case 1: - tsprintf (buffer, sizeof(buffer), "!msbimmeds", aop->aopu.aop_immd); - break; - case 0: - tsprintf (buffer, sizeof(buffer), "!lsbimmeds", aop->aopu.aop_immd); - break; - default: - wassertl (0, "Fetching from beyond the limits of an immediate value."); - } + switch (offset) + { + case 2: + tsprintf (buffer, sizeof(buffer), "!bankimmeds", aop->aopu.aop_immd); + break; + case 1: + tsprintf (buffer, sizeof(buffer), "!msbimmeds", aop->aopu.aop_immd); + break; + case 0: + tsprintf (buffer, sizeof(buffer), "!lsbimmeds", aop->aopu.aop_immd); + break; + default: + wassertl (0, "Fetching from beyond the limits of an immediate value."); + } return traceAlloc(&_G.trace.aops, Safe_strdup(buffer)); @@ -1517,11 +1695,35 @@ aopGet (asmop * aop, int offset, bool bit16) return traceAlloc(&_G.trace.aops, Safe_strdup(buffer)); case AOP_SFR: - wassert (IS_GB); - emit2 ("ldh a,(%s+%d)", aop->aopu.aop_dir, offset); - SNPRINTF (buffer, sizeof(buffer), "a"); + if( IS_GB ) + { + // wassert (IS_GB); + emit2 ("ldh a,(%s+%d)", aop->aopu.aop_dir, offset); + SNPRINTF (buffer, sizeof(buffer), "a"); - return traceAlloc(&_G.trace.aops, Safe_strdup(buffer)); + return traceAlloc(&_G.trace.aops, Safe_strdup(buffer)); + } + else + { /*.p.t.20030716 handling for i/o port read access for Z80 */ + if( aop->paged ) + { /* banked mode */ + /* reg A goes to address bits 15-8 during "in a,(x)" instruction */ + emit2( "ld a,!msbimmeds", aop->aopu.aop_dir); + emit2( "in a,(!lsbimmeds)", aop->aopu.aop_dir); + } + else if( z80_opts.port_mode == 180 ) + { /* z180 in0/out0 mode */ + emit2( "in0 a,(%s)", aop->aopu.aop_dir ); + } + else + { /* 8 bit mode */ + emit2( "in a,(%s)", aop->aopu.aop_dir ); + } + + SNPRINTF (buffer, sizeof(buffer), "a"); + + return traceAlloc(&_G.trace.aops, Safe_strdup(buffer)); + } case AOP_REG: return aop->aopu.aop_reg[offset]->name; @@ -1549,17 +1751,17 @@ aopGet (asmop * aop, int offset, bool bit16) case AOP_STK: if (IS_GB) - { - setupPair (PAIR_HL, aop, offset); - tsprintf (buffer, sizeof(buffer), "!*hl"); - } + { + setupPair (PAIR_HL, aop, offset); + tsprintf (buffer, sizeof(buffer), "!*hl"); + } else - { - if (aop->aopu.aop_stk >= 0) - offset += _G.stack.param_offset; - tsprintf (buffer, sizeof(buffer), - "!*ixx", aop->aopu.aop_stk + offset); - } + { + if (aop->aopu.aop_stk >= 0) + offset += _G.stack.param_offset; + tsprintf (buffer, sizeof(buffer), + "!*ixx", aop->aopu.aop_stk + offset); + } return traceAlloc(&_G.trace.aops, Safe_strdup(buffer)); @@ -1568,9 +1770,9 @@ aopGet (asmop * aop, int offset, bool bit16) case AOP_ACC: if (!offset) - { - return "a"; - } + { + return "a"; + } else { tsprintf(buffer, sizeof(buffer), "!zero"); @@ -1587,11 +1789,11 @@ aopGet (asmop * aop, int offset, bool bit16) case AOP_SIMPLELIT: { unsigned long v = aop->aopu.aop_simplelit; - + v >>= (offset * 8); - tsprintf (buffer, sizeof(buffer), - "!immedbyte", (unsigned int) v & 0xff); - + tsprintf (buffer, sizeof(buffer), + "!immedbyte", (unsigned int) v & 0xff); + return traceAlloc(&_G.trace.aops, Safe_strdup(buffer)); } case AOP_STR: @@ -1600,8 +1802,15 @@ aopGet (asmop * aop, int offset, bool bit16) case AOP_PAIRPTR: setupPair (aop->aopu.aop_pairId, aop, offset); - SNPRINTF (buffer, sizeof(buffer), - "(%s)", _pairs[aop->aopu.aop_pairId].name); + if (aop->aopu.aop_pairId==PAIR_IX) + SNPRINTF (buffer, sizeof(buffer), + "!*ixx", 0); + else if (aop->aopu.aop_pairId==PAIR_IY) + SNPRINTF (buffer, sizeof(buffer), + "!*iyx", 0); + else + SNPRINTF (buffer, sizeof(buffer), + "(%s)", _pairs[aop->aopu.aop_pairId].name); return traceAlloc(&_G.trace.aops, Safe_strdup(buffer)); @@ -1654,7 +1863,7 @@ aopPut (asmop * aop, const char *s, int offset) if (aop->size && offset > (aop->size - 1)) { werror (E_INTERNAL_ERROR, __FILE__, __LINE__, - "aopPut got offset > aop->size"); + "aopPut got offset > aop->size"); exit (0); } @@ -1666,37 +1875,79 @@ aopPut (asmop * aop, const char *s, int offset) /* depending on where it is ofcourse */ switch (aop->type) { + case AOP_DUMMY: + _moveA (s); /* in case s is volatile */ + break; + case AOP_DIR: /* Direct. Hmmm. */ wassert (IS_GB); if (strcmp (s, "a")) - emit2 ("ld a,%s", s); + emit2 ("ld a,%s", s); emit2 ("ld (%s+%d),a", aop->aopu.aop_dir, offset); break; case AOP_SFR: - wassert (IS_GB); - if (strcmp (s, "a")) - emit2 ("ld a,%s", s); - emit2 ("ldh (%s+%d),a", aop->aopu.aop_dir, offset); + if( IS_GB ) + { + // wassert (IS_GB); + if (strcmp (s, "a")) + emit2 ("ld a,%s", s); + emit2 ("ldh (%s+%d),a", aop->aopu.aop_dir, offset); + } + else + { /*.p.t.20030716 handling for i/o port read access for Z80 */ + if (aop->paged) + { /* banked mode */ + if (aop->bcInUse) + emit2( "push bc" ); + + if (strlen(s) != 1 + || (s[0] != 'a' && s[0] != 'd' && s[0] != 'e' + && s[0] != 'h' && s[0] != 'l')) + { + emit2( "ld a,%s", s ); + s = "a"; + } + + emit2( "ld bc,#%s", aop->aopu.aop_dir ); + emit2( "out (c),%s", s ); + + if( aop->bcInUse ) + emit2( "pop bc" ); + else + spillPair (PAIR_BC); + } + else if( z80_opts.port_mode == 180 ) + { /* z180 in0/out0 mode */ + emit2( "ld a,%s", s ); + emit2( "out0 (%s),a", aop->aopu.aop_dir ); + } + else + { /* 8 bit mode */ + emit2( "ld a,%s", s ); + emit2( "out (%s),a", aop->aopu.aop_dir ); + } + } break; case AOP_REG: if (!strcmp (s, "!*hl")) - emit2 ("ld %s,!*hl", aop->aopu.aop_reg[offset]->name); + emit2 ("ld %s,!*hl", aop->aopu.aop_reg[offset]->name); else - emit2 ("ld %s,%s", - aop->aopu.aop_reg[offset]->name, s); + emit2 ("ld %s,%s", + aop->aopu.aop_reg[offset]->name, s); + spillPairReg(aop->aopu.aop_reg[offset]->name); break; case AOP_IY: wassert (!IS_GB); if (!canAssignToPtr (s)) - { - emit2 ("ld a,%s", s); + { + emit2 ("ld a,%s", s); setupPair (PAIR_IY, aop, offset); - emit2 ("ld !*iyx,a", offset); - } + emit2 ("ld !*iyx,a", offset); + } else { setupPair (PAIR_IY, aop, offset); @@ -1708,10 +1959,10 @@ aopPut (asmop * aop, const char *s, int offset) wassert (IS_GB); /* PENDING: for re-target */ if (!strcmp (s, "!*hl") || !strcmp (s, "(hl)") || !strcmp (s, "[hl]")) - { - emit2 ("ld a,!*hl"); - s = "a"; - } + { + emit2 ("ld a,!*hl"); + s = "a"; + } setupPair (PAIR_HL, aop, offset); emit2 ("ld !*hl,%s", s); @@ -1720,11 +1971,11 @@ aopPut (asmop * aop, const char *s, int offset) case AOP_EXSTK: wassert (!IS_GB); if (!canAssignToPtr (s)) - { - emit2 ("ld a,%s", s); + { + emit2 ("ld a,%s", s); setupPair (PAIR_IY, aop, offset); - emit2 ("ld !*iyx,a", offset); - } + emit2 ("ld !*iyx,a", offset); + } else { setupPair (PAIR_IY, aop, offset); @@ -1734,88 +1985,98 @@ aopPut (asmop * aop, const char *s, int offset) case AOP_STK: if (IS_GB) - { - /* PENDING: re-target */ - if (!strcmp (s, "!*hl") || !strcmp (s, "(hl)") || !strcmp (s, "[hl]")) - { - emit2 ("ld a,!*hl"); - s = "a"; - } - setupPair (PAIR_HL, aop, offset); - if (!canAssignToPtr (s)) - { - emit2 ("ld a,%s", s); - emit2 ("ld !*hl,a"); - } - else - emit2 ("ld !*hl,%s", s); - } + { + /* PENDING: re-target */ + if (!strcmp (s, "!*hl") || !strcmp (s, "(hl)") || !strcmp (s, "[hl]")) + { + emit2 ("ld a,!*hl"); + s = "a"; + } + setupPair (PAIR_HL, aop, offset); + if (!canAssignToPtr (s)) + { + emit2 ("ld a,%s", s); + emit2 ("ld !*hl,a"); + } + else + emit2 ("ld !*hl,%s", s); + } else - { - if (aop->aopu.aop_stk >= 0) - offset += _G.stack.param_offset; - if (!canAssignToPtr (s)) - { - emit2 ("ld a,%s", s); - emit2 ("ld !*ixx,a", aop->aopu.aop_stk + offset); - } - else + { + if (aop->aopu.aop_stk >= 0) + offset += _G.stack.param_offset; + if (!canAssignToPtr (s)) + { + emit2 ("ld a,%s", s); + emit2 ("ld !*ixx,a", aop->aopu.aop_stk + offset); + } + else { emit2 ("ld !*ixx,%s", aop->aopu.aop_stk + offset, s); } - } + } break; case AOP_CRY: /* if bit variable */ if (!aop->aopu.aop_dir) - { - emit2 ("ld a,!zero"); - emit2 ("rla"); - } + { + emit2 ("ld a,!zero"); + emit2 ("rla"); + } else - { - /* In bit space but not in C - cant happen */ - wassertl (0, "Tried to write into a bit variable"); - } + { + /* In bit space but not in C - cant happen */ + wassertl (0, "Tried to write into a bit variable"); + } break; case AOP_STR: aop->coff = offset; if (strcmp (aop->aopu.aop_str[offset], s)) - { - emit2 ("ld %s,%s", aop->aopu.aop_str[offset], s); - } + { + emit2 ("ld %s,%s", aop->aopu.aop_str[offset], s); + } + spillPairReg(aop->aopu.aop_str[offset]); break; case AOP_ACC: aop->coff = offset; if (!offset && (strcmp (s, "acc") == 0)) - break; + break; if (offset > 0) - { + { wassertl (0, "Tried to access past the end of A"); - } + } else - { - if (strcmp (aop->aopu.aop_str[offset], s)) - emit2 ("ld %s,%s", aop->aopu.aop_str[offset], s); - } + { + if (strcmp (aop->aopu.aop_str[offset], s)) + { + emit2 ("ld %s,%s", aop->aopu.aop_str[offset], s); + spillPairReg(aop->aopu.aop_str[offset]); + } + } break; case AOP_HLREG: wassert (offset < 2); emit2 ("ld %s,%s", aop->aopu.aop_str[offset], s); + spillPairReg(aop->aopu.aop_str[offset]); break; case AOP_PAIRPTR: setupPair (aop->aopu.aop_pairId, aop, offset); - emit2 ("ld (%s),%s", _pairs[aop->aopu.aop_pairId].name, s); + if (aop->aopu.aop_pairId==PAIR_IX) + emit2 ("ld !*ixx,%s", 0, s); + else if (aop->aopu.aop_pairId==PAIR_IY) + emit2 ("ld !*iyx,%s", 0, s); + else + emit2 ("ld (%s),%s", _pairs[aop->aopu.aop_pairId].name, s); break; default: werror (E_INTERNAL_ERROR, __FILE__, __LINE__, - "aopPut got unsupported aop->type"); + "aopPut got unsupported aop->type"); exit (0); } } @@ -1823,7 +2084,7 @@ aopPut (asmop * aop, const char *s, int offset) #define AOP(op) op->aop #define AOP_TYPE(op) AOP(op)->type #define AOP_SIZE(op) AOP(op)->size -#define AOP_NEEDSACC(x) (AOP(x) && (AOP_TYPE(x) == AOP_CRY)) +#define AOP_NEEDSACC(x) (AOP(x) && ((AOP_TYPE(x) == AOP_CRY) || (AOP_TYPE(x) == AOP_SFR))) static void commitPair (asmop * aop, PAIR_ID id) @@ -1832,11 +2093,9 @@ commitPair (asmop * aop, PAIR_ID id) if (id == PAIR_HL && requiresHL (aop) && IS_GB) { emit2 ("ld a,l"); - if (aop->size>1) - emit2 ("ld d,h"); + emit2 ("ld d,h"); aopPut (aop, "a", 0); - if (aop->size>1) - aopPut (aop, "d", 1); + aopPut (aop, "d", 1); } else { @@ -1851,8 +2110,7 @@ commitPair (asmop * aop, PAIR_ID id) else { aopPut (aop, _pairs[id].l, 0); - if (aop->size>1) - aopPut (aop, _pairs[id].h, 1); + aopPut (aop, _pairs[id].h, 1); } } } @@ -1878,7 +2136,7 @@ getDataSize (operand * op) /*-----------------------------------------------------------------*/ static void movLeft2Result (operand * left, int offl, - operand * result, int offr, int sign) + operand * result, int offr, int sign) { const char *l; @@ -1887,23 +2145,23 @@ movLeft2Result (operand * left, int offl, l = aopGet (AOP (left), offl, FALSE); if (!sign) - { - aopPut (AOP (result), l, offr); - } + { + aopPut (AOP (result), l, offr); + } else - { + { if (getDataSize (left) == offl + 1) { emit2 ("ld a,%s", l); aopPut (AOP (result), "a", offr); } - } + } } } static void movLeft2ResultLong (operand * left, int offl, - operand * result, int offr, int sign, + operand * result, int offr, int sign, int size) { if (size == 1) @@ -1920,12 +2178,12 @@ movLeft2ResultLong (operand * left, int offl, emit2 ("ld a,%s", aopGet (AOP (left), LSB, FALSE)); emit2 ("ld h,%s", aopGet (AOP (left), MSB16, FALSE)); emit2 ("ld l,a"); - spillPair (PAIR_HL); + spillPair (PAIR_HL); } else if ( getPairId ( AOP (result)) == PAIR_IY) { PAIR_ID id = getPairId (AOP (left)); - if (id != PAIR_INVALID) + if (id != PAIR_INVALID) { emit2("push %s", _pairs[id].name); emit2("pop iy"); @@ -1958,9 +2216,9 @@ outAcc (operand * result) offset = 1; /* unsigned or positive */ while (size--) - { - aopPut (AOP (result), "!zero", offset++); - } + { + aopPut (AOP (result), "!zero", offset++); + } } } @@ -1979,7 +2237,7 @@ outBitCLong (operand * result, bool swap_sense) emit2 ("ld a,!zero"); emit2 ("rla"); if (swap_sense) - emit2 ("xor a,!immedbyte", 1); + emit2 ("xor a,!immedbyte", 1); outAcc (result); } } @@ -2003,63 +2261,25 @@ _toBoolean (operand * oper) emit2 ("ld a,%s", aopGet (AOP (oper), offset++, FALSE)); size--; while (size--) - emit2 ("or a,%s", aopGet (AOP (oper), offset++, FALSE)); + emit2 ("or a,%s", aopGet (AOP (oper), offset++, FALSE)); } else { if (AOP (oper)->type != AOP_ACC) - { - _clearCarry(); - emit2 ("or a,%s", aopGet (AOP (oper), 0, FALSE)); - } + { + _clearCarry(); + emit2 ("or a,%s", aopGet (AOP (oper), 0, FALSE)); + } } } + /*-----------------------------------------------------------------*/ -/* genNotFloat - generates not for float operations */ +/* genNot - generate code for ! operation */ /*-----------------------------------------------------------------*/ static void -genNotFloat (operand * op, operand * res) +genNot (iCode * ic) { - int size, offset; - symbol *tlbl; - - emitDebug ("; genNotFloat"); - - /* we will put 127 in the first byte of - the result */ - aopPut (AOP (res), "!immedbyte", 0x7F); - size = AOP_SIZE (op) - 1; - offset = 1; - - _moveA (aopGet (op->aop, offset++, FALSE)); - - while (size--) - { - emit2 ("or a,%s", aopGet (op->aop, offset++, FALSE)); - } - - tlbl = newiTempLabel (NULL); - aopPut (res->aop, "!one", 1); - emit2 ("!shortjp z !tlabel", tlbl->key + 100); - aopPut (res->aop, "!zero", 1); - - emitLabel(tlbl->key + 100); - - size = res->aop->size - 2; - offset = 2; - /* put zeros in the rest */ - while (size--) - aopPut (res->aop, "!zero", offset++); -} - -/*-----------------------------------------------------------------*/ -/* genNot - generate code for ! operation */ -/*-----------------------------------------------------------------*/ -static void -genNot (iCode * ic) -{ - sym_link *optype = operandType (IC_LEFT (ic)); /* assign asmOps to operand & result */ aopOp (IC_LEFT (ic), ic, FALSE, TRUE); @@ -2071,13 +2291,6 @@ genNot (iCode * ic) wassertl (0, "Tried to negate a bit"); } - /* if type float then do float */ - if (IS_FLOAT (optype)) - { - genNotFloat (IC_LEFT (ic), IC_RESULT (ic)); - goto release; - } - _toBoolean (IC_LEFT (ic)); /* Not of A: @@ -2087,7 +2300,6 @@ genNot (iCode * ic) emit2 ("sub a,!one"); outBitC (IC_RESULT (ic)); - release: /* release the aops */ freeAsmop (IC_LEFT (ic), NULL, ic); freeAsmop (IC_RESULT (ic), NULL, ic); @@ -2193,7 +2405,7 @@ genUminusFloat (operand * op, operand * result) emitDebug("; genUminusFloat"); /* for this we just need to flip the - first it then copy the rest in place */ + first bit then copy the rest in place */ size = AOP_SIZE (op) - 1; _moveA(aopGet (AOP (op), MSB32, FALSE)); @@ -2270,7 +2482,7 @@ genUminus (iCode * ic) emit2 ("rlc a"); emit2 ("sbc a,a"); while (size--) - aopPut (AOP (IC_RESULT (ic)), "a", offset++); + aopPut (AOP (IC_RESULT (ic)), "a", offset++); } release: @@ -2304,9 +2516,9 @@ assignResultValue (operand * oper) else { while (size--) - { - aopPut (AOP (oper), _fReturn[size], size); - } + { + aopPut (AOP (oper), _fReturn[size], size); + } } } @@ -2347,7 +2559,7 @@ _saveRegsForCall(iCode *ic, int sendSetSize) o Compute if DE and/or BC are used to hold the result value o If (DE is used, or in the send set) and is not used in the result, push. o If BC is used and is not in the result, push - o + o o If DE is used in the send set, fetch o If HL is used in the send set, fetch o Call @@ -2359,7 +2571,8 @@ _saveRegsForCall(iCode *ic, int sendSetSize) bool bcInRet = FALSE, deInRet = FALSE; bitVect *rInUse; - rInUse = bitVectCplAnd (bitVectCopy (ic->rMask), ic->rUsed); + rInUse = bitVectCplAnd (bitVectCopy (ic->rMask), + z80_rUmaskForOp (IC_RESULT(ic))); deInUse = bitVectBitValue (rInUse, D_IDX) || bitVectBitValue(rInUse, E_IDX); bcInUse = bitVectBitValue (rInUse, B_IDX) || bitVectBitValue(rInUse, C_IDX); @@ -2409,7 +2622,7 @@ genIpush (iCode * ic) */ int nAddSets = 0; iCode *walk = ic->next; - + while (walk) { if (walk->op == SEND) { nAddSets++; @@ -2442,43 +2655,43 @@ genIpush (iCode * ic) else { if (size == 2) - { - fetchHL (AOP (IC_LEFT (ic))); - emit2 ("push hl"); - spillPair (PAIR_HL); - _G.stack.pushed += 2; - goto release; - } + { + fetchHL (AOP (IC_LEFT (ic))); + emit2 ("push hl"); + spillPair (PAIR_HL); + _G.stack.pushed += 2; + goto release; + } if (size == 4) - { - fetchPairLong (PAIR_HL, AOP (IC_LEFT (ic)), ic, 2); - emit2 ("push hl"); - spillPair (PAIR_HL); - _G.stack.pushed += 2; - fetchPairLong (PAIR_HL, AOP (IC_LEFT (ic)), ic, 0); - emit2 ("push hl"); - spillPair (PAIR_HL); - _G.stack.pushed += 2; - goto release; - } + { + fetchPairLong (PAIR_HL, AOP (IC_LEFT (ic)), ic, 2); + emit2 ("push hl"); + spillPair (PAIR_HL); + _G.stack.pushed += 2; + fetchPairLong (PAIR_HL, AOP (IC_LEFT (ic)), ic, 0); + emit2 ("push hl"); + spillPair (PAIR_HL); + _G.stack.pushed += 2; + goto release; + } offset = size; while (size--) - { - if (AOP (IC_LEFT (ic))->type == AOP_IY) - { - char *l = aopGetLitWordLong (AOP (IC_LEFT (ic)), --offset, FALSE); - wassert (l); - emit2 ("ld a,(%s)", l); - } - else - { - l = aopGet (AOP (IC_LEFT (ic)), --offset, FALSE); - emit2 ("ld a,%s", l); - } - emit2 ("push af"); - emit2 ("inc sp"); - _G.stack.pushed++; - } + { + if (AOP (IC_LEFT (ic))->type == AOP_IY) + { + char *l = aopGetLitWordLong (AOP (IC_LEFT (ic)), --offset, FALSE); + wassert (l); + emit2 ("ld a,(%s)", l); + } + else + { + l = aopGet (AOP (IC_LEFT (ic)), --offset, FALSE); + emit2 ("ld a,%s", l); + } + emit2 ("push af"); + emit2 ("inc sp"); + _G.stack.pushed++; + } } release: freeAsmop (IC_LEFT (ic), NULL, ic); @@ -2507,12 +2720,12 @@ genIpop (iCode * ic) else { while (size--) - { - emit2 ("dec sp"); - emit2 ("pop hl"); - spillPair (PAIR_HL); - aopPut (AOP (IC_LEFT (ic)), "l", offset--); - } + { + emit2 ("dec sp"); + emit2 ("pop hl"); + spillPair (PAIR_HL); + aopPut (AOP (IC_LEFT (ic)), "l", offset--); + } } freeAsmop (IC_LEFT (ic), NULL, ic); @@ -2561,28 +2774,28 @@ _opUsesPair (operand * op, iCode * ic, PAIR_ID pairId) { int i; for (i = 0; i < aop->size; i++) - { - if (pairId == PAIR_DE) - { - emitDebug ("; name %s", aop->aopu.aop_reg[i]->name); - if (!strcmp (aop->aopu.aop_reg[i]->name, "e")) - ret++; - if (!strcmp (aop->aopu.aop_reg[i]->name, "d")) - ret++; - } + { + if (pairId == PAIR_DE) + { + emitDebug ("; name %s", aop->aopu.aop_reg[i]->name); + if (!strcmp (aop->aopu.aop_reg[i]->name, "e")) + ret++; + if (!strcmp (aop->aopu.aop_reg[i]->name, "d")) + ret++; + } else if (pairId == PAIR_BC) { - emitDebug ("; name %s", aop->aopu.aop_reg[i]->name); - if (!strcmp (aop->aopu.aop_reg[i]->name, "c")) - ret++; - if (!strcmp (aop->aopu.aop_reg[i]->name, "b")) - ret++; + emitDebug ("; name %s", aop->aopu.aop_reg[i]->name); + if (!strcmp (aop->aopu.aop_reg[i]->name, "c")) + ret++; + if (!strcmp (aop->aopu.aop_reg[i]->name, "b")) + ret++; + } + else + { + wassert (0); } - else - { - wassert (0); - } - } + } } freeAsmop (IC_LEFT (ic), NULL, ic); @@ -2594,6 +2807,7 @@ _opUsesPair (operand * op, iCode * ic, PAIR_ID pairId) static void emitCall (iCode * ic, bool ispcall) { + bool bInRet, cInRet, dInRet, eInRet; sym_link *dtype = operandType (IC_LEFT (ic)); /* if caller saves & we have not saved then */ @@ -2667,28 +2881,29 @@ emitCall (iCode * ic, bool ispcall) if (ispcall) { if (IFFUNC_ISBANKEDCALL (dtype) && !SPEC_STAT(getSpec(dtype))) - { - werror (W_INDIR_BANKED); - } + { + werror (W_INDIR_BANKED); + } aopOp (IC_LEFT (ic), ic, FALSE, FALSE); if (isLitWord (AOP (IC_LEFT (ic)))) - { - emit2 ("call %s", aopGetLitWordLong (AOP (IC_LEFT (ic)), 0, FALSE)); - } + { + emit2 ("call %s", aopGetLitWordLong (AOP (IC_LEFT (ic)), 0, FALSE)); + } else - { - symbol *rlbl = newiTempLabel (NULL); - spillPair (PAIR_HL); - emit2 ("ld hl,!immed!tlabel", (rlbl->key + 100)); - emit2 ("push hl"); - _G.stack.pushed += 2; - - fetchHL (AOP (IC_LEFT (ic))); - emit2 ("jp !*hl"); - emit2 ("!tlabeldef", (rlbl->key + 100)); - _G.stack.pushed -= 2; - } + { + symbol *rlbl = newiTempLabel (NULL); + spillPair (PAIR_HL); + emit2 ("ld hl,!immed!tlabel", (rlbl->key + 100)); + emit2 ("push hl"); + _G.stack.pushed += 2; + + fetchHL (AOP (IC_LEFT (ic))); + emit2 ("jp !*hl"); + emit2 ("!tlabeldef", (rlbl->key + 100)); + _G.lines.current->isLabel = 1; + _G.stack.pushed -= 2; + } freeAsmop (IC_LEFT (ic), NULL, ic); } else @@ -2697,26 +2912,26 @@ emitCall (iCode * ic, bool ispcall) OP_SYMBOL (IC_LEFT (ic))->rname : OP_SYMBOL (IC_LEFT (ic))->name; if (IFFUNC_ISBANKEDCALL (dtype) && !SPEC_STAT(getSpec(dtype))) - { - emit2 ("call banked_call"); - emit2 ("!dws", name); - emit2 ("!dw !bankimmeds", name); - } + { + emit2 ("call banked_call"); + emit2 ("!dws", name); + emit2 ("!dw !bankimmeds", name); + } else - { - /* make the call */ - emit2 ("call %s", name); - } + { + /* make the call */ + emit2 ("call %s", name); + } } spillCached (); - /* Mark the regsiters as restored. */ + /* Mark the registers as restored. */ _G.saves.saved = FALSE; /* if we need assign a result value */ if ((IS_ITEMP (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))) { @@ -2734,40 +2949,52 @@ emitCall (iCode * ic, bool ispcall) _G.stack.pushed -= i; if (IS_GB) - { - emit2 ("!ldaspsp", i); - } + { + emit2 ("!ldaspsp", i); + } else - { - spillCached (); - if (i > 8) - { - emit2 ("ld iy,!immedword", i); - emit2 ("add iy,sp"); - emit2 ("ld sp,iy"); - } - else - { - while (i > 1) - { - emit2 ("pop af"); - i -= 2; - } - if (i) + { + spillCached (); + if (i > 8) + { + emit2 ("ld iy,!immedword", i); + emit2 ("add iy,sp"); + emit2 ("ld sp,iy"); + } + else + { + while (i > 1) + { + emit2 ("pop af"); + i -= 2; + } + if (i) { emit2 ("inc sp"); } - } - } + } + } } spillCached (); - - if (_G.stack.pushedDE) + if (IC_RESULT (ic)) + { + bitVect *result = z80_rUmaskForOp (IC_RESULT (ic)); + bInRet = bitVectBitValue(result, B_IDX); + cInRet = bitVectBitValue(result, C_IDX); + dInRet = bitVectBitValue(result, D_IDX); + eInRet = bitVectBitValue(result, E_IDX); + } + else { - bool dInRet = bitVectBitValue(ic->rUsed, D_IDX); - bool eInRet = bitVectBitValue(ic->rUsed, E_IDX); + bInRet = FALSE; + cInRet = FALSE; + dInRet = FALSE; + eInRet = FALSE; + } + if (_G.stack.pushedDE) + { if (dInRet && eInRet) { wassertl (0, "Shouldn't push DE if it's wiped out by the return"); @@ -2791,12 +3018,9 @@ emitCall (iCode * ic, bool ispcall) } _G.stack.pushedDE = FALSE; } - - if (_G.stack.pushedBC) - { - bool bInRet = bitVectBitValue(ic->rUsed, B_IDX); - bool cInRet = bitVectBitValue(ic->rUsed, C_IDX); + if (_G.stack.pushedBC) + { if (bInRet && cInRet) { wassertl (0, "Shouldn't push BC if it's wiped out by the return"); @@ -2853,7 +3077,7 @@ resultRemat (iCode * ic) { symbol *sym = OP_SYMBOL (IC_RESULT (ic)); if (sym->remat && !POINTER_SET (ic)) - return 1; + return 1; } return 0; @@ -2867,6 +3091,8 @@ extern set *publics; static void genFunction (iCode * ic) { + bool stackParm; + symbol *sym = OP_SYMBOL (IC_LEFT (ic)); sym_link *ftype; @@ -2875,36 +3101,71 @@ genFunction (iCode * ic) setArea (IFFUNC_NONBANKED (sym->type)); - /* PENDING: Reset the receive offset as it doesn't seem to get reset anywhere - else. + /* PENDING: Reset the receive offset as it + doesn't seem to get reset anywhere else. */ _G.receiveOffset = 0; /* Record the last function name for debugging. */ _G.lastFunctionName = sym->rname; - + /* Create the function header */ emit2 ("!functionheader", sym->name); - sprintf (buffer, "%s_start", sym->rname); - emit2 ("!labeldef", buffer); - emit2 ("!functionlabeldef", sym->rname); - - if (options.profile) + if (!IS_STATIC(sym->etype)) { - emit2 ("!profileenter"); + sprintf (buffer, "%s_start", sym->rname); + emit2 ("!labeldef", buffer); + _G.lines.current->isLabel = 1; } + emit2 ("!functionlabeldef", sym->rname); + _G.lines.current->isLabel = 1; ftype = operandType (IC_LEFT (ic)); - /* if critical function then turn interrupts off */ - if (IFFUNC_ISCRITICAL (ftype)) - emit2 ("!di"); + if (IFFUNC_ISNAKED(ftype)) + { + emitDebug("; naked function: no prologue."); + return; + } - /* if this is an interrupt service routine then save all potentially used registers. */ + /* if this is an interrupt service routine + then save all potentially used registers. */ if (IFFUNC_ISISR (sym->type)) { + /* If critical function then turn interrupts off */ + /* except when no interrupt number is given then it implies the NMI handler */ + if (IFFUNC_ISCRITICAL (sym->type) && (FUNC_INTNO(sym->type) != INTNO_UNSPEC)) + { + emit2 ("!di"); + } + emit2 ("!pusha"); } + else + { + /* This is a non-ISR function. + If critical function then turn interrupts off */ + if (IFFUNC_ISCRITICAL (sym->type)) + { + if (IS_GB) + { + emit2 ("!di"); + } + else + { + //get interrupt enable flag IFF2 into P/O + emit2 ("ld a,i"); + emit2 ("!di"); + //save P/O flag + emit2 ("push af"); + } + } + } + + if (options.profile) + { + emit2 ("!profileenter"); + } /* PENDING: callee-save etc */ @@ -2920,30 +3181,30 @@ genFunction (iCode * ic) { int i; for (i = 0; i < sym->regsUsed->size; i++) - { - if (bitVectBitValue (sym->regsUsed, i)) - { - switch (i) - { - case C_IDX: - case B_IDX: + { + if (bitVectBitValue (sym->regsUsed, i)) + { + switch (i) + { + case C_IDX: + case B_IDX: bcInUse = TRUE; - break; - case D_IDX: - case E_IDX: - if (IS_Z80) { + break; + case D_IDX: + case E_IDX: + if (IS_Z80) { deInUse = TRUE; } else { /* Other systems use DE as a temporary. */ } - break; - } - } - } + break; + } + } + } } - if (bcInUse) + if (bcInUse) { emit2 ("push bc"); _G.stack.param_offset += 2; @@ -2962,12 +3223,34 @@ genFunction (iCode * ic) /* adjust the stack for the function */ _G.stack.last = sym->stack; - if (sym->stack && IS_GB && sym->stack > -INT8MIN) + stackParm = FALSE; + for (sym = setFirstItem (istack->syms); sym; + sym = setNextItem (istack->syms)) + { + if (sym->_isparm && !IS_REGPARM (sym->etype)) + { + stackParm = TRUE; + break; + } + } + sym = OP_SYMBOL (IC_LEFT (ic)); + + _G.omitFramePtr = options.ommitFramePtr; + if (IS_Z80 && !stackParm && !sym->stack) + { + /* When the conflicts between AOP_EXSTK && AOP_HLREG are fixed, */ + /* the above !sym->stack condition can be removed. -- EEP */ + if (sym->stack) + emit2 ("!ldaspsp", -sym->stack); + _G.omitFramePtr = TRUE; + } + else if (sym->stack && IS_GB && sym->stack > -INT8MIN) emit2 ("!enterxl", sym->stack); else if (sym->stack) emit2 ("!enterx", sym->stack); else emit2 ("!enter"); + _G.stack.offset = sym->stack; } @@ -2979,54 +3262,112 @@ genEndFunction (iCode * ic) { symbol *sym = OP_SYMBOL (IC_LEFT (ic)); - if (IFFUNC_ISISR (sym->type)) + if (IFFUNC_ISNAKED(sym->type)) + { + emitDebug("; naked function: no epilogue."); + return; + } + + /* PENDING: calleeSave */ + if (IS_Z80 && _G.omitFramePtr) + { + if (_G.stack.offset) + emit2 ("!ldaspsp", _G.stack.offset); + } + else if (_G.stack.offset && IS_GB && _G.stack.offset > INT8MAX) + { + emit2 ("!leavexl", _G.stack.offset); + } + else if (_G.stack.offset) { - wassertl (0, "Tried to close an interrupt support function"); + emit2 ("!leavex", _G.stack.offset); } else { - if (IFFUNC_ISCRITICAL (sym->type)) - emit2 ("!ei"); + emit2 ("!leave"); + } - /* PENDING: calleeSave */ + if (_G.calleeSaves.pushedDE) + { + emit2 ("pop de"); + _G.calleeSaves.pushedDE = FALSE; + } - if (_G.stack.offset && IS_GB && _G.stack.offset > INT8MAX) - { - emit2 ("!leavexl", _G.stack.offset); - } - else if (_G.stack.offset) - { - emit2 ("!leavex", _G.stack.offset); - } - else - { - emit2 ("!leave"); - } + if (_G.calleeSaves.pushedBC) + { + emit2 ("pop bc"); + _G.calleeSaves.pushedBC = FALSE; + } - if (_G.calleeSaves.pushedDE) - { - emit2 ("pop de"); - _G.calleeSaves.pushedDE = FALSE; - } + if (options.profile) + { + emit2 ("!profileexit"); + } - if (_G.calleeSaves.pushedBC) + /* if this is an interrupt service routine + then save all potentially used registers. */ + if (IFFUNC_ISISR (sym->type)) + { + emit2 ("!popa"); + + /* If critical function then turn interrupts back on */ + /* except when no interrupt number is given then it implies the NMI handler */ + if (IFFUNC_ISCRITICAL (sym->type) && (FUNC_INTNO(sym->type) != INTNO_UNSPEC)) { - emit2 ("pop bc"); - _G.calleeSaves.pushedBC = FALSE; + emit2 ("!ei"); } - - if (options.profile) + } + else + { + /* This is a non-ISR function. + If critical function then turn interrupts back on */ + if (IFFUNC_ISCRITICAL (sym->type)) { - emit2 ("!profileexit"); + if (IS_GB) + { + emit2 ("!ei"); + } + else + { + symbol *tlbl = newiTempLabel (NULL); + //restore P/O flag + emit2 ("pop af"); + //parity odd <==> P/O=0 <==> interrupt enable flag IFF2 was 0 <==> + //don't enable interrupts as they were off before + emit2 ("jp PO,!tlabel", tlbl->key + 100); + emit2 ("!ei"); + emit2 ("!tlabeldef", (tlbl->key + 100)); + _G.lines.current->isLabel = 1; + } } + } + if (options.debug && currFunc) + { + debugFile->writeEndFunction (currFunc, ic, 1); + } - /* Both baned and non-banked just ret */ + if (IFFUNC_ISISR (sym->type)) + { + /* "critical interrupt" is used to imply NMI handler */ + if (IS_Z80 && IFFUNC_ISCRITICAL (sym->type) && FUNC_INTNO(sym->type) == INTNO_UNSPEC) + emit2 ("retn"); + else + emit2 ("reti"); + } + else + { + /* Both banked and non-banked just ret */ emit2 ("ret"); + } + if (!IS_STATIC(sym->etype)) + { sprintf (buffer, "%s_end", sym->rname); emit2 ("!labeldef", buffer); + _G.lines.current->isLabel = 1; } + _G.flushStatics = 1; _G.stack.pushed = 0; _G.stack.offset = 0; @@ -3053,34 +3394,43 @@ genRet (iCode * ic) aopOp (IC_LEFT (ic), ic, FALSE, FALSE); size = AOP_SIZE (IC_LEFT (ic)); + aopDump("IC_LEFT", AOP(IC_LEFT(ic))); + + #if 0 if ((size == 2) && ((l = aopGetWord (AOP (IC_LEFT (ic)), 0)))) { if (IS_GB) - { - emit2 ("ld de,%s", l); - } + { + emit2 ("ld de,%s", l); + } else - { - emit2 ("ld hl,%s", l); - } + { + emit2 ("ld hl,%s", l); + } + } + #endif + if (size==2) + { + fetchPair(IS_GB ? PAIR_DE : PAIR_HL, AOP (IC_LEFT (ic))); } else { if (IS_GB && size == 4 && requiresHL (AOP (IC_LEFT (ic)))) - { - fetchPair (PAIR_DE, AOP (IC_LEFT (ic))); - fetchPairLong (PAIR_HL, AOP (IC_LEFT (ic)), ic, 2); - } + { + fetchPair (PAIR_DE, AOP (IC_LEFT (ic))); + fetchPairLong (PAIR_HL, AOP (IC_LEFT (ic)), ic, 2); + } else - { - while (size--) - { - l = aopGet (AOP (IC_LEFT (ic)), offset, - FALSE); - if (strcmp (_fReturn[offset], l)) - emit2 ("ld %s,%s", _fReturn[offset++], l); - } - } + { + while (size--) + { + l = aopGet (AOP (IC_LEFT (ic)), offset, + FALSE); + if (strcmp (_fReturn[offset], l)) + emit2 ("ld %s,%s", _fReturn[offset], l); + offset++; + } + } } freeAsmop (IC_LEFT (ic), NULL, ic); @@ -3088,7 +3438,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)) emit2 ("jp !tlabel", returnLabel->key + 100); } @@ -3139,12 +3489,12 @@ genPlusIncr (iCode * ic) if (resultId != PAIR_INVALID) { if (isLitWord (AOP (IC_LEFT (ic)))) - { + { fetchLitPair (getPairId (AOP (IC_RESULT (ic))), AOP (IC_LEFT (ic)), icount); - return TRUE; - } + return TRUE; + } if (isPair (AOP (IC_LEFT (ic))) && resultId == PAIR_HL && icount > 2) - { + { if (getPairId (AOP (IC_LEFT (ic))) == PAIR_HL) { PAIR_ID freep = getFreePairId (ic); @@ -3161,20 +3511,20 @@ genPlusIncr (iCode * ic) emit2 ("add hl,%s", getPairName (AOP (IC_LEFT (ic)))); return TRUE; } - } + } if (icount > 5) - return FALSE; + return FALSE; /* Inc a pair */ if (!sameRegs (AOP (IC_LEFT (ic)), AOP (IC_RESULT (ic)))) - { - if (icount > 2) - return FALSE; - movLeft2ResultLong (IC_LEFT (ic), 0, IC_RESULT (ic), 0, 0, 2); - } + { + if (icount > 2) + return FALSE; + movLeft2ResultLong (IC_LEFT (ic), 0, IC_RESULT (ic), 0, 0, 2); + } while (icount--) - { - emit2 ("inc %s", getPairName (AOP (IC_RESULT (ic)))); - } + { + emit2 ("inc %s", getPairName (AOP (IC_RESULT (ic)))); + } return TRUE; } @@ -3200,13 +3550,13 @@ genPlusIncr (iCode * ic) symbol *tlbl = NULL; tlbl = newiTempLabel (NULL); while (size--) - { - emit2 ("inc %s", aopGet (AOP (IC_RESULT (ic)), offset++, FALSE)); - if (size) - { - emit2 ("!shortjp nz,!tlabel", tlbl->key + 100); - } - } + { + emit2 ("inc %s", aopGet (AOP (IC_RESULT (ic)), offset++, FALSE)); + if (size) + { + emit2 ("!shortjp NZ,!tlabel", tlbl->key + 100); + } + } emitLabel (tlbl->key + 100); return TRUE; } @@ -3257,7 +3607,7 @@ outBitAcc (operand * result) } else { - emit2 ("!shortjp z,!tlabel", tlbl->key + 100); + emit2 ("!shortjp Z,!tlabel", tlbl->key + 100); emit2 ("ld a,!one"); emitLabel (tlbl->key + 100); outAcc (result); @@ -3285,30 +3635,27 @@ shiftIntoPair (int idx, asmop *aop) wassertl (IS_Z80, "Only implemented for the Z80"); // wassertl (aop->type == AOP_EXSTK, "Only implemented for EXSTK"); - switch (idx) + emitDebug ("; Shift into pair idx %u", idx); + + switch (idx) { case 0: id = PAIR_HL; + setupPair (PAIR_HL, aop, 0); break; case 1: id = PAIR_DE; _push (PAIR_DE); - break; - default: - wassertl (0, "Internal error - hit default case"); - } - - emitDebug ("; Shift into pair idx %u", idx); - - if (id == PAIR_HL) - { - setupPair (PAIR_HL, aop, 0); - } - else - { setupPair (PAIR_IY, aop, 0); emit2 ("push iy"); emit2 ("pop %s", _pairs[id].name); + break; + case 2: + id = PAIR_IY; + setupPair (PAIR_IY, aop, 0); + break; + default: + wassertl (0, "Internal error - hit default case"); } aop->type = AOP_PAIRPTR; @@ -3317,9 +3664,13 @@ shiftIntoPair (int idx, asmop *aop) _G.pairs[id].last_type = aop->type; } -static void -setupToPreserveCarry (asmop *result, asmop *left, asmop *right) +static void +setupToPreserveCarry (iCode * ic) { + asmop *left = AOP (IC_LEFT (ic)); + asmop *right = AOP (IC_RIGHT (ic)); + asmop *result = AOP (IC_RESULT (ic)); + wassert (left && right); if (IS_Z80) @@ -3327,11 +3678,21 @@ setupToPreserveCarry (asmop *result, asmop *left, asmop *right) if (couldDestroyCarry (right) && couldDestroyCarry (result)) { shiftIntoPair (0, right); - shiftIntoPair (1, result); + /* check result again, in case right == result */ + if (couldDestroyCarry (result)) + { + if (!isPairInUse (PAIR_DE, ic)) + shiftIntoPair (1, result); + else + shiftIntoPair (2, result); + } } else if (couldDestroyCarry (right)) { - shiftIntoPair (0, right); + if (getPairId (result) == PAIR_HL) + _G.preserveCarry = TRUE; + else + shiftIntoPair (0, right); } else if (couldDestroyCarry (result)) { @@ -3365,7 +3726,7 @@ genPlus (iCode * ic) 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); @@ -3408,14 +3769,14 @@ genPlus (iCode * ic) if (AOP_TYPE(IC_LEFT(ic)) == AOP_LIT && AOP_TYPE(IC_RIGHT(ic)) == AOP_LIT && left && right) - { - /* It's a pair */ - /* PENDING: fix */ - char buffer[100]; - sprintf (buffer, "#(%s + %s)", left, right); - emit2 ("ld %s,%s", getPairName (AOP (IC_RESULT (ic))), buffer); - goto release; - } + { + /* It's a pair */ + /* PENDING: fix */ + char buffer[100]; + sprintf (buffer, "#(%s + %s)", left, right); + emit2 ("ld %s,%s", getPairName (AOP (IC_RESULT (ic))), buffer); + goto release; + } } if ((isPair (AOP (IC_RIGHT (ic))) || isPair (AOP (IC_LEFT (ic)))) && getPairId (AOP (IC_RESULT (ic))) == PAIR_HL) @@ -3425,7 +3786,7 @@ genPlus (iCode * ic) PAIR_ID right = getPairId (AOP (IC_RIGHT (ic))); spillPair (PAIR_HL); - + if (left == PAIR_HL && right != PAIR_INVALID) { emit2 ("add hl,%s", _pairs[right].name); @@ -3443,7 +3804,7 @@ genPlus (iCode * ic) goto release; } else if (left != PAIR_INVALID && left != PAIR_HL) - { + { fetchPair (PAIR_HL, AOP (IC_RIGHT (ic))); emit2 ("add hl,%s", getPairName (AOP (IC_LEFT (ic)))); goto release; @@ -3464,8 +3825,8 @@ genPlus (iCode * ic) } /* Special case: - ld hl,sp+n trashes C so we cant afford to do it during an - add with stack based varibles. Worst case is: + ld hl,sp+n trashes C so we can't afford to do it during an + add with stack based variables. Worst case is: ld hl,sp+left ld a,(hl) ld hl,sp+right @@ -3478,7 +3839,7 @@ genPlus (iCode * ic) adc (hl) ld hl,sp+result+1 ld (hl),a - So you cant afford to load up hl if either left, right, or result + So you can't afford to load up hl if either left, right, or result is on the stack (*sigh*) The alt is: ld hl,sp+left ld de,(hl) @@ -3494,78 +3855,78 @@ genPlus (iCode * ic) if (IS_GB) { if (AOP_TYPE (IC_LEFT (ic)) == AOP_STK || - AOP_TYPE (IC_RIGHT (ic)) == AOP_STK || - AOP_TYPE (IC_RESULT (ic)) == AOP_STK) - { - if ((AOP_SIZE (IC_LEFT (ic)) == 2 || - AOP_SIZE (IC_RIGHT (ic)) == 2) && - (AOP_SIZE (IC_LEFT (ic)) <= 2 && - AOP_SIZE (IC_RIGHT (ic)) <= 2)) - { - if (getPairId (AOP (IC_RIGHT (ic))) == PAIR_BC) - { - /* Swap left and right */ - operand *t = IC_RIGHT (ic); - IC_RIGHT (ic) = IC_LEFT (ic); - IC_LEFT (ic) = t; - } - if (getPairId (AOP (IC_LEFT (ic))) == PAIR_BC) - { - fetchPair (PAIR_HL, AOP (IC_RIGHT (ic))); - emit2 ("add hl,bc"); - } - else - { - fetchPair (PAIR_DE, AOP (IC_LEFT (ic))); - fetchPair (PAIR_HL, AOP (IC_RIGHT (ic))); - emit2 ("add hl,de"); - } - commitPair (AOP (IC_RESULT (ic)), PAIR_HL); - goto release; - } - } - if (size == 4) + AOP_TYPE (IC_RIGHT (ic)) == AOP_STK || + AOP_TYPE (IC_RESULT (ic)) == AOP_STK) { - /* Be paranoid on the GB with 4 byte variables due to how C - can be trashed by lda hl,n(sp). - */ - _gbz80_emitAddSubLong (ic, TRUE); - goto release; - } - } - - setupToPreserveCarry (AOP (IC_RESULT (ic)), AOP (IC_LEFT (ic)), AOP (IC_RIGHT (ic))); - + if ((AOP_SIZE (IC_LEFT (ic)) == 2 || + AOP_SIZE (IC_RIGHT (ic)) == 2) && + (AOP_SIZE (IC_LEFT (ic)) <= 2 && + AOP_SIZE (IC_RIGHT (ic)) <= 2)) + { + if (getPairId (AOP (IC_RIGHT (ic))) == PAIR_BC) + { + /* Swap left and right */ + operand *t = IC_RIGHT (ic); + IC_RIGHT (ic) = IC_LEFT (ic); + IC_LEFT (ic) = t; + } + if (getPairId (AOP (IC_LEFT (ic))) == PAIR_BC) + { + fetchPair (PAIR_HL, AOP (IC_RIGHT (ic))); + emit2 ("add hl,bc"); + } + else + { + fetchPair (PAIR_DE, AOP (IC_LEFT (ic))); + fetchPair (PAIR_HL, AOP (IC_RIGHT (ic))); + emit2 ("add hl,de"); + } + commitPair (AOP (IC_RESULT (ic)), PAIR_HL); + goto release; + } + } + if (size == 4) + { + /* Be paranoid on the GB with 4 byte variables due to how C + can be trashed by lda hl,n(sp). + */ + _gbz80_emitAddSubLong (ic, TRUE); + goto release; + } + } + + setupToPreserveCarry (ic); + while (size--) { if (AOP_TYPE (IC_LEFT (ic)) == AOP_ACC) - { - _moveA (aopGet (AOP (IC_LEFT (ic)), offset, FALSE)); - if (offset == 0) - emit2 ("add a,%s", - aopGet (AOP (IC_RIGHT (ic)), offset, FALSE)); - else - emit2 ("adc a,%s", - aopGet (AOP (IC_RIGHT (ic)), offset, FALSE)); - } + { + _moveA (aopGet (AOP (IC_LEFT (ic)), offset, FALSE)); + if (offset == 0) + emit2 ("add a,%s", + aopGet (AOP (IC_RIGHT (ic)), offset, FALSE)); + else + emit2 ("adc a,%s", + aopGet (AOP (IC_RIGHT (ic)), offset, FALSE)); + } else - { - _moveA (aopGet (AOP (IC_LEFT (ic)), offset, FALSE)); - if (offset == 0) - emit2 ("add a,%s", - aopGet (AOP (IC_RIGHT (ic)), offset, FALSE)); - else - emit2 ("adc a,%s", - aopGet (AOP (IC_RIGHT (ic)), offset, FALSE)); - } + { + _moveA (aopGet (AOP (IC_LEFT (ic)), offset, FALSE)); + if (offset == 0) + emit2 ("add a,%s", + aopGet (AOP (IC_RIGHT (ic)), offset, FALSE)); + else + emit2 ("adc a,%s", + aopGet (AOP (IC_RIGHT (ic)), offset, FALSE)); + } aopPut (AOP (IC_RESULT (ic)), "a", offset++); } release: + _G.preserveCarry = FALSE; freeAsmop (IC_LEFT (ic), NULL, ic); freeAsmop (IC_RIGHT (ic), NULL, ic); freeAsmop (IC_RESULT (ic), NULL, ic); - } /*-----------------------------------------------------------------*/ @@ -3594,7 +3955,7 @@ genMinusDec (iCode * ic) (size > 1) && isPair (AOP (IC_RESULT (ic)))) { while (icount--) - emit2 ("dec %s", getPairName (AOP (IC_RESULT (ic)))); + emit2 ("dec %s", getPairName (AOP (IC_RESULT (ic)))); return TRUE; } @@ -3603,7 +3964,7 @@ genMinusDec (iCode * ic) { movLeft2ResultLong (IC_LEFT (ic), 0, IC_RESULT (ic), 0, 0, 2); while (icount--) - emit2 ("dec %s", getPairName (AOP (IC_RESULT (ic)))); + emit2 ("dec %s", getPairName (AOP (IC_RESULT (ic)))); return TRUE; } @@ -3634,7 +3995,7 @@ genMinusDec (iCode * ic) if (sameRegs (AOP (IC_LEFT (ic)), AOP (IC_RESULT (ic)))) { while (icount--) - emit2 ("dec %s", aopGet (AOP (IC_RESULT (ic)), 0, FALSE)); + emit2 ("dec %s", aopGet (AOP (IC_RESULT (ic)), 0, FALSE)); return TRUE; } @@ -3682,45 +4043,45 @@ genMinus (iCode * ic) if (IS_GB) { if (AOP_TYPE (IC_LEFT (ic)) == AOP_STK || - AOP_TYPE (IC_RIGHT (ic)) == AOP_STK || - AOP_TYPE (IC_RESULT (ic)) == AOP_STK) - { - if ((AOP_SIZE (IC_LEFT (ic)) == 2 || - AOP_SIZE (IC_RIGHT (ic)) == 2) && - (AOP_SIZE (IC_LEFT (ic)) <= 2 && - AOP_SIZE (IC_RIGHT (ic)) <= 2)) - { - PAIR_ID left = getPairId (AOP (IC_LEFT (ic))); - PAIR_ID right = getPairId (AOP (IC_RIGHT (ic))); - - if (left == PAIR_INVALID && right == PAIR_INVALID) - { - left = PAIR_DE; - right = PAIR_HL; - } - else if (right == PAIR_INVALID) - right = PAIR_DE; - else if (left == PAIR_INVALID) - left = PAIR_DE; - - fetchPair (left, AOP (IC_LEFT (ic))); - /* Order is important. Right may be HL */ - fetchPair (right, AOP (IC_RIGHT (ic))); - - emit2 ("ld a,%s", _pairs[left].l); - emit2 ("sub a,%s", _pairs[right].l); - emit2 ("ld e,a"); - emit2 ("ld a,%s", _pairs[left].h); - emit2 ("sbc a,%s", _pairs[right].h); + AOP_TYPE (IC_RIGHT (ic)) == AOP_STK || + AOP_TYPE (IC_RESULT (ic)) == AOP_STK) + { + if ((AOP_SIZE (IC_LEFT (ic)) == 2 || + AOP_SIZE (IC_RIGHT (ic)) == 2) && + (AOP_SIZE (IC_LEFT (ic)) <= 2 && + AOP_SIZE (IC_RIGHT (ic)) <= 2)) + { + PAIR_ID left = getPairId (AOP (IC_LEFT (ic))); + PAIR_ID right = getPairId (AOP (IC_RIGHT (ic))); + + if (left == PAIR_INVALID && right == PAIR_INVALID) + { + left = PAIR_DE; + right = PAIR_HL; + } + else if (right == PAIR_INVALID) + right = PAIR_DE; + else if (left == PAIR_INVALID) + left = PAIR_DE; + + fetchPair (left, AOP (IC_LEFT (ic))); + /* Order is important. Right may be HL */ + fetchPair (right, AOP (IC_RIGHT (ic))); + + emit2 ("ld a,%s", _pairs[left].l); + emit2 ("sub a,%s", _pairs[right].l); + emit2 ("ld e,a"); + emit2 ("ld a,%s", _pairs[left].h); + emit2 ("sbc a,%s", _pairs[right].h); if ( AOP_SIZE (IC_RESULT (ic)) > 1) { aopPut (AOP (IC_RESULT (ic)), "a", 1); } - aopPut (AOP (IC_RESULT (ic)), "e", 0); - goto release; - } - } + aopPut (AOP (IC_RESULT (ic)), "e", 0); + goto release; + } + } if (size == 4) { /* Be paranoid on the GB with 4 byte variables due to how C @@ -3731,29 +4092,29 @@ genMinus (iCode * ic) } } - setupToPreserveCarry (AOP (IC_RESULT (ic)), AOP (IC_LEFT (ic)), AOP (IC_RIGHT (ic))); + setupToPreserveCarry (ic); /* if literal, add a,#-lit, else normal subb */ while (size--) { _moveA (aopGet (AOP (IC_LEFT (ic)), offset, FALSE)); if (AOP_TYPE (IC_RIGHT (ic)) != AOP_LIT) - { - if (!offset) - emit2 ("sub a,%s", - aopGet (AOP (IC_RIGHT (ic)), offset, FALSE)); - else - emit2 ("sbc a,%s", - aopGet (AOP (IC_RIGHT (ic)), offset, FALSE)); - } + { + if (!offset) + emit2 ("sub a,%s", + aopGet (AOP (IC_RIGHT (ic)), offset, FALSE)); + else + emit2 ("sbc a,%s", + aopGet (AOP (IC_RIGHT (ic)), offset, FALSE)); + } else - { - /* first add without previous c */ - if (!offset) - emit2 ("add a,!immedbyte", (unsigned int) (lit & 0x0FFL)); - else - emit2 ("adc a,!immedbyte", (unsigned int) ((lit >> (offset * 8)) & 0x0FFL)); - } + { + /* first add without previous c */ + if (!offset) + emit2 ("add a,!immedbyte", (unsigned int) (lit & 0x0FFL)); + else + emit2 ("adc a,!immedbyte", (unsigned int) ((lit >> (offset * 8)) & 0x0FFL)); + } aopPut (AOP (IC_RESULT (ic)), "a", offset++); } @@ -3765,6 +4126,7 @@ genMinus (iCode * ic) } release: + _G.preserveCarry = FALSE; freeAsmop (IC_LEFT (ic), NULL, ic); freeAsmop (IC_RIGHT (ic), NULL, ic); freeAsmop (IC_RESULT (ic), NULL, ic); @@ -3780,12 +4142,15 @@ genMult (iCode * ic) int count, i; /* If true then the final operation should be a subtract */ bool active = FALSE; + bool byteResult; /* Shouldn't occur - all done through function calls */ aopOp (IC_LEFT (ic), ic, FALSE, FALSE); aopOp (IC_RIGHT (ic), ic, FALSE, FALSE); aopOp (IC_RESULT (ic), ic, TRUE, FALSE); + byteResult = (AOP_SIZE (IC_RESULT (ic)) == 1); + if (AOP_SIZE (IC_LEFT (ic)) > 2 || AOP_SIZE (IC_RIGHT (ic)) > 2 || AOP_SIZE (IC_RESULT (ic)) > 2) @@ -3815,10 +4180,13 @@ genMult (iCode * ic) if ( AOP_SIZE (IC_LEFT (ic)) == 1 && !SPEC_USIGN (getSpec (operandType ( IC_LEFT (ic))))) { emit2 ("ld e,%s", aopGet (AOP (IC_LEFT (ic)), LSB, FALSE)); - emit2 ("ld a,e"); - emit2 ("rlc a"); - emit2 ("sbc a,a"); - emit2 ("ld d,a"); + if (!byteResult) + { + emit2 ("ld a,e"); + emit2 ("rlc a"); + emit2 ("sbc a,a"); + emit2 ("ld d,a"); + } } else { @@ -3840,7 +4208,8 @@ genMult (iCode * ic) if (active == FALSE) { emit2 ("ld l,e"); - emit2 ("ld h,d"); + if (!byteResult) + emit2 ("ld h,d"); } else { @@ -3859,7 +4228,10 @@ genMult (iCode * ic) _G.stack.pushedDE = FALSE; } - commitPair ( AOP (IC_RESULT (ic)), PAIR_HL); + if (byteResult) + aopPut (AOP (IC_RESULT (ic)), _pairs[PAIR_HL].l, 0); + else + commitPair ( AOP (IC_RESULT (ic)), PAIR_HL); freeAsmop (IC_LEFT (ic), NULL, ic); freeAsmop (IC_RIGHT (ic), NULL, ic); @@ -3901,60 +4273,60 @@ genIfxJump (iCode * ic, char *jval) { jlbl = IC_TRUE (ic); if (!strcmp (jval, "a")) - { - inst = "nz"; - } + { + inst = "NZ"; + } else if (!strcmp (jval, "c")) - { - inst = "c"; - } + { + inst = "C"; + } else if (!strcmp (jval, "nc")) - { - inst = "nc"; - } + { + inst = "NC"; + } else if (!strcmp (jval, "m")) - { - inst = "m"; - } + { + inst = "M"; + } else if (!strcmp (jval, "p")) - { - inst = "p"; - } + { + inst = "P"; + } else - { - /* The buffer contains the bit on A that we should test */ - inst = "nz"; - } + { + /* The buffer contains the bit on A that we should test */ + inst = "NZ"; + } } else { /* false label is present */ jlbl = IC_FALSE (ic); if (!strcmp (jval, "a")) - { - inst = "z"; - } + { + inst = "Z"; + } else if (!strcmp (jval, "c")) - { - inst = "nc"; - } + { + inst = "NC"; + } else if (!strcmp (jval, "nc")) - { - inst = "c"; - } + { + inst = "C"; + } else if (!strcmp (jval, "m")) - { - inst = "p"; - } + { + inst = "P"; + } else if (!strcmp (jval, "p")) - { - inst = "m"; - } + { + inst = "M"; + } else - { - /* The buffer contains the bit on A that we should test */ - inst = "z"; - } + { + /* The buffer contains the bit on A that we should test */ + inst = "Z"; + } } /* Z80 can do a conditional long jump */ if (!strcmp (jval, "a")) @@ -3994,17 +4366,17 @@ _getPairIdName (PAIR_ID id) #if OLD /* if unsigned char cmp with lit, just compare */ if ((size == 1) && - (AOP_TYPE (right) == AOP_LIT && AOP_TYPE (left) != AOP_DIR)) - { - emit2 ("ld a,%s", aopGet (AOP (left), offset, FALSE)); - if (sign) - { - emit2 ("xor a,!immedbyte", 0x80); - emit2 ("cp %s^!constbyte", aopGet (AOP (right), offset, FALSE), 0x80); - } - else - emit2 ("cp %s", aopGet (AOP (right), offset, FALSE)); - } + (AOP_TYPE (right) == AOP_LIT && AOP_TYPE (left) != AOP_DIR)) + { + emit2 ("ld a,%s", aopGet (AOP (left), offset, FALSE)); + if (sign) + { + emit2 ("xor a,!immedbyte", 0x80); + emit2 ("cp %s^!constbyte", aopGet (AOP (right), offset, FALSE), 0x80); + } + else + emit2 ("cp %s", aopGet (AOP (right), offset, FALSE)); + } else if (size == 4 && IS_GB && requiresHL(AOP(right)) && requiresHL(AOP(left))) { // On the Gameboy we can't afford to adjust HL as it may trash the carry. @@ -4036,7 +4408,7 @@ _getPairIdName (PAIR_ID id) emit2 ("ld a,(de)"); emit2 ("%s a,(hl)", offset == 0 ? "sub" : "sbc"); } - + if (size != 0) { emit2 ("inc hl"); @@ -4073,7 +4445,7 @@ _getPairIdName (PAIR_ID id) emit2 ("ld a,(hl)"); emit2 ("%s a,%d(iy)", offset == 0 ? "sub" : "sbc", offset); } - + if (size != 0) { emit2 ("inc hl"); @@ -4084,87 +4456,87 @@ _getPairIdName (PAIR_ID id) spillPair (PAIR_IY); } 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) - { - /* No sign so it's always false */ - _clearCarry(); - } - else - { - /* Just load in the top most bit */ - _moveA (aopGet (AOP (left), AOP_SIZE (left) - 1, FALSE)); - if (!(AOP_TYPE (result) == AOP_CRY && AOP_SIZE (result)) && ifx) - { - genIfxJump (ifx, "7"); - return; - } - else - emit2 ("rlc a"); - } - goto release; - } - } - - if (sign) - { - /* First setup h and l contaning the top most bytes XORed */ - bool fDidXor = FALSE; - if (AOP_TYPE (left) == AOP_LIT) - { - unsigned long lit = (unsigned long) - floatFromVal (AOP (left)->aopu.aop_lit); - emit2 ("ld %s,!immedbyte", _fTmp[0], - 0x80 ^ (unsigned int) ((lit >> ((size - 1) * 8)) & 0x0FFL)); - } - else - { - emit2 ("ld a,%s", aopGet (AOP (left), size - 1, FALSE)); - emit2 ("xor a,!immedbyte", 0x80); - emit2 ("ld %s,a", _fTmp[0]); - fDidXor = TRUE; - } - if (AOP_TYPE (right) == AOP_LIT) - { - unsigned long lit = (unsigned long) - floatFromVal (AOP (right)->aopu.aop_lit); - emit2 ("ld %s,!immedbyte", _fTmp[1], - 0x80 ^ (unsigned int) ((lit >> ((size - 1) * 8)) & 0x0FFL)); - } - else - { - emit2 ("ld a,%s", aopGet (AOP (right), size - 1, FALSE)); - emit2 ("xor a,!immedbyte", 0x80); - emit2 ("ld %s,a", _fTmp[1]); - fDidXor = TRUE; - } - } - while (size--) - { - /* Do a long subtract */ - if (!sign || size) - { - _moveA (aopGet (AOP (left), offset, FALSE)); - } - if (sign && size == 0) - { - emit2 ("ld a,%s", _fTmp[0]); - emit2 ("%s a,%s", offset == 0 ? "sub" : "sbc", _fTmp[1]); - } - else - { - /* Subtract through, propagating the carry */ - emit2 ("%s a,%s", offset == 0 ? "sub" : "sbc", aopGet (AOP (right), offset, FALSE)); - offset++; - } - } - } + { + 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) + { + /* No sign so it's always false */ + _clearCarry(); + } + else + { + /* Just load in the top most bit */ + _moveA (aopGet (AOP (left), AOP_SIZE (left) - 1, FALSE)); + if (!(AOP_TYPE (result) == AOP_CRY && AOP_SIZE (result)) && ifx) + { + genIfxJump (ifx, "7"); + return; + } + else + emit2 ("rlc a"); + } + goto release; + } + } + + if (sign) + { + /* First setup h and l contaning the top most bytes XORed */ + bool fDidXor = FALSE; + if (AOP_TYPE (left) == AOP_LIT) + { + unsigned long lit = (unsigned long) + floatFromVal (AOP (left)->aopu.aop_lit); + emit2 ("ld %s,!immedbyte", _fTmp[0], + 0x80 ^ (unsigned int) ((lit >> ((size - 1) * 8)) & 0x0FFL)); + } + else + { + emit2 ("ld a,%s", aopGet (AOP (left), size - 1, FALSE)); + emit2 ("xor a,!immedbyte", 0x80); + emit2 ("ld %s,a", _fTmp[0]); + fDidXor = TRUE; + } + if (AOP_TYPE (right) == AOP_LIT) + { + unsigned long lit = (unsigned long) + floatFromVal (AOP (right)->aopu.aop_lit); + emit2 ("ld %s,!immedbyte", _fTmp[1], + 0x80 ^ (unsigned int) ((lit >> ((size - 1) * 8)) & 0x0FFL)); + } + else + { + emit2 ("ld a,%s", aopGet (AOP (right), size - 1, FALSE)); + emit2 ("xor a,!immedbyte", 0x80); + emit2 ("ld %s,a", _fTmp[1]); + fDidXor = TRUE; + } + } + while (size--) + { + /* Do a long subtract */ + if (!sign || size) + { + _moveA (aopGet (AOP (left), offset, FALSE)); + } + if (sign && size == 0) + { + emit2 ("ld a,%s", _fTmp[0]); + emit2 ("%s a,%s", offset == 0 ? "sub" : "sbc", _fTmp[1]); + } + else + { + /* Subtract through, propagating the carry */ + emit2 ("%s a,%s", offset == 0 ? "sub" : "sbc", aopGet (AOP (right), offset, FALSE)); + offset++; + } + } + } } #endif @@ -4172,7 +4544,7 @@ _getPairIdName (PAIR_ID id) */ static void genCmp (operand * left, operand * right, - operand * result, iCode * ifx, int sign) + operand * result, iCode * ifx, int sign) { int size, offset = 0; unsigned long lit = 0L; @@ -4203,7 +4575,7 @@ genCmp (operand * left, operand * right, { emit2 ("ld a,(de)"); emit2 ("%s a,(hl)", offset == 0 ? "sub" : "sbc"); - + if (size != 0) { emit2 ("inc hl"); @@ -4237,7 +4609,7 @@ genCmp (operand * left, operand * right, } else { - if (!sign) + if (!sign) { emit2 ("rlc a"); } @@ -4395,67 +4767,72 @@ gencjneshort (operand * left, operand * right, symbol * lbl) AOP_TYPE (left) != AOP_DIR) { if (lit == 0) - { - emit2 ("ld a,%s", aopGet (AOP (left), offset, FALSE)); - if (size > 1) - { - while (--size) - { - emit2 ("or a,%s", aopGet (AOP (left), ++offset, FALSE)); - } - } - else - { - emit2 ("or a,a"); - } - emit2 ("jp nz,!tlabel", lbl->key + 100); - } + { + emit2 ("ld a,%s", aopGet (AOP (left), offset, FALSE)); + if (size > 1) + { + while (--size) + { + emit2 ("or a,%s", aopGet (AOP (left), ++offset, FALSE)); + } + } + else + { + emit2 ("or a,a"); + } + emit2 ("jp NZ,!tlabel", lbl->key + 100); + } else - { - while (size--) - { - emit2 ("ld a,%s", aopGet (AOP (left), offset, FALSE)); - if ((AOP_TYPE (right) == AOP_LIT) && lit == 0) - emit2 ("or a,a"); - else - emit2 ("cp a,%s", aopGet (AOP (right), offset, FALSE)); - emit2 ("jp nz,!tlabel", lbl->key + 100); - offset++; - } - } + { + while (size--) + { + _moveA (aopGet (AOP (left), offset, FALSE)); + if ((unsigned int) ((lit >> (offset * 8)) & 0x0FFL) == 0) + emit2 ("or a,a"); + else + emit2 ("sub a,%s", aopGet (AOP (right), offset, FALSE)); + emit2 ("jp NZ,!tlabel", 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)) + AOP_TYPE (right) == AOP_DIR || + (AOP_TYPE (left) == AOP_DIR && AOP_TYPE (right) == AOP_LIT)) { while (size--) - { - _moveA (aopGet (AOP (left), offset, FALSE)); - if ((AOP_TYPE (left) == AOP_DIR && AOP_TYPE (right) == AOP_LIT) && - ((unsigned int) ((lit >> (offset * 8)) & 0x0FFL) == 0)) - /* PENDING */ - emit2 ("jp nz,!tlabel", lbl->key + 100); - else - { - emit2 ("cp %s", aopGet (AOP (right), offset, FALSE)); - emit2 ("jp nz,!tlabel", lbl->key + 100); - } - offset++; - } + { + _moveA (aopGet (AOP (left), offset, FALSE)); + if (/*AOP_TYPE (left) == AOP_DIR &&*/ AOP_TYPE (right) == AOP_LIT && + ((unsigned int) ((lit >> (offset * 8)) & 0x0FFL) == 0)) + { + /* PENDING */ + /* MB: pending what? doesn't this need "or a,a"? */ + /* and I don't think AOP_TYPE(left) has anything to do with this */ + emit2 ("or a,a"); + emit2 ("jp NZ,!tlabel", lbl->key + 100); + } + else + { + emit2 ("sub %s", aopGet (AOP (right), offset, FALSE)); + emit2 ("jp NZ,!tlabel", lbl->key + 100); + } + offset++; + } } else { /* right is a pointer reg need both a & b */ /* PENDING: is this required? */ while (size--) - { - _moveA (aopGet (AOP (right), offset, FALSE)); - emit2 ("cp %s", aopGet (AOP (left), offset, FALSE)); - emit2 ("!shortjp nz,!tlabel", lbl->key + 100); - offset++; - } + { + _moveA (aopGet (AOP (right), offset, FALSE)); + emit2 ("cp %s", aopGet (AOP (left), offset, FALSE)); + emit2 ("!shortjp NZ,!tlabel", lbl->key + 100); + offset++; + } } } @@ -4506,29 +4883,29 @@ genCmpEq (iCode * ic, iCode * ifx) symbol *tlbl; /* if they are both bit variables */ if (AOP_TYPE (left) == AOP_CRY && - ((AOP_TYPE (right) == AOP_CRY) || (AOP_TYPE (right) == AOP_LIT))) - { - wassertl (0, "Tried to compare two bits"); - } + ((AOP_TYPE (right) == AOP_CRY) || (AOP_TYPE (right) == AOP_LIT))) + { + wassertl (0, "Tried to compare two bits"); + } else - { - tlbl = newiTempLabel (NULL); - gencjneshort (left, right, tlbl); - if (IC_TRUE (ifx)) - { - emit2 ("jp !tlabel", IC_TRUE (ifx)->key + 100); - emitLabel (tlbl->key + 100); - } - else - { - /* PENDING: do this better */ - symbol *lbl = newiTempLabel (NULL); - emit2 ("!shortjp !tlabel", lbl->key + 100); - emitLabel (tlbl->key + 100); - emit2 ("jp !tlabel", IC_FALSE (ifx)->key + 100); - emitLabel (lbl->key + 100); - } - } + { + tlbl = newiTempLabel (NULL); + gencjneshort (left, right, tlbl); + if (IC_TRUE (ifx)) + { + emit2 ("jp !tlabel", IC_TRUE (ifx)->key + 100); + emitLabel (tlbl->key + 100); + } + else + { + /* PENDING: do this better */ + symbol *lbl = newiTempLabel (NULL); + emit2 ("!shortjp !tlabel", lbl->key + 100); + emitLabel (tlbl->key + 100); + emit2 ("jp !tlabel", IC_FALSE (ifx)->key + 100); + emitLabel (lbl->key + 100); + } + } /* mark the icode as generated */ ifx->generated = 1; goto release; @@ -4543,25 +4920,25 @@ genCmpEq (iCode * ic, iCode * ifx) else { emitDebug(";4"); - + gencjne (left, right, newiTempLabel (NULL)); if (AOP_TYPE (result) == AOP_CRY && AOP_SIZE (result)) - { - wassert (0); - } + { + wassert (0); + } if (ifx) - { + { emitDebug(";5"); - 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) - { + { emitDebug(";6"); - outAcc (result); - } + outAcc (result); + } /* leave the result in acc */ } @@ -4619,7 +4996,7 @@ genAndOp (iCode * ic) { tlbl = newiTempLabel (NULL); _toBoolean (left); - emit2 ("!shortjp z,!tlabel", tlbl->key + 100); + emit2 ("!shortjp Z,!tlabel", tlbl->key + 100); _toBoolean (right); emitLabel (tlbl->key + 100); outBitAcc (result); @@ -4656,7 +5033,7 @@ genOrOp (iCode * ic) { tlbl = newiTempLabel (NULL); _toBoolean (left); - emit2 ("!shortjp nz,!tlabel", tlbl->key + 100); + emit2 ("!shortjp NZ,!tlabel", tlbl->key + 100); _toBoolean (right); emitLabel (tlbl->key + 100); outBitAcc (result); @@ -4729,7 +5106,7 @@ genAnd (iCode * ic, iCode * ifx) /* if left is a literal & right is not then exchange them */ if ((AOP_TYPE (left) == AOP_LIT && AOP_TYPE (right) != AOP_LIT) || - AOP_NEEDSACC (left)) + (AOP_NEEDSACC (right) && !AOP_NEEDSACC (left))) { operand *tmp = right; right = left; @@ -4790,15 +5167,16 @@ genAnd (iCode * ic, iCode * ifx) /* For the flags */ emit2 ("or a,a"); } - emit2 ("!shortjp nz,!tlabel", tlbl->key + 100); + emit2 ("!shortjp NZ,!tlabel", tlbl->key + 100); } - offset++; + offset++; } // bit = left & literal if (size) { emit2 ("clr c"); emit2 ("!tlabeldef", tlbl->key + 100); + _G.lines.current->isLabel = 1; } // if(left & literal) else @@ -4817,82 +5195,82 @@ 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 - { - _moveA (aopGet (AOP (left), offset, FALSE)); - emit2 ("and a,%s", - aopGet (AOP (right), offset, FALSE)); - aopPut (AOP (left), "a", offset); - } - } - - } - else - { - if (AOP_TYPE (left) == AOP_ACC) - { - wassertl (0, "Tried to perform an AND where the left operand is allocated into A"); - } - else - { - _moveA (aopGet (AOP (left), offset, FALSE)); - emit2 ("and a,%s", - aopGet (AOP (right), offset, FALSE)); - aopPut (AOP (left), "a", 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 + { + _moveA (aopGet (AOP (left), offset, FALSE)); + emit2 ("and a,%s", + aopGet (AOP (right), offset, FALSE)); + aopPut (AOP (left), "a", offset); + } + } + + } + else + { + if (AOP_TYPE (left) == AOP_ACC) + { + wassertl (0, "Tried to perform an AND where the left operand is allocated into A"); + } + else + { + _moveA (aopGet (AOP (left), offset, FALSE)); + emit2 ("and a,%s", + aopGet (AOP (right), offset, FALSE)); + aopPut (AOP (left), "a", offset); + } + } + } } else { // left & result in different registers if (AOP_TYPE (result) == AOP_CRY) - { - wassertl (0, "Tried to AND where the result is in carry"); - } + { + wassertl (0, "Tried to AND where the result is in carry"); + } 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), - offset); - continue; - } - else if (bytelit == 0) - { - aopPut (AOP (result), "!zero", offset); - continue; - } - } - // faster than result <- left, anl result,right - // and better if result is SFR - if (AOP_TYPE (left) == AOP_ACC) - emit2 ("and a,%s", aopGet (AOP (right), offset, FALSE)); - else - { - _moveA (aopGet (AOP (left), offset, FALSE)); - emit2 ("and a,%s", - aopGet (AOP (right), offset, FALSE)); - } - aopPut (AOP (result), "a", offset); - } - } + { + 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), + offset); + continue; + } + else if (bytelit == 0) + { + aopPut (AOP (result), "!zero", offset); + continue; + } + } + // faster than result <- left, anl result,right + // and better if result is SFR + if (AOP_TYPE (left) == AOP_ACC) + emit2 ("and a,%s", aopGet (AOP (right), offset, FALSE)); + else + { + _moveA (aopGet (AOP (left), offset, FALSE)); + emit2 ("and a,%s", + aopGet (AOP (right), offset, FALSE)); + } + aopPut (AOP (result), "a", offset); + } + } } @@ -4919,7 +5297,7 @@ genOr (iCode * ic, iCode * ifx) /* if left is a literal & right is not then exchange them */ if ((AOP_TYPE (left) == AOP_LIT && AOP_TYPE (right) != AOP_LIT) || - AOP_NEEDSACC (left)) + (AOP_NEEDSACC (right) && !AOP_NEEDSACC (left))) { operand *tmp = right; right = left; @@ -4966,7 +5344,7 @@ genOr (iCode * ic, iCode * ifx) { wassertl (0, "Result is assigned to a bit"); } - /* PENDING: Modeled after the AND code which is inefficent. */ + /* PENDING: Modeled after the AND code which is inefficient. */ while (sizel--) { bytelit = (lit >> (offset * 8)) & 0x0FFL; @@ -4974,7 +5352,7 @@ genOr (iCode * ic, iCode * ifx) _moveA (aopGet (AOP (left), offset, FALSE)); /* OR with any literal is the same as OR with itself. */ emit2 ("or a,a"); - emit2 ("!shortjp nz,!tlabel", tlbl->key + 100); + emit2 ("!shortjp NZ,!tlabel", tlbl->key + 100); offset++; } @@ -4989,70 +5367,70 @@ 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 - { - _moveA (aopGet (AOP (left), offset, FALSE)); - emit2 ("or a,%s", - aopGet (AOP (right), offset, FALSE)); - aopPut (AOP (result), "a", offset); - } - } - else - { - if (AOP_TYPE (left) == AOP_ACC) - emit2 ("or a,%s", aopGet (AOP (right), offset, FALSE)); - else - { - _moveA (aopGet (AOP (left), offset, FALSE)); - emit2 ("or a,%s", - aopGet (AOP (right), offset, FALSE)); - aopPut (AOP (result), "a", offset); - } - } - } + { + if (AOP_TYPE (right) == AOP_LIT) + { + if (((lit >> (offset * 8)) & 0x0FFL) == 0x00L) + continue; + else + { + _moveA (aopGet (AOP (left), offset, FALSE)); + emit2 ("or a,%s", + aopGet (AOP (right), offset, FALSE)); + aopPut (AOP (result), "a", offset); + } + } + else + { + if (AOP_TYPE (left) == AOP_ACC) + emit2 ("or a,%s", aopGet (AOP (right), offset, FALSE)); + else + { + _moveA (aopGet (AOP (left), offset, FALSE)); + emit2 ("or a,%s", + aopGet (AOP (right), offset, FALSE)); + aopPut (AOP (result), "a", offset); + } + } + } } else { // left & result in different registers if (AOP_TYPE (result) == AOP_CRY) - { - wassertl (0, "Result of OR is in a bit"); - } + { + wassertl (0, "Result of OR is in a bit"); + } 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), - offset); - continue; - } - } - // faster than result <- left, anl result,right - // and better if result is SFR - if (AOP_TYPE (left) == AOP_ACC) - emit2 ("or a,%s", aopGet (AOP (right), offset, FALSE)); - else - { - _moveA (aopGet (AOP (left), offset, FALSE)); - emit2 ("or a,%s", - aopGet (AOP (right), offset, FALSE)); - } - aopPut (AOP (result), "a", offset); - /* PENDING: something weird is going on here. Add exception. */ - if (AOP_TYPE (result) == AOP_ACC) - break; - } + 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), + offset); + continue; + } + } + // faster than result <- left, anl result,right + // and better if result is SFR + if (AOP_TYPE (left) == AOP_ACC) + emit2 ("or a,%s", aopGet (AOP (right), offset, FALSE)); + else + { + _moveA (aopGet (AOP (left), offset, FALSE)); + emit2 ("or a,%s", + aopGet (AOP (right), offset, FALSE)); + } + aopPut (AOP (result), "a", offset); + /* PENDING: something weird is going on here. Add exception. */ + if (AOP_TYPE (result) == AOP_ACC) + break; + } } release: @@ -5077,7 +5455,7 @@ genXor (iCode * ic, iCode * ifx) /* if left is a literal & right is not then exchange them */ if ((AOP_TYPE (left) == AOP_LIT && AOP_TYPE (right) != AOP_LIT) || - AOP_NEEDSACC (left)) + (AOP_NEEDSACC (right) && !AOP_NEEDSACC (left))) { operand *tmp = right; right = left; @@ -5129,7 +5507,7 @@ genXor (iCode * ic, iCode * ifx) { _moveA (aopGet (AOP (left), offset, FALSE)); emit2 ("xor a,%s", aopGet (AOP (right), offset, FALSE)); - emit2 ("!shortjp nz,!tlabel", tlbl->key + 100); + emit2 ("!shortjp NZ,!tlabel", tlbl->key + 100); offset++; } if (ifx) @@ -5147,71 +5525,71 @@ genXor (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 - { - _moveA (aopGet (AOP (right), offset, FALSE)); - emit2 ("xor a,%s", - aopGet (AOP (left), offset, FALSE)); - aopPut (AOP (result), "a", offset); - } - } - else - { - if (AOP_TYPE (left) == AOP_ACC) + { + if (AOP_TYPE (right) == AOP_LIT) + { + if (((lit >> (offset * 8)) & 0x0FFL) == 0x00L) + continue; + else + { + _moveA (aopGet (AOP (left), offset, FALSE)); + emit2 ("xor a,%s", + aopGet (AOP (right), offset, FALSE)); + aopPut (AOP (result), "a", offset); + } + } + else + { + if (AOP_TYPE (left) == AOP_ACC) { emit2 ("xor a,%s", aopGet (AOP (right), offset, FALSE)); } - else - { - _moveA (aopGet (AOP (right), offset, FALSE)); - emit2 ("xor a,%s", - aopGet (AOP (left), offset, FALSE)); - aopPut (AOP (result), "a", 0); - } - } - } + else + { + _moveA (aopGet (AOP (left), offset, FALSE)); + emit2 ("xor a,%s", + aopGet (AOP (right), offset, FALSE)); + aopPut (AOP (result), "a", offset); + } + } + } } else { // left & result in different registers if (AOP_TYPE (result) == AOP_CRY) - { - wassertl (0, "Result of XOR is in a bit"); - } + { + wassertl (0, "Result of XOR is in a bit"); + } 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), - offset); - continue; - } - } - // faster than result <- left, anl result,right - // and better if result is SFR - if (AOP_TYPE (left) == AOP_ACC) + 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), + offset); + continue; + } + } + // faster than result <- left, anl result,right + // and better if result is SFR + if (AOP_TYPE (left) == AOP_ACC) { emit2 ("xor a,%s", aopGet (AOP (right), offset, FALSE)); } - else - { - _moveA (aopGet (AOP (right), offset, FALSE)); - emit2 ("xor a,%s", - aopGet (AOP (left), offset, FALSE)); - } - aopPut (AOP (result), "a", offset); - } + else + { + _moveA (aopGet (AOP (left), offset, FALSE)); + emit2 ("xor a,%s", + aopGet (AOP (right), offset, FALSE)); + } + aopPut (AOP (result), "a", offset); + } } release: @@ -5237,24 +5615,24 @@ genInline (iCode * ic) while (*bp) { if (*bp == '\n') - { - *bp++ = '\0'; - emit2 (bp1); - bp1 = bp; - } + { + *bp++ = '\0'; + emit2 (bp1); + bp1 = bp; + } else - { - if (*bp == ':') - { - bp++; - *bp = '\0'; - bp++; - emit2 (bp1); - bp1 = bp; - } - else - bp++; - } + { + if (*bp == ':') + { + bp++; + *bp = '\0'; + bp++; + emit2 (bp1); + bp1 = bp; + } + else + bp++; + } } if (bp1 != bp) emit2 (bp1); @@ -5338,8 +5716,8 @@ emitRsh2 (asmop *aop, int size, int is_signed) /*-----------------------------------------------------------------*/ static void shiftR2Left2Result (operand * left, int offl, - operand * result, int offr, - int shCount, int is_signed) + operand * result, int offr, + int shCount, int is_signed) { int size = 2; symbol *tlbl, *tlbl1; @@ -5347,8 +5725,11 @@ shiftR2Left2Result (operand * left, int offl, movLeft2Result (left, offl, result, offr, 0); movLeft2Result (left, offl + 1, result, offr + 1, 0); + if (shCount == 0) + return; + /* if (AOP(result)->type == AOP_REG) { */ - + tlbl = newiTempLabel (NULL); tlbl1 = newiTempLabel (NULL); @@ -5370,7 +5751,7 @@ shiftR2Left2Result (operand * left, int offl, emitLabel (tlbl1->key + 100); emit2 ("dec a"); - emit2 ("!shortjp nz,!tlabel", tlbl->key + 100); + emit2 ("!shortjp NZ,!tlabel", tlbl->key + 100); } } @@ -5379,7 +5760,7 @@ shiftR2Left2Result (operand * left, int offl, /*-----------------------------------------------------------------*/ static void shiftL2Left2Result (operand * left, int offl, - operand * result, int offr, int shCount) + operand * result, int offr, int shCount) { if (sameRegs (AOP (result), AOP (left)) && ((offl + MSB16) == offr)) @@ -5393,12 +5774,15 @@ shiftL2Left2Result (operand * left, int offl, movLeft2Result (left, offl + 1, result, offr + 1, 0); } + if (shCount == 0) + return; + if (getPairId (AOP (result)) == PAIR_HL) { while (shCount--) - { - emit2 ("add hl,hl"); - } + { + emit2 ("add hl,hl"); + } } else { @@ -5412,54 +5796,54 @@ shiftL2Left2Result (operand * left, int offl, if (AOP (result)->type == AOP_REG) { - while (shCount--) - { - for (offset = 0; offset < size; offset++) - { - l = aopGet (AOP (result), offset, FALSE); - - if (offset == 0) - { - emit2 ("sla %s", l); - } - else - { - emit2 ("rl %s", l); - } - } - } + while (shCount--) + { + for (offset = 0; offset < size; offset++) + { + l = aopGet (AOP (result), offset, FALSE); + + if (offset == 0) + { + emit2 ("sla %s", l); + } + else + { + emit2 ("rl %s", l); + } + } + } } else { - /* Left is already in result - so now do the shift */ - if (shCount > 1) - { - emit2 ("ld a,!immedbyte+1", shCount); - emit2 ("!shortjp !tlabel", tlbl1->key + 100); - emitLabel (tlbl->key + 100); - } - - while (size--) - { - l = aopGet (AOP (result), offset, FALSE); - - if (offset == 0) - { - emit2 ("sla %s", l); - } - else - { - emit2 ("rl %s", l); - } - - offset++; - } - if (shCount > 1) - { - emitLabel (tlbl1->key + 100); - emit2 ("dec a"); - emit2 ("!shortjp nz,!tlabel", tlbl->key + 100); - } + /* Left is already in result - so now do the shift */ + if (shCount > 1) + { + emit2 ("ld a,!immedbyte+1", shCount); + emit2 ("!shortjp !tlabel", tlbl1->key + 100); + emitLabel (tlbl->key + 100); + } + + while (size--) + { + l = aopGet (AOP (result), offset, FALSE); + + if (offset == 0) + { + emit2 ("sla %s", l); + } + else + { + emit2 ("rl %s", l); + } + + offset++; + } + if (shCount > 1) + { + emitLabel (tlbl1->key + 100); + emit2 ("dec a"); + emit2 ("!shortjp NZ,!tlabel", tlbl->key + 100); + } } } } @@ -5470,8 +5854,9 @@ shiftL2Left2Result (operand * left, int offl, static void AccRol (int shCount) { - shCount &= 0x0007; // shCount : 0..7 + shCount &= 0x0007; // shCount : 0..7 +#if 0 switch (shCount) { case 0: @@ -5507,6 +5892,43 @@ AccRol (int shCount) emit2 ("srl a"); break; } +#else + switch (shCount) + { + case 0: + break; + case 1: + emit2 ("rlca"); + break; + case 2: + emit2 ("rlca"); + emit2 ("rlca"); + break; + case 3: + emit2 ("rlca"); + emit2 ("rlca"); + emit2 ("rlca"); + break; + case 4: + emit2 ("rlca"); + emit2 ("rlca"); + emit2 ("rlca"); + emit2 ("rlca"); + break; + case 5: + emit2 ("rrca"); + emit2 ("rrca"); + emit2 ("rrca"); + break; + case 6: + emit2 ("rrca"); + emit2 ("rrca"); + break; + case 7: + emit2 ("rrca"); + break; + } +#endif } /*-----------------------------------------------------------------*/ @@ -5523,21 +5945,21 @@ AccLsh (int shCount) if (shCount != 0) { if (shCount == 1) - { - emit2 ("add a,a"); - } + { + emit2 ("add a,a"); + } else if (shCount == 2) - { - emit2 ("add a,a"); - emit2 ("add a,a"); - } + { + emit2 ("add a,a"); + emit2 ("add a,a"); + } else - { - /* rotate left accumulator */ - AccRol (shCount); - /* and kill the lower order bits */ - emit2 ("and a,!immedbyte", SLMask[shCount]); - } + { + /* rotate left accumulator */ + AccRol (shCount); + /* and kill the lower order bits */ + emit2 ("and a,!immedbyte", SLMask[shCount]); + } } } @@ -5546,7 +5968,7 @@ AccLsh (int shCount) /*-----------------------------------------------------------------*/ static void shiftL1Left2Result (operand * left, int offl, - operand * result, int offr, int shCount) + operand * result, int offr, int shCount) { const char *l; l = aopGet (AOP (left), offl, FALSE); @@ -5558,7 +5980,7 @@ shiftL1Left2Result (operand * left, int offl, /*-----------------------------------------------------------------*/ -/* genlshTwo - left shift two bytes by known amount != 0 */ +/* genlshTwo - left shift two bytes by known amount */ /*-----------------------------------------------------------------*/ static void genlshTwo (operand * result, operand * left, int shCount) @@ -5572,35 +5994,35 @@ genlshTwo (operand * result, operand * left, int shCount) { shCount -= 8; if (size > 1) - { - if (shCount) - { - movLeft2Result (left, LSB, result, MSB16, 0); - aopPut (AOP (result), "!zero", 0); - shiftL1Left2Result (left, LSB, result, MSB16, shCount); - } - else - { - movLeft2Result (left, LSB, result, MSB16, 0); - aopPut (AOP (result), "!zero", 0); - } - } + { + if (shCount) + { + movLeft2Result (left, LSB, result, MSB16, 0); + shiftL1Left2Result (left, LSB, result, MSB16, shCount); + aopPut (AOP (result), "!zero", LSB); + } + else + { + movLeft2Result (left, LSB, result, MSB16, 0); + aopPut (AOP (result), "!zero", 0); + } + } else - { - aopPut (AOP (result), "!zero", LSB); - } + { + aopPut (AOP (result), "!zero", LSB); + } } - /* 1 <= shCount <= 7 */ + /* 0 <= shCount <= 7 */ else { if (size == 1) - { - wassert (0); - } + { + wassert (0); + } else - { - shiftL2Left2Result (left, LSB, result, LSB, shCount); - } + { + shiftL2Left2Result (left, LSB, result, LSB, shCount); + } } } @@ -5618,9 +6040,9 @@ genlshOne (operand * result, operand * left, int shCount) /*-----------------------------------------------------------------*/ static void 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; @@ -5633,12 +6055,8 @@ genLeftShiftLiteral (operand * left, size = getSize (operandType (result)); /* I suppose that the left size >= result size */ - if (shCount == 0) - { - wassert (0); - } - else if (shCount >= (size * 8)) + if (shCount >= (size * 8)) { while (size--) { @@ -5648,19 +6066,19 @@ genLeftShiftLiteral (operand * left, else { switch (size) - { - case 1: - genlshOne (result, left, shCount); - break; - case 2: - genlshTwo (result, left, shCount); - break; - case 4: - wassertl (0, "Shifting of longs is currently unsupported"); - break; - default: - wassert (0); - } + { + case 1: + genlshOne (result, left, shCount); + break; + case 2: + genlshTwo (result, left, shCount); + break; + case 4: + wassertl (0, "Shifting of longs is currently unsupported"); + break; + default: + wassert (0); + } } freeAsmop (left, NULL, ic); freeAsmop (result, NULL, ic); @@ -5701,6 +6119,9 @@ genLeftShift (iCode * ic) aopOp (left, ic, FALSE, FALSE); aopOp (result, ic, FALSE, FALSE); + if (AOP_TYPE (left) != AOP_REG || AOP_TYPE (result) != AOP_REG) + _push (PAIR_AF); + /* now move the left to the result if they are not the same */ @@ -5710,11 +6131,11 @@ genLeftShift (iCode * ic) size = AOP_SIZE (result); offset = 0; while (size--) - { - l = aopGet (AOP (left), offset, FALSE); - aopPut (AOP (result), l, offset); - offset++; - } + { + l = aopGet (AOP (left), offset, FALSE); + aopPut (AOP (result), l, offset); + offset++; + } } tlbl = newiTempLabel (NULL); @@ -5722,6 +6143,9 @@ genLeftShift (iCode * ic) offset = 0; tlbl1 = newiTempLabel (NULL); + if (AOP_TYPE (left) != AOP_REG || AOP_TYPE (result) != AOP_REG) + _pop (PAIR_AF); + emit2 ("!shortjp !tlabel", tlbl1->key + 100); emitLabel (tlbl->key + 100); l = aopGet (AOP (result), offset, FALSE); @@ -5742,7 +6166,7 @@ genLeftShift (iCode * ic) } emitLabel (tlbl1->key + 100); emit2 ("dec a"); - emit2 ("!shortjp nz,!tlabel", tlbl->key + 100); + emit2 ("!shortjp NZ,!tlabel", tlbl->key + 100); freeAsmop (left, NULL, ic); freeAsmop (result, NULL, ic); @@ -5776,9 +6200,9 @@ genrshOne (operand * result, operand * left, int shCount, int is_signed) { _moveA (l); while (shCount--) - { - emit2 ("%s a", is_signed ? "sra" : "srl"); - } + { + emit2 ("%s a", is_signed ? "sra" : "srl"); + } aopPut (AOP (result), "a", 0); } } @@ -5808,16 +6232,16 @@ AccRsh (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) { _moveA (aopGet (AOP (left), offl, FALSE)); if (sign) { while (shCount--) - { - emit2 ("%s a", sign ? "sra" : "srl"); - } + { + emit2 ("%s a", sign ? "sra" : "srl"); + } } else { @@ -5827,25 +6251,25 @@ shiftR1Left2Result (operand * left, int offl, } /*-----------------------------------------------------------------*/ -/* genrshTwo - right shift two bytes by known amount != 0 */ +/* genrshTwo - right shift two bytes by known amount */ /*-----------------------------------------------------------------*/ static void genrshTwo (operand * result, operand * left, - int shCount, int sign) + int shCount, int sign) { /* if shCount >= 8 */ if (shCount >= 8) { shCount -= 8; 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); + } if (sign) { /* Sign extend the result */ @@ -5860,7 +6284,7 @@ genrshTwo (operand * result, operand * left, aopPut (AOP (result), "!zero", 1); } } - /* 1 <= shCount <= 7 */ + /* 0 <= shCount <= 7 */ else { shiftR2Left2Result (left, LSB, result, LSB, shCount, sign); @@ -5872,9 +6296,9 @@ genrshTwo (operand * result, operand * left, /*-----------------------------------------------------------------*/ static void genRightShiftLiteral (operand * left, - operand * right, - operand * result, - iCode * ic, + operand * right, + operand * result, + iCode * ic, int sign) { int shCount = (int) floatFromVal (AOP (right)->aopu.aop_lit); @@ -5888,12 +6312,8 @@ genRightShiftLiteral (operand * left, size = getSize (operandType (result)); /* I suppose that the left size >= result size */ - if (shCount == 0) - { - wassert (0); - } - else if (shCount >= (size * 8)) { + if (shCount >= (size * 8)) { const char *s; if (!SPEC_USIGN(getSpec(operandType(left)))) { _moveA(aopGet (AOP (left), 0, FALSE)); @@ -5909,19 +6329,19 @@ genRightShiftLiteral (operand * left, else { switch (size) - { - case 1: - genrshOne (result, left, shCount, sign); - break; - case 2: - genrshTwo (result, left, shCount, sign); - break; - case 4: - wassertl (0, "Asked to shift right a long which should be a function call"); - break; - default: - wassertl (0, "Entered default case in right shift delegate"); - } + { + case 1: + genrshOne (result, left, shCount, sign); + break; + case 2: + genrshTwo (result, left, shCount, sign); + break; + case 4: + wassertl (0, "Asked to shift right a long which should be a function call"); + break; + default: + wassertl (0, "Entered default case in right shift delegate"); + } } freeAsmop (left, NULL, ic); freeAsmop (result, NULL, ic); @@ -5975,6 +6395,9 @@ genRightShift (iCode * ic) aopOp (left, ic, FALSE, FALSE); aopOp (result, ic, FALSE, FALSE); + if (AOP_TYPE (left) != AOP_REG || AOP_TYPE (result) != AOP_REG) + _push (PAIR_AF); + /* now move the left to the result if they are not the same */ if (!sameRegs (AOP (left), AOP (result))) @@ -5983,11 +6406,11 @@ genRightShift (iCode * ic) size = AOP_SIZE (result); offset = 0; while (size--) - { - l = aopGet (AOP (left), offset, FALSE); - aopPut (AOP (result), l, offset); - offset++; - } + { + l = aopGet (AOP (left), offset, FALSE); + aopPut (AOP (result), l, offset); + offset++; + } } tlbl = newiTempLabel (NULL); @@ -5995,16 +6418,19 @@ genRightShift (iCode * ic) size = AOP_SIZE (result); offset = size - 1; + if (AOP_TYPE (left) != AOP_REG || AOP_TYPE (result) != AOP_REG) + _pop (PAIR_AF); + emit2 ("!shortjp !tlabel", tlbl1->key + 100); emitLabel (tlbl->key + 100); while (size--) { l = aopGet (AOP (result), offset--, FALSE); if (first) - { + { emit2 ("%s %s", is_signed ? "sra" : "srl", l); - first = 0; - } + first = 0; + } else { emit2 ("rr %s", l); @@ -6012,18 +6438,136 @@ genRightShift (iCode * ic) } emitLabel (tlbl1->key + 100); emit2 ("dec a"); - emit2 ("!shortjp nz,!tlabel", tlbl->key + 100); + emit2 ("!shortjp NZ,!tlabel", tlbl->key + 100); freeAsmop (left, NULL, ic); freeAsmop (result, NULL, ic); } + +/*-----------------------------------------------------------------*/ +/* genUnpackBits - generates code for unpacking bits */ +/*-----------------------------------------------------------------*/ +static void +genUnpackBits (operand * result, int pair) +{ + 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 */ + + emitDebug ("; genUnpackBits"); + + etype = getSpec (operandType (result)); + rsize = getSize (operandType (result)); + blen = SPEC_BLEN (etype); + bstr = SPEC_BSTR (etype); + + /* If the bitfield length is less than a byte */ + if (blen < 8) + { + emit2 ("ld a,!*pair", _pairs[pair].name); + AccRol (8 - bstr); + emit2 ("and a,!immedbyte", ((unsigned char) -1) >> (8 - blen)); + if (!SPEC_USIGN (etype)) + { + /* signed bitfield */ + symbol *tlbl = newiTempLabel (NULL); + + emit2 ("bit %d,a", blen - 1); + emit2 ("jp Z,!tlabel", tlbl->key + 100); + emit2 ("or a,!immedbyte", (unsigned char) (0xff << blen)); + emitLabel (tlbl->key + 100); + } + aopPut (AOP (result), "a", offset++); + goto finish; + } + + /* TODO: what if pair == PAIR_DE ? */ + if (getPairId (AOP (result)) == PAIR_HL) + { + wassertl (rsize == 2, "HL must be of size 2"); + emit2 ("ld a,!*hl"); + emit2 ("inc hl"); + emit2 ("ld h,!*hl"); + emit2 ("ld l,a"); + emit2 ("ld a,h"); + emit2 ("and a,!immedbyte", ((unsigned char) -1) >> (16 - blen)); + if (!SPEC_USIGN (etype)) + { + /* signed bitfield */ + symbol *tlbl = newiTempLabel (NULL); + + emit2 ("bit %d,a", blen - 1); + emit2 ("jp Z,!tlabel", tlbl->key + 100); + emit2 ("or a,!immedbyte", (unsigned char) (0xff << blen)); + emitLabel (tlbl->key + 100); + } + emit2 ("ld h,a"); + spillPair (PAIR_HL); + return; + } + + /* Bit field did not fit in a byte. Copy all + but the partial byte at the end. */ + for (rlen=blen;rlen>=8;rlen-=8) + { + emit2 ("ld a,!*pair", _pairs[pair].name); + aopPut (AOP (result), "a", offset++); + if (rlen>8) + { + emit2 ("inc %s", _pairs[pair].name); + _G.pairs[pair].offset++; + } + } + + /* Handle the partial byte at the end */ + if (rlen) + { + emit2 ("ld a,!*pair", _pairs[pair].name); + emit2 ("and a,!immedbyte", ((unsigned char) -1) >> (8 - rlen)); + if (!SPEC_USIGN (etype)) + { + /* signed bitfield */ + symbol *tlbl = newiTempLabel (NULL); + + emit2 ("bit %d,a", rlen - 1); + emit2 ("jp Z,!tlabel", tlbl->key + 100); + emit2 ("or a,!immedbyte", (unsigned char) (0xff << rlen)); + emitLabel (tlbl->key + 100); + } + aopPut (AOP (result), "a", offset++); + } + +finish: + if (offset < rsize) + { + char *source; + + if (SPEC_USIGN (etype)) + source = "!zero"; + else + { + /* signed bitfield: sign extension with 0x00 or 0xff */ + emit2 ("rla"); + emit2 ("sbc a,a"); + + source = "a"; + } + rsize -= offset; + while (rsize--) + aopPut (AOP (result), source, offset++); + } +} + /*-----------------------------------------------------------------*/ /* genGenPointerGet - get value from generic pointer space */ /*-----------------------------------------------------------------*/ static void genGenPointerGet (operand * left, - operand * result, iCode * ic) + operand * result, iCode * ic) { int size, offset; sym_link *retype = getSpec (operandType (result)); @@ -6037,36 +6581,36 @@ genGenPointerGet (operand * left, size = AOP_SIZE (result); - if (isPair (AOP (left)) && size == 1) + if (isPair (AOP (left)) && size == 1 && !IS_BITVAR (retype)) { /* Just do it */ if (isPtrPair (AOP (left))) - { - tsprintf (buffer, sizeof(buffer), - "!*pair", getPairName (AOP (left))); - aopPut (AOP (result), buffer, 0); - } + { + tsprintf (buffer, sizeof(buffer), + "!*pair", getPairName (AOP (left))); + aopPut (AOP (result), buffer, 0); + } else - { - emit2 ("ld a,!*pair", getPairName (AOP (left))); - aopPut (AOP (result), "a", 0); - } + { + emit2 ("ld a,!*pair", getPairName (AOP (left))); + aopPut (AOP (result), "a", 0); + } freeAsmop (left, NULL, ic); goto release; } - if (getPairId (AOP (left)) == PAIR_IY) + if (getPairId (AOP (left)) == PAIR_IY && !IS_BITVAR (retype)) { /* Just do it */ offset = 0; - while (size--) + while (size--) { char at[20]; tsprintf (at, sizeof(at), "!*iyx", offset); aopPut (AOP (result), at, offset); offset++; } - + freeAsmop (left, NULL, ic); goto release; } @@ -6078,7 +6622,10 @@ genGenPointerGet (operand * left, /* if bit then unpack */ if (IS_BITVAR (retype)) { - wassert (0); + genUnpackBits (result, pair); + freeAsmop (left, NULL, ic); + goto release; + //wassert (0); } else if (getPairId (AOP (result)) == PAIR_HL) { @@ -6095,23 +6642,23 @@ genGenPointerGet (operand * left, offset = 0; while (size--) - { - /* PENDING: make this better */ - if (!IS_GB && AOP_TYPE (result) == AOP_REG) - { - aopPut (AOP (result), "!*hl", offset++); - } - else - { - emit2 ("ld a,!*pair", _pairs[pair].name); - aopPut (AOP (result), "a", offset++); - } - if (size) - { - emit2 ("inc %s", _pairs[pair].name); - _G.pairs[pair].offset++; - } - } + { + /* PENDING: make this better */ + if (!IS_GB && AOP_TYPE (result) == AOP_REG) + { + aopPut (AOP (result), "!*hl", offset++); + } + else + { + emit2 ("ld a,!*pair", _pairs[pair].name); + aopPut (AOP (result), "a", offset++); + } + if (size) + { + emit2 ("inc %s", _pairs[pair].name); + _G.pairs[pair].offset++; + } + } /* Fixup HL back down */ for (size = AOP_SIZE (result)-1; size; size--) { @@ -6124,24 +6671,24 @@ genGenPointerGet (operand * left, offset = 0; while (size--) - { - /* PENDING: make this better */ - if (!IS_GB && + { + /* PENDING: make this better */ + if (!IS_GB && (AOP_TYPE (result) == AOP_REG || AOP_TYPE (result) == AOP_HLREG)) - { - aopPut (AOP (result), "!*hl", offset++); - } - else - { - emit2 ("ld a,!*pair", _pairs[pair].name); - aopPut (AOP (result), "a", offset++); - } - if (size) - { - emit2 ("inc %s", _pairs[pair].name); - _G.pairs[pair].offset++; - } - } + { + aopPut (AOP (result), "!*hl", offset++); + } + else + { + emit2 ("ld a,!*pair", _pairs[pair].name); + aopPut (AOP (result), "a", offset++); + } + if (size) + { + emit2 ("inc %s", _pairs[pair].name); + _G.pairs[pair].offset++; + } + } } freeAsmop (left, NULL, ic); @@ -6178,17 +6725,162 @@ isRegOrLit (asmop * aop) return FALSE; } + +/*-----------------------------------------------------------------*/ +/* genPackBits - generates code for packed bit storage */ +/*-----------------------------------------------------------------*/ +static void +genPackBits (sym_link * etype, + operand * right, + int pair, + iCode *ic) +{ + 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 */ + int extraPair; /* a tempory register */ + bool needPopExtra=0; /* need to restore original value of temp reg */ + + emitDebug ("; genPackBits",""); + + blen = SPEC_BLEN (etype); + bstr = SPEC_BSTR (etype); + + /* If the bitfield length is less than a byte */ + if (blen < 8) + { + mask = ((unsigned char) (0xFF << (blen + bstr)) | + (unsigned char) (0xFF >> (8 - bstr))); + + 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; + emit2 ("ld a,!*pair", _pairs[pair].name); + if ((mask|litval)!=0xff) + emit2 ("and a,!immedbyte", mask); + if (litval) + emit2 ("or a,!immedbyte", litval); + emit2 ("ld !*pair,a", _pairs[pair].name); + return; + } + else + { + /* Case with a bitfield length <8 and arbitrary source + */ + _moveA (aopGet (AOP (right), 0, FALSE)); + /* shift and mask source value */ + AccLsh (bstr); + emit2 ("and a,!immedbyte", (~mask) & 0xff); + + extraPair = getFreePairId(ic); + if (extraPair == PAIR_INVALID) + { + extraPair = PAIR_BC; + if (getPairId (AOP (right)) != PAIR_BC + || !isLastUse (ic, right)) + { + _push (extraPair); + needPopExtra = 1; + } + } + emit2 ("ld %s,a", _pairs[extraPair].l); + emit2 ("ld a,!*pair", _pairs[pair].name); + + emit2 ("and a,!immedbyte", mask); + emit2 ("or a,%s", _pairs[extraPair].l); + emit2 ("ld !*pair,a", _pairs[pair].name); + if (needPopExtra) + _pop (extraPair); + return; + } + } + + /* 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) + { + emit2 ("ld a,%s", aopGet (AOP (right), offset++, FALSE) ); + emit2 ("ld !*pair,a", _pairs[pair].name); + if (rlen>8) + { + emit2 ("inc %s", _pairs[pair].name); + _G.pairs[pair].offset++; + } + } + + /* If there was a partial byte at the end */ + if (rlen) + { + mask = (((unsigned char) -1 << rlen) & 0xff); + + if (AOP_TYPE (right) == AOP_LIT) + { + /* Case with partial byte and literal source + */ + litval = (int) floatFromVal (AOP (right)->aopu.aop_lit); + litval >>= (blen-rlen); + litval &= (~mask) & 0xff; + emit2 ("ld a,!*pair", _pairs[pair].name); + if ((mask|litval)!=0xff) + emit2 ("and a,!immedbyte", mask); + if (litval) + emit2 ("or a,!immedbyte", litval); + } + else + { + /* Case with partial byte and arbitrary source + */ + _moveA (aopGet (AOP (right), offset++, FALSE)); + emit2 ("and a,!immedbyte", (~mask) & 0xff); + + extraPair = getFreePairId(ic); + if (extraPair == PAIR_INVALID) + { + extraPair = getPairId (AOP (right)); + if (!isLastUse (ic, right) || (extraPair == PAIR_INVALID)) + extraPair = PAIR_BC; + + if (getPairId (AOP (right)) != PAIR_BC + || !isLastUse (ic, right)) + { + _push (extraPair); + needPopExtra = 1; + } + } + emit2 ("ld %s,a", _pairs[extraPair].l); + emit2 ("ld a,!*pair", _pairs[pair].name); + + emit2 ("and a,!immedbyte", mask); + emit2 ("or a,%s", _pairs[extraPair].l); + if (needPopExtra) + _pop (extraPair); + + } + emit2 ("ld !*pair,a", _pairs[pair].name); + } +} + + /*-----------------------------------------------------------------*/ /* genGenPointerSet - stores the value into a pointer location */ /*-----------------------------------------------------------------*/ static void genGenPointerSet (operand * right, - operand * result, iCode * ic) + operand * result, iCode * ic) { int size, offset; sym_link *retype = getSpec (operandType (right)); + sym_link *letype = getSpec (operandType (result)); PAIR_ID pairId = PAIR_HL; - + bool isBitvar; + aopOp (result, ic, FALSE, FALSE); aopOp (right, ic, FALSE, FALSE); @@ -6197,31 +6889,34 @@ genGenPointerSet (operand * right, size = AOP_SIZE (right); + isBitvar = IS_BITVAR(retype) || IS_BITVAR(letype); + emitDebug("; isBitvar = %d", isBitvar); + /* Handle the exceptions first */ - if (isPair (AOP (result)) && size == 1) + if (isPair (AOP (result)) && size == 1 && !isBitvar) { /* Just do it */ const char *l = aopGet (AOP (right), 0, FALSE); const char *pair = getPairName (AOP (result)); if (canAssignToPtr (l) && isPtr (pair)) - { - emit2 ("ld !*pair,%s", pair, l); - } + { + emit2 ("ld !*pair,%s", pair, l); + } else - { - _moveA (l); - emit2 ("ld !*pair,a", pair); - } + { + _moveA (l); + emit2 ("ld !*pair,a", pair); + } goto release; } - - if ( getPairId( AOP (result)) == PAIR_IY) + + if ( getPairId( AOP (result)) == PAIR_IY && !isBitvar) { /* Just do it */ const char *l = aopGet (AOP (right), 0, FALSE); offset = 0; - while (size--) + while (size--) { if (canAssignToPtr (l)) { @@ -6236,29 +6931,30 @@ genGenPointerSet (operand * right, } goto release; } - else if (getPairId (AOP (result)) == PAIR_HL && !isLastUse (ic, result)) + else if (getPairId (AOP (result)) == PAIR_HL && !isLastUse (ic, result) + && !isBitvar) { offset = 0; while (size--) - { - const char *l = aopGet (AOP (right), offset, FALSE); - if (isRegOrLit (AOP (right)) && !IS_GB) - { - emit2 ("ld !*pair,%s", _pairs[PAIR_HL].name, l); - } - else - { - _moveA (l); - emit2 ("ld !*pair,a", _pairs[PAIR_HL].name); - } - if (size) - { - emit2 ("inc %s", _pairs[PAIR_HL].name); - _G.pairs[PAIR_HL].offset++; - } - offset++; - } + { + const char *l = aopGet (AOP (right), offset, FALSE); + if (isRegOrLit (AOP (right)) && !IS_GB) + { + emit2 ("ld !*pair,%s", _pairs[PAIR_HL].name, l); + } + else + { + _moveA (l); + emit2 ("ld !*pair,a", _pairs[PAIR_HL].name); + } + if (size) + { + emit2 ("inc %s", _pairs[PAIR_HL].name); + _G.pairs[PAIR_HL].offset++; + } + offset++; + } /* Fixup HL back down */ for (size = AOP_SIZE (right)-1; size; size--) @@ -6274,37 +6970,39 @@ genGenPointerSet (operand * right, { fetchPair (pairId, AOP (result)); } - /* so hl know contains the address */ + /* so hl now contains the address */ freeAsmop (result, NULL, ic); /* if bit then unpack */ - if (IS_BITVAR (retype)) + if (isBitvar) { - wassert (0); + genPackBits ((IS_BITVAR (retype) ? retype : letype), right, pairId, ic); + goto release; + //wassert (0); } else { offset = 0; while (size--) - { - const char *l = aopGet (AOP (right), offset, FALSE); - if (isRegOrLit (AOP (right)) && !IS_GB) - { - emit2 ("ld !*pair,%s", _pairs[pairId].name, l); - } - else - { - _moveA (l); - emit2 ("ld !*pair,a", _pairs[pairId].name); - } - if (size) - { - emit2 ("inc %s", _pairs[pairId].name); - _G.pairs[pairId].offset++; - } - offset++; - } + { + const char *l = aopGet (AOP (right), offset, FALSE); + if (isRegOrLit (AOP (right)) && !IS_GB) + { + emit2 ("ld !*pair,%s", _pairs[pairId].name, l); + } + else + { + _moveA (l); + emit2 ("ld !*pair,a", _pairs[pairId].name); + } + if (size) + { + emit2 ("inc %s", _pairs[pairId].name); + _G.pairs[pairId].offset++; + } + offset++; + } } release: freeAsmop (right, NULL, ic); @@ -6381,40 +7079,40 @@ genAddrOf (iCode * ic) if (IS_GB) { if (sym->onStack) - { - spillCached (); - if (sym->stack <= 0) - { + { + spillCached (); + if (sym->stack <= 0) + { setupPairFromSP (PAIR_HL, sym->stack + _G.stack.pushed + _G.stack.offset); - } - else - { + } + else + { setupPairFromSP (PAIR_HL, sym->stack + _G.stack.pushed + _G.stack.offset + _G.stack.param_offset); - } + } commitPair (AOP (IC_RESULT (ic)), PAIR_HL); - } + } else - { - emit2 ("ld de,!hashedstr", sym->rname); + { + emit2 ("ld de,!hashedstr", sym->rname); commitPair (AOP (IC_RESULT (ic)), PAIR_DE); - } + } } else { spillCached (); if (sym->onStack) - { - /* if it has an offset then we need to compute it */ - if (sym->stack > 0) - emit2 ("ld hl,!immedword", sym->stack + _G.stack.pushed + _G.stack.offset + _G.stack.param_offset); - else - emit2 ("ld hl,!immedword", sym->stack + _G.stack.pushed + _G.stack.offset); - emit2 ("add hl,sp"); - } + { + /* if it has an offset then we need to compute it */ + if (sym->stack > 0) + emit2 ("ld hl,!immedword", sym->stack + _G.stack.pushed + _G.stack.offset + _G.stack.param_offset); + else + emit2 ("ld hl,!immedword", sym->stack + _G.stack.pushed + _G.stack.offset); + emit2 ("add hl,sp"); + } else - { - emit2 ("ld hl,!hashedstr", sym->rname); - } + { + emit2 ("ld hl,!hashedstr", sym->rname); + } commitPair (AOP (IC_RESULT (ic)), PAIR_HL); } freeAsmop (IC_RESULT (ic), NULL, ic); @@ -6470,10 +7168,10 @@ genAssign (iCode * ic) fetchPairLong (getPairId (AOP (result)), AOP (right), ic, LSB); } else if ((size > 1) && - (AOP_TYPE (result) != AOP_REG) && - (AOP_TYPE (right) == AOP_LIT) && - !IS_FLOAT (operandType (right)) && - (lit < 256L)) + (AOP_TYPE (result) != AOP_REG) && + (AOP_TYPE (right) == AOP_LIT) && + !IS_FLOAT (operandType (right)) && + (lit < 256L)) { bool fXored = FALSE; offset = 0; @@ -6481,29 +7179,29 @@ genAssign (iCode * ic) Done this way so that we can use the cached copy of 0 in A for a fast clear */ while (size--) - { - if ((unsigned int) ((lit >> (offset * 8)) & 0x0FFL) == 0) - { - if (!fXored && size > 1) - { - emit2 ("xor a,a"); - fXored = TRUE; - } - if (fXored) - { - aopPut (AOP (result), "a", offset); - } - else - { - aopPut (AOP (result), "!zero", offset); - } - } - else - aopPut (AOP (result), - aopGet (AOP (right), offset, FALSE), - offset); - offset++; - } + { + if ((unsigned int) ((lit >> (offset * 8)) & 0x0FFL) == 0) + { + if (!fXored && size > 1) + { + emit2 ("xor a,a"); + fXored = TRUE; + } + if (fXored) + { + aopPut (AOP (result), "a", offset); + } + else + { + aopPut (AOP (result), "!zero", offset); + } + } + else + aopPut (AOP (result), + aopGet (AOP (right), offset, FALSE), + offset); + offset++; + } } else if (size == 2 && AOP_TYPE (right) == AOP_IY) { @@ -6544,19 +7242,19 @@ genAssign (iCode * ic) else { while (size--) - { - /* PENDING: do this check better */ - if (IS_GB && requiresHL (AOP (right)) && requiresHL (AOP (result))) - { - _moveA (aopGet (AOP (right), offset, FALSE)); - aopPut (AOP (result), "a", offset); - } - else - aopPut (AOP (result), - aopGet (AOP (right), offset, FALSE), - offset); - offset++; - } + { + /* PENDING: do this check better */ + if (IS_GB && requiresHL (AOP (right)) && requiresHL (AOP (result))) + { + _moveA (aopGet (AOP (right), offset, FALSE)); + aopPut (AOP (result), "a", offset); + } + else + aopPut (AOP (result), + aopGet (AOP (right), offset, FALSE), + offset); + offset++; + } } release: @@ -6627,18 +7325,18 @@ 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; while (size--) - { - aopPut (AOP (result), - aopGet (AOP (right), offset, FALSE), - offset); - offset++; - } + { + aopPut (AOP (result), + aopGet (AOP (right), offset, FALSE), + offset); + offset++; + } goto release; } @@ -6650,29 +7348,29 @@ genCast (iCode * ic) while (size--) { aopPut (AOP (result), - aopGet (AOP (right), offset, FALSE), - offset); + aopGet (AOP (right), offset, FALSE), + offset); offset++; } /* now depending on the sign of the destination */ size = AOP_SIZE (result) - AOP_SIZE (right); /* Unsigned or not an integral type - right fill with zeros */ - if (SPEC_USIGN (rtype) || !IS_SPEC (rtype) || AOP_TYPE(right)==AOP_CRY) + if (!IS_SPEC (rtype) || SPEC_USIGN (rtype) || AOP_TYPE(right)==AOP_CRY) { while (size--) - aopPut (AOP (result), "!zero", offset++); + aopPut (AOP (result), "!zero", offset++); } else { /* we need to extend the sign :{ */ const char *l = aopGet (AOP (right), AOP_SIZE (right) - 1, - FALSE); + FALSE); _moveA (l); emit2 ("rla "); emit2 ("sbc a,a"); while (size--) - aopPut (AOP (result), "a", offset++); + aopPut (AOP (result), "a", offset++); } release: @@ -6703,12 +7401,131 @@ genReceive (iCode * ic) for (i = 0; i < size; i++) { aopPut(AOP(IC_RESULT(ic)), _fReceive[_G.receiveOffset++], i); - } + } } freeAsmop (IC_RESULT (ic), NULL, ic); } +/*-----------------------------------------------------------------*/ +/* genDummyRead - generate code for dummy read of volatiles */ +/*-----------------------------------------------------------------*/ +static void +genDummyRead (iCode * ic) +{ + operand *op; + int size, offset; + + op = IC_RIGHT (ic); + if (op && IS_SYMOP (op)) + { + aopOp (op, ic, FALSE, FALSE); + + /* general case */ + size = AOP_SIZE (op); + offset = 0; + + while (size--) + { + _moveA (aopGet (AOP (op), offset, FALSE)); + offset++; + } + + freeAsmop (op, NULL, ic); + } + + op = IC_LEFT (ic); + if (op && IS_SYMOP (op)) + { + aopOp (op, ic, FALSE, FALSE); + + /* general case */ + size = AOP_SIZE (op); + offset = 0; + + while (size--) + { + _moveA (aopGet (AOP (op), offset, FALSE)); + offset++; + } + + freeAsmop (op, NULL, ic); + } +} + +/*-----------------------------------------------------------------*/ +/* genCritical - generate code for start of a critical sequence */ +/*-----------------------------------------------------------------*/ +static void +genCritical (iCode *ic) +{ + symbol *tlbl = newiTempLabel (NULL); + + if (IS_GB) + { + emit2 ("!di"); + } + else if (IC_RESULT (ic)) + { + aopOp (IC_RESULT (ic), ic, TRUE, FALSE); + aopPut (AOP (IC_RESULT (ic)), "!zero", 0); + //get interrupt enable flag IFF2 into P/O + emit2 ("ld a,i"); + //disable interrupt + emit2 ("!di"); + //parity odd <==> P/O=0 <==> interrupt enable flag IFF2=0 + emit2 ("jp PO,!tlabel", tlbl->key + 100); + aopPut (AOP (IC_RESULT (ic)), "!one", 0); + emit2 ("!tlabeldef", (tlbl->key + 100)); + _G.lines.current->isLabel = 1; + freeAsmop (IC_RESULT (ic), NULL, ic); + } + else + { + //get interrupt enable flag IFF2 into P/O + emit2 ("ld a,i"); + //disable interrupt + emit2 ("!di"); + //save P/O flag + emit2 ("push af"); + } +} + +/*-----------------------------------------------------------------*/ +/* genEndCritical - generate code for end of a critical sequence */ +/*-----------------------------------------------------------------*/ +static void +genEndCritical (iCode *ic) +{ + symbol *tlbl = newiTempLabel (NULL); + + if (IS_GB) + { + emit2 ("!ei"); + } + else if (IC_RIGHT (ic)) + { + aopOp (IC_RIGHT (ic), ic, FALSE, TRUE); + _toBoolean (IC_RIGHT (ic)); + //don't enable interrupts if they were off before + emit2 ("!shortjp Z,!tlabel", tlbl->key + 100); + emit2 ("!ei"); + emitLabel (tlbl->key + 100); + freeAsmop (IC_RIGHT (ic), NULL, ic); + } + else + { + //restore P/O flag + emit2 ("pop af"); + //parity odd <==> P/O=0 <==> interrupt enable flag IFF2 was 0 <==> + //don't enable interrupts as they were off before + emit2 ("jp PO,!tlabel", tlbl->key + 100); + emit2 ("!ei"); + emit2 ("!tlabeldef", (tlbl->key + 100)); + _G.lines.current->isLabel = 1; + } +} + enum { /** Maximum number of bytes to emit per line. */ @@ -6724,7 +7541,7 @@ typedef struct /** Flushes a byte chunker by writing out all in the buffer and - reseting. + reseting. */ static void _dbFlush(DBEMITCTX *self) @@ -6785,9 +7602,9 @@ _rleCommit(RLECTX *self) { DBEMITCTX db; memset(&db, 0, sizeof(db)); - + emit2(".db %u", self->pos); - + for (i = 0; i < self->pos; i++) { _dbEmit(&db, self->buffer[i]); @@ -6819,7 +7636,7 @@ _rleCommit(RLECTX *self) chunks. */ static void -_rleAppend(RLECTX *self, int c) +_rleAppend(RLECTX *self, unsigned c) { int i; @@ -6897,18 +7714,32 @@ genArrayInit (iCode * ic) fetchPair (PAIR_HL, AOP (IC_LEFT (ic))); emit2 ("call __initrleblock"); - + type = operandType(IC_LEFT(ic)); - + if (type && type->next) { - elementSize = getSize(type->next); + if (IS_SPEC(type->next) || IS_PTR(type->next)) + { + elementSize = getSize(type->next); + } + else if (IS_ARRAY(type->next) && type->next->next) + { + elementSize = getSize(type->next->next); + } + else + { + printTypeChainRaw (type, NULL); + wassertl (0, "Can't determine element size in genArrayInit."); + } } else { wassertl (0, "Can't determine element size in genArrayInit."); } + wassertl ((elementSize > 0) && (elementSize <= 4), "Illegal element size in genArrayInit."); + iLoop = IC_ARRAYILIST(ic); lastVal = (unsigned)-1; @@ -6921,18 +7752,15 @@ genArrayInit (iCode * ic) { ix = iLoop->count; - if (ix != 0) + for (i = 0; i < ix; i++) { - for (i = 0; i < ix; i++) + for (eIndex = 0; eIndex < elementSize; eIndex++) { - for (eIndex = 0; eIndex < elementSize; eIndex++) - { - val = (((int)iLoop->literalValue) >> (eIndex * 8)) & 0xff; - _rleAppend(&rle, val); - } + val = (((int)iLoop->literalValue) >> (eIndex * 8)) & 0xff; + _rleAppend(&rle, val); } - } - + } + iLoop = iLoop->next; } @@ -6971,27 +7799,27 @@ _swap (PAIR_ID one, PAIR_ID two) Note: Have ex de,hl Combinations: - hl = hl => unity, fine + hl = hl => unity, fine bc = bc de = de - hl = hl hl = hl, swap de <=> bc + hl = hl hl = hl, swap de <=> bc bc = de de = bc - hl = bc Worst case + hl = bc Worst case bc = de de = hl - - hl = bc de = de, swap bc <=> hl + + hl = bc de = de, swap bc <=> hl bc = hl de = de - hl = de Worst case + hl = de Worst case bc = hl de = bc - hl = de bc = bc, swap hl <=> de + hl = de bc = bc, swap hl <=> de bc = bc de = hl @@ -7008,7 +7836,7 @@ _swap (PAIR_ID one, PAIR_ID two) So how do we detect the cases? How about a 3x3 matrix? - source + source dest x x x x x x x x x x x x (Fourth for iTemp/other) @@ -7044,7 +7872,7 @@ setupForBuiltin3 (iCode *ic, int nparams, operand **pparams) } /* Count the number of unity or iTemp assigns. */ - for (i = 0; i < 3; i++) + for (i = 0; i < 3; i++) { if (ids[dest[i]][dest[i]] == TRUE || ids[dest[i]][PAIR_INVALID] == TRUE) { @@ -7150,7 +7978,7 @@ genBuiltInStrcpy (iCode *ic, int nParams, operand **pparams) emit2 ("ld a,(hl)"); emit2 ("ldi"); emit2 ("or a"); - emit2 ("!shortjp nz,!tlabel ; 1", label->key); + emit2 ("!shortjp NZ,!tlabel ; 1", label->key); freeAsmop (from, NULL, ic->next); freeAsmop (to, NULL, ic); @@ -7181,7 +8009,7 @@ genBuiltInMemcpy (iCode *ic, int nParams, operand **pparams) /* if we need assign a result value */ if ((IS_ITEMP (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))) { aopOp (IC_RESULT (ic), ic, FALSE, FALSE); @@ -7194,7 +8022,7 @@ genBuiltInMemcpy (iCode *ic, int nParams, operand **pparams) /*-----------------------------------------------------------------*/ /* genBuiltIn - calls the appropriate function to generating code */ -/* for a built in function */ +/* for a built in function */ /*-----------------------------------------------------------------*/ static void genBuiltIn (iCode *ic) { @@ -7209,17 +8037,17 @@ static void genBuiltIn (iCode *ic) /* which function is it */ bif = OP_SYMBOL(IC_LEFT(bi_iCode)); - if (strcmp(bif->name,"__builtin_strcpy")==0) + if (strcmp(bif->name,"__builtin_strcpy")==0) { - genBuiltInStrcpy(bi_iCode, nbi_parms, bi_parms); - } - else if (strcmp(bif->name,"__builtin_memcpy")==0) + genBuiltInStrcpy(bi_iCode, nbi_parms, bi_parms); + } + else if (strcmp(bif->name,"__builtin_memcpy")==0) { - genBuiltInMemcpy(bi_iCode, nbi_parms, bi_parms); - } - else + genBuiltInMemcpy(bi_iCode, nbi_parms, bi_parms); + } + else { - wassertl (0, "Unknown builtin function encountered"); + wassertl (0, "Unknown builtin function encountered"); } } @@ -7246,257 +8074,270 @@ genZ80Code (iCode * lic) _G.lines.head = _G.lines.current = NULL; + /* if debug information required */ + if (options.debug && currFunc) + { + debugFile->writeFunction (currFunc, lic); + } + for (ic = lic; ic; ic = ic->next) { + _G.current_iCode = ic; - if (cln != ic->lineno) - { - if (!options.noCcodeInAsm) { - emit2 (";%s:%d: %s", ic->filename, ic->lineno, - printCLine(ic->filename, ic->lineno)); - } - cln = ic->lineno; - } - if (options.iCodeInAsm) { - emit2 (";ic:%d: %s", ic->key, printILine(ic)); - } + if (ic->lineno && cln != ic->lineno) + { + if (options.debug) + { + debugFile->writeCLine (ic); + } + if (!options.noCcodeInAsm) + { + emit2 (";%s:%d: %s", ic->filename, ic->lineno, + printCLine(ic->filename, ic->lineno)); + } + cln = ic->lineno; + } + if (options.iCodeInAsm) + { + emit2 (";ic:%d: %s", ic->key, printILine(ic)); + } /* if the result is marked as spilt and rematerializable or code for this has already been generated then do nothing */ if (resultRemat (ic) || ic->generated) - continue; + continue; /* depending on the operation */ switch (ic->op) - { - case '!': - emitDebug ("; genNot"); - genNot (ic); - break; - - case '~': - emitDebug ("; genCpl"); - genCpl (ic); - break; - - case UNARYMINUS: - emitDebug ("; genUminus"); - genUminus (ic); - break; - - case IPUSH: - emitDebug ("; genIpush"); - 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))) - { + { + case '!': + emitDebug ("; genNot"); + genNot (ic); + break; + + case '~': + emitDebug ("; genCpl"); + genCpl (ic); + break; + + case UNARYMINUS: + emitDebug ("; genUminus"); + genUminus (ic); + break; + + case IPUSH: + emitDebug ("; genIpush"); + 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))) + { emitDebug ("; genIfx"); - genIfx (ic->next, ic); - } - else - { - emitDebug ("; genIpop"); - genIpop (ic); - } - break; - - case CALL: - emitDebug ("; genCall"); - genCall (ic); - break; - - case PCALL: - emitDebug ("; genPcall"); - genPcall (ic); - break; - - case FUNCTION: - emitDebug ("; genFunction"); - genFunction (ic); - break; - - case ENDFUNCTION: - emitDebug ("; genEndFunction"); - genEndFunction (ic); - break; - - case RETURN: - emitDebug ("; genRet"); - genRet (ic); - break; - - case LABEL: - emitDebug ("; genLabel"); - genLabel (ic); - break; - - case GOTO: - emitDebug ("; genGoto"); - genGoto (ic); - break; - - case '+': - emitDebug ("; genPlus"); - genPlus (ic); - break; - - case '-': - emitDebug ("; genMinus"); - genMinus (ic); - break; - - case '*': - emitDebug ("; genMult"); - genMult (ic); - break; - - case '/': - emitDebug ("; genDiv"); - genDiv (ic); - break; - - case '%': - emitDebug ("; genMod"); - genMod (ic); - break; - - case '>': - emitDebug ("; genCmpGt"); - genCmpGt (ic, ifxForOp (IC_RESULT (ic), ic)); - break; - - case '<': - emitDebug ("; genCmpLt"); - 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: - emitDebug ("; genCmpEq"); - genCmpEq (ic, ifxForOp (IC_RESULT (ic), ic)); - break; - - case AND_OP: - emitDebug ("; genAndOp"); - genAndOp (ic); - break; - - case OR_OP: - emitDebug ("; genOrOp"); - genOrOp (ic); - break; - - case '^': - emitDebug ("; genXor"); - genXor (ic, ifxForOp (IC_RESULT (ic), ic)); - break; - - case '|': - emitDebug ("; genOr"); - genOr (ic, ifxForOp (IC_RESULT (ic), ic)); - break; - - case BITWISEAND: - emitDebug ("; genAnd"); - genAnd (ic, ifxForOp (IC_RESULT (ic), ic)); - break; - - case INLINEASM: - emitDebug ("; genInline"); - genInline (ic); - break; - - case RRC: - emitDebug ("; genRRC"); - genRRC (ic); - break; - - case RLC: - emitDebug ("; genRLC"); - genRLC (ic); - break; - - case GETHBIT: - emitDebug ("; genGetHBIT"); - genGetHbit (ic); + genIfx (ic->next, ic); + } + else + { + emitDebug ("; genIpop"); + genIpop (ic); + } + break; + + case CALL: + emitDebug ("; genCall"); + genCall (ic); + break; + + case PCALL: + emitDebug ("; genPcall"); + genPcall (ic); + break; + + case FUNCTION: + emitDebug ("; genFunction"); + genFunction (ic); + break; + + case ENDFUNCTION: + emitDebug ("; genEndFunction"); + genEndFunction (ic); + break; + + case RETURN: + emitDebug ("; genRet"); + genRet (ic); + break; + + case LABEL: + emitDebug ("; genLabel"); + genLabel (ic); + break; + + case GOTO: + emitDebug ("; genGoto"); + genGoto (ic); + break; + + case '+': + emitDebug ("; genPlus"); + genPlus (ic); + break; + + case '-': + emitDebug ("; genMinus"); + genMinus (ic); + break; + + case '*': + emitDebug ("; genMult"); + genMult (ic); + break; + + case '/': + emitDebug ("; genDiv"); + genDiv (ic); break; - case LEFT_OP: - emitDebug ("; genLeftShift"); - genLeftShift (ic); - break; - - case RIGHT_OP: - emitDebug ("; genRightShift"); - genRightShift (ic); - break; - - case GET_VALUE_AT_ADDRESS: - emitDebug ("; genPointerGet"); - genPointerGet (ic); - break; - - case '=': - - if (POINTER_SET (ic)) - { - emitDebug ("; genAssign (pointer)"); - genPointerSet (ic); - } - else - { - emitDebug ("; genAssign"); - genAssign (ic); - } - break; - - case IFX: + case '%': + emitDebug ("; genMod"); + genMod (ic); + break; + + case '>': + emitDebug ("; genCmpGt"); + genCmpGt (ic, ifxForOp (IC_RESULT (ic), ic)); + break; + + case '<': + emitDebug ("; genCmpLt"); + 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: + emitDebug ("; genCmpEq"); + genCmpEq (ic, ifxForOp (IC_RESULT (ic), ic)); + break; + + case AND_OP: + emitDebug ("; genAndOp"); + genAndOp (ic); + break; + + case OR_OP: + emitDebug ("; genOrOp"); + genOrOp (ic); + break; + + case '^': + emitDebug ("; genXor"); + genXor (ic, ifxForOp (IC_RESULT (ic), ic)); + break; + + case '|': + emitDebug ("; genOr"); + genOr (ic, ifxForOp (IC_RESULT (ic), ic)); + break; + + case BITWISEAND: + emitDebug ("; genAnd"); + genAnd (ic, ifxForOp (IC_RESULT (ic), ic)); + break; + + case INLINEASM: + emitDebug ("; genInline"); + genInline (ic); + break; + + case RRC: + emitDebug ("; genRRC"); + genRRC (ic); + break; + + case RLC: + emitDebug ("; genRLC"); + genRLC (ic); + break; + + case GETHBIT: + emitDebug ("; genGetHBIT"); + genGetHbit (ic); + break; + + case LEFT_OP: + emitDebug ("; genLeftShift"); + genLeftShift (ic); + break; + + case RIGHT_OP: + emitDebug ("; genRightShift"); + genRightShift (ic); + break; + + case GET_VALUE_AT_ADDRESS: + emitDebug ("; genPointerGet"); + genPointerGet (ic); + break; + + case '=': + + if (POINTER_SET (ic)) + { + emitDebug ("; genAssign (pointer)"); + genPointerSet (ic); + } + else + { + emitDebug ("; genAssign"); + genAssign (ic); + } + break; + + case IFX: emitDebug ("; genIfx"); - genIfx (ic, NULL); - break; - - case ADDRESS_OF: - emitDebug ("; genAddrOf"); - genAddrOf (ic); - break; - - case JUMPTABLE: - emitDebug ("; genJumpTab"); - genJumpTab (ic); - break; - - case CAST: - emitDebug ("; genCast"); - genCast (ic); - break; - - case RECEIVE: - emitDebug ("; genReceive"); - genReceive (ic); - break; - - case SEND: - if (ic->builtinSEND) + genIfx (ic, NULL); + break; + + case ADDRESS_OF: + emitDebug ("; genAddrOf"); + genAddrOf (ic); + break; + + case JUMPTABLE: + emitDebug ("; genJumpTab"); + genJumpTab (ic); + break; + + case CAST: + emitDebug ("; genCast"); + genCast (ic); + break; + + case RECEIVE: + emitDebug ("; genReceive"); + genReceive (ic); + break; + + case SEND: + if (ic->builtinSEND) { emitDebug ("; genBuiltIn"); genBuiltIn(ic); @@ -7506,16 +8347,31 @@ genZ80Code (iCode * lic) emitDebug ("; addSet"); addSet (&_G.sendSet, ic); } - break; + break; - case ARRAYINIT: - emitDebug ("; genArrayInit"); + case ARRAYINIT: + emitDebug ("; genArrayInit"); genArrayInit(ic); break; - - default: - ic = ic; - } + + case DUMMY_READ_VOLATILE: + emitDebug ("; genDummyRead"); + genDummyRead (ic); + break; + + case CRITICAL: + emitDebug ("; genCritical"); + genCritical (ic); + break; + + case ENDCRITICAL: + emitDebug ("; genEndCritical"); + genEndCritical (ic); + break; + + default: + ic = ic; + } } @@ -7533,8 +8389,8 @@ genZ80Code (iCode * lic) printLine (_G.lines.head, codeOutFile); if (_G.flushStatics) { - flushStatics (); - _G.flushStatics = 0; + flushStatics (); + _G.flushStatics = 0; } codeOutFile = fp; } @@ -7553,9 +8409,9 @@ _isPairUsed (iCode * ic, PAIR_ID pairId) { case PAIR_DE: if (bitVectBitValue (ic->rMask, D_IDX)) - ret++; + ret++; if (bitVectBitValue (ic->rMask, E_IDX)) - ret++; + ret++; break; default: wassert (0);