X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fpic16%2Fmain.c;h=ee7b4b4f4fd8848b66367b86cb07602fffaf97fd;hb=3062f96ccb55d1d05caf9c8782f4961f87b341ce;hp=7e51fb27680fcfb49e618420a9920cd0942d7b58;hpb=f98f0bb012d04593bdeb00a0c18dc281bae1e9bb;p=fw%2Fsdcc diff --git a/src/pic16/main.c b/src/pic16/main.c index 7e51fb27..ee7b4b4f 100644 --- a/src/pic16/main.c +++ b/src/pic16/main.c @@ -31,7 +31,7 @@ #include "SDCCutil.h" #include "glue.h" #include "pcode.h" -//#include "gen.h" +#include "dbuf_string.h" static char _defaultRules[] = @@ -53,6 +53,7 @@ static char *_pic16_keywords[] = "pdata", "reentrant", "sfr", + "sfr16", "using", "_data", "_code", @@ -62,6 +63,10 @@ static char *_pic16_keywords[] = "_naked", "shadowregs", "wparam", + "prodlp", + "prodhp", + "fsr0lp", + "fixed16x16", // "bit", // "idata", @@ -75,12 +80,14 @@ static char *_pic16_keywords[] = pic16_sectioninfo_t pic16_sectioninfo; +int xinst=0; + extern char *pic16_processor_base_name(void); void pic16_pCodeInitRegisters(void); -void pic16_assignRegisters (eBBlock ** ebbs, int count); +void pic16_assignRegisters (ebbIndex *); static int regParmFlg = 0; /* determine if we can register a parameter */ @@ -94,7 +101,6 @@ extern set *libFilesSet; /* for an unknowned reason. - EEP */ void pic16_emitDebuggerSymbol (char *); -extern regs* newReg(short type, short pc_type, int rIdx, char *name, int size, int alias, operand *refop); extern void pic16_emitConfigRegs(FILE *of); extern void pic16_emitIDRegs(FILE *of); @@ -115,7 +121,7 @@ _pic16_reset_regparm (void) } static int -_pic16_regparm (sym_link * l) +_pic16_regparm (sym_link * l, bool reentrant) { /* force all parameters via SEND/RECEIVE */ if(0 /*pic16_options.ip_stack*/) { @@ -140,6 +146,12 @@ set *sectNames=NULL; /* list of section listed in pragma directives */ set *sectSyms=NULL; /* list of symbols set in a specific section */ set *wparamList=NULL; +#if 0 +/* This is an experimental code for #pragma inline + and is temporarily disabled for 2.5.0 release */ +set *asmInlineMap=NULL; +#endif /* 0 */ + struct { unsigned ignore: 1; unsigned want_libc: 1; @@ -149,196 +161,359 @@ struct { } libflags = { 0, 0, 0, 0, 0 }; +enum { + P_MAXRAM = 1, + P_STACK, + P_CODE, + P_UDATA, + P_LIBRARY +}; + static int -_process_pragma(const char *sz) +do_pragma(int id, const char *name, const char *cp) { - static const char *WHITE = " \t\n"; - static const char *WHITECOMMA = " \t\n,"; - - char *ptr = strtok((char *)sz, WHITE); + struct pragma_token_s token; + int err = 0; + int processed = 1; - /* #pragma maxram [maxram] */ - if (startsWith (ptr, "maxram")) { - char *maxRAM = strtok((char *)NULL, WHITE); + init_pragma_token(&token); - if (maxRAM != (char *)NULL) { - int maxRAMaddress; - value *maxRAMVal; + switch (id) + { + /* #pragma maxram [maxram] */ + case P_MAXRAM: + { + int max_ram; + + cp = get_pragma_token(cp, &token); + if (TOKEN_INT == token.type) + max_ram = token.val.int_val; + else + { + err = 1; + break; + } - maxRAMVal = constVal(maxRAM); - maxRAMaddress = (int)floatFromVal(maxRAMVal); - pic16_setMaxRAM(maxRAMaddress); - } + cp = get_pragma_token(cp, &token); + if (TOKEN_EOL != token.type) + { + err = 1; + break; + } - return 0; - } - - /* #pragma stack [stack-position] [stack-len] */ - if(startsWith(ptr, "stack")) { - char *stackPosS = strtok((char *)NULL, WHITE); - char *stackLenS = strtok((char *)NULL, WHITE); - value *stackPosVal; - value *stackLenVal; - regs *reg; - symbol *sym; - - stackPosVal = constVal( stackPosS ); - stackPos = (unsigned int)floatFromVal( stackPosVal ); + pic16_setMaxRAM(max_ram); + } + break; + + /* #pragma stack [stack-position] [stack-len] */ + case P_STACK: + { + unsigned int stackPos, stackLen; + regs *reg; + symbol *sym; + + cp = get_pragma_token(cp, &token); + if (TOKEN_INT != token.type) + { + err = 1; + break; + } + stackPos = token.val.int_val; - - if(stackLenS) { - stackLenVal = constVal( stackLenS ); - stackLen = (unsigned int)floatFromVal( stackLenVal ); - } + cp = get_pragma_token(cp, &token); + if (TOKEN_INT != token.type) + { + err = 1; + break; + } + stackLen = token.val.int_val; - if(stackLen < 1) { - stackLen = 64; - fprintf(stderr, "%s:%d: warning: setting stack to default size %d (0x%04x)\n", - filename, lineno-1, stackLen, stackLen); - -// fprintf(stderr, "%s:%d setting stack to default size %d\n", __FILE__, __LINE__, stackLen); - } + cp = get_pragma_token(cp, &token); + if (TOKEN_EOL != token.type) + { + err = 1; + break; + } -// fprintf(stderr, "Initializing stack pointer at 0x%x len 0x%x\n", stackPos, stackLen); - - reg=newReg(REG_SFR, PO_SFR_REGISTER, stackPos, "_stack", stackLen-1, 0, NULL); - addSet(&pic16_fix_udata, reg); - - reg = newReg(REG_SFR, PO_SFR_REGISTER, stackPos + stackLen-1, "_stack_end", 1, 0, NULL); - addSet(&pic16_fix_udata, reg); + if (stackLen < 1) { + stackLen = 64; + fprintf(stderr, "%s:%d: warning: setting stack to default size %d (0x%04x)\n", + filename, lineno, stackLen, stackLen); + } - sym = newSymbol("stack", 0); - sprintf(sym->rname, "_%s", sym->name); - addSet(&publics, sym); + /* check sanity of stack */ + if ((stackPos >> 8) != ((stackPos + stackLen - 1) >> 8)) { + fprintf (stderr, "%s:%u: warning: stack [0x%03X,0x%03X] crosses memory bank boundaries (not fully tested)\n", + filename, lineno, stackPos, stackPos + stackLen - 1); + } - sym = newSymbol("stack_end", 0); - sprintf(sym->rname, "_%s", sym->name); - addSet(&publics, sym); - - initsfpnt = 1; // force glue() to initialize stack/frame pointers */ + if (pic16) { + if (stackPos < pic16->acsSplitOfs) { + fprintf (stderr, "%s:%u: warning: stack [0x%03X, 0x%03X] intersects with the access bank [0x000,0x%03x] -- this is highly discouraged!\n", + filename, lineno, stackPos, stackPos + stackLen - 1, pic16->acsSplitOfs); + } - return 0; - } - - /* #pragma code [symbol] [location] */ - if(startsWith(ptr, "code")) { - char *symname = strtok((char *)NULL, WHITE); - char *location = strtok((char *)NULL, WHITE); - absSym *absS; - value *addr; - - absS = Safe_calloc(1, sizeof(absSym)); - sprintf(absS->name, "_%s", symname); - - addr = constVal( location ); - absS->address = (unsigned int)floatFromVal( addr ); + if (stackPos+stackLen > 0xF00 + pic16->acsSplitOfs) { + fprintf (stderr, "%s:%u: warning: stack [0x%03X,0x%03X] intersects with special function registers [0x%03X,0xFFF]-- this is highly discouraged!\n", + filename, lineno, stackPos, stackPos + stackLen - 1, 0xF00 + pic16->acsSplitOfs); + } - if((absS->address % 2) != 0) { - absS->address--; - fprintf(stderr, "%s:%d: warning: code memory locations should be word aligned, will locate to 0x%06x instead\n", - filename, lineno-1, absS->address); - } + if (stackPos+stackLen > pic16->RAMsize) { + fprintf (stderr, "%s:%u: error: stack [0x%03X,0x%03X] is placed outside available memory [0x000,0x%03X]!\n", + filename, lineno, stackPos, stackPos + stackLen - 1, pic16->RAMsize-1); + err = 1; + break; + } + } - addSet(&absSymSet, absS); -// fprintf(stderr, "%s:%d symbol %s will be placed in location 0x%06x in code memory\n", -// __FILE__, __LINE__, symname, absS->address); + reg = newReg(REG_SFR, PO_SFR_REGISTER, stackPos, "_stack", stackLen-1, 0, NULL); + addSet(&pic16_fix_udata, reg); - return 0; - } + reg = newReg(REG_SFR, PO_SFR_REGISTER, stackPos + stackLen-1, "_stack_end", 1, 0, NULL); + addSet(&pic16_fix_udata, reg); + + sym = newSymbol("stack", 0); + sprintf(sym->rname, "_%s", sym->name); + addSet(&publics, sym); + + sym = newSymbol("stack_end", 0); + sprintf(sym->rname, "_%s", sym->name); + addSet(&publics, sym); + + initsfpnt = 1; // force glue() to initialize stack/frame pointers */ + } + break; + + /* #pragma code [symbol] [location] */ + case P_CODE: + { + absSym *absS; + + cp = get_pragma_token(cp, &token); + if (TOKEN_STR != token.type) + goto code_err; + + absS = Safe_calloc(1, sizeof(absSym)); + sprintf(absS->name, "_%s", get_pragma_string(&token)); + + cp = get_pragma_token(cp, &token); + if (TOKEN_INT != token.type) + { + code_err: + //fprintf (stderr, "%s:%d: #pragma code [symbol] [location] -- symbol or location missing\n", filename, lineno); + err = 1; + break; + } + absS->address = token.val.int_val; + + cp = get_pragma_token(cp, &token); + if (TOKEN_EOL != token.type) + { + err = 1; + break; + } + + if ((absS->address % 2) != 0) { + absS->address--; + fprintf(stderr, "%s:%d: warning: code memory locations should be word aligned, will locate to 0x%06x instead\n", + filename, lineno, absS->address); + } + + addSet(&absSymSet, absS); +// fprintf(stderr, "%s:%d symbol %s will be placed in location 0x%06x in code memory\n", +// __FILE__, __LINE__, symname, absS->address); + } + break; + + /* #pragma udata [section-name] [symbol] */ + case P_UDATA: + { + char *sectname; + const char *symname; + symbol *nsym; + sectSym *ssym; + sectName *snam; + int found = 0; + + cp = get_pragma_token(cp, &token); + if (TOKEN_STR == token.type) + sectname = Safe_strdup(get_pragma_string(&token)); + else + { + err = 1; + break; + } + + cp = get_pragma_token(cp, &token); + if (TOKEN_STR == token.type) + symname = get_pragma_string(&token); + else + { + //fprintf (stderr, "%s:%d: #pragma udata [section-name] [symbol] -- section-name or symbol missing!\n", filename, lineno); + err = 1; + symname = NULL; + } + + while (symname) + { + ssym = Safe_calloc(1, sizeof(sectSym)); + ssym->name = Safe_calloc(1, strlen(symname) + 2); + sprintf(ssym->name, "%s%s", port->fun_prefix, symname); + ssym->reg = NULL; + + addSet(§Syms, ssym); + + nsym = newSymbol((char *)symname, 0); + strcpy(nsym->rname, ssym->name); - /* #pragma udata [section-name] [symbol] */ - if(startsWith(ptr, "udata")) { - char *sectname = strtok((char *)NULL, WHITE); - char *symname = strtok((char *)NULL, WHITE); - symbol *nsym; - sectSym *ssym; - sectName *snam; - int found=0; - - while(symname) { - ssym = Safe_calloc(1, sizeof(sectSyms)); - ssym->name = Safe_calloc(1, strlen(symname)+2); - sprintf(ssym->name, "_%s", symname); - ssym->reg = NULL; - - addSet(§Syms, ssym); - - nsym = newSymbol(symname, 0); - strcpy(nsym->rname, ssym->name); #if 0 - checkAddSym(&publics, nsym); + checkAddSym(&publics, nsym); #endif - found = 0; - for(snam=setFirstItem(sectNames);snam;snam=setNextItem(sectNames)) { - if(!strcmp(sectname, snam->name)){ found=1; break; } - } - - if(!found) { - snam = Safe_calloc(1, sizeof(sectNames)); - snam->name = Safe_strdup( sectname ); - snam->regsSet = NULL; - - addSet(§Names, snam); - } - - ssym->section = snam; - + found = 0; + for (snam = setFirstItem(sectNames);snam;snam=setNextItem(sectNames)) + { + if (!strcmp(sectname, snam->name)) + { + found=1; + break; + } + } + + if(!found) + { + snam = Safe_calloc(1, sizeof(sectName)); + snam->name = Safe_strdup(sectname); + snam->regsSet = NULL; + + addSet(§Names, snam); + } + + ssym->section = snam; + #if 0 - fprintf(stderr, "%s:%d placing symbol %s at section %s (%p)\n", __FILE__, __LINE__, - ssym->name, snam->name, snam); + fprintf(stderr, "%s:%d placing symbol %s at section %s (%p)\n", __FILE__, __LINE__, + ssym->name, snam->name, snam); #endif - symname = strtok((char *)NULL, WHITE); - } + cp = get_pragma_token(cp, &token); + if (TOKEN_STR == token.type) + symname = get_pragma_string(&token); + else if (TOKEN_EOL == token.type) + symname = NULL; + else + { + err = 1; + symname = NULL; + } + } - return 0; - } - - /* #pragma wparam function1[, function2[,...]] */ - if(startsWith(ptr, "wparam")) { - char *fname = strtok((char *)NULL, WHITECOMMA); - - while(fname) { - addSet(&wparamList, Safe_strdup(fname)); - -// debugf("passing with WREG to %s\n", fname); - fname = strtok((char *)NULL, WHITECOMMA); - } - - return 0; - } - - /* #pragma library library_module */ - if(startsWith(ptr, "library")) { - char *lmodule = strtok((char *)NULL, WHITE); - - if(lmodule) { - /* lmodule can be: - * c link the C library - * math link the math library - * io link the IO library - * debug link the debug libary - * anything else, will link as-is */ - if(!strcmp(lmodule, "c"))libflags.want_libc = 1; - else if(!strcmp(lmodule, "math"))libflags.want_libm = 1; - else if(!strcmp(lmodule, "io"))libflags.want_libio = 1; - else if(!strcmp(lmodule, "debug"))libflags.want_libdebug = 1; - else if(!strcmp(lmodule, "ignore"))libflags.ignore = 1; - else { - if(!libflags.ignore) { - fprintf(stderr, "link library %s\n", lmodule); - addSetHead(&libFilesSet, lmodule); - } + Safe_free(sectname); + } + break; + + /* #pragma library library_module */ + case P_LIBRARY: + { + const char *lmodule; + + cp = get_pragma_token(cp, &token); + if (TOKEN_EOL != token.type) + { + lmodule = get_pragma_string(&token); + + /* lmodule can be: + * c link the C library + * math link the math library + * io link the IO library + * debug link the debug libary + * anything else, will link as-is */ + + if(!strcmp(lmodule, "c")) + libflags.want_libc = 1; + else if(!strcmp(lmodule, "math")) + libflags.want_libm = 1; + else if(!strcmp(lmodule, "io")) + libflags.want_libio = 1; + else if(!strcmp(lmodule, "debug")) + libflags.want_libdebug = 1; + else if(!strcmp(lmodule, "ignore")) + libflags.ignore = 1; + else + { + if(!libflags.ignore) + { + fprintf(stderr, "link library %s\n", lmodule); + addSetHead(&libFilesSet, (char *)lmodule); + } } - } - - return 0; + } + else + { + err = 1; + break; + } + + cp = get_pragma_token(cp, &token); + if (TOKEN_EOL != token.type) + { + err = 1; + break; + } + } + break; + +#if 0 + /* This is an experimental code for #pragma inline + and is temporarily disabled for 2.5.0 release */ + case P_INLINE: + { + char *tmp = strtok((char *)NULL, WHITECOMMA); + + while(tmp) { + addSet(&asmInlineMap, Safe_strdup( tmp )); + tmp = strtok((char *)NULL, WHITECOMMA); } - - - - return 1; + + { + char *s; + + for(s = setFirstItem(asmInlineMap); s ; s = setNextItem(asmInlineMap)) { + debugf("inline asm: `%s'\n", s); + } + } + } + break; +#endif /* 0 */ + + default: + processed = 0; + break; + } + + get_pragma_token(cp, &token); + + if (1 == err) + werror(W_BAD_PRAGMA_ARGUMENTS, name); + + free_pragma_token(&token); + return processed; +} + +static struct pragma_s pragma_tbl[] = { + { "maxram", P_MAXRAM, 0, do_pragma }, + { "stack", P_STACK, 0, do_pragma }, + { "code", P_CODE, 0, do_pragma }, + { "udata", P_UDATA, 0, do_pragma }, + { "library", P_LIBRARY, 0, do_pragma }, +/*{ "inline", P_INLINE, 0, do_pragma }, */ + { NULL, 0, 0, NULL }, + }; + +static int +_process_pragma(const char *s) +{ + return process_pragma_tbl(pragma_tbl, s); } #define REP_UDATA "--preplace-udata-with=" @@ -349,7 +524,7 @@ _process_pragma(const char *sz) #define ALT_ASM "--asm=" #define ALT_LINK "--link=" -#define IVT_LOC "--ivt-loc" +#define IVT_LOC "--ivt-loc=" #define NO_DEFLIBS "--nodefaultlibs" #define MPLAB_COMPAT "--mplab-comp" @@ -359,6 +534,8 @@ _process_pragma(const char *sz) #define OFMSG_LRSUPPORT "--flr-support" #define OPTIMIZE_GOTO "--optimize-goto" +#define OPTIMIZE_CMP "--optimize-cmp" +#define OPTIMIZE_DF "--optimize-df" char *alt_asm=NULL; char *alt_link=NULL; @@ -399,8 +576,13 @@ OPTION pic16_optionsTable[]= { { 0, USE_CRT, NULL, "use run-time initialization module"}, { 0, "--no-crt", &pic16_options.no_crt, "do not link any default run-time initialization module"}, { 0, "--gstack", &pic16_options.gstack, "trace stack pointer push/pop to overflow"}, -// { 0, OFMSG_LRSUPPORT, NULL, "use support functions for local register store/restore"}, { 0, OPTIMIZE_GOTO, NULL, "try to use (conditional) BRA instead of GOTO"}, + { 0, OPTIMIZE_CMP, NULL, "try to optimize some compares"}, + { 0, OPTIMIZE_DF, NULL, "thoroughly analyze data flow (memory and time intensive!)"}, + { 0, "--num-func-alloc-regs", &pic16_options.CATregs, "dump number of temporary registers allocated for each function"}, +#if XINST + { 'y', "--extended", &xinst, "enable Extended Instruction Set/Literal Offset Addressing mode"}, +#endif { 0, NULL, NULL, NULL} }; @@ -435,7 +617,7 @@ _pic16_parseOptions (int *pargc, char **argv, int *i) else if(!STRCASECMP(stkmodel, "large"))pic16_options.stack_model = 1; else { fprintf(stderr, "Unknown stack model: %s", stkmodel); - exit(-1); + exit(EXIT_FAILURE); } return TRUE; } @@ -462,6 +644,7 @@ _pic16_parseOptions (int *pargc, char **argv, int *i) if(ISOPT(IVT_LOC)) { pic16_options.ivt_loc = getIntArg(IVT_LOC, argv, i, *pargc); + fprintf(stderr, "%s:%d setting interrupt vector addresses 0x%x\n", __FILE__, __LINE__, pic16_options.ivt_loc); return TRUE; } @@ -473,7 +656,7 @@ _pic16_parseOptions (int *pargc, char **argv, int *i) else if(!STRCASECMP(tmp, "crlf"))pic16_nl = 1; else { fprintf(stderr, "invalid termination character id\n"); - exit(-1); + exit(EXIT_FAILURE); } return TRUE; } @@ -492,12 +675,21 @@ _pic16_parseOptions (int *pargc, char **argv, int *i) } #endif -#if 1 if (ISOPT(OPTIMIZE_GOTO)) { pic16_options.opt_flags |= OF_OPTIMIZE_GOTO; return TRUE; } -#endif + + if(ISOPT(OPTIMIZE_CMP)) { + pic16_options.opt_flags |= OF_OPTIMIZE_CMP; + return TRUE; + } + + if (ISOPT(OPTIMIZE_DF)) { + pic16_options.opt_flags |= OF_OPTIMIZE_DF; + return TRUE; + } + return FALSE; } @@ -506,8 +698,6 @@ extern set *userIncDirsSet; static void _pic16_initPaths(void) { - char pic16incDir[512]; - char pic16libDir[512]; set *pic16incDirsSet=NULL; set *pic16libDirsSet=NULL; char devlib[512]; @@ -515,13 +705,18 @@ static void _pic16_initPaths(void) setMainValue("mcu", pic16->name[2] ); addSet(&preArgvSet, Safe_strdup("-D{mcu}")); - sprintf(pic16incDir, "%s%cpic16", INCLUDE_DIR_SUFFIX, DIR_SEPARATOR_CHAR); - sprintf(pic16libDir, "%s%cpic16", LIB_DIR_SUFFIX, DIR_SEPARATOR_CHAR); - + setMainValue("mcu1", pic16->name[1] ); + addSet(&preArgvSet, Safe_strdup("-D__{mcu1}")); if(!options.nostdinc) { + struct dbuf_s pic16incDir; + + dbuf_init(&pic16incDir, 128); + dbuf_makePath(&pic16incDir, INCLUDE_DIR_SUFFIX, "pic16"); + /* setup pic16 include directory */ - pic16incDirsSet = appendStrSet(dataDirsSet, NULL, pic16incDir); + pic16incDirsSet = appendStrSet(dataDirsSet, NULL, dbuf_c_str(&pic16incDir)); + dbuf_destroy(&pic16incDir); includeDirsSet = pic16incDirsSet; // mergeSets(&includeDirsSet, pic16incDirsSet); } @@ -530,8 +725,13 @@ static void _pic16_initPaths(void) mergeSets(&pic16incDirsSet, userIncDirsSet); if(!options.nostdlib) { + struct dbuf_s pic16libDir; + + dbuf_init(&pic16libDir, 128); + dbuf_makePath(&pic16libDir, INCLUDE_DIR_SUFFIX, "pic16"); /* setup pic16 library directory */ - pic16libDirsSet = appendStrSet(dataDirsSet, NULL, pic16libDir); + pic16libDirsSet = appendStrSet(dataDirsSet, NULL, dbuf_c_str(&pic16libDir)); + dbuf_destroy(&pic16libDir); libDirsSet = pic16libDirsSet; // mergeSets(&libDirsSet, pic16libDirsSet); } @@ -550,13 +750,18 @@ extern set *linkOptionsSet; char *msprintf(hTab *pvals, const char *pformat, ...); int my_system(const char *cmd); +/* forward declarations */ +extern const char *pic16_linkCmd[]; +extern const char *pic16_asmCmd[]; +extern set *asmOptionsSet; + /* custom function to link objects */ static void _pic16_linkEdit(void) { hTab *linkValues=NULL; - char lfrm[256]; + char lfrm[1024]; char *lcmd; - char temp[128]; + char temp[1024]; set *tSet=NULL; int ret; @@ -565,10 +770,9 @@ static void _pic16_linkEdit(void) * {linker} {incdirs} {lflags} -o {outfile} {spec_ofiles} {ofiles} {libs} * */ - - sprintf(lfrm, "{linker} {incdirs} {lflags} -o {outfile} {user_ofile} {spec_ofiles} {ofiles} {libs}"); - - shash_add(&linkValues, "linker", "gplink"); + sprintf(lfrm, "{linker} {incdirs} {lflags} -w -r -o {outfile} {user_ofile} {ofiles} {spec_ofiles} {libs}"); + + shash_add(&linkValues, "linker", pic16_linkCmd[0]); mergeSets(&tSet, libDirsSet); mergeSets(&tSet, libPathsSet); @@ -576,10 +780,10 @@ static void _pic16_linkEdit(void) shash_add(&linkValues, "incdirs", joinStrSet( appendStrSet(tSet, "-I\"", "\""))); shash_add(&linkValues, "lflags", joinStrSet(linkOptionsSet)); - shash_add(&linkValues, "outfile", dstFileName); + shash_add(&linkValues, "outfile", fullDstFileName ? fullDstFileName : dstFileName); if(fullSrcFileName) { - sprintf(temp, "%s.o", dstFileName); + sprintf(temp, "%s.o", fullDstFileName ? fullDstFileName : dstFileName); // addSetHead(&relFilesSet, Safe_strdup(temp)); shash_add(&linkValues, "user_ofile", temp); } @@ -618,11 +822,6 @@ static void _pic16_linkEdit(void) } -/* forward declarations */ -extern const char *pic16_linkCmd[]; -extern const char *pic16_asmCmd[]; -extern set *asmOptionsSet; - static void _pic16_finaliseOptions (void) { @@ -661,6 +860,14 @@ _pic16_finaliseOptions (void) if(options.model == MODEL_LARGE) addSet(&asmOptionsSet, Safe_strdup("-DSDCC_MODEL_LARGE")); + { + char buf[128]; + + sprintf(buf, "-D%s -D__%s", pic16->name[2], pic16->name[1]); + *(strrchr(buf, 'f')) = 'F'; + addSet(&asmOptionsSet, Safe_strdup( buf )); + } + if(STACK_MODEL_LARGE) { addSet(&preArgvSet, Safe_strdup("-DSTACK_MODEL_LARGE")); addSet(&asmOptionsSet, Safe_strdup("-DSTACK_MODEL_LARGE")); @@ -729,6 +936,7 @@ _pic16_setDefaultOptions (void) pic16_options.ip_stack = 1; /* set to 1 to enable ipop/ipush for stack */ pic16_options.gstack = 0; pic16_options.debgen = 0; + pic16_options.CATregs = 0; } static const char * @@ -761,6 +969,10 @@ _pic16_genAssemblerPreamble (FILE * of) } fprintf (of, "\tlist\tp=%s\n",&name[1]); + if (pic16_mplab_comp) { + // provide ACCESS macro used during SFR accesses + fprintf (of, "\tinclude \n", &name[1]); + } if(!pic16_options.omit_configw) { pic16_emitConfigRegs(of); @@ -773,35 +985,35 @@ _pic16_genAssemblerPreamble (FILE * of) /* Generate interrupt vector table. */ static int -_pic16_genIVT (FILE * of, symbol ** interrupts, int maxInterrupts) +_pic16_genIVT (struct dbuf_s * oBuf, symbol ** interrupts, int maxInterrupts) { #if 1 /* PIC18F family has only two interrupts, the high and the low * priority interrupts, which reside at 0x0008 and 0x0018 respectively - VR */ if((!pic16_options.omit_ivt) || (pic16_options.omit_ivt && pic16_options.leave_reset)) { - fprintf(of, "; RESET vector\n"); - fprintf(of, "\tgoto\t__sdcc_gsinit_startup\n"); + dbuf_printf(oBuf, "; RESET vector\n"); + dbuf_printf(oBuf, "\tgoto\t__sdcc_gsinit_startup\n"); } if(!pic16_options.omit_ivt) { - fprintf(of, "\tres 4\n"); + dbuf_printf(oBuf, "\tres 4\n"); - fprintf(of, "; High priority interrupt vector 0x0008\n"); + dbuf_printf(oBuf, "; High priority interrupt vector 0x0008\n"); if(interrupts[1]) { - fprintf(of, "\tgoto\t%s\n", interrupts[1]->rname); - fprintf(of, "\tres\t12\n"); + dbuf_printf(oBuf, "\tgoto\t%s\n", interrupts[1]->rname); + dbuf_printf(oBuf, "\tres\t12\n"); } else { - fprintf(of, "\tretfie\n"); - fprintf(of, "\tres\t14\n"); + dbuf_printf(oBuf, "\tretfie\n"); + dbuf_printf(oBuf, "\tres\t14\n"); } - fprintf(of, "; Low priority interrupt vector 0x0018\n"); + dbuf_printf(oBuf, "; Low priority interrupt vector 0x0018\n"); if(interrupts[2]) { - fprintf(of, "\tgoto\t%s\n", interrupts[2]->rname); + dbuf_printf(oBuf, "\tgoto\t%s\n", interrupts[2]->rname); } else { - fprintf(of, "\tretfie\n"); + dbuf_printf(oBuf, "\tretfie\n"); } } #endif @@ -812,21 +1024,114 @@ _pic16_genIVT (FILE * of, symbol ** interrupts, int maxInterrupts) * False to convert it to function call */ static bool _hasNativeMulFor (iCode *ic, sym_link *left, sym_link *right) { -// fprintf(stderr,"checking for native mult for %c (size: %d)\n", ic->op, getSize(OP_SYMBOL(IC_RESULT(ic))->type)); + //fprintf(stderr,"checking for native mult for %c (size: %d)\n", ic->op, getSize(OP_SYMBOL(IC_RESULT(ic))->type)); + int symL, symR, symRes, sizeL = 0, sizeR = 0, sizeRes = 0; + + /* left/right are symbols? */ + symL = IS_SYMOP(IC_LEFT(ic)); + symR = IS_SYMOP(IC_RIGHT(ic)); + symRes = IS_SYMOP(IC_RESULT(ic)); + + /* --> then determine their sizes */ + sizeL = symL ? getSize(OP_SYM_TYPE(IC_LEFT(ic))) : 4; + sizeR = symR ? getSize(OP_SYM_TYPE(IC_RIGHT(ic))) : 4; + sizeRes = symRes ? getSize(OP_SYM_TYPE(IC_RESULT(ic))) : 4; + + /* Checks to enable native multiplication. + * PICs do not offer native division at all... + * + * Ideas: + * ( i) if result is just one byte, use native MUL + * (regardless of the operands) + * ( ii) if left and right are unsigned 8-bit operands, + * use native MUL + * (iii) if left or right is a literal in the range of [-128..256) + * and the other is an unsigned byte, use native MUL + */ + if (ic->op == '*') + { + /* use native mult for `*: x --> {u8_t, s8_t}' */ + if (sizeRes == 1) { return TRUE; } -#if 1 - /* multiplication is fixed */ - /* support mul for char/int/long */ - if((ic->op == '*') - && (getSize(OP_SYMBOL(IC_LEFT(ic))->type ) < 2))return TRUE; -#endif + /* use native mult for `u8_t x u8_t --> { u16_t, s16_t }' */ + if (sizeL == 1 && symL /*&& SPEC_USIGN(OP_SYM_TYPE(IC_LEFT(ic)))*/) { + sizeL = 1; + } else { + //printf( "%s: left too large (%u) / signed (%u)\n", __FUNCTION__, sizeL, symL && !SPEC_USIGN(OP_SYM_TYPE(IC_LEFT(ic)))); + sizeL = 4; + } + if (sizeR == 1 && symR /*&& SPEC_USIGN(OP_SYM_TYPE(IC_RIGHT(ic)))*/) { + sizeR = 1; + } else { + //printf( "%s: right too large (%u) / signed (%u)\n", __FUNCTION__, sizeR, symR && !SPEC_USIGN(OP_SYM_TYPE(IC_RIGHT(ic)))); + sizeR = 4; + } + + /* also allow literals [-128..256) for left/right operands */ + if (IS_VALOP(IC_LEFT(ic))) + { + long l = (long)floatFromVal( OP_VALUE( IC_LEFT(ic) ) ); + sizeL = 4; + //printf( "%s: val(left) = %ld\n", __FUNCTION__, l ); + if (l >= -128 && l < 256) + { + sizeL = 1; + } else { + //printf( "%s: left value %ld outside [-128..256)\n", __FUNCTION__, l ); + } + } + if (IS_VALOP( IC_RIGHT(ic) )) + { + long l = (long)floatFromVal( OP_VALUE( IC_RIGHT(ic) ) ); + sizeR = 4; + //printf( "%s: val(right) = %ld\n", __FUNCTION__, l ); + if (l >= -128 && l < 256) + { + sizeR = 1; + } else { + //printf( "%s: right value %ld outside [-128..256)\n", __FUNCTION__, l ); + } + } + + /* use native mult iff left and right are (unsigned) 8-bit operands */ + if (sizeL == 1 && sizeR == 1) { return TRUE; } + } + + if (ic->op == '/' || ic->op == '%') + { + /* We must catch /: {u8_t,s8_t} x {u8_t,s8_t} --> {u8_t,s8_t}, + * because SDCC will call 'divuchar' even for u8_t / s8_t. + * Example: 128 / -2 becomes 128 / 254 = 0 != -64... */ + if (sizeL == 1 && sizeR == 1) return TRUE; + + /* What about literals? */ + if (IS_VALOP( IC_LEFT(ic) )) + { + long l = (long)floatFromVal( OP_VALUE( IC_LEFT(ic) ) ); + sizeL = 4; + //printf( "%s: val(left) = %ld\n", __FUNCTION__, l ); + if (l >= -128 && l < 256) + { + sizeL = 1; + } else { + //printf( "%s: left value %ld outside [-128..256)\n", __FUNCTION__, l ); + } + } + if (IS_VALOP( IC_RIGHT(ic) )) + { + long l = (long)floatFromVal( OP_VALUE( IC_RIGHT(ic) ) ); + sizeR = 4; + //printf( "%s: val(right) = %ld\n", __FUNCTION__, l ); + if (l >= -128 && l < 256) + { + sizeR = 1; + } else { + //printf( "%s: right value %ld outside [-128..256)\n", __FUNCTION__, l ); + } + } + if (sizeL == 1 && sizeR == 1) { return TRUE; } + } -#if 0 - /* support div for char/int/long */ - if((getSize(OP_SYMBOL(IC_LEFT(ic))->type ) < 0) - && (ic->op == '/'))return TRUE; -#endif - return FALSE; } @@ -904,7 +1209,7 @@ oclsExpense (struct memmap *oclass) */ const char *pic16_linkCmd[] = { - "gplink", "$l", "-o \"$2\"", "\"$1\"","$3", NULL + "gplink", "$l", "-w", "-r", "-o \"$2\"", "\"$1\"","$3", NULL }; @@ -966,6 +1271,15 @@ PORT pic16_port = 4, /* float */ 4 /* max */ }, + + /* generic pointer tags */ + { + 0x00, /* far */ + 0x80, /* near */ + 0x00, /* xstack */ + 0x00 /* code */ + }, + { "XSEG (XDATA)", // xstack "STACK (DATA)", // istack @@ -982,6 +1296,10 @@ PORT pic16_port = "HOME (CODE)", // home NULL, // xidata NULL, // xinit + "CONST (CODE)", // const_name - const data (code or not) + "CABS (ABS,CODE)", // cabs_name - const absolute data (code or not) + "XABS (ABS,XDATA)", // xabs_name - absolute xdata + "IABS (ABS,DATA)", // iabs_name - absolute data NULL, // default location for auto vars NULL, // default location for global vars 1 // code is read only 1=yes