X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fpic%2Fglue.c;h=d1f271717f98e2d94880c1402f19de6fbb689ba0;hb=238e1b53dc1ac88bd559c93bd7f355d0887d39e1;hp=ff62132beacfffec3115b2408e60b1aa891210d5;hpb=91b0931c40c5cad20cf18aa66303f9cb850f5dbc;p=fw%2Fsdcc diff --git a/src/pic/glue.c b/src/pic/glue.c index ff62132b..d1f27171 100644 --- a/src/pic/glue.c +++ b/src/pic/glue.c @@ -29,10 +29,19 @@ #include "newalloc.h" +#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 printIval (symbol *, sym_link *, initList *, FILE *); +static void printIval (symbol * sym, sym_link * type, initList * ilist, pBlock *pb); extern int noAlloc; extern set *publics; +extern set *externs; extern unsigned maxInterrupts; extern int maxRegBank; extern symbol *mainf; @@ -47,50 +56,20 @@ extern char *iComments2; extern DEFSETFUNC (closeTmpFiles); extern DEFSETFUNC (rmTmpFiles); +extern void AnalyzeBanking (void); extern void copyFile (FILE * dest, FILE * src); +extern void ReuseReg(void); +extern void InlinepCode(void); +extern void writeUsedRegs(FILE *); - -//extern void emitMaps (); -//extern void createInterruptVect (FILE * vFile); extern void initialComments (FILE * afile); extern void printPublics (FILE * afile); extern void printChar (FILE * ofile, char *s, int plen); +void pCodeInitRegisters(void); +int getConfigWord(int address); -#if 0 -char * -aopLiteral (value * val, int offset) - static void emitRegularMap (memmap * map, bool addPublics, bool arFlag) - value *initPointer (initList * ilist) - void printIvalType (sym_link * type, initList * ilist, FILE * oFile) - void printIvalStruct (symbol * sym, sym_link * type, - initList * ilist, FILE * oFile) - int printIvalChar (sym_link * type, initList * ilist, FILE * oFile, char *s) - void printIvalArray (symbol * sym, sym_link * type, initList * ilist, - FILE * oFile) - void printIvalFuncPtr (sym_link * type, initList * ilist, FILE * oFile) - int printIvalCharPtr (symbol * sym, sym_link * type, value * val, FILE * oFile) - void printIvalPtr (symbol * sym, sym_link * type, initList * ilist, FILE * oFile) -#endif - -/*-----------------------------------------------------------------*/ -/* Allocation macros that replace those in SDCCalloc.h */ -/* Why? I dunno. I ran across a bug with those macros that */ -/* I couldn't fix, but I could work around... */ -/*-----------------------------------------------------------------*/ - -#define _ALLOC(x,sz) if (!(x = calloc((sz),1) )) \ - { \ - werror(E_OUT_OF_MEM,__FILE__,(long) sz);\ - exit (1); \ - } - -#define _ALLOC_ATOMIC(x,y) if (!((x) = malloc(y))) \ - { \ - werror(E_OUT_OF_MEM,__FILE__,(long) y); \ - exit (1); \ - } - +char *udata_section_name=0; // FIXME Temporary fix to change udata section name -- VR /*-----------------------------------------------------------------*/ /* aopLiteral - string from a literal value */ @@ -107,16 +86,12 @@ int pic14aopLiteral (value *val, int offset) if (!IS_FLOAT(val->type)) { unsigned long v = (unsigned long) floatFromVal(val); - //v >>= (offset * 8); return ( (v >> (offset * 8)) & 0xff); - //sprintf(buffer,"0x%02x",((char) v) & 0xff); - //_ALLOC_ATOMIC(rs,strlen(buffer)+1); - //return strcpy (rs,buffer); } /* it is type float */ fl.f = (float) floatFromVal(val); -#ifdef _BIG_ENDIAN +#ifdef WORDS_BIGENDIAN return fl.c[3-offset]; #else return fl.c[offset]; @@ -132,314 +107,186 @@ static void pic14emitRegularMap (memmap * map, bool addPublics, bool arFlag) { symbol *sym; - int i, size, bitvars = 0;; + int bitvars = 0;; + /* print the area name */ 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 extern then do nothing */ - if (IS_EXTERN (sym->etype)) - continue; - - /* if allocation required check is needed - 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) - continue; - - /* if global variable & not static or extern - and addPublics allowed then add it to the public set */ - if ((sym->level == 0 || - (sym->_isparm && !IS_REGPARM (sym->etype))) && - addPublics && - !IS_STATIC (sym->etype)) - addSetHead (&publics, sym); - - /* if extern then do nothing or is a function - then do nothing */ - 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 (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 (map->oFile,"; == 0x%04x\n",SPEC_ADDR (sym->etype)); - - fprintf (map->oFile, "%s\tEQU\t0x%04x\n", - sym->rname, - SPEC_ADDR (sym->etype)); - } - else - { - /* 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 */ - /* by grouping the bits together into groups of 8 and storing them in the normal ram. */ - if (IS_BITVAR (sym->etype)) - { - if ((bitvars % 8) == 0) - { - fprintf (map->oFile, " cblock\n"); - fprintf (map->oFile, "\tbitfield%d\n", bitvars); - fprintf (map->oFile, " endc\n"); - } + sym = setNextItem (map->syms)) { - fprintf (map->oFile, "%s\tEQU\t( (bitfield%d<<3)+%d)\n", - sym->rname, - bitvars & 0xfff8, - bitvars & 0x0007); + //printf("%s\n",sym->name); - bitvars++; - } - else - { - fprintf (map->oFile, "\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); - } - } - //fprintf (map->oFile, "\t.ds\t0x%04x\n", (unsigned int)getSize (sym->type) & 0xffff); - } - - /* if it has a initial value then do it only if - it is a global variable */ - if (sym->ival && sym->level == 0) { - ast *ival = NULL; - - 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 extern then add it into the extern list */ + if (IS_EXTERN (sym->etype)) { + addSetHead (&externs, sym); + continue; } -} - + /* if allocation required check is needed + 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) + continue; + + /* if global variable & not static or extern + and addPublics allowed then add it to the public set */ + if ((sym->level == 0 || + (sym->_isparm && !IS_REGPARM (sym->etype))) && + addPublics && + !IS_STATIC (sym->etype)) + addSetHead (&publics, sym); + + // PIC code allocates its own registers - so ignore parameter variable generated by processFuncArgs() + if (sym->_isparm) + continue; + /* if extern then do nothing or is a function + then do nothing */ + if (IS_FUNC (sym->type)) + continue; #if 0 -/*-----------------------------------------------------------------*/ -/* initPointer - pointer initialization code massaging */ -/*-----------------------------------------------------------------*/ -value * -initPointer (initList * ilist) -{ - value *val; - ast *expr = list2expr (ilist); - - if (!expr) - goto wrong; - - /* try it the oldway first */ - if ((val = constExprValue (expr, FALSE))) - return val; - - /* 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 (); - 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); - } - -wrong: - werror (E_INIT_WRONG); - return NULL; - -} - -/*-----------------------------------------------------------------*/ -/* printChar - formats and prints a characater string with DB */ -/*-----------------------------------------------------------------*/ -void -printChar (FILE * ofile, char *s, int plen) -{ - int i; - int len = strlen (s); - int pplen = 0; - - while (len && pplen < plen) - { - - fprintf (ofile, "\t.ascii /"); - i = 60; - while (i && *s && pplen < plen) - { - if (*s < ' ' || *s == '/') - { - fprintf (ofile, "/\n\t.byte 0x%02x\n\t.ascii /", *s++); - } + /* print extra debug info if required */ + if (options.debug || sym->level == 0) + { + if (!sym->level) /* global */ + if (IS_STATIC (sym->etype)) + fprintf (map->oFile, "F%s_", moduleName); /* scope is file */ else - fprintf (ofile, "%c", *s++); - pplen++; - i--; - } - fprintf (ofile, "/\n"); + 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 (len > 60) - len -= 60; + /* if it 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 (map->oFile,"; == 0x%04x\n",SPEC_ADDR (sym->etype)); + + fprintf (map->oFile, "%s\tEQU\t0x%04x\n", + sym->rname, + SPEC_ADDR (sym->etype)); + } + else + { + /* 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 */ + /* by grouping the bits together into groups of 8 and storing them in the normal ram. */ + if (IS_BITVAR (sym->etype)) + { + bitvars++; + } + else + { + fprintf (map->oFile, "%s\tres\t%d\n", sym->rname,getSize (sym->type) & 0xffff); + /* + { + int i, size; + + 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); + } + } + */ + } + //fprintf (map->oFile, "\t.ds\t0x%04x\n", (unsigned int)getSize (sym->type) & 0xffff); + } + + /* if it has a initial value then do it only if + it is a global variable */ + if (sym->ival && sym->level == 0) { + ast *ival = NULL; + + if (IS_AGGREGATE (sym->type)) + ival = initAggregates (sym, sym->ival, NULL); else - len = 0; + ival = newNode ('=', newAst_VALUE(symbolVal (sym)), + decorateType (resolveSymbols (list2expr (sym->ival)), RESULT_CHECK)); + codeOutFile = statsg->oFile; + GcurMemmap = statsg; + eBBlockFromiCode (iCodeFromAst (ival)); + sym->ival = NULL; } - if (pplen < plen) - fprintf (ofile, "\t.byte\t0\n"); + } } + /*-----------------------------------------------------------------*/ /* printIvalType - generates ival for int/char */ /*-----------------------------------------------------------------*/ -void -printIvalType (sym_link * type, initList * ilist, FILE * oFile) +static void +printIvalType (symbol *sym, sym_link * type, initList * ilist, pBlock *pb) { value *val; + unsigned long ulval; + + //fprintf(stderr, "%s\n",__FUNCTION__); /* if initList is deep */ if (ilist->type == INIT_DEEP) ilist = ilist->init.deep; - val = list2val (ilist); - switch (getSize (type)) - { - case 1: - if (!val) - fprintf (oFile, "\t.byte 0\n"); - else - fprintf (oFile, "\t.byte %s\n", - aopLiteral (val, 0)); - break; - - case 2: - if (!val) - fprintf (oFile, "\t.word 0\n"); - else - fprintf (oFile, "\t.byte %s,%s\n", - aopLiteral (val, 0), aopLiteral (val, 1)); - break; - - case 4: - if (!val) - fprintf (oFile, "\t.word 0,0\n"); - else - fprintf (oFile, "\t.byte %s,%s,%s,%s\n", - aopLiteral (val, 0), aopLiteral (val, 1), - aopLiteral (val, 2), aopLiteral (val, 3)); - break; - } - - return; -} - -/*-----------------------------------------------------------------*/ -/* printIvalStruct - generates initial value for structures */ -/*-----------------------------------------------------------------*/ -void -printIvalStruct (symbol * sym, sym_link * type, - initList * ilist, FILE * oFile) -{ - symbol *sflds; - initList *iloop; - - sflds = SPEC_STRUCT (type)->fields; - if (ilist->type != INIT_DEEP) - { - werror (E_INIT_STRUCT, sym->name); - return; - } + if (!IS_AGGREGATE(sym->type) && getNelements(type, ilist)>1) { + werror (W_EXCESS_INITIALIZERS, "scalar", sym->name, sym->lineDef); + } - iloop = ilist->init.deep; + if (!(val = list2val (ilist))) { + // assuming a warning has been thrown + val=constVal("0"); + } - for (; sflds; sflds = sflds->next, iloop = (iloop ? iloop->next : NULL)) - printIval (sflds, sflds->type, iloop, oFile); + if (val->type != type) { + val = valCastLiteral(type, floatFromVal(val)); + } - return; + if(val) + ulval = (unsigned long) floatFromVal (val); + else + ulval =0; + + switch (getSize (type)) { + case 1: + addpCode2pBlock(pb,newpCode(POC_RETLW,newpCodeOpLit(BYTE_IN_LONG(ulval,0)))); + break; + + case 2: + addpCode2pBlock(pb,newpCode(POC_RETLW,newpCodeOpLit(BYTE_IN_LONG(ulval,0)))); + addpCode2pBlock(pb,newpCode(POC_RETLW,newpCodeOpLit(BYTE_IN_LONG(ulval,1)))); + break; + + case 4: + addpCode2pBlock(pb,newpCode(POC_RETLW,newpCodeOpLit(BYTE_IN_LONG(ulval,0)))); + addpCode2pBlock(pb,newpCode(POC_RETLW,newpCodeOpLit(BYTE_IN_LONG(ulval,1)))); + addpCode2pBlock(pb,newpCode(POC_RETLW,newpCodeOpLit(BYTE_IN_LONG(ulval,2)))); + addpCode2pBlock(pb,newpCode(POC_RETLW,newpCodeOpLit(BYTE_IN_LONG(ulval,3)))); + break; + } } /*-----------------------------------------------------------------*/ /* printIvalChar - generates initital value for character array */ /*-----------------------------------------------------------------*/ -int -printIvalChar (sym_link * type, initList * ilist, FILE * oFile, char *s) +static int +printIvalChar (sym_link * type, initList * ilist, pBlock *pb, char *s) { value *val; int remain; + if(!pb) + return 0; + + //fprintf(stderr, "%s\n",__FUNCTION__); if (!s) { @@ -450,45 +297,58 @@ printIvalChar (sym_link * type, initList * ilist, FILE * oFile, char *s) if (!DCL_ELEM (type)) DCL_ELEM (type) = strlen (SPEC_CVAL (val->etype).v_char) + 1; - /* if size mismatch */ -/* if (DCL_ELEM (type) < ((int) strlen (SPEC_CVAL (val->etype).v_char) + 1)) */ -/* werror (E_ARRAY_BOUND); */ - - printChar (oFile, SPEC_CVAL (val->etype).v_char, DCL_ELEM (type)); + //printChar (oFile, SPEC_CVAL (val->etype).v_char, DCL_ELEM (type)); + //fprintf(stderr, "%s omitting call to printChar\n",__FUNCTION__); + addpCode2pBlock(pb,newpCodeCharP(";omitting call to printChar")); if ((remain = (DCL_ELEM (type) - strlen (SPEC_CVAL (val->etype).v_char) - 1)) > 0) while (remain--) - fprintf (oFile, "\t.byte 0\n"); - + //tfprintf (oFile, "\t!db !constbyte\n", 0); + addpCode2pBlock(pb,newpCode(POC_RETLW,newpCodeOpLit(0))); return 1; } else return 0; } - else - printChar (oFile, s, strlen (s) + 1); + else { + //printChar (oFile, s, strlen (s) + 1); + + for(remain=0; remain<(int)strlen(s); remain++) { + addpCode2pBlock(pb,newpCode(POC_RETLW,newpCodeOpLit(s[remain]))); + //fprintf(stderr,"0x%02x ",s[remain]); + } + //fprintf(stderr,"\n"); + } return 1; } /*-----------------------------------------------------------------*/ /* printIvalArray - generates code for array initialization */ /*-----------------------------------------------------------------*/ -void +static void printIvalArray (symbol * sym, sym_link * type, initList * ilist, - FILE * oFile) + pBlock *pb) { initList *iloop; int lcnt = 0, size = 0; + if(!pb) + return; + /* take care of the special case */ /* array of characters can be init */ /* by a string */ - if (IS_CHAR (type->next)) + if (IS_CHAR (type->next)) { + //fprintf(stderr,"%s:%d - is_char\n",__FUNCTION__,__LINE__); + if (!IS_LITERAL(list2val(ilist)->etype)) { + werror (W_INIT_WRONG); + return; + } if (printIvalChar (type, (ilist->type == INIT_DEEP ? ilist->init.deep : ilist), - oFile, SPEC_CVAL (sym->etype).v_char)) + pb, SPEC_CVAL (sym->etype).v_char)) return; - + } /* not the special case */ if (ilist->type != INIT_DEEP) { @@ -501,8 +361,9 @@ printIvalArray (symbol * sym, sym_link * type, initList * ilist, for (;;) { + //fprintf(stderr,"%s:%d - is_char\n",__FUNCTION__,__LINE__); size++; - printIval (sym, type->next, iloop, oFile); + printIval (sym, type->next, iloop, pb); iloop = (iloop ? iloop->next : NULL); @@ -513,8 +374,13 @@ printIvalArray (symbol * sym, sym_link * type, initList * ilist, /* no of elements given and we */ /* have generated for all of them */ - if (!--lcnt) + if (!--lcnt) { + /* if initializers left */ + if (iloop) { + werror (W_EXCESS_INITIALIZERS, "array", sym->name, sym->lineDef); + } break; + } } /* if we have not been given a size */ @@ -524,177 +390,49 @@ printIvalArray (symbol * sym, sym_link * type, initList * ilist, return; } -/*-----------------------------------------------------------------*/ -/* printIvalFuncPtr - generate initial value for function pointers */ -/*-----------------------------------------------------------------*/ -void -printIvalFuncPtr (sym_link * type, initList * ilist, FILE * oFile) -{ - value *val; - int dLvl = 0; - - val = list2val (ilist); - /* check the types */ - if ((dLvl = checkType (val->type, type->next)) <= 0) - { - - fprintf (oFile, "\t.word 0\n"); - return; - } - - /* now generate the name */ - if (!val->sym) - { - if (IS_LITERAL (val->etype)) - fprintf (oFile, "\t.byte %s,%s\n", - aopLiteral (val, 0), aopLiteral (val, 1)); - else - fprintf (oFile, "\t.byte %s,(%s >> 8)\n", - val->name, val->name); - } - else - fprintf (oFile, "\t.byte %s,(%s >> 8)\n", - val->sym->rname, val->sym->rname); - - return; -} - -/*-----------------------------------------------------------------*/ -/* printIvalCharPtr - generates initial values for character pointers */ -/*-----------------------------------------------------------------*/ -int -printIvalCharPtr (symbol * sym, sym_link * type, value * val, FILE * oFile) -{ - int size = 0; - - size = getSize (type); - - if (size == 1) - fprintf (oFile, - "\t.byte %s", val->name); - else - fprintf (oFile, - "\t.byte %s,(%s >> 8)", - val->name, val->name); - - if (size > 2) - fprintf (oFile, ",#0x02\n"); - else - fprintf (oFile, "\n"); - - if (val->sym && val->sym->isstrlit) - addSet (&statsg->syms, val->sym); - - return 1; -} - -/*-----------------------------------------------------------------*/ -/* printIvalPtr - generates initial value for pointers */ -/*-----------------------------------------------------------------*/ -void -printIvalPtr (symbol * sym, sym_link * type, initList * ilist, FILE * oFile) -{ - value *val; - - /* if deep then */ - if (ilist->type == INIT_DEEP) - ilist = ilist->init.deep; - - /* function pointer */ - if (IS_FUNC (type->next)) - { - printIvalFuncPtr (type, ilist, oFile); - return; - } - - if (!(val = initPointer (ilist))) - return; - - /* if character pointer */ - if (IS_CHAR (type->next)) - if (printIvalCharPtr (sym, type, val, oFile)) - return; - - /* check the type */ - if (checkType (type, val->type) != 1) - werror (E_INIT_WRONG); - - /* if val is literal */ - if (IS_LITERAL (val->etype)) - { - switch (getSize (type)) - { - case 1: - fprintf (oFile, "\t.byte 0x%02x\n", ((char) floatFromVal (val)) & 0xff); - break; - case 2: - fprintf (oFile, "\t.byte %s,%s\n", - aopLiteral (val, 0), aopLiteral (val, 1)); - - break; - case 3: - fprintf (oFile, "\t.byte %s,%s,0x%02x\n", - aopLiteral (val, 0), aopLiteral (val, 1), CPOINTER); - } - return; - } - - - switch (getSize (type)) - { - case 1: - fprintf (oFile, "\t.byte %s\n", val->name); - break; - case 2: - fprintf (oFile, "\t.byte %s,(%s >> 8)\n", val->name, val->name); - break; - - case 3: - fprintf (oFile, "\t.byte %s,(%s >> 8),0x%02x\n", - val->name, val->name, DCL_TYPE (val->type)); - } - return; -} - /*-----------------------------------------------------------------*/ /* printIval - generates code for initial value */ /*-----------------------------------------------------------------*/ -void -printIval (symbol * sym, sym_link * type, initList * ilist, FILE * oFile) +static void +printIval (symbol * sym, sym_link * type, initList * ilist, pBlock *pb) { - if (!ilist) + if (!ilist || !pb) return; /* if structure then */ if (IS_STRUCT (type)) { - printIvalStruct (sym, type, ilist, oFile); + //fprintf(stderr,"%s struct\n",__FUNCTION__); + //printIvalStruct (sym, type, ilist, oFile); return; } /* if this is a pointer */ if (IS_PTR (type)) { - printIvalPtr (sym, type, ilist, oFile); + //fprintf(stderr,"%s pointer\n",__FUNCTION__); + //printIvalPtr (sym, type, ilist, oFile); return; } /* if this is an array */ if (IS_ARRAY (type)) { - printIvalArray (sym, type, ilist, oFile); + //fprintf(stderr,"%s array\n",__FUNCTION__); + printIvalArray (sym, type, ilist, pb); return; } /* if type is SPECIFIER */ if (IS_SPEC (type)) { - printIvalType (type, ilist, oFile); + //fprintf(stderr,"%s spec\n",__FUNCTION__); + printIvalType (sym, type, ilist, pb); return; } } -#endif +extern void pCodeConstString(char *name, char *value); /*-----------------------------------------------------------------*/ /* emitStaticSeg - emitcode for the static segment */ /*-----------------------------------------------------------------*/ @@ -705,15 +443,17 @@ pic14emitStaticSeg (memmap * map) fprintf (map->oFile, ";\t.area\t%s\n", map->sname); + //fprintf(stderr, "%s\n",__FUNCTION__); /* for all variables in this segment do */ for (sym = setFirstItem (map->syms); sym; sym = setNextItem (map->syms)) { - - /* if it is "extern" then do nothing */ - if (IS_EXTERN (sym->etype)) - continue; + /* if extern then add it into the extern list */ + if (IS_EXTERN (sym->etype)) { + addSetHead (&externs, sym); + continue; + } /* if it is not static add it to the public table */ @@ -723,9 +463,6 @@ pic14emitStaticSeg (memmap * map) /* 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)) @@ -738,6 +475,7 @@ pic14emitStaticSeg (memmap * map) fprintf (code->oFile, "L%s_", (sym->localof ? sym->localof->name : "-null-")); fprintf (code->oFile, "%s_%d_%d", sym->name, sym->level, sym->block); + } /* if it has an absolute address */ @@ -758,27 +496,37 @@ pic14emitStaticSeg (memmap * map) /* if it has an initial value */ if (sym->ival) { + pBlock *pb; + fprintf (code->oFile, "%s:\n", sym->rname); noAlloc++; - resolveIvalSym (sym->ival); - printIval (sym, sym->type, sym->ival, code->oFile); + resolveIvalSym (sym->ival, sym->type); + //printIval (sym, sym->type, sym->ival, code->oFile); + pb = newpCodeChain(NULL, 'P',newpCodeCharP("; Starting pCode block for Ival")); + addpBlock(pb); + addpCode2pBlock(pb,newpCodeLabel(sym->rname,-1)); + + printIval (sym, sym->type, sym->ival, pb); noAlloc--; } else { + /* allocate space */ 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) - printChar (code->oFile, + 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); + strlen (SPEC_CVAL (sym->etype).v_char) + 1);*/ else fprintf (code->oFile, "\t.ds\t0x%04x\n", (unsigned int) getSize (sym->type) & 0xffff); } } } + } @@ -806,7 +554,6 @@ pic14emitMaps () static void pic14createInterruptVect (FILE * vFile) { - unsigned i = 0; mainf = newSymbol ("main", 0); mainf->block = 0; @@ -814,7 +561,8 @@ pic14createInterruptVect (FILE * vFile) if (!(mainf = findSymWithLevel (SymbolTab, mainf))) { if (!options.cc_only) - werror (E_NO_MAIN); +// werror (E_NO_MAIN); + fprintf(stderr,"WARNING: function 'main' undefined\n"); return; } @@ -823,33 +571,22 @@ pic14createInterruptVect (FILE * vFile) { /* if ! compile only then main function should be present */ if (!options.cc_only) - werror (E_NO_MAIN); +// werror (E_NO_MAIN); + fprintf(stderr,"WARNING: function 'main' undefined\n"); return; } - fprintf (vFile, ";\t.area\t%s\n", CODE_NAME); - fprintf (vFile, ";__interrupt_vect:\n"); - - - if (!port->genIVT || !(port->genIVT (vFile, interrupts, maxInterrupts))) - { - /* "generic" interrupt table header (if port doesn't specify one). - - * Look suspiciously like 8051 code to me... - */ - - fprintf (vFile, ";\tljmp\t__sdcc_gsinit_startup\n"); - - - /* now for the other interrupts */ - for (; i < maxInterrupts; i++) - { - if (interrupts[i]) - fprintf (vFile, ";\tljmp\t%s\n\t.ds\t5\n", interrupts[i]->rname); - else - fprintf (vFile, ";\treti\n;\t.ds\t7\n"); - } - } + fprintf (vFile, "%s", iComments2); + fprintf (vFile, "; config word \n"); + fprintf (vFile, "%s", iComments2); + fprintf (vFile, "\t__config 0x%x\n", getConfigWord(0x2007)); + + fprintf (vFile, "%s", iComments2); + fprintf (vFile, "; reset vector \n"); + fprintf (vFile, "%s", iComments2); + fprintf (vFile, "STARTUP\t%s\n", CODE_NAME); // Lkr file should place section STARTUP at address 0x0 + fprintf (vFile, "\tnop\n"); /* first location for used by incircuit debugger */ + fprintf (vFile, "\tgoto\t__sdcc_gsinit_startup\n"); } @@ -865,6 +602,23 @@ pic14initialComments (FILE * afile) } +/*-----------------------------------------------------------------*/ +/* printExterns - generates extern for external variables */ +/*-----------------------------------------------------------------*/ +static void +pic14printExterns (FILE * afile) +{ + symbol *sym; + + fprintf (afile, "%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); +} + /*-----------------------------------------------------------------*/ /* printPublics - generates .global for publics */ /*-----------------------------------------------------------------*/ @@ -878,11 +632,18 @@ pic14printPublics (FILE * afile) fprintf (afile, "%s", iComments2); for (sym = setFirstItem (publics); sym; - sym = setNextItem (publics)) - fprintf (afile, ";\t.globl %s\n", sym->rname); -} - + sym = setNextItem (publics)) { + if(!IS_BITFIELD(sym->type) && ((IS_FUNC(sym->type) || sym->allocreq))) { + if (!IS_BITVAR(sym->type)) + fprintf (afile, "\tglobal %s\n", sym->rname); + } else { + /* Absolute variables are defines in the asm file as equates and thus can not be made global. */ + if (!SPEC_ABSA (sym->etype)) + fprintf (afile, "\tglobal %s\n", sym->rname); + } + } +} /*-----------------------------------------------------------------*/ /* emitOverlay - will emit code for the overlay stuff */ @@ -892,8 +653,13 @@ pic14emitOverlay (FILE * afile) { set *ovrset; - if (!elementsInSet (ovrSetSets)) - fprintf (afile, ";\t.area\t%s\n", port->mem.overlay_name); +/* if (!elementsInSet (ovrSetSets))*/ + + /* the hack below, fixes translates for devices which + * only have udata_shr memory */ + fprintf (afile, "%s\t%s\n", + (elementsInSet(ovrSetSets)?"":";"), + port->mem.overlay_name); /* for each of the sets in the overlay segment do */ for (ovrset = setFirstItem (ovrSetSets); ovrset; @@ -908,6 +674,9 @@ pic14emitOverlay (FILE * afile) otherwise the assembler will append each of these declarations into one chunk and will not overlay sad but true */ + + /* I don't think this applies to us. We are using gpasm. CRF */ + fprintf (afile, ";\t.area _DUMMY\n"); /* output the area informtion */ fprintf (afile, ";\t.area\t%s\n", port->mem.overlay_name); /* MOF */ @@ -943,9 +712,6 @@ pic14emitOverlay (FILE * afile) /* 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)) @@ -987,21 +753,19 @@ pic14emitOverlay (FILE * afile) } - /*-----------------------------------------------------------------*/ /* glue - the final glue that hold the whole thing together */ /*-----------------------------------------------------------------*/ void picglue () { - + char udata_name[80]; FILE *vFile; FILE *asmFile; FILE *ovrFile = tempfile(); - int i; addSetHead(&tmpfileSet,ovrFile); - + pCodeInitRegisters(); if (mainf && IFFUNC_HASBODY(mainf->type)) { @@ -1009,7 +773,7 @@ picglue () addpBlock(pb); /* entry point @ start of CSEG */ - addpCode2pBlock(pb,newpCodeLabelStr("__sdcc_program_startup")); + addpCode2pBlock(pb,newpCodeLabel("__sdcc_program_startup",-1)); /* put in the call to main */ addpCode2pBlock(pb,newpCode(POC_CALL,newpCodeOp("_main",PO_STR))); @@ -1031,29 +795,17 @@ picglue () /* Now it needs to be rearranged into the order it should be placed in the */ /* code space */ - movepBlock2Head(code->dbName); // Last + movepBlock2Head('P'); // Last + movepBlock2Head(code->dbName); movepBlock2Head('X'); movepBlock2Head(statsg->dbName); // First - AnalyzepCode('*'); //code->dbName); - printCallTree(stderr); - - pCodePeepInit(); - - OptimizepCode(code->dbName); - - /* print the global struct definitions */ if (options.debug) - cdbStructBlock (0,cdbFile); + cdbStructBlock (0); vFile = tempfile(); - /* PENDING: this isnt the best place but it will do */ - if (port->general.glue_up_main) { - /* create the interrupt vector table */ - pic14createInterruptVect (vFile); - } addSetHead(&tmpfileSet,vFile); @@ -1062,6 +814,19 @@ picglue () /* do the overlay segments */ pic14emitOverlay(ovrFile); + /* PENDING: this isnt the best place but it will do */ + if (port->general.glue_up_main) { + /* create the interrupt vector table */ + pic14createInterruptVect (vFile); + } + + AnalyzepCode('*'); + + ReuseReg(); // ReuseReg where call tree permits + + InlinepCode(); + + AnalyzepCode('*'); pcode_test(); @@ -1069,13 +834,15 @@ picglue () /* now put it all together into the assembler file */ /* create the assembler file name */ - if (!options.c1mode) { - sprintf (buffer, srcFileName); - strcat (buffer, ".asm"); - } - else { - strcpy(buffer, options.out_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); @@ -1094,49 +861,33 @@ picglue () port->genAssemblerPreamble(asmFile); } + /* print the extern variables in this module */ + pic14printExterns (asmFile); + /* print the global variables in this module */ pic14printPublics (asmFile); - /* copy the sfr segment */ fprintf (asmFile, "%s", iComments2); fprintf (asmFile, "; special function registers\n"); fprintf (asmFile, "%s", iComments2); copyFile (asmFile, sfr->oFile); - - - /* Put all variables into a cblock */ - fprintf (asmFile, "\n\n\tcblock 0x20\n\n"); - for(i=0; i=0x0c) ) - fprintf (asmFile, "\t%s\n",regspic14[i].name); + + if (udata_section_name) { + sprintf(udata_name,"%s",udata_section_name); + } else { + sprintf(udata_name,"data_%s",moduleName); } - - - /* For now, create a "dpl" and a "dph" in the register space */ - /* of the pic so that we can use the same calling mechanism */ - /* as the 8051 port */ fprintf (asmFile, "%s", iComments2); - fprintf (asmFile, "; dpl and dph to emulate the 8051 calling mechanism \n"); - fprintf (asmFile, "%s", iComments2); - - fprintf (asmFile, "\tdph\n"); - - - - /* copy the sbit segment */ - fprintf (asmFile, "%s", iComments2); - fprintf (asmFile, "; special function bits \n"); - fprintf (asmFile, "%s", iComments2); - copyFile (asmFile, sfrbit->oFile); - - /* copy the data segment */ - fprintf (asmFile, "%s", iComments2); - fprintf (asmFile, "; internal ram data\n"); + fprintf (asmFile, "; udata\n"); fprintf (asmFile, "%s", iComments2); + fprintf (asmFile, "%s\tudata\n", udata_name); copyFile (asmFile, data->oFile); + /* Put all variables into a cblock */ + AnalyzeBanking(); + writeUsedRegs(asmFile); /* create the overlay segments */ fprintf (asmFile, "%s", iComments2); @@ -1144,6 +895,8 @@ picglue () fprintf (asmFile, "%s", iComments2); copyFile (asmFile, ovrFile); +#if 0 + /* create the stack segment MOF */ if (mainf && IFFUNC_HASBODY(mainf->type)) { fprintf (asmFile, "%s", iComments2); @@ -1167,17 +920,14 @@ picglue () fprintf (asmFile,";\t.area XSEG (XDATA)\n"); /* MOF */ fprintf (asmFile,";\t.ds 256\n"); } - - + /* copy xtern ram data */ fprintf (asmFile, "%s", iComments2); fprintf (asmFile, "; external ram data\n"); fprintf (asmFile, "%s", iComments2); copyFile (asmFile, xdata->oFile); - - - fprintf (asmFile, "\tendc\n"); +#endif /* copy the bit segment */ fprintf (asmFile, "%s", iComments2); @@ -1185,73 +935,60 @@ picglue () fprintf (asmFile, "%s", iComments2); copyFile (asmFile, bit->oFile); - - fprintf (asmFile, "\tORG 0\n"); - /* copy the interrupt vector table */ if (mainf && IFFUNC_HASBODY(mainf->type)) { + copyFile (asmFile, vFile); + fprintf (asmFile, "%s", iComments2); - fprintf (asmFile, "; interrupt vector \n"); + fprintf (asmFile, "; interrupt and initialization code\n"); fprintf (asmFile, "%s", iComments2); - copyFile (asmFile, vFile); + fprintf (asmFile, "code_init\t%s\t0x4\n", CODE_NAME); // Note - for mplink may have to enlarge section vectors in .lnk file + + /* interrupt service routine */ + fprintf (asmFile, "__sdcc_interrupt:\n"); + copypCode(asmFile, 'I'); + + /* initialize data memory */ + fprintf (asmFile,"__sdcc_gsinit_startup:\n"); + /* FIXME: This is temporary. The idata section should be used. If + not, we could add a special feature to the linker. This will + work in the mean time. Put all initalized data in main.c */ + copypCode(asmFile, statsg->dbName); + fprintf (asmFile,"\tpagesel _main\n"); + fprintf (asmFile,"\tgoto _main\n"); } - + +#if 0 + /* copy global & static initialisations */ fprintf (asmFile, "%s", iComments2); fprintf (asmFile, "; global & static initialisations\n"); fprintf (asmFile, "%s", iComments2); - - /* 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); - - if (mainf && IFFUNC_HASBODY(mainf->type)) { - fprintf (asmFile,"__sdcc_gsinit_startup:\n"); - /* if external stack is specified then the - higher order byte of the xdatalocation is - going into P2 and the lower order going into - spx */ - 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); - } + copypCode(asmFile, statsg->dbName); - } +#endif - if (port->general.glue_up_main && mainf && IFFUNC_HASBODY(mainf->type)) - { - /* This code is generated in the post-static area. - * This area is guaranteed to follow the static area - * by the ugly shucking and jiving about 20 lines ago. - */ - fprintf(asmFile, ";\t.area %s\n", port->mem.post_static_name); - fprintf (asmFile,";\tljmp\t__sdcc_program_startup\n"); - } - /* copy over code */ fprintf (asmFile, "%s", iComments2); fprintf (asmFile, "; code\n"); fprintf (asmFile, "%s", iComments2); - fprintf (asmFile, ";\t.area %s\n", port->mem.code_name); + fprintf (asmFile, "code_%s\t%s\n", moduleName, port->mem.code_name); - //copyFile (asmFile, code->oFile); - - copypCode(asmFile, statsg->dbName); + /* unknown */ copypCode(asmFile, 'X'); + + /* _main function */ + copypCode(asmFile, 'M'); + + /* other functions */ copypCode(asmFile, code->dbName); + /* unknown */ + copypCode(asmFile, 'P'); fprintf (asmFile,"\tend\n"); fclose (asmFile); - applyToSet(tmpfileSet,closeTmpFiles); - applyToSet(tmpfileNameSet, rmTmpFiles); + + rm_tmpfiles(); }