X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fpic16%2Fglue.c;h=02447f32891d8f9e76b5fa2c6bd738f494ed523e;hb=254937341ccdf0083b6cbf287dae55dce616e404;hp=f59f1536014df40d7ed4d53c53e100e494ec9ad3;hpb=eb492a412dfa4bd69a5029d202ba19b23644d06e;p=fw%2Fsdcc diff --git a/src/pic16/glue.c b/src/pic16/glue.c index f59f1536..02447f32 100644 --- a/src/pic16/glue.c +++ b/src/pic16/glue.c @@ -30,18 +30,9 @@ #include "gen.h" #include "device.h" #include "main.h" +#include "dbuf_string.h" #include -#include - - -#ifdef WORDS_BIGENDIAN - #define _ENDIAN(x) (3-x) -#else - #define _ENDIAN(x) (x) -#endif - -#define BYTE_IN_LONG(x,b) ((x>>(8*_ENDIAN(b)))&0xff) extern symbol *interrupts[256]; void pic16_printIval (symbol * sym, sym_link * type, initList * ilist, char ptype, void *p); @@ -52,15 +43,15 @@ extern unsigned maxInterrupts; extern int maxRegBank; extern symbol *mainf; extern char *VersionString; -extern FILE *codeOutFile; -extern set *tmpfileSet; -extern set *tmpfileNameSet; +extern struct dbuf_s *codeOutBuf; extern char *iComments1; extern char *iComments2; -//extern void emitStaticSeg (memmap * map); extern int initsfpnt; +extern unsigned long pFile_isize; +extern unsigned long pic16_countInstructions(); +set *pic16_localFunctions = NULL; set *rel_idataSymSet=NULL; set *fix_idataSymSet=NULL; @@ -68,7 +59,8 @@ extern DEFSETFUNC (closeTmpFiles); extern DEFSETFUNC (rmTmpFiles); extern void pic16_AnalyzeBanking (void); -extern void copyFile (FILE * dest, FILE * src); +extern void pic16_OptimizeJumps (); +extern void pic16_OptimizeBanksel (); extern void pic16_InlinepCode(void); extern void pic16_writeUsedRegs(FILE *); @@ -76,15 +68,14 @@ extern void initialComments (FILE * afile); extern void printPublics (FILE * afile); void pic16_pCodeInitRegisters(void); -pCodeOp *pic16_popGetLit(unsigned int lit); -pCodeOp *pic16_popGetLit2(unsigned int lit, pCodeOp *arg2); pCodeOp *pic16_popCopyReg(pCodeOpReg *pc); extern void pic16_pCodeConstString(char *name, char *value); + /*-----------------------------------------------------------------*/ /* aopLiteral - string from a literal value */ /*-----------------------------------------------------------------*/ -int pic16aopLiteral (value *val, int offset) +unsigned int pic16aopLiteral (value *val, int offset) { union { float f; @@ -93,12 +84,18 @@ int pic16aopLiteral (value *val, int offset) /* if it is a float then it gets tricky */ /* otherwise it is fairly simple */ - if (!IS_FLOAT(val->type)) { + if (!(IS_FLOAT(val->type) || IS_FIXED(val->type))) { unsigned long v = (unsigned long) floatFromVal(val); return ( (v >> (offset * 8)) & 0xff); } + if(IS_FIXED16X16(val->type)) { + unsigned long v = (unsigned long)fixed16x16FromDouble( floatFromVal( val ) ); + + return ( (v >> (offset * 8)) & 0xff); + } + /* it is type float */ fl.f = (float) floatFromVal(val); #ifdef WORDS_BIGENDIAN @@ -126,34 +123,35 @@ pic16emitRegularMap (memmap * map, bool addPublics, bool arFlag) // fprintf(stderr, "%s:%d map name= %s\n", __FUNCTION__, __LINE__, map->sname); if(addPublics) - fprintf (map->oFile, ";\t.area\t%s\n", map->sname); + dbuf_printf (&map->oBuf, ";\t.area\t%s\n", map->sname); /* print the area name */ for (sym = setFirstItem (map->syms); sym; sym = setNextItem (map->syms)) { #if 0 - fprintf(stderr, "%s\t%s: sym: %s\tused: %d\textern: %d\tstatic: %d\taggregate: %d\n", + fprintf(stderr, "%s\t%s: sym: %s\tused: %d\textern: %d\tstatic: %d\taggregate: %d\tregister: 0x%x\tfunction: %d\n", __FUNCTION__, map->sname, sym->name, sym->used, IS_EXTERN(sym->etype), IS_STATIC(sym->etype), - IS_AGGREGATE(sym->type)); + IS_AGGREGATE(sym->type), (SPEC_SCLS(sym->etype) == S_REGISTER), IS_FUNC(sym->type)); printTypeChain( sym->type, stderr ); fprintf(stderr, "\n"); #endif /* if extern then add to externs */ if (IS_EXTERN (sym->etype)) { - /* reduce overhead while linking by not declaring * extern unused external functions (usually declared * in header files) */ if(IS_FUNC(sym->type) && !sym->used)continue; - checkAddSym(&externs, sym); + /* make sure symbol is not in publics section */ + if(!checkSym(publics, sym)) + checkAddSym(&externs, sym); continue; } /* if allocation required check is needed - * then check if the symbol really requires + * then check if the symbol really requires * allocation only for local variables */ if (arFlag && !IS_AGGREGATE (sym->type) && !(sym->_isparm && !IS_REGPARM (sym->etype)) && @@ -173,16 +171,14 @@ pic16emitRegularMap (memmap * map, bool addPublics, bool arFlag) checkAddSym(&publics, sym); } else + /* new version */ if(IS_STATIC(sym->etype) - && !(sym->ival && !sym->level) - ) { + && !sym->ival) /* && !sym->level*/ { regs *reg; - /* add it to udata list */ + sectSym *ssym; + int found=0; -// fprintf(stderr, "%s:%d adding %s (%s) remat=%d\n", __FILE__, __LINE__, -// sym->name, sym->rname, sym->remat); - - //, OP_SYMBOL(operandFromSymbol(sym))->name); +// debugf("adding symbol %s\n", sym->name); #define SET_IMPLICIT 1 #if SET_IMPLICIT @@ -192,18 +188,20 @@ pic16emitRegularMap (memmap * map, bool addPublics, bool arFlag) reg = pic16_allocDirReg( operandFromSymbol( sym )); - { - sectSym *ssym; - int found=0; - -#if 1 - for(ssym=setFirstItem(sectSyms); ssym; ssym=setNextItem(sectSyms)) { - if(!strcmp(ssym->name, reg->name))found=1; - } + if(reg) { + for(ssym=setFirstItem(sectSyms); ssym; ssym=setNextItem(sectSyms)) { + if(!strcmp(ssym->name, reg->name))found=1; + } + + if(!found) + checkAddReg(&pic16_rel_udata, reg); +#if 0 + else + debugf("Did find %s in pic16_rel_udata already. Check!\n", reg->name); +// checkAddSym(&publics, sym); #endif - if(!found)checkAddReg(&pic16_rel_udata, reg); - } + } } /* if extern then do nothing or is a function @@ -216,32 +214,13 @@ pic16emitRegularMap (memmap * map, bool addPublics, bool arFlag) continue; } -#if 0 - /* print extra debug info if required */ - if (options.debug || sym->level == 0) { - cdbWriteSymbol (sym); //, cdbFile, FALSE, FALSE); - - if (!sym->level) /* global */ - if (IS_STATIC (sym->etype)) - fprintf (map->oFile, "F%s_", moduleName); /* scope is file */ - else - fprintf (map->oFile, "G_"); /* scope is global */ - else - /* symbol is local */ - fprintf (map->oFile, "L%s_", (sym->localof ? sym->localof->name : "-null-")); - fprintf (map->oFile, "%s_%d_%d", sym->name, sym->level, sym->block); - } -#endif - - /* if is has an absolute address then generate an equate for this no need to allocate space */ if (SPEC_ABSA (sym->etype)) { -// if (options.debug || sym->level == 0) // fprintf (stderr,"; %s == 0x%04x\t\treqv= %p nRegs= %d\n", // sym->name, SPEC_ADDR (sym->etype), sym->reqv, sym->regType); - fprintf (map->oFile, "%s\tEQU\t0x%04x\n", + dbuf_printf (&map->oBuf, "%s\tEQU\t0x%04x\n", sym->rname, SPEC_ADDR (sym->etype)); @@ -297,17 +276,21 @@ pic16emitRegularMap (memmap * map, bool addPublics, bool arFlag) sectSym *ssym; int found=0; -#if 1 - for(ssym=setFirstItem(sectSyms); ssym; ssym=setNextItem(sectSyms)) { - if(!strcmp(ssym->name, reg->name))found=1; - } +#if 0 + fprintf(stderr, "%s:%d sym->rname: %s reg: %p reg->name: %s\n", __FILE__, __LINE__, + sym->rname, reg, (reg?reg->name:"<>")); #endif - if(!found) - if(checkAddReg(&pic16_rel_udata, reg)) { - addSetHead(&publics, sym); - } + if(reg) { + for(ssym=setFirstItem(sectSyms); ssym; ssym=setNextItem(sectSyms)) { + if(!strcmp(ssym->name, reg->name))found=1; + } + if(!found) + if(checkAddReg(&pic16_rel_udata, reg)) { + addSetHead(&publics, sym); + } + } } @@ -325,13 +308,13 @@ pic16emitRegularMap (memmap * map, bool addPublics, bool arFlag) if (IS_BITVAR (sym->etype)) { bitvars++; } else { - fprintf (map->oFile, "\t%s\n", sym->rname); + dbuf_printf (map->oBuf, "\t%s\n", sym->rname); if ((size = (unsigned int) getSize (sym->type) & 0xffff) > 1) { for (i = 1; i < size; i++) - fprintf (map->oFile, "\t%s_%d\n", sym->rname, i); + dbuf_printf (map->oBuf, "\t%s_%d\n", sym->rname, i); } } - fprintf (map->oFile, "\t.ds\t0x%04x\n", (unsigned int)getSize (sym->type) & 0xffff); + dbuf_printf (map->oBuf, "\t.ds\t0x%04x\n", (unsigned int)getSize (sym->type) & 0xffff); #endif } @@ -341,7 +324,9 @@ pic16emitRegularMap (memmap * map, bool addPublics, bool arFlag) /* if it has an initial value then do it only if it is a global variable */ - if (sym->ival && sym->level == 0) { + if (sym->ival + && ((sym->level == 0) + || IS_STATIC(sym->etype)) ) { ast *ival = NULL; #if 0 @@ -372,12 +357,12 @@ pic16emitRegularMap (memmap * map, bool addPublics, bool arFlag) addSet(&rel_idataSymSet, copySymbol(sym)); // ival = newNode ('=', newAst_VALUE(symbolVal (sym)), -// decorateType (resolveSymbols (list2expr (sym->ival)), RESULT_CHECK)); +// decorateType (resolveSymbols (list2expr (sym->ival)), RESULT_TYPE_NONE)); } if(ival) { setAstLineno(ival, sym->lineDef); - codeOutFile = statsg->oFile; + codeOutBuf = &statsg->oBuf; GcurMemmap = statsg; eBBlockFromiCode (iCodeFromAst (ival)); sym->ival = NULL; @@ -438,7 +423,7 @@ value *pic16_initPointer (initList * ilist, sym_link *toType) if (IS_AST_OP (expr) && expr->opval.op == '&') { /* address of symbol */ if (IS_AST_SYM_VALUE (expr->left)) { - val = copyValue (AST_VALUE (expr->left)); + val = AST_VALUE (expr->left); val->type = newLink (DECLARATOR); if(SPEC_SCLS (expr->left->etype) == S_CODE) { DCL_TYPE (val->type) = CPOINTER; @@ -548,28 +533,44 @@ void _pic16_printPointerType (const char *name, char ptype, void *p) void pic16_printPointerType (const char *name, char ptype, void *p) { _pic16_printPointerType (name, ptype, p); - pic16_flushDB(ptype, p); + //pic16_flushDB(ptype, p); /* breaks char* const arr[] = {&c, &c, &c}; */ } /*-----------------------------------------------------------------*/ /* printGPointerType - generates ival for generic pointer type */ /*-----------------------------------------------------------------*/ -void pic16_printGPointerType (const char *iname, const char *oname, const unsigned int itype, - const unsigned int type, char ptype, void *p) +void pic16_printGPointerType (const char *iname, const unsigned int itype, + char ptype, void *p) { - _pic16_printPointerType (iname, ptype, p); - - if(itype == FPOINTER || itype == CPOINTER) { // || itype == GPOINTER) { - char buf[256]; + char buf[256]; + + _pic16_printPointerType (iname, ptype, p); - sprintf(buf, "UPPER(%s)", iname); - pic16_emitDS(buf, ptype, p); - } + switch( itype ) { + case FPOINTER: + case CPOINTER: + case GPOINTER: + case FUNCTION: + { + sprintf(buf, "UPPER(%s)", iname); + pic16_emitDS(buf, ptype, p); + }; break; + case POINTER: + case IPOINTER: + sprintf(buf, "0x80"); + pic16_emitDS(buf, ptype, p); + break; + default: + debugf("itype = %d\n", itype ); + assert( 0 ); + } - pic16_flushDB(ptype, p); + //pic16_flushDB(ptype, p); /* might break char* const arr[] = {...}; */ } +/* set to 0 to disable debug messages */ +#define DEBUG_PRINTIVAL 0 /*-----------------------------------------------------------------*/ /* pic16_printIvalType - generates ival for int/char */ @@ -578,10 +579,14 @@ static void pic16_printIvalType (symbol *sym, sym_link * type, initList * ilist, char ptype, void *p) { value *val; - unsigned long ulval; // fprintf(stderr, "%s for symbol %s\n",__FUNCTION__, sym->rname); +#if DEBUG_PRINTIVAL + fprintf(stderr, "%s\n",__FUNCTION__); +#endif + + /* if initList is deep */ if (ilist && ilist->type == INIT_DEEP) ilist = ilist->init.deep; @@ -599,26 +604,24 @@ pic16_printIvalType (symbol *sym, sym_link * type, initList * ilist, char ptype, val = valCastLiteral(type, floatFromVal(val)); } - if(val) - ulval = (unsigned long) floatFromVal (val); - else - ulval =0; - switch (getSize (type)) { case 1: - pic16_emitDB(BYTE_IN_LONG(ulval,0), ptype, p); + pic16_emitDB(pic16aopLiteral(val, 0), ptype, p); break; case 2: - pic16_emitDB(BYTE_IN_LONG(ulval,0), ptype, p); - pic16_emitDB(BYTE_IN_LONG(ulval,1), ptype, p); + pic16_emitDB(pic16aopLiteral(val, 0), ptype, p); + pic16_emitDB(pic16aopLiteral(val, 1), ptype, p); break; - + case 3: + pic16_emitDB(pic16aopLiteral(val, 0), ptype, p); + pic16_emitDB(pic16aopLiteral(val, 1), ptype, p); + pic16_emitDB(pic16aopLiteral(val, 2), ptype, p); case 4: - pic16_emitDB(BYTE_IN_LONG(ulval,0), ptype, p); - pic16_emitDB(BYTE_IN_LONG(ulval,1), ptype, p); - pic16_emitDB(BYTE_IN_LONG(ulval,2), ptype, p); - pic16_emitDB(BYTE_IN_LONG(ulval,3), ptype, p); + pic16_emitDB(pic16aopLiteral(val, 0), ptype, p); + pic16_emitDB(pic16aopLiteral(val, 1), ptype, p); + pic16_emitDB(pic16aopLiteral(val, 2), ptype, p); + pic16_emitDB(pic16aopLiteral(val, 3), ptype, p); break; } } @@ -627,40 +630,63 @@ pic16_printIvalType (symbol *sym, sym_link * type, initList * ilist, char ptype, /* pic16_printIvalChar - generates initital value for character array */ /*--------------------------------------------------------------------*/ static int -pic16_printIvalChar (sym_link * type, initList * ilist, char *s, char ptype, void *p) +pic16_printIvalChar (symbol *sym, sym_link * type, initList * ilist, char *s, char ptype, void *p) { value *val; - int remain; + int remain, len, ilen; if(!p) return 0; +#if DEBUG_PRINTIVAL + fprintf(stderr, "%s\n",__FUNCTION__); +#endif - // fprintf(stderr, "%s\n",__FUNCTION__); - if (!s) - { - - val = list2val (ilist); - /* if the value is a character string */ - if (IS_ARRAY (val->type) && IS_CHAR (val->etype)) - { - if (!DCL_ELEM (type)) - DCL_ELEM (type) = strlen (SPEC_CVAL (val->etype).v_char) + 1; + if(!s) { + val = list2val (ilist); - for(remain=0; remainetype).v_char[ remain ], ptype, p); - - if ((remain = (DCL_ELEM (type) - strlen (SPEC_CVAL (val->etype).v_char) - 1)) > 0) { - while (remain--) { - pic16_emitDB(0x00, ptype, p); - } + /* if the value is a character string */ + if(IS_ARRAY (val->type) && IS_CHAR (val->etype)) { + /* length of initializer string (might contain \0, so do not use strlen) */ + ilen = DCL_ELEM(val->type); + + if(!DCL_ELEM (type)) + DCL_ELEM (type) = ilen; + + /* len is 0 if declartion equals initializer, + * >0 if declaration greater than initializer + * <0 if declaration less than initializer + * Strategy: if >0 emit 0x00 for the rest of the length, + * if <0 then emit only the length of declaration elements + * and warn user + */ + len = DCL_ELEM (type) - ilen; + +// fprintf(stderr, "%s:%d ilen = %i len = %i DCL_ELEM(type) = %i SPEC_CVAL-len = %i\n", __FILE__, __LINE__, +// ilen, len, DCL_ELEM(type), strlen(SPEC_CVAL(val->etype).v_char)); + + if(len >= 0) { + /* emit initializer */ + for(remain=0; remainetype).v_char[ remain ], ptype, p); + + /* fill array with 0x00 */ + while(len--) { + pic16_emitDB(0x00, ptype, p); } - return 1; - } - else - return 0; - } - else { + } else { + werror (W_EXCESS_INITIALIZERS, "array of chars", sym->name, sym->lineDef); + + for(remain=0; remainetype).v_char[ remain ], ptype, p); + } + + +// if((remain = (DCL_ELEM (type) - strlen (SPEC_CVAL (val->etype).v_char) - 1)) > 0) { +// } + return 1; + } else return 0; + } else { for(remain=0; remaintype == INIT_DEEP ? ilist->init.deep : ilist), SPEC_CVAL (sym->etype).v_char, ptype, p)) return; @@ -748,6 +777,11 @@ void pic16_printIvalBitFields(symbol **sym, initList **ilist, char ptype, void * int size =0; +#if DEBUG_PRINTIVAL + fprintf(stderr, "%s\n",__FUNCTION__); +#endif + + do { unsigned long i; val = list2val(lilist); @@ -764,6 +798,7 @@ void pic16_printIvalBitFields(symbol **sym, initList **ilist, char ptype, void * i <<= SPEC_BSTR (lsym->etype); ival |= i; if (! ( lsym->next && + (lilist && lilist->next) && (IS_BITFIELD(lsym->next->type)) && (SPEC_BSTR(lsym->next->etype)))) break; lsym = lsym->next; @@ -772,19 +807,19 @@ void pic16_printIvalBitFields(symbol **sym, initList **ilist, char ptype, void * switch (size) { case 1: pic16_emitDB(BYTE_IN_LONG(ival, 0), ptype, p); - break; + break; case 2: pic16_emitDB(BYTE_IN_LONG(ival, 0), ptype, p); pic16_emitDB(BYTE_IN_LONG(ival, 1), ptype, p); - break; + break; case 4: /* EEP: why is this db and not dw? */ pic16_emitDB(BYTE_IN_LONG(ival, 0), ptype, p); pic16_emitDB(BYTE_IN_LONG(ival, 1), ptype, p); pic16_emitDB(BYTE_IN_LONG(ival, 2), ptype, p); pic16_emitDB(BYTE_IN_LONG(ival, 3), ptype, p); - break; + break; default: /* VR - only 1,2,4 size long can be handled???? Why? */ fprintf(stderr, "%s:%d: unhandled case. Contact author.\n", __FILE__, __LINE__); @@ -804,6 +839,11 @@ void pic16_printIvalStruct (symbol * sym, sym_link * type, symbol *sflds; initList *iloop = NULL; + +#if DEBUG_PRINTIVAL + fprintf(stderr, "%s\n",__FUNCTION__); +#endif + sflds = SPEC_STRUCT (type)->fields; if (ilist) { @@ -815,7 +855,7 @@ void pic16_printIvalStruct (symbol * sym, sym_link * type, iloop = ilist->init.deep; } - for (; sflds; sflds = sflds->next, iloop = (iloop ? iloop->next : NULL)) { + for (; (sflds && iloop); sflds = sflds->next, iloop = (iloop ? iloop->next : NULL)) { // fprintf(stderr, "%s:%d sflds: %p\tiloop = %p\n", __FILE__, __LINE__, sflds, iloop); if (IS_BITFIELD(sflds->type)) { pic16_printIvalBitFields(&sflds, &iloop, ptype, p); @@ -829,6 +869,55 @@ void pic16_printIvalStruct (symbol * sym, sym_link * type, return; } +/*-----------------------------------------------------------------*/ +/* printIvalUnion - generates initial value for unions */ +/*-----------------------------------------------------------------*/ +void pic16_printIvalUnion (symbol * sym, sym_link * type, + initList * ilist, char ptype, void *p) +{ + //symbol *sflds; + initList *iloop = NULL; + int i, size; + + +#if DEBUG_PRINTIVAL + fprintf(stderr, "%s\n",__FUNCTION__); +#endif + + iloop = ilist; + i = 0; + while (iloop) + { + i++; + iloop = iloop->next; + } // while + + size = -1; + if (type) size = SPEC_STRUCT(type)->size; + + if (i == 1 && size >= 0 && size <= sizeof(long)) + { + unsigned long val = (unsigned long)floatFromVal(list2val(ilist)); + while (size--) + { + pic16_emitDB(val, ptype, p); + val >>= 8; + } // while + return; + } // if + + fprintf( stderr, "INCOMPLETE SUPPORT FOR INITIALIZED union---FALLING BACK TO struct\n" ); + fprintf( stderr, "This is a bug. Please file a bug-report with your source attached.\n" ); + pic16_printIvalStruct( sym, type, ilist, ptype, p ); +} + +static int +pic16_isUnion( symbol *sym, sym_link *type ) +{ + if (type && SPEC_STRUCT(type)->type == UNION) return 1; + return 0; +} + /*--------------------------------------------------------------------------*/ /* pic16_printIvalCharPtr - generates initial values for character pointers */ /*--------------------------------------------------------------------------*/ @@ -843,7 +932,10 @@ int pic16_printIvalCharPtr (symbol * sym, sym_link * type, value * val, char pty VR - Attempting to port this function to pic16 port - 8-Jun-2004 */ -// fprintf(stderr, "%s\n",__FUNCTION__); + +#if DEBUG_PRINTIVAL + fprintf(stderr, "%s\n",__FUNCTION__); +#endif size = getSize (type); @@ -869,7 +961,7 @@ int pic16_printIvalCharPtr (symbol * sym, sym_link * type, value * val, char pty // this is a literal string type=CPOINTER; } - pic16_printGPointerType(val->name, sym->name, type, type, ptype, p); + pic16_printGPointerType(val->name, type, ptype, p); } else { @@ -917,6 +1009,11 @@ void pic16_printIvalFuncPtr (sym_link * type, initList * ilist, char ptype, void value *val; int dLvl = 0; + +#if DEBUG_PRINTIVAL + fprintf(stderr, "%s\n",__FUNCTION__); +#endif + if (ilist) val = list2val (ilist); else @@ -945,9 +1042,21 @@ void pic16_printIvalFuncPtr (sym_link * type, initList * ilist, char ptype, void /* now generate the name */ if (!val->sym) { - pic16_printPointerType (val->name, ptype, p); + pic16_printGPointerType (val->name, DCL_TYPE(val->type), ptype, p); } else { - pic16_printPointerType (val->sym->rname, ptype, p); + pic16_printGPointerType (val->sym->rname, DCL_TYPE(val->type), ptype, p); + + if(IS_FUNC(val->sym->type) && !val->sym->used && !IS_STATIC(val->sym->etype)) { + + if(!checkSym(publics, val->sym)) + if(checkAddSym(&externs, val->sym) && (ptype == 'f')) { + /* this has not been declared as extern + * so declare it as a 'late extern' just after the symbol */ + fprintf((FILE *)p, ";\tdeclare symbol as extern\n"); + fprintf((FILE *)p, "\textern\t%s\n", val->sym->rname); + fprintf((FILE *)p, ";\tcontinue variable declaration\n"); + } + } } return; @@ -1008,7 +1117,9 @@ void pic16_printIvalPtr (symbol * sym, sym_link * type, initList * ilist, char p pic16_emitDB(pic16aopLiteral(val, 0), ptype, p); pic16_emitDB(pic16aopLiteral(val, 1), ptype, p); pic16_emitDB(pic16aopLiteral(val, 2), ptype, p); + break; default: + fprintf(stderr, "%s:%d size = %d\n", __FILE__, __LINE__, getSize(type)); assert(0); } return; @@ -1027,9 +1138,8 @@ void pic16_printIvalPtr (symbol * sym, sym_link * type, initList * ilist, char p } else if (size == 3) { - pic16_printGPointerType (val->name, sym->name, (IS_PTR(type)?DCL_TYPE(type):PTR_TYPE(SPEC_OCLS(sym->etype))), - (IS_PTR (val->type) ? DCL_TYPE (val->type) : - PTR_TYPE (SPEC_OCLS (val->etype))), ptype, p); + pic16_printGPointerType (val->name, (IS_PTR(type)?DCL_TYPE(type):PTR_TYPE(SPEC_OCLS(sym->etype))), + ptype, p); } else assert(0); return; @@ -1056,8 +1166,14 @@ void pic16_printIval (symbol * sym, sym_link * type, initList * ilist, char ptyp /* if structure then */ if (IS_STRUCT (type)) { -// fprintf(stderr,"%s struct\n",__FUNCTION__); - pic16_printIvalStruct (sym, type, ilist, ptype, p); + if (pic16_isUnion(sym, type)) + { + //fprintf(stderr,"%s union\n",__FUNCTION__); + pic16_printIvalUnion (sym, type, ilist, ptype, p); + } else { + //fprintf(stderr,"%s struct\n",__FUNCTION__); + pic16_printIvalStruct (sym, type, ilist, ptype, p); + } return; } @@ -1144,6 +1260,7 @@ static void pic16emitStaticSeg (memmap * map) { symbol *sym; + static int didcode=0; //fprintf(stderr, "%s\n",__FUNCTION__); @@ -1179,7 +1296,7 @@ CODESPACE: %d\tCONST: %d\tPTRCONST: %d\tSPEC_CONST: %d\n", __FUNCTION__, } /* if it is "extern" then do nothing */ - if (IS_EXTERN (sym->etype) && !SPEC_ABSA(sym->etype)) { + if (IS_EXTERN (sym->etype)/* && !SPEC_ABSA(sym->etype)*/) { checkAddSym(&externs, sym); continue; } @@ -1216,11 +1333,11 @@ CODESPACE: %d\tCONST: %d\tPTRCONST: %d\tSPEC_CONST: %d\n", __FUNCTION__, resolveIvalSym (sym->ival, sym->type); asym = newSymbol(sym->rname, 0); abSym = Safe_calloc(1, sizeof(absSym)); - abSym->name = Safe_strdup( sym->rname ); + strcpy(abSym->name, sym->rname); abSym->address = SPEC_ADDR( sym->etype ); addSet(&absSymSet, abSym); - pb = pic16_newpCodeChain(NULL, 'A',pic16_newpCodeCharP("; Starting pCode block for absolute Ival")); + pb = pic16_newpCodeChain(NULL, 'A', pic16_newpCodeCharP("; Starting pCode block for absolute Ival")); pic16_addpBlock(pb); pcf = pic16_newpCodeFunction(moduleName, asym->name); @@ -1228,7 +1345,7 @@ CODESPACE: %d\tCONST: %d\tPTRCONST: %d\tSPEC_CONST: %d\n", __FUNCTION__, pic16_addpCode2pBlock(pb,pcf); pic16_addpCode2pBlock(pb,pic16_newpCodeLabel(sym->rname,-1)); -// fprintf(stderr, "%s:%d [1] generating init for label: %s\n", __FILE__, __LINE__, sym->rname); + //fprintf(stderr, "%s:%d [1] generating init for label: %s\n", __FILE__, __LINE__, sym->rname); pic16_printIval(sym, sym->type, sym->ival, 'p', (void *)pb); pic16_flushDB('p', (void *)pb); @@ -1241,7 +1358,7 @@ CODESPACE: %d\tCONST: %d\tPTRCONST: %d\tSPEC_CONST: %d\n", __FUNCTION__, /* symbol has absolute address but no initial value */ /* allocate space */ - fprintf (code->oFile, "%s:\n", sym->rname); + dbuf_printf (&code->oBuf, "%s:\n", sym->rname); /* special case for character strings */ if (IS_ARRAY (sym->type) && IS_CHAR (sym->type->next) && @@ -1251,6 +1368,7 @@ CODESPACE: %d\tCONST: %d\tPTRCONST: %d\tSPEC_CONST: %d\n", __FUNCTION__, pic16_pCodeConstString(sym->rname , SPEC_CVAL (sym->etype).v_char); } else { + fprintf (stderr, "%s:%u(%s): do not know how to intialize symbol %s\n", __FILE__, __LINE__, __FUNCTION__, sym->rname); assert(0); } } @@ -1259,21 +1377,28 @@ CODESPACE: %d\tCONST: %d\tPTRCONST: %d\tSPEC_CONST: %d\n", __FUNCTION__, // fprintf(stderr, "%s:%d spec_absa is false for symbol: %s\n", // __FILE__, __LINE__, sym->name); + /* if it has an initial value */ if (sym->ival) { pBlock *pb; /* symbol doesn't have absolute address but has initial value */ - fprintf (code->oFile, "%s:\n", sym->rname); + dbuf_printf (&code->oBuf, "%s:\n", sym->rname); noAlloc++; resolveIvalSym (sym->ival, sym->type); pb = pic16_newpCodeChain(NULL, 'P',pic16_newpCodeCharP("; Starting pCode block for Ival")); pic16_addpBlock(pb); -// fprintf(stderr, "%s:%d [2] generating init for label: %s\n", __FILE__, __LINE__, sym->rname); + if(!didcode) { + /* make sure that 'code' directive is emitted before, once */ + pic16_addpCode2pBlock(pb, pic16_newpCodeAsmDir("code", NULL)); + + didcode++; + } pic16_addpCode2pBlock(pb,pic16_newpCodeLabel(sym->rname,-1)); + //fprintf(stderr, "%s:%d [2] generating init for label: %s\n", __FILE__, __LINE__, sym->rname); pic16_printIval(sym, sym->type, sym->ival, 'p', (void *)pb); pic16_flushDB('p', (void *)pb); noAlloc--; @@ -1282,12 +1407,12 @@ CODESPACE: %d\tCONST: %d\tPTRCONST: %d\tSPEC_CONST: %d\n", __FUNCTION__, /* symbol doesn't have absolute address and no initial value */ /* allocate space */ // fprintf(stderr, "%s:%d [3] generating init for label: %s\n", __FILE__, __LINE__, sym->rname); - fprintf (code->oFile, "%s:\n", sym->rname); + dbuf_printf (&code->oBuf, "%s:\n", sym->rname); /* special case for character strings */ if (IS_ARRAY (sym->type) && IS_CHAR (sym->type->next) && SPEC_CVAL (sym->etype).v_char) { -// fprintf(stderr, "%s:%d printing code string from %s\n", __FILE__, __LINE__, sym->rname); +// fprintf(stderr, "%s:%d printing code string for %s\n", __FILE__, __LINE__, sym->rname); pic16_pCodeConstString(sym->rname , SPEC_CVAL (sym->etype).v_char); } else { @@ -1307,7 +1432,7 @@ void pic16_emitConfigRegs(FILE *of) { int i; - for(i=0;icwInfo.confAddrEnd-pic16->cwInfo.confAddrStart;i++) + for(i=0;i<=(pic16->cwInfo.confAddrEnd-pic16->cwInfo.confAddrStart);i++) if(pic16->cwInfo.crInfo[i].emit) //mask != -1) fprintf (of, "\t__config 0x%x, 0x%hhx\n", pic16->cwInfo.confAddrStart+i, @@ -1318,7 +1443,7 @@ void pic16_emitIDRegs(FILE *of) { int i; - for(i=0;iidInfo.idAddrEnd-pic16->idInfo.idAddrStart;i++) + for(i=0;i<=(pic16->idInfo.idAddrEnd-pic16->idInfo.idAddrStart);i++) if(pic16->idInfo.irInfo[i].emit) fprintf (of, "\t__idlocs 0x%06x, 0x%hhx\n", pic16->idInfo.idAddrStart+i, @@ -1339,13 +1464,14 @@ pic16emitMaps () pic16emitRegularMap (sfrbit, FALSE, FALSE); pic16emitRegularMap (code, TRUE, FALSE); pic16emitStaticSeg (statsg); + pic16emitStaticSeg (c_abs); } /*-----------------------------------------------------------------*/ /* createInterruptVect - creates the interrupt vector */ /*-----------------------------------------------------------------*/ static void -pic16createInterruptVect (FILE * vFile) +pic16createInterruptVect (struct dbuf_s * vBuf) { /* if the main is only a prototype ie. no body then do nothing */ #if 0 @@ -1356,10 +1482,10 @@ pic16createInterruptVect (FILE * vFile) return; } #endif - +#if 0 if((!pic16_options.omit_ivt) || (pic16_options.omit_ivt && pic16_options.leave_reset)) { - fprintf (vFile, ";\t.area\t%s\n", CODE_NAME); - fprintf(vFile, ".intvecs\tcode\t0x%06x\n", pic16_options.ivt_loc); + dbuf_printf (vBuf, ";\t.area\t%s\n", CODE_NAME); + dbuf_printf (vBuf, ".intvecs\tcode\t0x%06x\n", pic16_options.ivt_loc); /* this is an overkill since WE are the port, * and we know if we have a genIVT function! */ @@ -1367,6 +1493,7 @@ pic16createInterruptVect (FILE * vFile) port->genIVT(vFile, interrupts, maxInterrupts); } } +#endif } @@ -1377,10 +1504,54 @@ pic16createInterruptVect (FILE * vFile) static void pic16initialComments (FILE * afile) { - initialComments (afile); - fprintf (afile, "; PIC16 port for the Microchip 16-bit core micros\n"); - fprintf (afile, iComments2); + initialComments (afile); + fprintf (afile, "; PIC16 port for the Microchip 16-bit core micros\n"); + if(xinst) + fprintf (afile, "; * Extended Instruction Set\n"); + + if(pic16_mplab_comp) + fprintf(afile, "; * MPLAB/MPASM/MPASMWIN/MPLINK compatibility mode enabled\n"); + fprintf (afile, iComments2); + + if(options.debug) { + fprintf (afile, "\n\t.ident \"SDCC version %s #%s [pic16 port]%s\"\n", + SDCC_VERSION_STR, getBuildNumber(), (!xinst?"":" {extended}") ); + } +} + +int +pic16_stringInSet(const char *str, set **world, int autoAdd) +{ + char *s; + + if (!str) return 1; + assert(world); + for (s = setFirstItem(*world); s; s = setNextItem(*world)) + { + /* found in set */ + if (0 == strcmp(s, str)) return 1; + } + + /* not found */ + if (autoAdd) addSet(world, Safe_strdup(str)); + return 0; +} + +static int +pic16_emitSymbolIfNew(FILE *file, const char *fmt, const char *sym, int checkLocals) +{ + static set *emitted = NULL; + + if (!pic16_stringInSet(sym, &emitted, 1)) { + /* sym was not in emittedSymbols */ + if (!checkLocals || !pic16_stringInSet(sym, &pic16_localFunctions, 0)) { + /* sym is not a locally defined function---avoid bug #1443651 */ + fprintf( file, fmt, sym ); + return 0; + } + } + return 1; } /*-----------------------------------------------------------------*/ @@ -1391,12 +1562,14 @@ pic16printPublics (FILE *afile) { symbol *sym; - fprintf (afile, "%s", iComments2); + fprintf (afile, "\n%s", iComments2); fprintf (afile, "; public variables in this module\n"); fprintf (afile, "%s", iComments2); for(sym = setFirstItem (publics); sym; sym = setNextItem (publics)) - fprintf(afile, "\tglobal %s\n", sym->rname); + /* sanity check */ + if(!IS_STATIC(sym->etype)) + pic16_emitSymbolIfNew(afile, "\tglobal %s\n", sym->rname, 0); } /*-----------------------------------------------------------------*/ @@ -1407,27 +1580,31 @@ pic16_printExterns(FILE *afile) { symbol *sym; - fprintf(afile, "%s", iComments2); + /* print nothing if no externs to declare */ + if(!elementsInSet(externs) && !elementsInSet(pic16_builtin_functions)) + return; + + fprintf(afile, "\n%s", iComments2); fprintf(afile, "; extern variables in this module\n"); fprintf(afile, "%s", iComments2); for(sym = setFirstItem(externs); sym; sym = setNextItem(externs)) - fprintf(afile, "\textern %s\n", sym->rname); + pic16_emitSymbolIfNew(afile, "\textern %s\n", sym->rname, 1); for(sym = setFirstItem(pic16_builtin_functions); sym; sym = setNextItem(pic16_builtin_functions)) - fprintf(afile, "\textern _%s\n", sym->name); + pic16_emitSymbolIfNew(afile, "\textern _%s\n", sym->name, 1); } /*-----------------------------------------------------------------*/ /* emitOverlay - will emit code for the overlay stuff */ /*-----------------------------------------------------------------*/ static void -pic16emitOverlay (FILE * afile) +pic16emitOverlay (struct dbuf_s *aBuf) { set *ovrset; if (!elementsInSet (ovrSetSets)) - fprintf (afile, ";\t.area\t%s\n", port->mem.overlay_name); + dbuf_printf (aBuf, ";\t.area\t%s\n", port->mem.overlay_name); /* for each of the sets in the overlay segment do */ for (ovrset = setFirstItem (ovrSetSets); ovrset; @@ -1442,9 +1619,9 @@ pic16emitOverlay (FILE * afile) otherwise the assembler will append each of these declarations into one chunk and will not overlay sad but true */ - fprintf (afile, ";\t.area _DUMMY\n"); + dbuf_printf (aBuf, ";\t.area _DUMMY\n"); /* output the area informtion */ - fprintf (afile, ";\t.area\t%s\n", port->mem.overlay_name); /* MOF */ + dbuf_printf (aBuf, ";\t.area\t%s\n", port->mem.overlay_name); /* MOF */ } for (sym = setFirstItem (ovrset); sym; @@ -1477,27 +1654,6 @@ pic16emitOverlay (FILE * afile) if (IS_FUNC (sym->type)) continue; -#if 0 - /* print extra debug info if required */ - if (options.debug || sym->level == 0) - { - - cdbSymbol (sym, cdbFile, FALSE, FALSE); - - if (!sym->level) - { /* global */ - if (IS_STATIC (sym->etype)) - fprintf (afile, "F%s_", moduleName); /* scope is file */ - else - fprintf (afile, "G_"); /* scope is global */ - } - else - /* symbol is local */ - fprintf (afile, "L%s_", - (sym->localof ? sym->localof->name : "-null-")); - fprintf (afile, "%s_%d_%d", sym->name, sym->level, sym->block); - } -#endif /* if is has an absolute address then generate an equate for this no need to allocate space */ @@ -1505,26 +1661,49 @@ pic16emitOverlay (FILE * afile) { if (options.debug || sym->level == 0) - fprintf (afile, " == 0x%04x\n", SPEC_ADDR (sym->etype)); + dbuf_printf (aBuf, " == 0x%04x\n", SPEC_ADDR (sym->etype)); - fprintf (afile, "%s\t=\t0x%04x\n", + dbuf_printf (aBuf, "%s\t=\t0x%04x\n", sym->rname, SPEC_ADDR (sym->etype)); } else { if (options.debug || sym->level == 0) - fprintf (afile, "==.\n"); + dbuf_printf (aBuf, "==.\n"); /* allocate space */ - fprintf (afile, "%s:\n", sym->rname); - fprintf (afile, "\t.ds\t0x%04x\n", (unsigned int) getSize (sym->type) & 0xffff); + dbuf_printf (aBuf, "%s:\n", sym->rname); + dbuf_printf (aBuf, "\t.ds\t0x%04x\n", (unsigned int) getSize (sym->type) & 0xffff); } } } } +void emitStatistics(FILE *asmFile) +{ + unsigned long isize, udsize, ramsize; + statistics.isize = pic16_countInstructions(); + isize = (statistics.isize >= 0) ? statistics.isize : 0; + udsize = (statistics.udsize >= 0) ? statistics.udsize : 0; + ramsize = pic16 ? pic16->RAMsize : 0x200; + ramsize -= 256; /* ignore access bank and SFRs */ + if (ramsize == 0) ramsize = 64; /* prevent division by zero (below) */ + + fprintf (asmFile, "\n\n; Statistics:\n"); + fprintf (asmFile, "; code size:\t%5ld (0x%04lx) bytes (%5.2f%%)\n; \t%5ld (0x%04lx) words\n", + isize, isize, (isize*100.0)/(128UL << 10), + isize>>1, isize>>1); + fprintf (asmFile, "; udata size:\t%5ld (0x%04lx) bytes (%5.2f%%)\n", + udsize, udsize, (udsize*100.0) / (1.0 * ramsize)); + fprintf (asmFile, "; access size:\t%5ld (0x%04lx) bytes\n", + statistics.intsize, statistics.intsize); + + fprintf (asmFile, "\n\n"); +} + + /*-----------------------------------------------------------------*/ /* glue - the final glue that hold the whole thing together */ @@ -1532,248 +1711,229 @@ pic16emitOverlay (FILE * afile) void pic16glue () { - - FILE *vFile; FILE *asmFile; - FILE *ovrFile = tempfile(); + struct dbuf_s ovrBuf; + struct dbuf_s vBuf; + dbuf_init(&ovrBuf, 4096); + dbuf_init(&vBuf, 4096); - mainf = newSymbol ("main", 0); - mainf->block = 0; + mainf = newSymbol ("main", 0); + mainf->block = 0; - mainf = findSymWithLevel(SymbolTab, mainf); -#if 0 - /* only if the main function exists */ - if (!(mainf = findSymWithLevel (SymbolTab, mainf))) { - if (!options.cc_only) - werror (E_NO_MAIN); - return; - } -#endif + mainf = findSymWithLevel(SymbolTab, mainf); -// fprintf(stderr, "main function= %p (%s)\thas body= %d\n", mainf, (mainf?mainf->name:NULL), mainf?IFFUNC_HASBODY(mainf->type):-1); + pic16_pCodeInitRegisters(); - addSetHead(&tmpfileSet,ovrFile); - pic16_pCodeInitRegisters(); + if(pic16_options.no_crt && mainf && IFFUNC_HASBODY(mainf->type)) { + pBlock *pb = pic16_newpCodeChain(NULL,'X',pic16_newpCodeCharP("; Starting pCode block")); - if (mainf && IFFUNC_HASBODY(mainf->type)) { - pBlock *pb = pic16_newpCodeChain(NULL,'X',pic16_newpCodeCharP("; Starting pCode block")); + pic16_addpBlock(pb); - pic16_addpBlock(pb); + /* entry point @ start of CSEG */ + pic16_addpCode2pBlock(pb,pic16_newpCodeLabel("__sdcc_program_startup",-1)); - /* entry point @ start of CSEG */ - pic16_addpCode2pBlock(pb,pic16_newpCodeLabel("__sdcc_program_startup",-1)); + if(initsfpnt) { + pic16_addpCode2pBlock(pb, pic16_newpCode(POC_LFSR, + pic16_popGetLit2(1, pic16_newpCodeOpRegFromStr("_stack_end")))); + pic16_addpCode2pBlock(pb, pic16_newpCode(POC_LFSR, + pic16_popGetLit2(2, pic16_newpCodeOpRegFromStr("_stack_end")))); + } - if(initsfpnt) { - pic16_addpCode2pBlock(pb, pic16_newpCode(POC_LFSR, - pic16_popGetLit2(1, pic16_newpCodeOpRegFromStr("_stack")))); - pic16_addpCode2pBlock(pb, pic16_newpCode(POC_LFSR, - pic16_popGetLit2(2, pic16_newpCodeOpRegFromStr("_stack")))); - } + /* put in the call to main */ + pic16_addpCode2pBlock(pb,pic16_newpCode(POC_CALL,pic16_newpCodeOp("_main",PO_STR))); - /* put in the call to main */ - pic16_addpCode2pBlock(pb,pic16_newpCode(POC_CALL,pic16_newpCodeOp("_main",PO_STR))); + if (options.mainreturn) { + pic16_addpCode2pBlock(pb,pic16_newpCodeCharP(";\treturn from main will return to caller\n")); + pic16_addpCode2pBlock(pb,pic16_newpCode(POC_RETURN,NULL)); + } else { + pic16_addpCode2pBlock(pb,pic16_newpCodeCharP(";\treturn from main will lock up\n")); + pic16_addpCode2pBlock(pb,pic16_newpCode(POC_GOTO,pic16_newpCodeOp("$",PO_STR))); + } + } - if (options.mainreturn) { - pic16_addpCode2pBlock(pb,pic16_newpCodeCharP(";\treturn from main will return to caller\n")); - pic16_addpCode2pBlock(pb,pic16_newpCode(POC_RETURN,NULL)); - } else { - pic16_addpCode2pBlock(pb,pic16_newpCodeCharP(";\treturn from main will lock up\n")); - pic16_addpCode2pBlock(pb,pic16_newpCode(POC_GOTO,pic16_newpCodeOp("$",PO_STR))); - } - } + /* At this point we've got all the code in the form of pCode structures */ + /* Now it needs to be rearranged into the order it should be placed in the */ + /* code space */ - /* At this point we've got all the code in the form of pCode structures */ - /* Now it needs to be rearranged into the order it should be placed in the */ - /* code space */ + pic16_movepBlock2Head('P'); // Last + pic16_movepBlock2Head(code->dbName); + pic16_movepBlock2Head('X'); + pic16_movepBlock2Head(statsg->dbName); // First - pic16_movepBlock2Head('P'); // Last - pic16_movepBlock2Head(code->dbName); - pic16_movepBlock2Head('X'); - pic16_movepBlock2Head(statsg->dbName); // First + /* print the global struct definitions */ - /* print the global struct definitions */ -// if (options.debug) -// cdbStructBlock (0); //,cdbFile); + /* PENDING: this isnt the best place but it will do */ + if (port->general.glue_up_main) { + /* create the interrupt vector table */ + pic16createInterruptVect (&vBuf); + } - vFile = tempfile(); - /* PENDING: this isnt the best place but it will do */ - if (port->general.glue_up_main) { - /* create the interrupt vector table */ - pic16createInterruptVect (vFile); - } + /* emit code for the all the variables declared */ + pic16emitMaps (); - addSetHead(&tmpfileSet,vFile); - - /* emit code for the all the variables declared */ - pic16emitMaps (); - /* do the overlay segments */ - pic16emitOverlay(ovrFile); - pic16_AnalyzepCode('*'); + /* do the overlay segments */ + pic16emitOverlay(&ovrBuf); + pic16_AnalyzepCode('*'); #if 1 - if(pic16_options.dumpcalltree) { - FILE *cFile; - sprintf(buffer, dstFileName); - strcat(buffer, ".calltree"); - cFile = fopen(buffer, "w"); - pic16_printCallTree( cFile ); - fclose(cFile); - } + if(pic16_options.dumpcalltree) { + FILE *cFile; + + sprintf(buffer, dstFileName); + strcat(buffer, ".calltree"); + cFile = fopen(buffer, "w"); + pic16_printCallTree( cFile ); + fclose(cFile); + } #endif - pic16_InlinepCode(); - pic16_AnalyzepCode('*'); + pic16_InlinepCode(); + pic16_AnalyzepCode('*'); - if(pic16_debug_verbose) - pic16_pcode_test(); - /* now put it all together into the assembler file */ - /* create the assembler file name */ - if ((noAssemble || options.c1mode) && fullDstFileName) { - sprintf (buffer, fullDstFileName); - } else { - sprintf (buffer, dstFileName); - strcat (buffer, ".asm"); - } + if(pic16_debug_verbose) + pic16_pcode_test(); - if (!(asmFile = fopen (buffer, "w"))) { - werror (E_FILE_OPEN_ERR, buffer); - exit (1); - } + /* now put it all together into the assembler file */ + /* create the assembler file name */ + if((noAssemble || options.c1mode) && fullDstFileName) { + sprintf (buffer, fullDstFileName); + } else { + sprintf (buffer, dstFileName); + strcat (buffer, ".asm"); + } + + if(!(asmFile = fopen (buffer, "w"))) { + werror (E_FILE_OPEN_ERR, buffer); + exit (1); + } - /* initial comments */ - pic16initialComments (asmFile); + /* initial comments */ + pic16initialComments (asmFile); - /* print module name */ - fprintf(asmFile, "#FILE\t\"%s\"\n", fullSrcFileName); + /* print module name */ + if(options.debug) + fprintf(asmFile, "\t.file\t\"%s\"\n", fullSrcFileName); - /* Let the port generate any global directives, etc. */ - if (port->genAssemblerPreamble) { - port->genAssemblerPreamble(asmFile); - } - - /* print the extern variables to this module */ - pic16_printExterns(asmFile); + /* Let the port generate any global directives, etc. */ + if(port->genAssemblerPreamble) { + port->genAssemblerPreamble(asmFile); + } - /* print the global variables in this module */ - pic16printPublics (asmFile); + /* Put all variables into a cblock */ + pic16_AnalyzeBanking(); #if 0 - /* copy the sfr segment */ - fprintf (asmFile, "%s", iComments2); - fprintf (asmFile, "; special function registers\n"); - fprintf (asmFile, "%s", iComments2); - copyFile (asmFile, sfr->oFile); + if(pic16_options.opt_flags & OF_LR_SUPPORT) { + pic16_OptimizeLocalRegs(); + } #endif - /* Put all variables into a cblock */ - pic16_AnalyzeBanking(); - pic16_writeUsedRegs(asmFile); + /* remove redundant BANKSELs -- added by RN 2005-01-17 */ + if(pic16_options.opt_banksel > 1) { + pic16_OptimizeBanksel(); + } + + /* turn GOTOs into BRAs -- added by RN 2004-11-16 */ + if(pic16_options.opt_flags & OF_OPTIMIZE_GOTO) { + pic16_OptimizeJumps(); + } + + /* print the global variables in this module */ + pic16printPublics (asmFile); + + /* print the extern variables to this module */ + pic16_printExterns(asmFile); + + pic16_writeUsedRegs(asmFile); #if 0 - /* no xdata in pic */ - /* if external stack then reserve space of it */ - if (mainf && IFFUNC_HASBODY(mainf->type) && options.useXstack ) { - fprintf (asmFile, "%s", iComments2); - fprintf (asmFile, "; external stack \n"); - fprintf (asmFile, "%s", iComments2); - fprintf (asmFile,";\t.area XSEG (XDATA)\n"); /* MOF */ - fprintf (asmFile,";\t.ds 256\n"); - } + /* no xdata in pic */ + /* if external stack then reserve space of it */ + if(mainf && IFFUNC_HASBODY(mainf->type) && options.useXstack ) { + fprintf (asmFile, "%s", iComments2); + fprintf (asmFile, "; external stack \n"); + fprintf (asmFile, "%s", iComments2); + fprintf (asmFile,";\t.area XSEG (XDATA)\n"); /* MOF */ + fprintf (asmFile,";\t.ds 256\n"); + } #endif #if 0 - /* no xdata in pic */ - /* copy xtern ram data */ - fprintf (asmFile, "%s", iComments2); - fprintf (asmFile, "; external ram data\n"); - fprintf (asmFile, "%s", iComments2); - copyFile (asmFile, xdata->oFile); + /* no xdata in pic */ + /* copy xtern ram data */ + fprintf (asmFile, "%s", iComments2); + fprintf (asmFile, "; external ram data\n"); + fprintf (asmFile, "%s", iComments2); + dbuf_write_and_destroy (&xdata->oBuf, asmFile); #endif #if 0 - /* copy the bit segment */ - fprintf (asmFile, "%s", iComments2); - fprintf (asmFile, "; bit data\n"); - fprintf (asmFile, "%s", iComments2); - copyFile (asmFile, bit->oFile); + /* copy the bit segment */ + fprintf (asmFile, "%s", iComments2); + fprintf (asmFile, "; bit data\n"); + fprintf (asmFile, "%s", iComments2); + dbuf_write_and_destroy (&bit->oBuf, asmFile); #endif - /* copy the interrupt vector table */ - if(mainf && IFFUNC_HASBODY(mainf->type)) { - fprintf (asmFile, "%s", iComments2); - fprintf (asmFile, "; interrupt vector \n"); - fprintf (asmFile, "%s", iComments2); - copyFile (asmFile, vFile); - } + /* copy the interrupt vector table */ + if(mainf && IFFUNC_HASBODY(mainf->type)) { + fprintf (asmFile, "\n%s", iComments2); + fprintf (asmFile, "; interrupt vector \n"); + fprintf (asmFile, "%s", iComments2); + dbuf_write_and_destroy (&vBuf, asmFile); + } - /* copy global & static initialisations */ - fprintf (asmFile, "%s", iComments2); - fprintf (asmFile, "; global & static initialisations\n"); - fprintf (asmFile, "%s", iComments2); + /* copy global & static initialisations */ + fprintf (asmFile, "\n%s", iComments2); + fprintf (asmFile, "; global & static initialisations\n"); + fprintf (asmFile, "%s", iComments2); -#if 0 - /* copy over code */ - fprintf (asmFile, "%s", iComments2); - fprintf (asmFile, "\tcode\n"); - fprintf (asmFile, "%s", iComments2); -#endif - - if(pic16_debug_verbose) - fprintf(asmFile, "; A code from now on!\n"); - pic16_copypCode(asmFile, 'A'); - - - if(mainf && IFFUNC_HASBODY(mainf->type)) { - fprintf(asmFile, "\tcode\n"); - fprintf(asmFile,"__sdcc_gsinit_startup:\n"); - -#if 0 - /* FIXME 8051 legacy (?!) - VR 20-Jun-2003 */ - /* if external stack is specified then the - * higher order byte of the xdatalocation is - * going into P2 and the lower order going into */ - - if (options.useXstack) { - fprintf(asmFile,";\tmov\tP2,#0x%02x\n", - (((unsigned int)options.xdata_loc) >> 8) & 0xff); - fprintf(asmFile,";\tmov\t_spx,#0x%02x\n", - (unsigned int)options.xdata_loc & 0xff); - } -#endif - } + if(pic16_debug_verbose) + fprintf(asmFile, "; A code from now on!\n"); + + pic16_copypCode(asmFile, 'A'); -// copyFile (stderr, code->oFile); + if(pic16_options.no_crt) { + if(mainf && IFFUNC_HASBODY(mainf->type)) { + fprintf(asmFile, "\tcode\n"); + fprintf(asmFile,"__sdcc_gsinit_startup:\n"); + } + } - fprintf(asmFile, "; I code from now on!\n"); - pic16_copypCode(asmFile, 'I'); +// dbuf_write_and_destroy (&code->oBuf, stderr); - if(pic16_debug_verbose) - fprintf(asmFile, "; dbName from now on!\n"); - pic16_copypCode(asmFile, statsg->dbName); + fprintf(asmFile, "; I code from now on!\n"); + pic16_copypCode(asmFile, 'I'); + if(pic16_debug_verbose) + fprintf(asmFile, "; dbName from now on!\n"); + + pic16_copypCode(asmFile, statsg->dbName); - if (port->general.glue_up_main && mainf && IFFUNC_HASBODY(mainf->type)) { - fprintf (asmFile,"\tgoto\t__sdcc_program_startup\n"); - } + if(pic16_options.no_crt) { + if (port->general.glue_up_main && mainf && IFFUNC_HASBODY(mainf->type)) { + fprintf (asmFile,"\tgoto\t__sdcc_program_startup\n"); + } + } + if(pic16_debug_verbose) + fprintf(asmFile, "; X code from now on!\n"); - if(pic16_debug_verbose) - fprintf(asmFile, "; X code from now on!\n"); - pic16_copypCode(asmFile, 'X'); - - if(pic16_debug_verbose) - fprintf(asmFile, "; M code from now on!\n"); - pic16_copypCode(asmFile, 'M'); + pic16_copypCode(asmFile, 'X'); + if(pic16_debug_verbose) + fprintf(asmFile, "; M code from now on!\n"); - pic16_copypCode(asmFile, code->dbName); + pic16_copypCode(asmFile, 'M'); - pic16_copypCode(asmFile, 'P'); + pic16_copypCode(asmFile, code->dbName); + + pic16_copypCode(asmFile, 'P'); - fprintf (asmFile,"\tend\n"); - fclose (asmFile); + emitStatistics(asmFile); - rm_tmpfiles(); + fprintf (asmFile,"\tend\n"); + fclose (asmFile); }