X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Favr%2Fgen.c;h=7c17501518f6b2e52645cd68e34217f0b4197c5f;hb=3062f96ccb55d1d05caf9c8782f4961f87b341ce;hp=fe2a666f9e7b1c4ec7722cf052b1200206f935f6;hpb=9ab4eb154ce78edd59b00a8f0764b6fa017eb751;p=fw%2Fsdcc diff --git a/src/avr/gen.c b/src/avr/gen.c index fe2a666f..7c175015 100644 --- a/src/avr/gen.c +++ b/src/avr/gen.c @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------- - avrgen.c - source file for code generation for ATMEL AVR + gen.c - source file for code generation for ATMEL AVR Written By - Sandeep Dutta . sandeep.dutta@usa.net (2000) @@ -31,19 +31,6 @@ #include "SDCCglobl.h" #include "newalloc.h" -#ifdef HAVE_SYS_ISA_DEFS_H -#include -#else -#ifdef HAVE_ENDIAN_H -#include -#else -#if !defined(__BORLANDC__) && !defined(_MSC_VER) -#warning "Cannot determine ENDIANESS of this machine assuming LITTLE_ENDIAN" -#warning "If you running sdcc on an INTEL 80x86 Platform you are okay" -#endif -#endif -#endif - #include "common.h" #include "SDCCpeeph.h" #include "ralloc.h" @@ -64,20 +51,7 @@ static char *spname; char *fReturnAVR[] = { "r16", "r17", "r18", "r19" }; unsigned fAVRReturnSize = 4; /* shared with ralloc.c */ char **fAVRReturn = fReturnAVR; -static char *larray[4] = { "lo8", "hi8", "hlo8", "hhi8" }; - -#if 0 -// PENDING: Unused -static short rbank = -1; -static char *tscr[4] = { "r0", "r1", "r24", "r25" }; -static unsigned char SLMask[] = { 0xFF, 0xFE, 0xFC, 0xF8, 0xF0, - 0xE0, 0xC0, 0x80, 0x00 -}; -static unsigned char SRMask[] = { 0xFF, 0x7F, 0x3F, 0x1F, 0x0F, - 0x07, 0x03, 0x01, 0x00 -}; - -#endif +static char *larray[4] = { ">", "<", "hlo8", "hhi8" }; static struct { short xPushed; @@ -91,7 +65,7 @@ static struct { extern int avr_ptrRegReq; extern int avr_nRegs; -extern FILE *codeOutFile; +extern struct dbuf_s *codeOutBuf; #define RESULTONSTACK(x) \ (IC_RESULT(x) && IC_RESULT(x)->aop && \ IC_RESULT(x)->aop->type == AOP_STK ) @@ -231,6 +205,26 @@ isLiteralBit (unsigned long lit) return idx + 1; return 0; } + +/*-----------------------------------------------------------------*/ +/* outAcc - output Acc */ +/*-----------------------------------------------------------------*/ +static void +outAcc (operand * result) +{ + int size, offset; + size = getDataSize (result); + if (size) { + aopPut (AOP (result), "r0", 0); + size--; + offset = 1; + /* unsigned or positive */ + while (size--) { + aopPut (AOP (result), zero, offset++); + } + } +} + #endif // End Unused code section /*-----------------------------------------------------------------*/ @@ -255,7 +249,7 @@ emitcode (char *inst, char *fmt, ...) else vsprintf (lb, fmt, ap); - while (isspace (*lbp)) + while (isspace ((unsigned char)*lbp)) lbp++; if (lbp && *lbp) @@ -267,34 +261,47 @@ emitcode (char *inst, char *fmt, ...) va_end (ap); } +/*-----------------------------------------------------------------*/ +/* avr_emitDebuggerSymbol - associate the current code location */ +/* with a debugger symbol */ +/*-----------------------------------------------------------------*/ +void +avr_emitDebuggerSymbol (char * debugSym) +{ + _G.debugLine = 1; + emitcode ("", "%s ==.", debugSym); + _G.debugLine = 0; +} + /*-----------------------------------------------------------------*/ /* hasInc - operand is incremented before any other use */ /*-----------------------------------------------------------------*/ static iCode * hasInc (operand *op, iCode *ic) { - sym_link *type = operandType(op); - sym_link *retype = getSpec (type); - iCode *lic = ic->next; - int isize ; + sym_link *type = operandType(op); + sym_link *retype = getSpec (type); + iCode *lic = ic->next; + int isize ; - if (IS_BITVAR(retype)||!IS_PTR(type)) return NULL; - isize = getSize(type->next); - while (lic) { - /* if operand of the form op = op + */ - if (lic->op == '+' && isOperandEqual(IC_LEFT(lic),op) && - isOperandEqual(IC_RESULT(lic),op) && - isOperandLiteral(IC_RIGHT(lic)) && - operandLitValue(IC_RIGHT(lic)) == isize) { - return lic; - } - /* if the operand used or deffed */ - if (bitVectBitValue(ic->uses,op->key) || ((unsigned) ic->defKey == op->key)) { - return NULL; - } - lic = lic->next; - } - return NULL; + if (IS_BITVAR(retype)||!IS_PTR(type)) return NULL; + if (IS_AGGREGATE(type->next)) return NULL; + isize = getSize(type->next); + while (lic) { + /* if operand of the form op = op + */ + if (lic->op == '+' && isOperandEqual(IC_LEFT(lic),op) && + isOperandEqual(IC_RESULT(lic),op) && + isOperandLiteral(IC_RIGHT(lic)) && + operandLitValue(IC_RIGHT(lic)) == isize) { + return lic; + } + /* if the operand used or deffed */ + if (bitVectBitValue(OP_USES(op),lic->key) || (lic->defKey == op->key)) { + return NULL; + } + lic = lic->next; + } + return NULL; } /*-----------------------------------------------------------------*/ @@ -455,10 +462,10 @@ aopForSym (iCode * ic, symbol * sym, bool result) _G.nRegsSaved)); } else { - emitcode ("subi", "%s,lo8(%d)", + emitcode ("subi", "%s,<(%d)", aop->aopu.aop_ptr->name, sym->stack - _G.nRegsSaved); - emitcode ("sbci", "%s,hi8(%d)", + emitcode ("sbci", "%s,>(%d)", aop->aop_ptr2->name, sym->stack - _G.nRegsSaved); } @@ -470,10 +477,10 @@ aopForSym (iCode * ic, symbol * sym, bool result) sym->stack); } else { - emitcode ("subi", "%s,lo8(-%d)", + emitcode ("subi", "%s,<(-%d)", aop->aopu.aop_ptr->name, sym->stack); - emitcode ("sbci", "%s,hi8(-%d)", + emitcode ("sbci", "%s,>(-%d)", aop->aop_ptr2->name, sym->stack); } @@ -516,8 +523,8 @@ aopForSym (iCode * ic, symbol * sym, bool result) aop->aopu.aop_ptr = getFreePtr (ic, &aop, result, aop->code); aop->size = getSize (sym->type); - emitcode ("ldi", "%s,lo8(%s)", aop->aopu.aop_ptr->name, sym->rname); - emitcode ("ldi", "%s,hi8(%s)", aop->aop_ptr2); + emitcode ("ldi", "%s,<(%s)", aop->aopu.aop_ptr->name, sym->rname); + emitcode ("ldi", "%s,>(%s)", aop->aop_ptr2); return aop; } @@ -675,6 +682,22 @@ isRegPair (asmop * aop) return 0; } +/*-----------------------------------------------------------------*/ +/* allHigh - all registers are high registers */ +/*-----------------------------------------------------------------*/ +static int allHigh (asmop * aop) +{ + int i; + + if (aop->type == AOP_X || aop->type == AOP_Z) + return 1; + if (aop->type != AOP_REG) + return 0; + for (i=0; i < aop->size ; i++ ) + if (aop->aopu.aop_reg[i]->rIdx < R16_IDX) return 0; + return 1; +} + /*-----------------------------------------------------------------*/ /* aopOp - allocates an asmop for an operand : */ /*-----------------------------------------------------------------*/ @@ -735,6 +758,8 @@ aopOp (operand * op, iCode * ic, bool result) b) has a spill location */ if (sym->isspilt || sym->nRegs == 0) { + asmop *oldAsmOp = NULL; + /* rematerialize it NOW */ if (sym->remat) { sym->aop = op->aop = aop = aopForRemat (sym); @@ -756,8 +781,17 @@ aopOp (operand * op, iCode * ic, bool result) } /* else spill location */ + if (sym->usl.spillLoc && 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); + 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; } @@ -832,10 +866,10 @@ freeAsmop (operand * op, asmop * aaop, iCode * ic, bool pop) stk + 1); } else { - emitcode ("subi", "%s,lo8(%d)", + emitcode ("subi", "%s,<(%d)", aop->aopu.aop_ptr->name, -(stk + 1)); - emitcode ("sbci", "%s,hi8(%d)", + emitcode ("sbci", "%s,>(%d)", aop->aop_ptr2->name, -(stk + 1)); } @@ -965,7 +999,7 @@ aopGet (asmop * aop, int offset) case AOP_LIT: s = aopLiteral (aop->aopu.aop_lit, offset); - emitcode ("ldi", "%s,lo8(%s)", + emitcode ("ldi", "%s,<(%s)", (rs = ((offset & 1) ? "r24" : "r25")), s); return rs; @@ -1014,7 +1048,7 @@ aopPut (asmop * aop, char *s, int offset) break; case AOP_REG: - if (toupper (*s) != 'R') { + if (toupper ((unsigned char)*s) != 'R') { if (s == zero) { emitcode ("clr", "%s", aop->aopu.aop_reg[offset]->name); @@ -1082,7 +1116,7 @@ aopPut (asmop * aop, char *s, int offset) case AOP_CRY: /* if used only for a condition code check */ - assert (toupper (*s) == 'R'); + assert (toupper ((unsigned char)*s) == 'R'); if (offset == 0) { emitcode ("xrl", "r0,r0"); emitcode ("cpi", "%s,0", s); @@ -1197,25 +1231,6 @@ getDataSize (operand * op) return size; } -/*-----------------------------------------------------------------*/ -/* outAcc - output Acc */ -/*-----------------------------------------------------------------*/ -static void -outAcc (operand * result) -{ - int size, offset; - size = getDataSize (result); - if (size) { - aopPut (AOP (result), "r0", 0); - size--; - offset = 1; - /* unsigned or positive */ - while (size--) { - aopPut (AOP (result), zero, offset++); - } - } -} - /*-----------------------------------------------------------------*/ /* toBoolean - emit code for orl a,operator(sizeop) */ /*-----------------------------------------------------------------*/ @@ -1224,10 +1239,15 @@ toBoolean (operand * oper, char *r, bool clr) { int size = AOP_SIZE (oper); int offset = 0; - if (clr) + if (clr) { emitcode ("clr", "%s", r); - while (size--) - emitcode ("or", "%s,%s", r, aopGet (AOP (oper), offset++)); + while (size--) + emitcode ("or", "%s,%s", r, aopGet (AOP (oper), offset++)); + } else { + size--; + emitcode("mov","%s,%s",r,aopGet (AOP (oper), offset++)); + if (size) while (size--) emitcode ("or", "%s,%s", r, aopGet (AOP (oper), offset++)); + } } @@ -1403,7 +1423,7 @@ genUminus (iCode * ic) size = AOP_SIZE (IC_LEFT (ic)) - 1; offset = 1; while (size--) { - emitcode ("sbci", "%s,lo8(-1)", + emitcode ("sbci", "%s,0xff", aopGet (AOP (IC_RESULT (ic)), offset++)); } } @@ -1532,7 +1552,7 @@ static void genCall (iCode * ic) { - /* if send set is not empty the assign */ + /* if send set is not empty then assign */ if (_G.sendSet) { iCode *sic; int rnum = 16; @@ -1576,9 +1596,9 @@ genCall (iCode * ic) emitcode ("sbiw", "r28,%d", ic->parmBytes); } else { - emitcode ("subi", "r28,lo8(%d)", + emitcode ("subi", "r28,<(%d)", ic->parmBytes); - emitcode ("sbci", "r29,hi8(%d)", + emitcode ("sbci", "r29,>(%d)", ic->parmBytes); } } @@ -1659,9 +1679,9 @@ genPcall (iCode * ic) emitcode ("sbiw", "r28,%d", ic->parmBytes); } else { - emitcode ("subi", "r28,lo8(%d)", + emitcode ("subi", "r28,<(%d)", ic->parmBytes); - emitcode ("sbci", "r29,hi8(%d)", + emitcode ("sbci", "r29,>(%d)", ic->parmBytes); } } @@ -1687,12 +1707,6 @@ resultRemat (iCode * ic) return 0; } -#if defined(__BORLANDC__) || defined(_MSC_VER) -#define STRCASECMP stricmp -#else -#define STRCASECMP strcasecmp -#endif - /*-----------------------------------------------------------------*/ /* genFunction - generated code for function entry */ /*-----------------------------------------------------------------*/ @@ -1700,7 +1714,7 @@ static void genFunction (iCode * ic) { symbol *sym; - sym_link *fetype; + sym_link *ftype; int i = 0; _G.nRegsSaved = 0; @@ -1711,13 +1725,13 @@ genFunction (iCode * ic) emitcode (";", "-----------------------------------------"); emitcode ("", "%s:", sym->rname); - fetype = getSpec (operandType (IC_LEFT (ic))); + ftype = operandType (IC_LEFT (ic)); /* if critical function then turn interrupts off */ - if (SPEC_CRTCL (fetype)) + if (IFFUNC_ISCRITICAL (ftype)) emitcode ("cli", ""); - if (IS_ISR (sym->etype)) { + if (IFFUNC_ISISR (sym->type)) { } /* save the preserved registers that are used in this function */ @@ -1754,8 +1768,8 @@ genFunction (iCode * ic) emitcode ("sbiw", "r28,%d", sym->stack); } else { - emitcode ("subi", "r28,lo8(%d)", sym->stack); - emitcode ("sbci", "r29,hi8(%d)", sym->stack); + emitcode ("subi", "r28,<(%d)", sym->stack); + emitcode ("sbci", "r29,>(%d)", sym->stack); } emitcode ("out", "__SP_L__,r28"); emitcode ("out", "__SP_H__,r29"); @@ -1777,8 +1791,8 @@ genEndFunction (iCode * ic) emitcode ("adiw", "r28,%d", sym->stack); } else { - emitcode ("subi", "r28,lo8(-%d)", sym->stack); - emitcode ("sbci", "r29,hi8(-%d)", sym->stack); + emitcode ("subi", "r28,<(-%d)", sym->stack); + emitcode ("sbci", "r29,>(-%d)", sym->stack); } emitcode ("out", "__SP_L__,r28"); emitcode ("out", "__SP_H__,r29"); @@ -1811,10 +1825,14 @@ genEndFunction (iCode * ic) } } - if (SPEC_CRTCL (sym->etype)) + if (IFFUNC_ISCRITICAL (sym->type)) emitcode ("sti", ""); - if (IS_ISR (sym->etype)) { + if (options.debug && currFunc) { + debugFile->writeEndFunction (currFunc, ic, 1); + } + + if (IFFUNC_ISISR (sym->type)) { emitcode ("rti", ""); } else { @@ -1889,7 +1907,7 @@ genLabel (iCode * ic) static void genGoto (iCode * ic) { - emitcode ("rjmp", "L%05d", (IC_LABEL (ic)->key + 100)); + emitcode ("rjmp", "L%05d", (IC_LABEL (ic)->key)); } /*-----------------------------------------------------------------*/ @@ -1899,6 +1917,7 @@ static bool genPlusIncr (iCode * ic) { unsigned int icount; + int offset = 0; /* will try to generate an increment */ /* if the right side is not a literal @@ -1906,8 +1925,7 @@ genPlusIncr (iCode * ic) if (AOP_TYPE (IC_RIGHT (ic)) != AOP_LIT) return FALSE; - icount = - (unsigned int) floatFromVal (AOP (IC_RIGHT (ic))->aopu. + icount = (unsigned int) floatFromVal (AOP (IC_RIGHT (ic))->aopu. aop_lit); /* if the sizes are greater than 2 or they are not the same regs @@ -1924,34 +1942,41 @@ genPlusIncr (iCode * ic) aopGet (AOP (IC_LEFT (ic)), 0)); return TRUE; } - emitcode ("subi", "%s,lo8(%d)", - aopGet (AOP (IC_LEFT (ic)), 0), 0-icount); - return TRUE; + if (AOP_ISHIGHREG( AOP (IC_LEFT (ic)),0)) { + emitcode ("subi", "%s,<(%d)", + aopGet (AOP (IC_LEFT (ic)), 0), 0-icount); + return TRUE; + } + } + + for (offset = 0 ; offset < AOP_SIZE(IC_RESULT(ic)) ; offset++) { + if (!(AOP_ISHIGHREG(AOP(IC_RESULT(ic)),offset))) return FALSE; } if (AOP_SIZE (IC_RESULT (ic)) <= 3) { /* if register pair and starts with 26/30 then adiw */ if (isRegPair (AOP (IC_RESULT (ic))) && icount > 0 && icount < 64 - && (IS_REGIDX (AOP (IC_RESULT (ic)), R26_IDX) - || IS_REGIDX (AOP (IC_RESULT (ic)), R30_IDX))) { + && (IS_REGIDX (AOP (IC_RESULT (ic)), R26_IDX) || + IS_REGIDX (AOP (IC_RESULT (ic)), R24_IDX) || + IS_REGIDX (AOP (IC_RESULT (ic)), R30_IDX))) { emitcode ("adiw", "%s,%d", aopGet (AOP (IC_RESULT (ic)), 0), icount); return TRUE; } /* use subi */ - emitcode ("subi", "%s,lo8(%d)", + emitcode ("subi", "%s,<(%d)", aopGet (AOP (IC_RESULT (ic)), 0), 0-icount); - emitcode ("sbci", "%s,hi8(%d)", + emitcode ("sbci", "%s,>(%d)", aopGet (AOP (IC_RESULT (ic)), 1), 0-icount); return TRUE; } /* for 32 bit longs */ - emitcode ("subi", "%s,lo8(%d)", aopGet (AOP (IC_RESULT (ic)), 0), + emitcode ("subi", "%s,<(%d)", aopGet (AOP (IC_RESULT (ic)), 0), 0-icount); - emitcode ("sbci", "%s,hi8(%d)", aopGet (AOP (IC_RESULT (ic)), 1), + emitcode ("sbci", "%s,>(%d)", aopGet (AOP (IC_RESULT (ic)), 1), 0-icount); emitcode ("sbci", "%s,hlo8(%d)", aopGet (AOP (IC_RESULT (ic)), 2), 0-icount); @@ -2037,16 +2062,27 @@ genPlus (iCode * ic) aopGet (AOP (IC_RIGHT (ic)), offset)); } else { - if (offset == 0) - l = "subi"; - else - l = "sbci"; - - emitcode (l, "%s,%s(-%d)", - aopGet (AOP (IC_RESULT (ic)), offset), - larray[offset], - (int) floatFromVal (AOP (IC_RIGHT (ic))-> - aopu.aop_lit)); + if (AOP_ISHIGHREG( AOP( IC_RESULT(ic)),offset)) { + if (offset == 0) + l = "subi"; + else + l = "sbci"; + + emitcode (l, "%s,%s(-%d)", + aopGet (AOP (IC_RESULT (ic)), offset), + larray[offset], + (int) floatFromVal (AOP (IC_RIGHT (ic))-> + aopu.aop_lit)); + } else { + if (offset == 0) + l = "add"; + else + l = "adc"; + + emitcode (l, "%s,%s", + aopGet (AOP (IC_RESULT (ic)), offset), + aopGet (AOP (IC_RIGHT (ic)), offset)); + } } offset++; } @@ -2068,6 +2104,7 @@ static bool genMinusDec (iCode * ic) { unsigned int icount; + int offset ; /* will try to generate an increment */ /* if the right side is not a literal @@ -2081,7 +2118,7 @@ genMinusDec (iCode * ic) /* if the sizes are greater than 2 or they are not the same regs then we cannot */ - if (!sameRegs (AOP (IC_LEFT (ic)), AOP (IC_RIGHT (ic)))) + if (!sameRegs (AOP (IC_LEFT (ic)), AOP (IC_RESULT (ic)))) return FALSE; /* so we know LEFT & RESULT in the same registers and add @@ -2093,33 +2130,40 @@ genMinusDec (iCode * ic) aopGet (AOP (IC_LEFT (ic)), 0)); return TRUE; } - emitcode ("subi", "%s,lo8(%d)", - aopGet (AOP (IC_LEFT (ic)), 0), icount); - return TRUE; + if (AOP_ISHIGHREG( AOP ( IC_LEFT(ic)),0)) { + emitcode ("subi", "%s,<(%d)", + aopGet (AOP (IC_LEFT (ic)), 0), icount); + return TRUE; + } + } + + for (offset = 0 ; offset < AOP_SIZE(IC_RESULT(ic)) ; offset++) { + if (!(AOP_ISHIGHREG(AOP(IC_RESULT(ic)),offset))) return FALSE; } if (AOP_SIZE (IC_RESULT (ic)) <= 3) { /* if register pair and starts with 26/30 then adiw */ if (isRegPair (AOP (IC_RESULT (ic))) && icount > 0 && icount < 64 - && (IS_REGIDX (AOP (IC_RESULT (ic)), R26_IDX) - || IS_REGIDX (AOP (IC_RESULT (ic)), R30_IDX))) { + && (IS_REGIDX (AOP (IC_RESULT (ic)), R26_IDX) || + IS_REGIDX (AOP (IC_RESULT (ic)), R24_IDX) || + IS_REGIDX (AOP (IC_RESULT (ic)), R30_IDX))) { emitcode ("sbiw", "%s,%d", aopGet (AOP (IC_RESULT (ic)), 0), icount); return TRUE; } /* use subi */ - emitcode ("subi", "%s,lo8(%d)", + emitcode ("subi", "%s,<(%d)", aopGet (AOP (IC_RESULT (ic)), 0), icount); - emitcode ("sbci", "%s,hi8(%d)", + emitcode ("sbci", "%s,>(%d)", aopGet (AOP (IC_RESULT (ic)), 1), icount); return TRUE; } /* for 32 bit longs */ - emitcode ("subi", "%s,lo8(%d)", aopGet (AOP (IC_RESULT (ic)), 0), + emitcode ("subi", "%s,<(%d)", aopGet (AOP (IC_RESULT (ic)), 0), icount); - emitcode ("sbci", "%s,hi8(%d)", aopGet (AOP (IC_RESULT (ic)), 1), + emitcode ("sbci", "%s,>(%d)", aopGet (AOP (IC_RESULT (ic)), 1), icount); emitcode ("sbci", "%s,hlo8(%d)", aopGet (AOP (IC_RESULT (ic)), 2), icount); @@ -2166,16 +2210,27 @@ genMinus (iCode * ic) aopGet (AOP (IC_RIGHT (ic)), offset)); } else { - if (offset == 0) - l = "subi"; - else - l = "sbci"; - - emitcode (l, "%s,%s(%d)", - aopGet (AOP (IC_RESULT (ic)), offset), - larray[offset], - (int) floatFromVal (AOP (IC_RIGHT (ic))-> - aopu.aop_lit)); + if (AOP_ISHIGHREG(AOP (IC_RESULT (ic)),offset)) { + if (offset == 0) + l = "subi"; + else + l = "sbci"; + + emitcode (l, "%s,%s(%d)", + aopGet (AOP (IC_RESULT (ic)), offset), + larray[offset], + (int) floatFromVal (AOP (IC_RIGHT (ic))-> + aopu.aop_lit)); + } else { + if (offset == 0) + l = "sub"; + else + l = "sbc"; + + emitcode (l, "%s,%s", + aopGet (AOP (IC_RESULT (ic)), offset), + aopGet (AOP (IC_RIGHT (ic)), offset)); + } } offset++; } @@ -2233,7 +2288,7 @@ genMultOneByte (operand * left, operand * right, operand * result) lbl = newiTempLabel (NULL); emitcode ("ldi", "r24,0"); emitcode ("brcc", "L%05d", lbl->key); - emitcode ("ldi", "r24,lo8(-1)"); + emitcode ("ldi", "r24,0xff)"); emitcode ("", "L%05d:", lbl->key); while (size--) aopPut (AOP (result), "r24", @@ -2266,7 +2321,7 @@ genMult (iCode * ic) } /* should have been converted to function call */ - assert (1); + assert (0); release: freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE)); @@ -2281,7 +2336,7 @@ static void genDiv (iCode * ic) { /* should have been converted to function call */ - assert (1); + assert (0); } /*-----------------------------------------------------------------*/ @@ -2291,7 +2346,7 @@ static void genMod (iCode * ic) { /* should have been converted to function call */ - assert (1); + assert (0); } @@ -2324,7 +2379,7 @@ revavrcnd (int type) if (rar[i].rtype == type) return rar[i].type; } - assert (1); /* cannot happen */ + assert (0); /* cannot happen */ return 0; /* makes the compiler happy */ } @@ -2379,7 +2434,7 @@ genCmp (iCode * ic, iCode * ifx, int br_type) if (ifx) { if (size == 1) { if (AOP_TYPE (right) == AOP_LIT) { - emitcode ("cpi", "%s,lo8(%d)", + emitcode ("cpi", "%s,<(%d)", aopGet (AOP (left), 0), (int) floatFromVal (AOP (IC_RIGHT (ic))-> @@ -2449,7 +2504,7 @@ static void genCmpGt (iCode * ic, iCode * ifx) { /* should have transformed by the parser */ - assert (1); + assert (0); } /*-----------------------------------------------------------------*/ @@ -2625,7 +2680,7 @@ genBitWise (iCode * ic, iCode * ifx, int bitop) (int) floatFromVal (AOP (right)->aopu. aop_lit); int p2 = powof2 (lit); - if (bitop == AVR_AND && p2) { /* right side is a power of 2 */ + if (bitop == AVR_AND && (p2 >= 0)) { /* right side is a power of 2 */ l = aopGet (AOP (left), p2 / 8); if (IC_TRUE (ifx)) { emitcode ("sbrc", "%s,%d", l, @@ -2645,12 +2700,12 @@ genBitWise (iCode * ic, iCode * ifx, int bitop) if (size == 1) { if (eh && AOP_ISHIGHREG(AOP(IC_LEFT(ic)),0)) { emitcode (bopnames_lit[bitop], - "%s,lo8(%d)", + "%s,<(%d)", aopGet (AOP (IC_LEFT (ic)), 0), lit); } else { MOVR24 (aopGet (AOP (IC_LEFT (ic)), 0)); - emitcode (bopnames_lit[bitop], "r24,lo8(%d)", lit); + emitcode (bopnames_lit[bitop], "r24,<(%d)", lit); } lbl = newiTempLabel (NULL); if (IC_TRUE (ifx)) { @@ -2666,8 +2721,8 @@ genBitWise (iCode * ic, iCode * ifx, int bitop) else if (size == 2) { emitcode ("mov", "r24,%s", aopGet (AOP (IC_LEFT (ic)), 0)); emitcode ("mov", "r25,%s", aopGet (AOP (IC_LEFT (ic)), 1)); - emitcode (bopnames_lit[bitop], "r24,lo8(%d)", lit); - emitcode (bopnames_lit[bitop], "r25,hi8(%d)", lit); + emitcode (bopnames_lit[bitop], "r24,<(%d)", lit); + emitcode (bopnames_lit[bitop], "r25,>(%d)", lit); emitcode ("sbiw", "r24,0"); lbl = newiTempLabel (NULL); if (IC_TRUE (ifx)) { @@ -2685,14 +2740,14 @@ genBitWise (iCode * ic, iCode * ifx, int bitop) lbl1 = newiTempLabel (NULL); while (size--) { if (eh && AOP_ISHIGHREG(AOP(IC_LEFT(ic)),offset)) { - emitcode (bopnames_lit [bitop], "%s,lo8(%d)", + emitcode (bopnames_lit [bitop], "%s,<(%d)", aopGet (AOP (IC_LEFT (ic)), offset), lit); } else { char *l = aopGet (AOP (IC_LEFT (ic)), offset); MOVR24 (l); - emitcode ("andi", "r24,lo8(%d)", lit); + emitcode ("andi", "r24,<(%d)", lit); } emitcode ("brne", "L%05d", lbl->key); offset++; @@ -3009,13 +3064,13 @@ genGetHbit (iCode * ic) if (!sameRegs (AOP (left), AOP (result))) { emitcode ("clr", "%s", aopGet (AOP (result), size - 1)); emitcode ("sbrc", "%s,7", aopGet (AOP (left), size - 1)); - emitcode ("subi", "%s,lo8(-1)", + emitcode ("subi", "%s,<(-1)", aopGet (AOP (result), size - 1)); } else { emitcode ("clr", "r0"); emitcode ("sbrc", "%s,7", aopGet (AOP (left), size - 1)); - emitcode ("subi", "r0,lo8(-1)"); + emitcode ("subi", "r0,<(-1)"); aopPut (AOP (result), "r0", 0); } offset = 1; @@ -3320,34 +3375,34 @@ genShiftRightLit (iCode * ic) aopGet (AOP (left), offset), offset); offset++; } - size = size = AOP_SIZE (result); + size = AOP_SIZE (result); offset = 0; } /* be as economical as possible */ if (shCount <= 4) { - offset = size - 1; while (shCount--) { - offset = size - 1; size = AOP_SIZE (result); + offset = size - 1; while (size--) { - if (offset == (size - 1)) + /* highest order byte */ + if (offset == (AOP_SIZE(result)-1)) emitcode ("asr", "%s", aopGet (AOP (result), offset)); else - emitcode ("lsr", "%s", aopGet (AOP (result), offset)); - offset--; + emitcode ("ror", "%s", aopGet (AOP (result), offset)); + offset--; } } } else { - emitcode ("ldi", "r24,lo8(%d)", shCount); + emitcode ("ldi", "r24,<(%d)", shCount); tlbl = newiTempLabel (NULL); emitcode ("", "L%05d:", tlbl->key); offset = size - 1; while (size--) { - if (offset == (size - 1)) + if (offset == (AOP_SIZE(result) - 1)) emitcode ("asr", "%s", aopGet (AOP (result), offset)); else - emitcode ("lsr", "%s", aopGet (AOP (result), offset)); + emitcode ("ror", "%s", aopGet (AOP (result), offset)); offset--; } emitcode ("dec", "r24"); @@ -4533,6 +4588,10 @@ genPointerSet (iCode * ic, iCode *pi) case GPOINTER: genGenPointerSet (right, result, ic, pi); break; + + default: + werror (E_INTERNAL_ERROR, __FILE__, __LINE__, + "genPointerSet: illegal pointer type"); } } @@ -4546,6 +4605,7 @@ genIfx (iCode * ic, iCode * popIc) operand *cond = IC_COND (ic); char *cname ; symbol *lbl; + int tob = 0; aopOp (cond, ic, FALSE); @@ -4553,30 +4613,32 @@ genIfx (iCode * ic, iCode * popIc) if (AOP_SIZE(cond) == 1 && AOP_ISHIGHREG(AOP(cond),0)) { cname = aopGet(AOP(cond),0); } else { - toBoolean (cond, "r24", 1); + toBoolean (cond, "r24", 0); + tob = 1; cname = "r24"; } /* the result is now in the accumulator */ freeAsmop (cond, NULL, ic, TRUE); /* if there was something to be popped then do it */ - if (popIc) + if (popIc) { genIpop (popIc); - - emitcode("cpi","%s,0",cname); + emitcode("cpi","%s,0",cname); + } else if (!tob) emitcode("cpi","%s,0",cname); + lbl = newiTempLabel(NULL); if (IC_TRUE(ic)) { - emitcode ("brne","L%05d",lbl->key); + emitcode ("breq","L%05d",lbl->key); emitcode ("jmp","L%05d",IC_TRUE(ic)->key); emitcode ("","L%05d:",lbl->key); } else { - emitcode ("breq","L%05d",lbl->key); + emitcode ("brne","L%05d",lbl->key); emitcode ("jmp","L%05d",IC_FALSE(ic)->key); emitcode ("","L%05d:",lbl->key); } ic->generated = 1; } -/* here */ + /*-----------------------------------------------------------------*/ /* genAddrOf - generates code for address of */ /*-----------------------------------------------------------------*/ @@ -4587,21 +4649,51 @@ genAddrOf (iCode * ic) int size, offset; aopOp (IC_RESULT (ic), ic, FALSE); - + assert(AOP_SIZE(IC_RESULT(ic)) >= 2); /* if the operand is on the stack then we need to get the stack offset of this variable */ if (sym->onStack) { /* if it has an offset then we need to compute it */ if (sym->stack) { - emitcode ("mov", "a,_bp"); - emitcode ("add", "a,#0x%02x", - ((char) sym->stack & 0xff)); - aopPut (AOP (IC_RESULT (ic)), "a", 0); + if (allHigh(AOP(IC_RESULT(ic)))) { + if (isRegPair (AOP(IC_RESULT(ic)))) { + emitcode ("movw","%s,r28",aopGet(AOP(IC_RESULT(ic)),0)); + } else { + emitcode ("mov","%s,r28",aopGet(AOP(IC_RESULT(ic)),0)); + emitcode ("mov","%s,r29",aopGet(AOP(IC_RESULT(ic)),1)); + } + if (sym->stack < 0) { + emitcode("subi","%s,<(%d)",aopGet(AOP(IC_RESULT(ic)),0),-sym->stack); + emitcode("sbci","%s,>(%d)",aopGet(AOP(IC_RESULT(ic)),1),-sym->stack); + } else { + emitcode("subi","%s,<(-%d)",aopGet(AOP(IC_RESULT(ic)),0),sym->stack); + emitcode("sbci","%s,>(-%d)",aopGet(AOP(IC_RESULT(ic)),1),sym->stack); + } + } else { + emitcode("movw","r24,r28"); + if (sym->stack > -63 && sym->stack < 63) { + if (sym->stack < 0) + emitcode("sbiw","r24,%d",-sym->stack); + else + emitcode("sbiw","r24,%d",sym->stack); + } else { + if (sym->stack < 0) { + emitcode("subi","r24,<(%d)",-sym->stack); + emitcode("sbci","r25,>(%d)",-sym->stack); + } else { + emitcode("subi","r24,<(-%d)",sym->stack); + emitcode("sbci","r25,>(-%d)",sym->stack); + } + } + + aopPut(AOP(IC_RESULT(ic)),"r24",0); + aopPut(AOP(IC_RESULT(ic)),"r25",1); + } } else { - /* we can just move _bp */ - aopPut (AOP (IC_RESULT (ic)), "_bp", 0); + aopPut(AOP(IC_RESULT(ic)),"r28",0); + aopPut(AOP(IC_RESULT(ic)),"r29",1); } /* fill the result with zero */ size = AOP_SIZE (IC_RESULT (ic)) - 2; @@ -4616,13 +4708,13 @@ genAddrOf (iCode * ic) /* object not on stack then we need the name */ size = AOP_SIZE (IC_RESULT (ic)); offset = 0; - + assert(size<=2); while (size--) { char s[SDCC_NAME_MAX]; if (offset) - sprintf (s, "(%s >> %d)", sym->rname, offset * 8); + sprintf (s, ">(%s)", sym->rname); else - sprintf (s, "%s", sym->rname); + sprintf (s, "<(%s)", sym->rname); aopPut (AOP (IC_RESULT (ic)), s, offset++); } @@ -4853,8 +4945,6 @@ genCast (iCode * ic) /* pointer to generic pointer */ if (IS_GENPTR (ctype)) { - char *l = zero; - if (IS_PTR (type)) p_type = DCL_TYPE (type); else { @@ -4870,30 +4960,22 @@ genCast (iCode * ic) aopGet (AOP (right), offset), offset); offset++; } - /* the last byte depending on type */ - switch (p_type) { - case IPOINTER: - case POINTER: - l = zero; - break; - case FPOINTER: - l = one; - break; - case CPOINTER: - l = "0x02"; - break; - case PPOINTER: - l = "0x03"; - break; - - default: - /* this should never happen */ - werror (E_INTERNAL_ERROR, __FILE__, __LINE__, - "got unknown pointer type"); - exit (1); + + /* the last byte depending on type */ + { + int gpVal = pointerTypeToGPByte(p_type, NULL, NULL); + char gpValStr[10]; + + if (gpVal == -1) + { + // pointerTypeToGPByte will have bitched. + exit(1); } - aopPut (AOP (result), l, GPTRSIZE - 1); - goto release; + + sprintf(gpValStr, "#0x%x", gpVal); + aopPut (AOP (result), gpValStr, GPTRSIZE - 1); + } + goto release; } /* just copy the pointers */ @@ -5021,6 +5103,18 @@ genReceive (iCode * ic) freeAsmop (IC_RESULT (ic), NULL, ic, TRUE); } +/*-----------------------------------------------------------------*/ +/* genDummyRead - generate code for dummy read of volatiles */ +/*-----------------------------------------------------------------*/ +static void +genDummyRead (iCode * ic) +{ + emitcode ("; genDummyRead",""); + emitcode ("; not implemented",""); + + ic = ic; +} + /*-----------------------------------------------------------------*/ /* gen51Code - generate code for 8051 based controllers */ /*-----------------------------------------------------------------*/ @@ -5034,14 +5128,10 @@ genAVRCode (iCode * lic) recvCnt = 0; /* print the allocation information */ if (allocInfo) - printAllocInfo (currFunc, codeOutFile); + printAllocInfo (currFunc, codeOutBuf); /* if debug information required */ - /* if (options.debug && currFunc) { */ - if (currFunc) { - cdbSymbol (currFunc, cdbFile, FALSE, TRUE); - _G.debugLine = 1; - emitcode ("", ".type %s,@function", currFunc->name); - _G.debugLine = 0; + if (options.debug && currFunc) { + debugFile->writeFunction (currFunc, lic); } /* stack pointer name */ spname = "sp"; @@ -5051,11 +5141,7 @@ genAVRCode (iCode * lic) if (cln != ic->lineno) { if (options.debug) { - _G.debugLine = 1; - emitcode ("", "C$%s$%d$%d$%d ==.", - FileBaseName (ic->filename), - ic->lineno, ic->level, ic->block); - _G.debugLine = 0; + debugFile->writeCLine (ic); } emitcode (";", "%s %d", ic->filename, ic->lineno); cln = ic->lineno; @@ -5252,6 +5338,10 @@ genAVRCode (iCode * lic) addSet (&_G.sendSet, ic); break; + case DUMMY_READ_VOLATILE: + genDummyRead (ic); + break; + default: ic = ic; } @@ -5264,6 +5354,6 @@ genAVRCode (iCode * lic) peepHole (&lineHead); /* now do the actual printing */ - printLine (lineHead, codeOutFile); + printLine (lineHead, codeOutBuf); return; }