X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fpic16%2Fglue.c;h=5e2ddab73c551e194966c434efab8b3d06a8a22d;hb=8332acb8ebcdd1490779c012db097c74c71d039e;hp=ba5703f4ad1de3767c3cfb9829525a15af01f0d0;hpb=a20bdd65ab5d25b38eaace299accab49179e26b3;p=fw%2Fsdcc diff --git a/src/pic16/glue.c b/src/pic16/glue.c index ba5703f4..5e2ddab7 100644 --- a/src/pic16/glue.c +++ b/src/pic16/glue.c @@ -27,8 +27,12 @@ #include "ralloc.h" #include "pcode.h" #include "newalloc.h" +#include "gen.h" #include "device.h" #include "main.h" +#include + +#include #ifdef WORDS_BIGENDIAN @@ -40,7 +44,7 @@ #define BYTE_IN_LONG(x,b) ((x>>(8*_ENDIAN(b)))&0xff) extern symbol *interrupts[256]; -static void printIval (symbol * sym, sym_link * type, initList * ilist, pBlock *pb); +void pic16_printIval (symbol * sym, sym_link * type, initList * ilist, char ptype, void *p); extern int noAlloc; extern set *publics; extern set *externs; @@ -55,6 +59,11 @@ extern char *iComments1; extern char *iComments2; //extern void emitStaticSeg (memmap * map); +extern int initsfpnt; + +set *rel_idataSymSet=NULL; +set *fix_idataSymSet=NULL; + extern DEFSETFUNC (closeTmpFiles); extern DEFSETFUNC (rmTmpFiles); @@ -66,12 +75,9 @@ extern void pic16_writeUsedRegs(FILE *); extern void initialComments (FILE * afile); extern void printPublics (FILE * afile); -extern void printChar (FILE * ofile, char *s, int plen); void pic16_pCodeInitRegisters(void); -pCodeOp *pic16_popGetLit(unsigned int lit); -pCodeOp *pic16_popGetLit2(unsigned int lit, pCodeOp *arg2); pCodeOp *pic16_popCopyReg(pCodeOpReg *pc); -pCodeOp *pic16_popCombine2(pCodeOpReg *src, pCodeOpReg *dst); +extern void pic16_pCodeConstString(char *name, char *value); /*-----------------------------------------------------------------*/ /* aopLiteral - string from a literal value */ @@ -101,6 +107,11 @@ int pic16aopLiteral (value *val, int offset) } +iCode *tic; +symbol *nsym; +char tbuffer[512], *tbuf=tbuffer;; + + /*-----------------------------------------------------------------*/ /* emitRegularMap - emit code for maps with no special cases */ /*-----------------------------------------------------------------*/ @@ -108,50 +119,98 @@ static void pic16emitRegularMap (memmap * map, bool addPublics, bool arFlag) { symbol *sym; - int i, size, bitvars = 0;; +// int i, size, bitvars = 0;; // fprintf(stderr, "%s:%d map name= %s\n", __FUNCTION__, __LINE__, map->sname); if(addPublics) fprintf (map->oFile, ";\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, "\t%s: sym: %s\tused: %d\n", map->sname, sym->name, sym->used); + 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), (SPEC_SCLS(sym->etype) == S_REGISTER), IS_FUNC(sym->type)); printTypeChain( sym->type, stderr ); - printf("\n"); + fprintf(stderr, "\n"); #endif + /* if extern then add to externs */ if (IS_EXTERN (sym->etype)) { -// if(sym->used) // fixme - addSetHead(&externs, sym); + /* reduce overhead while linking by not declaring + * extern unused external functions (usually declared + * in header files) */ + if(IS_FUNC(sym->type) && !sym->used)continue; + + /* 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)) && - !sym->allocreq && sym->level) - + !sym->allocreq && sym->level) { + +// fprintf(stderr, "%s:%d special case, continuing...\n", __FILE__, __LINE__); + continue; + } /* if global variable & not static or extern * and addPublics allowed then add it to the public set */ if ((sym->used) && (sym->level == 0 || (sym->_isparm && !IS_REGPARM (sym->etype))) && addPublics && - !IS_STATIC (sym->etype) && !IS_FUNC(sym->type)) - - addSetHead (&publics, sym); + !IS_STATIC (sym->etype) && !IS_FUNC(sym->type)) { + + checkAddSym(&publics, sym); + } else + if(IS_STATIC(sym->etype) + && !(sym->ival && !sym->level) + ) { + regs *reg; + /* add it to udata list */ + +// fprintf(stderr, "%s:%d adding %s (%s) remat=%d\n", __FILE__, __LINE__, +// sym->name, sym->rname, sym->remat); + + //, OP_SYMBOL(operandFromSymbol(sym))->name); +#define SET_IMPLICIT 1 + +#if SET_IMPLICIT + if(IS_STRUCT(sym->type)) + sym->implicit = 1; +#endif + + 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; + } +#endif + + if(!found)checkAddReg(&pic16_rel_udata, reg); + } + } /* if extern then do nothing or is a function * then do nothing */ if (IS_FUNC (sym->type) && !IS_STATIC(sym->etype)) { if(SPEC_OCLS(sym->etype) == code) { // fprintf(stderr, "%s:%d: symbol added: %s\n", __FILE__, __LINE__, sym->rname); - addSetHead(&publics, sym); + checkAddSym(&publics, sym); } continue; } @@ -173,9 +232,6 @@ pic16emitRegularMap (memmap * map, bool addPublics, bool arFlag) } #endif - /* FIXME -- VR - * The equates are nice, but do not allow relocatable objects to - * be created in the form that I (VR) want to make SDCC to work */ /* if is has an absolute address then generate an equate for this no need to allocate space */ @@ -187,23 +243,85 @@ pic16emitRegularMap (memmap * map, bool addPublics, bool arFlag) fprintf (map->oFile, "%s\tEQU\t0x%04x\n", sym->rname, SPEC_ADDR (sym->etype)); -#if 1 + /* emit only if it is global */ if(sym->level == 0) { regs *reg; - operand *op; -// fprintf(stderr, "%s: implicit add of symbol = %s\n", __FUNCTION__, sym->name); - op = operandFromSymbol( sym ); - reg = pic16_allocDirReg( op ); - if(reg) { - //continue; - checkAddReg(&pic16_fix_udata, reg); - /* and add to globals list */ - addSetHead(&publics, sym); + + reg = pic16_dirregWithName( sym->name ); + if(!reg) { + /* here */ +// fprintf(stderr, "%s:%d: implicit add of symbol = %s\n", +// __FUNCTION__, __LINE__, sym->name); + + /* if IS_STRUCT is omitted the following + * fixes structures but break char/int etc */ +#if SET_IMPLICIT + if(IS_STRUCT(sym->type)) + sym->implicit = 1; // mark as implicit +#endif + if(!sym->ival) { + reg = pic16_allocDirReg( operandFromSymbol(sym) ); + if(reg) { + if(checkAddReg(&pic16_fix_udata, reg)) { + /* and add to globals list if not exist */ + addSet(&publics, sym); + } + } + } else + addSet(&publics, sym); } } -#endif } else { + if(!sym->used && (sym->level == 0)) { + regs *reg; + + /* symbol not used, just declared probably, but its in + * level 0, so we must declare it fine as global */ + +// fprintf(stderr, "EXTRA symbol declaration sym= %s\n", sym->name); + +#if SET_IMPLICIT + if(IS_STRUCT(sym->type)) + sym->implicit = 1; // mark as implicit +#endif + if(!sym->ival) { + if(IS_AGGREGATE(sym->type)) { + reg=pic16_allocRegByName(sym->rname, getSize( sym->type ), NULL); + } else { + reg = pic16_allocDirReg( operandFromSymbol( sym ) ); + } + + { + sectSym *ssym; + int found=0; + +#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 1 + for(ssym=setFirstItem(sectSyms); ssym; ssym=setNextItem(sectSyms)) { + if(!strcmp(ssym->name, reg->name))found=1; + } +#endif + + if(!found) + if(checkAddReg(&pic16_rel_udata, reg)) { + addSetHead(&publics, sym); + } + + } + + + + } else + + addSetHead(&publics, sym); + } + +#if 0 /* allocate space */ /* If this is a bit variable, then allocate storage after 8 bits have been declared */ /* unlike the 8051, the pic does not have a separate bit area. So we emulate bit ram */ @@ -217,7 +335,8 @@ pic16emitRegularMap (memmap * map, bool addPublics, bool arFlag) fprintf (map->oFile, "\t%s_%d\n", sym->rname, i); } } -// fprintf (map->oFile, "\t.ds\t0x%04x\n", (unsigned int)getSize (sym->type) & 0xffff); + fprintf (map->oFile, "\t.ds\t0x%04x\n", (unsigned int)getSize (sym->type) & 0xffff); +#endif } /* FIXME -- VR Fix the following, so that syms to be placed @@ -226,44 +345,265 @@ pic16emitRegularMap (memmap * map, bool addPublics, bool arFlag) /* if it has an initial value then do it only if it is a global variable */ -#if 1 if (sym->ival && sym->level == 0) { ast *ival = NULL; -// if(SPEC_OCLS(sym->etype)==data) { -// fprintf(stderr, "%s: sym %s placed in data\n", map->sname, sym->name); -// } +#if 0 + if(SPEC_OCLS(sym->etype)==data) { + fprintf(stderr, "%s: sym %s placed in data segment\n", map->sname, sym->name); + } -// fprintf(stderr, "'%s': sym '%s' has initial value\n", map->sname, sym->name); + if(SPEC_OCLS(sym->etype)==code) { + fprintf(stderr, "%s: sym %s placed in code segment\n", map->sname, sym->name); + } +#endif - if (IS_AGGREGATE (sym->type)) - ival = initAggregates (sym, sym->ival, NULL); - else - ival = newNode ('=', newAst_VALUE(symbolVal (sym)), - decorateType (resolveSymbols (list2expr (sym->ival)))); - codeOutFile = statsg->oFile; - GcurMemmap = statsg; - eBBlockFromiCode (iCodeFromAst (ival)); - sym->ival = NULL; - } +#if 0 + fprintf(stderr, "'%s': sym '%s' has initial value SPEC_ABSA: %d, IS_AGGREGATE: %d\n", + map->sname, sym->name, SPEC_ABSA(sym->etype), IS_AGGREGATE(sym->type)); #endif + + if (IS_AGGREGATE (sym->type)) { + if(SPEC_ABSA(sym->etype)) + addSet(&fix_idataSymSet, copySymbol(sym)); + else + addSet(&rel_idataSymSet, copySymbol(sym)); +// ival = initAggregates (sym, sym->ival, NULL); + } else { + if(SPEC_ABSA(sym->etype)) + addSet(&fix_idataSymSet, copySymbol(sym)); + else + addSet(&rel_idataSymSet, copySymbol(sym)); + +// ival = newNode ('=', newAst_VALUE(symbolVal (sym)), +// decorateType (resolveSymbols (list2expr (sym->ival)), RESULT_TYPE_NONE)); + } + + if(ival) { + setAstLineno(ival, sym->lineDef); + codeOutFile = statsg->oFile; + GcurMemmap = statsg; + eBBlockFromiCode (iCodeFromAst (ival)); + sym->ival = NULL; + } + } } } /*-----------------------------------------------------------------*/ -/* printIvalType - generates ival for int/char */ +/* pic16_initPointer - pointer initialization code massaging */ +/*-----------------------------------------------------------------*/ +value *pic16_initPointer (initList * ilist, sym_link *toType) +{ + value *val; + ast *expr; + + if (!ilist) { + return valCastLiteral(toType, 0.0); + } + + expr = decorateType(resolveSymbols( list2expr (ilist) ), FALSE); +// expr = list2expr( ilist ); + + if (!expr) + goto wrong; + + /* try it the old way first */ + if ((val = constExprValue (expr, FALSE))) + return val; + + /* ( ptr + constant ) */ + if (IS_AST_OP (expr) && + (expr->opval.op == '+' || expr->opval.op == '-') && + IS_AST_SYM_VALUE (expr->left) && + (IS_ARRAY(expr->left->ftype) || IS_PTR(expr->left->ftype)) && + compareType(toType, expr->left->ftype) && + IS_AST_LIT_VALUE (expr->right)) { + return valForCastAggr (expr->left, expr->left->ftype, + expr->right, + expr->opval.op); + } + + /* (char *)&a */ + if (IS_AST_OP(expr) && expr->opval.op==CAST && + IS_AST_OP(expr->right) && expr->right->opval.op=='&') { + if (compareType(toType, expr->left->ftype)!=1) { + werror (W_INIT_WRONG); + printFromToType(expr->left->ftype, toType); + } + // skip the cast ??? + expr=expr->right; + } + + /* no then we have to do these cludgy checks */ + /* pointers can be initialized with address of + a variable or address of an array element */ + 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->type = newLink (DECLARATOR); + if(SPEC_SCLS (expr->left->etype) == S_CODE) { + DCL_TYPE (val->type) = CPOINTER; + DCL_PTR_CONST (val->type) = port->mem.code_ro; + } + else if (SPEC_SCLS (expr->left->etype) == S_XDATA) + DCL_TYPE (val->type) = FPOINTER; + else if (SPEC_SCLS (expr->left->etype) == S_XSTACK) + DCL_TYPE (val->type) = PPOINTER; + else if (SPEC_SCLS (expr->left->etype) == S_IDATA) + DCL_TYPE (val->type) = IPOINTER; + else if (SPEC_SCLS (expr->left->etype) == S_EEPROM) + DCL_TYPE (val->type) = EEPPOINTER; + else + DCL_TYPE (val->type) = POINTER; + + val->type->next = expr->left->ftype; + val->etype = getSpec (val->type); + return val; + } + + /* if address of indexed array */ + if (IS_AST_OP (expr->left) && expr->left->opval.op == '[') + return valForArray (expr->left); + + /* if address of structure element then + case 1. a.b ; */ + if (IS_AST_OP (expr->left) && + expr->left->opval.op == '.') { + return valForStructElem (expr->left->left, + expr->left->right); + } + + /* case 2. (&a)->b ; + (&some_struct)->element */ + if (IS_AST_OP (expr->left) && + expr->left->opval.op == PTR_OP && + IS_ADDRESS_OF_OP (expr->left->left)) { + return valForStructElem (expr->left->left->left, + expr->left->right); + } + } + /* case 3. (((char *) &a) +/- constant) */ + if (IS_AST_OP (expr) && + (expr->opval.op == '+' || expr->opval.op == '-') && + IS_AST_OP (expr->left) && expr->left->opval.op == CAST && + IS_AST_OP (expr->left->right) && + expr->left->right->opval.op == '&' && + IS_AST_LIT_VALUE (expr->right)) { + + return valForCastAggr (expr->left->right->left, + expr->left->left->opval.lnk, + expr->right, expr->opval.op); + + } + /* case 4. (char *)(array type) */ + if (IS_CAST_OP(expr) && IS_AST_SYM_VALUE (expr->right) && + IS_ARRAY(expr->right->ftype)) { + + val = copyValue (AST_VALUE (expr->right)); + val->type = newLink (DECLARATOR); + if (SPEC_SCLS (expr->right->etype) == S_CODE) { + DCL_TYPE (val->type) = CPOINTER; + DCL_PTR_CONST (val->type) = port->mem.code_ro; + } + else if (SPEC_SCLS (expr->right->etype) == S_XDATA) + DCL_TYPE (val->type) = FPOINTER; + else if (SPEC_SCLS (expr->right->etype) == S_XSTACK) + DCL_TYPE (val->type) = PPOINTER; + else if (SPEC_SCLS (expr->right->etype) == S_IDATA) + DCL_TYPE (val->type) = IPOINTER; + else if (SPEC_SCLS (expr->right->etype) == S_EEPROM) + DCL_TYPE (val->type) = EEPPOINTER; + else + DCL_TYPE (val->type) = POINTER; + val->type->next = expr->right->ftype->next; + val->etype = getSpec (val->type); + return val; + } + + wrong: + if (expr) + werrorfl (expr->filename, expr->lineno, E_INCOMPAT_PTYPES); + else + werror (E_INCOMPAT_PTYPES); + return NULL; + +} + + +/*-----------------------------------------------------------------*/ +/* printPointerType - generates ival for pointer type */ +/*-----------------------------------------------------------------*/ +void _pic16_printPointerType (const char *name, char ptype, void *p) +{ + char buf[256]; + + sprintf(buf, "LOW(%s)", name); + pic16_emitDS(buf, ptype, p); + sprintf(buf, "HIGH(%s)", name); + pic16_emitDS(buf, ptype, p); +} + +/*-----------------------------------------------------------------*/ +/* printPointerType - generates ival for pointer type */ +/*-----------------------------------------------------------------*/ +void pic16_printPointerType (const char *name, char ptype, void *p) +{ + _pic16_printPointerType (name, ptype, p); + pic16_flushDB(ptype, p); +} + +/*-----------------------------------------------------------------*/ +/* 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) +{ + char buf[256]; + + _pic16_printPointerType (iname, ptype, p); + + switch( itype ) { + case FPOINTER: + case CPOINTER: + { + sprintf(buf, "UPPER(%s)", iname); + pic16_emitDS(buf, ptype, p); + }; break; + case POINTER: + case IPOINTER: + sprintf(buf, "0x80"); + pic16_emitDS(buf, ptype, p); + break; + } + + pic16_flushDB(ptype, p); +} + + +/* set to 0 to disable debug messages */ +#define DEBUG_PRINTIVAL 0 + +/*-----------------------------------------------------------------*/ +/* pic16_printIvalType - generates ival for int/char */ /*-----------------------------------------------------------------*/ static void -printIvalType (symbol *sym, sym_link * type, initList * ilist, pBlock *pb) +pic16_printIvalType (symbol *sym, sym_link * type, initList * ilist, char ptype, void *p) { value *val; unsigned long ulval; - //fprintf(stderr, "%s\n",__FUNCTION__); +// 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->type == INIT_DEEP) + if (ilist && ilist->type == INIT_DEEP) ilist = ilist->init.deep; if (!IS_AGGREGATE(sym->type) && getNelements(type, ilist)>1) { @@ -286,36 +626,39 @@ printIvalType (symbol *sym, sym_link * type, initList * ilist, pBlock *pb) switch (getSize (type)) { case 1: - pic16_addpCode2pBlock(pb,pic16_newpCode(POC_RETLW,pic16_newpCodeOpLit(BYTE_IN_LONG(ulval,0)))); + pic16_emitDB(BYTE_IN_LONG(ulval,0), ptype, p); break; case 2: - pic16_addpCode2pBlock(pb,pic16_newpCode(POC_RETLW,pic16_newpCodeOpLit(BYTE_IN_LONG(ulval,0)))); - pic16_addpCode2pBlock(pb,pic16_newpCode(POC_RETLW,pic16_newpCodeOpLit(BYTE_IN_LONG(ulval,1)))); + pic16_emitDB(BYTE_IN_LONG(ulval,0), ptype, p); + pic16_emitDB(BYTE_IN_LONG(ulval,1), ptype, p); break; case 4: - pic16_addpCode2pBlock(pb,pic16_newpCode(POC_RETLW,pic16_newpCodeOpLit(BYTE_IN_LONG(ulval,0)))); - pic16_addpCode2pBlock(pb,pic16_newpCode(POC_RETLW,pic16_newpCodeOpLit(BYTE_IN_LONG(ulval,1)))); - pic16_addpCode2pBlock(pb,pic16_newpCode(POC_RETLW,pic16_newpCodeOpLit(BYTE_IN_LONG(ulval,2)))); - pic16_addpCode2pBlock(pb,pic16_newpCode(POC_RETLW,pic16_newpCodeOpLit(BYTE_IN_LONG(ulval,3)))); + 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); break; } } -/*-----------------------------------------------------------------*/ -/* printIvalChar - generates initital value for character array */ -/*-----------------------------------------------------------------*/ +/*--------------------------------------------------------------------*/ +/* pic16_printIvalChar - generates initital value for character array */ +/*--------------------------------------------------------------------*/ static int -printIvalChar (sym_link * type, initList * ilist, pBlock *pb, char *s) +pic16_printIvalChar (sym_link * type, initList * ilist, char *s, char ptype, void *p) { value *val; - int remain; + unsigned int remain; - if(!pb) + if(!p) return 0; +#if DEBUG_PRINTIVAL fprintf(stderr, "%s\n",__FUNCTION__); +#endif + if (!s) { @@ -326,60 +669,60 @@ printIvalChar (sym_link * type, initList * ilist, pBlock *pb, char *s) if (!DCL_ELEM (type)) DCL_ELEM (type) = strlen (SPEC_CVAL (val->etype).v_char) + 1; - //printChar (oFile, SPEC_CVAL (val->etype).v_char, DCL_ELEM (type)); - //fprintf(stderr, "%s omitting call to printChar\n",__FUNCTION__); - pic16_addpCode2pBlock(pb,pic16_newpCodeCharP(";omitting call to printChar")); - - if ((remain = (DCL_ELEM (type) - strlen (SPEC_CVAL (val->etype).v_char) - 1)) > 0) - while (remain--) - //tfprintf (oFile, "\t!db !constbyte\n", 0); - pic16_addpCode2pBlock(pb,pic16_newpCode(POC_RETLW,pic16_newpCodeOpLit(0))); + 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); + } + } return 1; } else return 0; } else { - //printChar (oFile, s, strlen (s) + 1); - for(remain=0; remainnext)) { - //fprintf(stderr,"%s:%d - is_char\n",__FUNCTION__,__LINE__); if (!IS_LITERAL(list2val(ilist)->etype)) { werror (W_INIT_WRONG); return; } - if (printIvalChar (type, + + if(pic16_printIvalChar (type, (ilist->type == INIT_DEEP ? ilist->init.deep : ilist), - pb, SPEC_CVAL (sym->etype).v_char)) + SPEC_CVAL (sym->etype).v_char, ptype, p)) return; } /* not the special case */ - if (ilist->type != INIT_DEEP) + if (ilist && ilist->type != INIT_DEEP) { werror (E_INIT_STRUCT, sym->name); return; @@ -390,9 +733,8 @@ printIvalArray (symbol * sym, sym_link * type, initList * ilist, for (;;) { - //fprintf(stderr,"%s:%d - is_char\n",__FUNCTION__,__LINE__); size++; - printIval (sym, type->next, iloop, pb); + pic16_printIval (sym, type->next, iloop, ptype, p); iloop = (iloop ? iloop->next : NULL); @@ -420,48 +762,440 @@ printIvalArray (symbol * sym, sym_link * type, initList * ilist, } /*-----------------------------------------------------------------*/ -/* printIval - generates code for initial value */ +/* pic16_printIvalBitFields - generate initializer for bitfields */ /*-----------------------------------------------------------------*/ -static void -printIval (symbol * sym, sym_link * type, initList * ilist, pBlock *pb) +void pic16_printIvalBitFields(symbol **sym, initList **ilist, char ptype, void *p) +{ + value *val ; + symbol *lsym = *sym; + initList *lilist = *ilist ; + unsigned long ival = 0; + int size =0; + + +#if DEBUG_PRINTIVAL + fprintf(stderr, "%s\n",__FUNCTION__); +#endif + + + do { + unsigned long i; + val = list2val(lilist); + if (size) { + if (SPEC_BLEN(lsym->etype) > 8) { + size += ((SPEC_BLEN (lsym->etype) / 8) + + (SPEC_BLEN (lsym->etype) % 8 ? 1 : 0)); + } + } else { + size = ((SPEC_BLEN (lsym->etype) / 8) + + (SPEC_BLEN (lsym->etype) % 8 ? 1 : 0)); + } + i = (unsigned long)floatFromVal(val); + i <<= SPEC_BSTR (lsym->etype); + ival |= i; + if (! ( lsym->next && + (IS_BITFIELD(lsym->next->type)) && + (SPEC_BSTR(lsym->next->etype)))) break; + lsym = lsym->next; + lilist = lilist->next; + } while (1); + switch (size) { + case 1: + pic16_emitDB(BYTE_IN_LONG(ival, 0), ptype, p); + break; + + case 2: + pic16_emitDB(BYTE_IN_LONG(ival, 0), ptype, p); + pic16_emitDB(BYTE_IN_LONG(ival, 1), ptype, p); + 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; + default: + /* VR - only 1,2,4 size long can be handled???? Why? */ + fprintf(stderr, "%s:%d: unhandled case. Contact author.\n", __FILE__, __LINE__); + assert(0); + } + *sym = lsym; + *ilist = lilist; +} + + +/*-----------------------------------------------------------------*/ +/* printIvalStruct - generates initial value for structures */ +/*-----------------------------------------------------------------*/ +void pic16_printIvalStruct (symbol * sym, sym_link * type, + initList * ilist, char ptype, void *p) { - if (!ilist || !pb) + symbol *sflds; + initList *iloop = NULL; + + +#if DEBUG_PRINTIVAL + fprintf(stderr, "%s\n",__FUNCTION__); +#endif + + sflds = SPEC_STRUCT (type)->fields; + + if (ilist) { + if (ilist->type != INIT_DEEP) { + werrorfl (sym->fileDef, sym->lineDef, E_INIT_STRUCT, sym->name); + return; + } + + iloop = ilist->init.deep; + } + + for (; sflds; 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); + } else { + pic16_printIval (sym, sflds->type, iloop, ptype, p); + } + } + if (iloop) { + werrorfl (sym->fileDef, sym->lineDef, W_EXCESS_INITIALIZERS, "struct", sym->name); + } + return; +} + +/*--------------------------------------------------------------------------*/ +/* pic16_printIvalCharPtr - generates initial values for character pointers */ +/*--------------------------------------------------------------------------*/ +int pic16_printIvalCharPtr (symbol * sym, sym_link * type, value * val, char ptype, void *p) +{ + int size = 0; + + /* PENDING: this is _very_ mcs51 specific, including a magic + number... + It's also endin specific. + + VR - Attempting to port this function to pic16 port - 8-Jun-2004 + */ + + +#if DEBUG_PRINTIVAL + fprintf(stderr, "%s\n",__FUNCTION__); +#endif + + size = getSize (type); + + if (val->name && strlen (val->name)) + { + if (size == 1) /* This appears to be Z80 specific?? */ + { + pic16_emitDS(val->name, ptype, p); + } + else if (size == 2) + { + pic16_printPointerType (val->name, ptype, p); + } + else if (size == 3) + { + int type; + if (IS_PTR (val->type)) { + type = DCL_TYPE (val->type); + } else { + type = PTR_TYPE (SPEC_OCLS (val->etype)); + } + if (val->sym && val->sym->isstrlit) { + // this is a literal string + type=CPOINTER; + } + pic16_printGPointerType(val->name, sym->name, type, type, ptype, p); + } + else + { + fprintf (stderr, "*** internal error: unknown size in " + "printIvalCharPtr.\n"); + assert(0); + } + } + else + { + // these are literals assigned to pointers + switch (size) + { + case 1: + pic16_emitDB(pic16aopLiteral(val, 0), ptype, p); + break; + case 2: + 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); + break; + + default: + assert (0); + } + } + + if (val->sym && val->sym->isstrlit) { // && !isinSet(statsg->syms, val->sym)) { + if(ptype == 'p' && !isinSet(statsg->syms, val->sym))addSet (&statsg->syms, val->sym); + else if(ptype == 'f' /*&& !isinSet(rel_idataSymSet, val->sym)*/)addSet(&rel_idataSymSet, val->sym); + } + + return 1; +} + +/*-----------------------------------------------------------------------*/ +/* pic16_printIvalFuncPtr - generate initial value for function pointers */ +/*-----------------------------------------------------------------------*/ +void pic16_printIvalFuncPtr (sym_link * type, initList * ilist, char ptype, void *p) +{ + value *val; + int dLvl = 0; + + +#if DEBUG_PRINTIVAL + fprintf(stderr, "%s\n",__FUNCTION__); +#endif + + if (ilist) + val = list2val (ilist); + else + val = valCastLiteral(type, 0.0); + + if (!val) { + // an error has been thrown already + val=constVal("0"); + } + + if (IS_LITERAL(val->etype)) { + if (compareType(type, val->etype) == 0) { + werrorfl (ilist->filename, ilist->lineno, E_INCOMPAT_TYPES); + printFromToType (val->type, type); + } + pic16_printIvalCharPtr (NULL, type, val, ptype, p); return; + } - /* if structure then */ - if (IS_STRUCT (type)) + /* check the types */ + if ((dLvl = compareType (val->type, type->next)) <= 0) { - //fprintf(stderr,"%s struct\n",__FUNCTION__); - //printIvalStruct (sym, type, ilist, oFile); + pic16_emitDB(0x00, ptype, p); return; } - /* if this is a pointer */ - if (IS_PTR (type)) + /* now generate the name */ + if (!val->sym) { + pic16_printPointerType (val->name, ptype, p); + } else { + pic16_printPointerType (val->sym->rname, ptype, p); + + if(IS_FUNC(val->sym->type) && !val->sym->used) { + + if(!checkSym(publics, val->sym)) + checkAddSym(&externs, val->sym); + + /* this has not been declared as extern + * so declare it as a 'late extern' just after the symbol */ + if(ptype == 'f') { + fprintf((FILE *)p, "declare symbol as extern"); + fprintf((FILE *)p, "\textern\t%s\n", val->sym->rname); + fprintf((FILE *)p, "continue variable declaration"); + } + } + } + + return; +} + + +/*-----------------------------------------------------------------*/ +/* pic16_printIvalPtr - generates initial value for pointers */ +/*-----------------------------------------------------------------*/ +void pic16_printIvalPtr (symbol * sym, sym_link * type, initList * ilist, char ptype, void *p) +{ + value *val; + int size; + +#if 0 + fprintf(stderr, "%s:%d initialising pointer: %s size: %d\n", __FILE__, __LINE__, + sym->rname, getSize(sym->type)); +#endif + + /* if deep then */ + if (ilist && (ilist->type == INIT_DEEP)) + ilist = ilist->init.deep; + + /* function pointer */ + if (IS_FUNC (type->next)) + { + pic16_printIvalFuncPtr (type, ilist, ptype, p); + return; + } + + if (!(val = pic16_initPointer (ilist, type))) + return; + + /* if character pointer */ + if (IS_CHAR (type->next)) + if (pic16_printIvalCharPtr (sym, type, val, ptype, p)) + return; + + /* check the type */ + if (compareType (type, val->type) == 0) { + werrorfl (ilist->filename, ilist->lineno, W_INIT_WRONG); + printFromToType (val->type, type); + } + + /* if val is literal */ + if (IS_LITERAL (val->etype)) + { + switch (getSize (type)) + { + case 1: + pic16_emitDB((unsigned int)floatFromVal(val) & 0xff, ptype, p); + break; + case 2: + 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); + break; + default: + fprintf(stderr, "%s:%d size = %d\n", __FILE__, __LINE__, getSize(type)); + assert(0); + } + return; + } + + + size = getSize (type); + + if (size == 1) /* Z80 specific?? */ + { + pic16_emitDS(val->name, ptype, p); + } + else if (size == 2) + { + pic16_printPointerType (val->name, ptype, 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); + } else + assert(0); + return; +} + + + +/*-----------------------------------------------------------------*/ +/* pic16_printIval - generates code for initial value */ +/*-----------------------------------------------------------------*/ +void pic16_printIval (symbol * sym, sym_link * type, initList * ilist, char ptype, void *p) +{ +// sym_link *itype; + + if (!p) + return; + +#if 0 + fprintf(stderr, "%s:%d generating init for %s\n", __FILE__, __LINE__, sym->name); + fprintf(stderr, "%s: IS_STRUCT: %d IS_ARRAY: %d IS_PTR: %d IS_SPEC: %d\n", sym->name, + IS_STRUCT(type), IS_ARRAY(type), IS_PTR(type), IS_SPEC(type)); +#endif + + /* if structure then */ + if (IS_STRUCT (type)) { - //fprintf(stderr,"%s pointer\n",__FUNCTION__); - //printIvalPtr (sym, type, ilist, oFile); +// fprintf(stderr,"%s struct\n",__FUNCTION__); + pic16_printIvalStruct (sym, type, ilist, ptype, p); return; } - /* if this is an array */ + /* if this is an array */ if (IS_ARRAY (type)) { - //fprintf(stderr,"%s array\n",__FUNCTION__); - printIvalArray (sym, type, ilist, pb); +// fprintf(stderr,"%s array\n",__FUNCTION__); + pic16_printIvalArray (sym, type, ilist, ptype, p); return; } +#if 0 + if (ilist) + { + // not an aggregate, ilist must be a node + if (ilist->type!=INIT_NODE) { + // or a 1-element list + if (ilist->init.deep->next) { + werrorfl (sym->fileDef, sym->lineDef, W_EXCESS_INITIALIZERS, "scalar", + sym->name); + } else { + ilist=ilist->init.deep; + } + } + +#if 0 + // and the type must match + itype=ilist->init.node->ftype; + + if (compareType(type, itype)==0) { + // special case for literal strings + if (IS_ARRAY (itype) && IS_CHAR (getSpec(itype)) && + // which are really code pointers + IS_PTR(type) && DCL_TYPE(type)==CPOINTER) { + // no sweat + } else { +// werrorfl (ilist->filename, ilist->lineno, E_TYPE_MISMATCH, "assignment", " "); +// printFromToType(itype, type); + } + } +#endif + } +#endif + + /* if this is a pointer */ + if (IS_PTR (type)) + { +// fprintf(stderr,"%s pointer\n",__FUNCTION__); + pic16_printIvalPtr (sym, type, ilist, ptype, p); + return; + } + + /* if type is SPECIFIER */ if (IS_SPEC (type)) { - //fprintf(stderr,"%s spec\n",__FUNCTION__); - printIvalType (sym, type, ilist, pb); +// fprintf(stderr,"%s spec\n",__FUNCTION__); + pic16_printIvalType (sym, type, ilist, ptype, p); return; } } -extern void pic16_pCodeConstString(char *name, char *value); +int PIC16_IS_CONFIG_ADDRESS(int address) +{ + return ((address >= pic16->cwInfo.confAddrStart && address <= pic16->cwInfo.confAddrEnd)); +} + +int PIC16_IS_IDLOC_ADDRESS(int address) +{ + return ((address >= pic16->idInfo.idAddrStart && address <= pic16->idInfo.idAddrEnd)); +} + +/* wrapper function for the above */ +int PIC16_IS_HWREG_ADDRESS(int address) +{ + return (PIC16_IS_CONFIG_ADDRESS(address) || PIC16_IS_IDLOC_ADDRESS(address)); +} + + /*-----------------------------------------------------------------*/ /* emitStaticSeg - emitcode for the static segment */ /*-----------------------------------------------------------------*/ @@ -469,102 +1203,164 @@ static void pic16emitStaticSeg (memmap * map) { symbol *sym; - - fprintf (map->oFile, ";\t.area\t%s\n", map->sname); + static int didcode=0; //fprintf(stderr, "%s\n",__FUNCTION__); + pic16_initDB(); + /* for all variables in this segment do */ for (sym = setFirstItem (map->syms); sym; sym = setNextItem (map->syms)) { -#if 1 - fprintf(stderr, "\t%s: sym: %s\tused: %d\n", map->sname, sym->name, sym->used); +#if 0 + fprintf(stderr, "%s\t%s: sym: %s\tused: %d\tSPEC_ABSA: %d\tSPEC_AGGREGATE: %d\tCODE: %d\n\ +CODESPACE: %d\tCONST: %d\tPTRCONST: %d\tSPEC_CONST: %d\n", __FUNCTION__, + map->sname, sym->name, sym->used, SPEC_ABSA(sym->etype), IS_AGGREGATE(sym->type), + IS_CODE(sym->etype), IN_CODESPACE( SPEC_OCLS(sym->etype)), IS_CONSTANT(sym->etype), + IS_PTR_CONST(sym->etype), SPEC_CONST(sym->etype)); printTypeChain( sym->type, stderr ); - printf("\n"); + fprintf(stderr, "\n"); #endif + if(SPEC_ABSA(sym->etype) && PIC16_IS_CONFIG_ADDRESS(SPEC_ADDR(sym->etype))) { + pic16_assignConfigWordValue(SPEC_ADDR(sym->etype), + (int) floatFromVal(list2val(sym->ival))); - /* if it is "extern" then do nothing */ - if (IS_EXTERN (sym->etype)) - continue; + continue; + } - /* if it is not static add it to the public - table */ - if (!IS_STATIC (sym->etype)) - addSetHead (&publics, sym); + if(SPEC_ABSA(sym->etype) && PIC16_IS_IDLOC_ADDRESS(SPEC_ADDR(sym->etype))) { + pic16_assignIdByteValue(SPEC_ADDR(sym->etype), + (char) floatFromVal(list2val(sym->ival))); + + continue; + } + + /* if it is "extern" then do nothing */ + if (IS_EXTERN (sym->etype) && !SPEC_ABSA(sym->etype)) { + checkAddSym(&externs, sym); + continue; + } + + /* if it is not static add it to the public + table */ + if (!IS_STATIC (sym->etype)) { + /* do not emit if it is a config word declaration */ + checkAddSym(&publics, sym); + } -#if 0 /* print extra debug info if required */ - if (options.debug || sym->level == 0) - { + if (options.debug || sym->level == 0) { /* NOTE to me - cdbFile may be null in which case, * the sym name will be printed to stdout. oh well */ - if(cdbFile) - cdbSymbol (sym, cdbFile, FALSE, FALSE); + debugFile->writeSymbol(sym); + } + + /* if it has an absolute address */ + if (SPEC_ABSA (sym->etype)) { +// fprintf(stderr, "%s:%d spec_absa is true for symbol: %s\n", +// __FILE__, __LINE__, sym->name); + + /* if it has an initial value */ + if (sym->ival) + { + pBlock *pb; + symbol *asym; + absSym *abSym; + pCode *pcf; + + /* symbol has absolute address and initial value */ + noAlloc++; + resolveIvalSym (sym->ival, sym->type); + asym = newSymbol(sym->rname, 0); + abSym = Safe_calloc(1, sizeof(absSym)); + abSym->name = Safe_strdup( sym->rname ); + abSym->address = SPEC_ADDR( sym->etype ); + addSet(&absSymSet, abSym); + + pb = pic16_newpCodeChain(NULL, 'A',pic16_newpCodeCharP("; Starting pCode block for absolute Ival")); + pic16_addpBlock(pb); - if (!sym->level) - { /* global */ - if (IS_STATIC (sym->etype)) - fprintf (code->oFile, "F%s_", moduleName); /* scope is file */ - else - fprintf (code->oFile, "G_"); /* scope is global */ + pcf = pic16_newpCodeFunction(moduleName, asym->name); + PCF(pcf)->absblock = 1; + + 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); + pic16_printIval(sym, sym->type, sym->ival, 'p', (void *)pb); + pic16_flushDB('p', (void *)pb); + + pic16_addpCode2pBlock(pb, pic16_newpCodeFunction(NULL, NULL)); + noAlloc--; } else - /* symbol is local */ - fprintf (code->oFile, "L%s_", - (sym->localof ? sym->localof->name : "-null-")); - fprintf (code->oFile, "%s_%d_%d", sym->name, sym->level, sym->block); + { - } -#endif + /* symbol has absolute address but no initial value */ + + /* allocate space */ + fprintf (code->oFile, "%s:\n", sym->rname); - /* if it has an absolute address */ - if (SPEC_ABSA (sym->etype)) - { - if (options.debug || sym->level == 0) - fprintf (code->oFile, " == 0x%04x\n", SPEC_ADDR (sym->etype)); + /* special case for character strings */ + if (IS_ARRAY (sym->type) && IS_CHAR (sym->type->next) && + SPEC_CVAL (sym->etype).v_char) { - fprintf (code->oFile, "%s\t=\t0x%04x\n", - sym->rname, - SPEC_ADDR (sym->etype)); - } - else - { - if (options.debug || sym->level == 0) - fprintf (code->oFile, " == .\n"); +// fprintf(stderr, "%s:%d printing code string from %s\n", __FILE__, __LINE__, sym->rname); + pic16_pCodeConstString(sym->rname , SPEC_CVAL (sym->etype).v_char); + } else { + assert(0); + } + } + + } else { +// 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) - { + if (sym->ival) { pBlock *pb; + /* symbol doesn't have absolute address but has initial value */ fprintf (code->oFile, "%s:\n", sym->rname); noAlloc++; - resolveIvalSym (sym->ival); - //printIval (sym, sym->type, sym->ival, code->oFile); + resolveIvalSym (sym->ival, sym->type); + pb = pic16_newpCodeChain(NULL, 'P',pic16_newpCodeCharP("; Starting pCode block for Ival")); pic16_addpBlock(pb); - pic16_addpCode2pBlock(pb,pic16_newpCodeLabel(sym->rname,-1)); - printIval (sym, sym->type, sym->ival, pb); + if(!didcode) { + /* make sure that 'code' directive is emitted before, once */ + pic16_addpCode2pBlock(pb, pic16_newpCodeAsmDir("code", NULL)); + + didcode++; + } + +// fprintf(stderr, "%s:%d [2] generating init for label: %s\n", __FILE__, __LINE__, sym->rname); + + pic16_addpCode2pBlock(pb,pic16_newpCodeLabel(sym->rname,-1)); + pic16_printIval(sym, sym->type, sym->ival, 'p', (void *)pb); + pic16_flushDB('p', (void *)pb); noAlloc--; - } - else - { + } else { + /* 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); /* special case for character strings */ if (IS_ARRAY (sym->type) && IS_CHAR (sym->type->next) && - SPEC_CVAL (sym->etype).v_char) + SPEC_CVAL (sym->etype).v_char) { + +// fprintf(stderr, "%s:%d printing code string from %s\n", __FILE__, __LINE__, sym->rname); + pic16_pCodeConstString(sym->rname , SPEC_CVAL (sym->etype).v_char); - /*printChar (code->oFile, - SPEC_CVAL (sym->etype).v_char, - strlen (SPEC_CVAL (sym->etype).v_char) + 1);*/ - else - fprintf (code->oFile, "\t.ds\t0x%04x\n", (unsigned int) getSize (sym->type) & 0xffff); + } else { + assert(0); + } } } } @@ -573,8 +1369,31 @@ pic16emitStaticSeg (memmap * map) /*-----------------------------------------------------------------*/ -/* emitMaps - emits the code for the data portion the code */ +/* pic16_emitConfigRegs - emits the configuration registers */ /*-----------------------------------------------------------------*/ +void pic16_emitConfigRegs(FILE *of) +{ + int i; + + for(i=0;icwInfo.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, + pic16->cwInfo.crInfo[i].value); +} + +void pic16_emitIDRegs(FILE *of) +{ + int i; + + for(i=0;iidInfo.idAddrEnd-pic16->idInfo.idAddrStart;i++) + if(pic16->idInfo.irInfo[i].emit) + fprintf (of, "\t__idlocs 0x%06x, 0x%hhx\n", + pic16->idInfo.idAddrStart+i, + pic16->idInfo.irInfo[i].value); +} + + static void pic16emitMaps () { @@ -608,8 +1427,7 @@ pic16createInterruptVect (FILE * vFile) 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\t0x0000\n"); - fprintf (vFile, "__interrupt_vect:\n"); + fprintf(vFile, ".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! */ @@ -622,15 +1440,16 @@ pic16createInterruptVect (FILE * vFile) /*-----------------------------------------------------------------*/ -/* initialComments - puts in some initial comments */ +/* pic16initialComments - puts in some initial comments */ /*-----------------------------------------------------------------*/ static void pic16initialComments (FILE * afile) { - initialComments (afile); - fprintf (afile, "; PIC port for the 16-bit core\n"); - fprintf (afile, iComments2); - + initialComments (afile); + fprintf (afile, "; PIC16 port for the Microchip 16-bit core micros\n"); + if(pic16_mplab_comp) + fprintf(afile, "; MPLAB/MPASM/MPASMWIN/MPLINK compatibility mode enabled\n"); + fprintf (afile, iComments2); } /*-----------------------------------------------------------------*/ @@ -641,7 +1460,7 @@ 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); @@ -657,7 +1476,11 @@ 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); @@ -716,8 +1539,11 @@ pic16emitOverlay (FILE * afile) /* if global variable & not static or extern and addPublics allowed then add it to the public set */ if ((sym->_isparm && !IS_REGPARM (sym->etype)) - && !IS_STATIC (sym->etype)) - addSetHead (&publics, sym); + && !IS_STATIC (sym->etype)) { +// fprintf(stderr, "%s:%d %s accessed\n", __FILE__, __LINE__, __FUNCTION__); + checkAddSym(&publics, sym); +// addSetHead (&publics, sym); + } /* if extern then do nothing or is a function then do nothing */ @@ -803,26 +1629,20 @@ pic16glue () addSetHead(&tmpfileSet,ovrFile); pic16_pCodeInitRegisters(); - if (mainf && IFFUNC_HASBODY(mainf->type)) { + + if (pic16_options.no_crt && mainf && IFFUNC_HASBODY(mainf->type)) { pBlock *pb = pic16_newpCodeChain(NULL,'X',pic16_newpCodeCharP("; Starting pCode block")); pic16_addpBlock(pb); /* entry point @ start of CSEG */ - pic16_addpCode2pBlock(pb,pic16_newpCodeLabel("__sdcc_program_startup\t;VR1",-1)); + pic16_addpCode2pBlock(pb,pic16_newpCodeLabel("__sdcc_program_startup",-1)); - if(USE_STACK) { -#if 0 - pic16_addpCode2pBlock(pb, pic16_newpCode(POC_LFSR, - pic16_popGetLit2(1, pic16_popGetLit(stackPos)))); - pic16_addpCode2pBlock(pb, pic16_newpCode(POC_LFSR, - pic16_popGetLit2(2, pic16_popGetLit(stackPos)))); -#else + if(initsfpnt) { pic16_addpCode2pBlock(pb, pic16_newpCode(POC_LFSR, - pic16_popGetLit2(1, pic16_newpCodeOpRegFromStr("stack")))); + pic16_popGetLit2(1, pic16_newpCodeOpRegFromStr("_stack_end")))); pic16_addpCode2pBlock(pb, pic16_newpCode(POC_LFSR, - pic16_popGetLit2(2, pic16_newpCodeOpRegFromStr("stack")))); -#endif + pic16_popGetLit2(2, pic16_newpCodeOpRegFromStr("_stack_end")))); } /* put in the call to main */ @@ -865,8 +1685,8 @@ pic16glue () pic16emitOverlay(ovrFile); pic16_AnalyzepCode('*'); -#if 0 - { +#if 1 + if(pic16_options.dumpcalltree) { FILE *cFile; sprintf(buffer, dstFileName); strcat(buffer, ".calltree"); @@ -898,18 +1718,18 @@ pic16glue () /* initial comments */ pic16initialComments (asmFile); - + /* print module name */ - fprintf (asmFile, ";\t.module %s\n", moduleName); - + fprintf(asmFile, "#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); - + /* print the global variables in this module */ pic16printPublics (asmFile); @@ -920,37 +1740,11 @@ pic16glue () fprintf (asmFile, "%s", iComments2); copyFile (asmFile, sfr->oFile); #endif - /* Put all variables into a cblock */ pic16_AnalyzeBanking(); pic16_writeUsedRegs(asmFile); - /* create the overlay segments */ - fprintf (asmFile, "%s", iComments2); - fprintf (asmFile, "; overlayable items in internal ram \n"); - fprintf (asmFile, "%s", iComments2); - copyFile (asmFile, ovrFile); - - /* create the stack segment MOF */ - if (mainf && IFFUNC_HASBODY(mainf->type)) { - fprintf (asmFile, "%s", iComments2); - fprintf (asmFile, "; Stack segment in internal ram \n"); - fprintf (asmFile, "%s", iComments2); - fprintf (asmFile, ";\t.area\tSSEG\t(DATA)\n" - ";__start__stack:\n;\t.ds\t1\n\n"); - } - -#if 0 - /* no indirect data in pic */ - /* create the idata segment */ - fprintf (asmFile, "%s", iComments2); - fprintf (asmFile, "; indirectly addressable internal ram data\n"); - fprintf (asmFile, "%s", iComments2); - copyFile (asmFile, idata->oFile); -#endif - - #if 0 /* no xdata in pic */ /* if external stack then reserve space of it */ @@ -972,81 +1766,56 @@ pic16glue () copyFile (asmFile, xdata->oFile); #endif +#if 0 /* copy the bit segment */ fprintf (asmFile, "%s", iComments2); fprintf (asmFile, "; bit data\n"); fprintf (asmFile, "%s", iComments2); copyFile (asmFile, bit->oFile); - +#endif /* copy the interrupt vector table */ if(mainf && IFFUNC_HASBODY(mainf->type)) { - fprintf (asmFile, "%s", iComments2); + fprintf (asmFile, "\n%s", iComments2); fprintf (asmFile, "; interrupt vector \n"); fprintf (asmFile, "%s", iComments2); copyFile (asmFile, vFile); } /* copy global & static initialisations */ - fprintf (asmFile, "%s", iComments2); + fprintf (asmFile, "\n%s", iComments2); fprintf (asmFile, "; global & static initialisations\n"); fprintf (asmFile, "%s", iComments2); -#if 0 - /* FIXME 8051 Legacy -- VR */ - /* Everywhere we generate a reference to the static_name area, - * (which is currently only here), we immediately follow it with a - * definition of the post_static_name area. This guarantees that - * the post_static_name area will immediately follow the static_name - * area. - */ - fprintf (asmFile, ";\t.area %s\n", port->mem.static_name); /* MOF */ - fprintf (asmFile, ";\t.area %s\n", port->mem.post_static_name); - fprintf (asmFile, ";\t.area %s\n", port->mem.static_name); -#endif - /* copy over code */ - fprintf (asmFile, "%s", iComments2); - fprintf (asmFile, "\tcode\n"); - fprintf (asmFile, "%s", iComments2); - + if(pic16_debug_verbose) + fprintf(asmFile, "; A code from now on!\n"); + pic16_copypCode(asmFile, 'A'); - if(mainf && IFFUNC_HASBODY(mainf->type)) { - fprintf (asmFile,"__sdcc_gsinit_startup:\t\t;VRokas\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); + if(pic16_options.no_crt) { + if(mainf && IFFUNC_HASBODY(mainf->type)) { + fprintf(asmFile, "\tcode\n"); + fprintf(asmFile,"__sdcc_gsinit_startup:\n"); } -#endif } // copyFile (stderr, code->oFile); - - if (port->general.glue_up_main && mainf && IFFUNC_HASBODY(mainf->type)) { - fprintf (asmFile,"\tgoto\t__sdcc_program_startup\t;VR2\n"); - } - - fprintf(asmFile, "; I code from now on!\n"); pic16_copypCode(asmFile, 'I'); - fprintf(asmFile, "; A code from now on!\n"); - pic16_copypCode(asmFile, 'A'); - - if(pic16_debug_verbose) fprintf(asmFile, "; dbName from now on!\n"); pic16_copypCode(asmFile, statsg->dbName); + + 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"); pic16_copypCode(asmFile, 'X');