X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fpic16%2Fmain.c;h=a570358a684be58910c1f0cfe1c9ccf10b6ee5c5;hb=6474449850aeace128aebe2d7f387ac7c550bcc5;hp=2cd6e6db63bb8df5f3754a2296412de9aa2c2df9;hpb=05ca13907af274b53739c9d1ec853db0a3a164d9;p=fw%2Fsdcc diff --git a/src/pic16/main.c b/src/pic16/main.c index 2cd6e6db..a570358a 100644 --- a/src/pic16/main.c +++ b/src/pic16/main.c @@ -43,27 +43,28 @@ static char _defaultRules[] = static char *_pic16_keywords[] = { "at", - "bit", +// "bit", "code", "critical", + "register", "data", "far", - "idata", +// "idata", "interrupt", "near", "pdata", "reentrant", "sfr", - "sbit", +// "sbit", "using", - "xdata", +// "xdata", "_data", "_code", "_generic", "_near", - "_xdata", +// "_xdata", "_pdata", - "_idata", +// "_idata", "_naked", NULL }; @@ -92,30 +93,20 @@ 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); static void _pic16_init (void) { - asm_addTree (&asm_asxxxx_mapping); - pic16_pCodeInitRegisters(); - maxInterrupts = 2; - - /* set pic16 port options to defaults */ - pic16_options.no_banksel = 0; - pic16_options.opt_banksel = 0; - pic16_options.omit_configw = 0; - pic16_options.omit_ivt = 0; - pic16_options.leave_reset = 0; - pic16_options.stack_model = 0; /* 0 for 'small', 1 for 'large' */ - pic16_options.ivt_loc = 0x000000; /* default location of interrupt vectors */ - pic16_options.nodefaultlibs = 0; /* link default libraries */ + asm_addTree (&asm_asxxxx_mapping); + pic16_pCodeInitRegisters(); + maxInterrupts = 2; } static void -_pic16_reset_regparm () +_pic16_reset_regparm (void) { regParmFlg = 0; } @@ -123,13 +114,18 @@ _pic16_reset_regparm () static int _pic16_regparm (sym_link * l) { - /* for this processor it is simple - can pass only the first parameter in a register */ - //if (regParmFlg) - // return 0; - - regParmFlg++;// = 1; - return 1; + /* force all parameters via SEND/RECEIVE */ + if(0 /*pic16_options.ip_stack*/) { + /* for this processor it is simple + * can pass only the first parameter in a register */ + if(regParmFlg)return 0; + regParmFlg++; + return 1; //regParmFlg; + } else { + /* otherwise pass all arguments in registers via SEND/RECEIVE */ + regParmFlg++;// = 1; + return regParmFlg; + } } @@ -137,13 +133,28 @@ int initsfpnt=0; /* set to 1 if source provides a pragma for stack * so glue() later emits code to initialize stack/frame pointers */ set *absSymSet; +set *sectNames=NULL; /* list of section listed in pragma directives */ +set *sectSyms=NULL; /* list of symbols set in a specific section */ +set *wparamList=NULL; + +struct { + unsigned ignore: 1; + unsigned want_libc: 1; + unsigned want_libm: 1; + unsigned want_libio: 1; + unsigned want_libdebug: 1; +} libflags = { 0, 0, 0, 0, 0 }; + + static int _process_pragma(const char *sz) { - static const char *WHITE = " \t"; + static const char *WHITE = " \t\n"; + static const char *WHITECOMMA = " \t\n,"; char *ptr = strtok((char *)sz, WHITE); + /* #pragma maxram [maxram] */ if (startsWith (ptr, "maxram")) { char *maxRAM = strtok((char *)NULL, WHITE); @@ -155,30 +166,58 @@ _process_pragma(const char *sz) maxRAMaddress = (int)floatFromVal(maxRAMVal); pic16_setMaxRAM(maxRAMaddress); } + + 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; -// fprintf(stderr, "Initializing stack pointer to 0x%x\n", (int)floatFromVal(constVal(stackPos))); stackPosVal = constVal( stackPosS ); stackPos = (unsigned int)floatFromVal( stackPosVal ); - reg=newReg(REG_SFR, PO_SFR_REGISTER, stackPos, "_stack", 1, 0, NULL); + + if(stackLenS) { + stackLenVal = constVal( stackLenS ); + stackLen = (unsigned int)floatFromVal( stackLenVal ); + } + + 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); + } + +// 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); 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 */ return 0; } + /* #pragma code [symbol] [location] */ if(startsWith(ptr, "code")) { char *symname = strtok((char *)NULL, WHITE); char *location = strtok((char *)NULL, WHITE); @@ -186,17 +225,116 @@ _process_pragma(const char *sz) value *addr; absS = Safe_calloc(1, sizeof(absSym)); - absS->name = Safe_strdup( symname ); + sprintf(absS->name, "_%s", symname); + addr = constVal( location ); absS->address = (unsigned int)floatFromVal( addr ); + 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); + } + 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); +// fprintf(stderr, "%s:%d symbol %s will be placed in location 0x%06x in code memory\n", +// __FILE__, __LINE__, symname, absS->address); return 0; - } + } + + /* #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); +#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; + +#if 0 + 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); + } + + 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); + } + } + } + + return 0; + } + + + return 1; } @@ -210,25 +348,35 @@ _process_pragma(const char *sz) #define IVT_LOC "--ivt-loc" #define NO_DEFLIBS "--nodefaultlibs" +#define MPLAB_COMPAT "--mplab-comp" + +#define NL_OPT "--nl=" +#define USE_CRT "--use-crt=" +#define OFMSG_LRSUPPORT "--flr-support" + +#define OPTIMIZE_GOTO "--optimize-goto" char *alt_asm=NULL; char *alt_link=NULL; +int pic16_mplab_comp=0; extern int pic16_debug_verbose; extern int pic16_ralloc_debug; extern int pic16_pcode_verbose; +int pic16_fstack=0; int pic16_enable_peeps=0; +int pic16_nl=0; /* 0 for LF, 1 for CRLF */ OPTION pic16_optionsTable[]= { { 0, NO_DEFLIBS, &pic16_options.nodefaultlibs, "do not link default libraries when linking"}, { 0, "--pno-banksel", &pic16_options.no_banksel, "do not generate BANKSEL assembler directives"}, { 0, OPT_BANKSEL, NULL, "set banksel optimization level (default=0 no)"}, - { 0, "--pomit-config-words", &pic16_options.omit_configw, "omit the generation of configuration words"}, - { 0, "--pomit-ivt", &pic16_options.omit_ivt, "omit the generation of the Interrupt Vector Table"}, - { 0, "--pleave-reset-vector",&pic16_options.leave_reset, "when omitting IVT leave RESET vector"}, - { 0, STACK_MODEL, NULL, "use stack model 'small' (default) or 'large'"}, +// { 0, "--pomit-config-words", &pic16_options.omit_configw, "omit the generation of configuration words"}, +// { 0, "--pomit-ivt", &pic16_options.omit_ivt, "omit the generation of the Interrupt Vector Table"}, +// { 0, "--pleave-reset-vector",&pic16_options.leave_reset, "when omitting IVT leave RESET vector"}, + { 0, STACK_MODEL, NULL, "use stack model 'small' (default) or 'large'"}, { 0, "--debug-xtra", &pic16_debug_verbose, "show more debug info in assembly output"}, { 0, "--debug-ralloc", &pic16_ralloc_debug, "dump register allocator debug file *.d"}, @@ -241,6 +389,15 @@ OPTION pic16_optionsTable[]= { { 0, "--denable-peeps", &pic16_enable_peeps, "explicit enable of peepholes"}, { 0, IVT_LOC, NULL, " interrupt vector table location"}, + { 0, "--calltree", &pic16_options.dumpcalltree, "dump call tree in .calltree file"}, + { 0, MPLAB_COMPAT, &pic16_mplab_comp, "enable compatibility mode for MPLAB utilities (MPASM/MPLINK)"}, + { 0, "--fstack", &pic16_fstack, "enable stack optimizations"}, + { 0, NL_OPT, NULL, "new line, \"lf\" or \"crlf\""}, + { 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, NULL, NULL, NULL} }; @@ -259,145 +416,259 @@ _pic16_parseOptions (int *pargc, char **argv, int *i) /* TODO: allow port-specific command line options to specify * segment names here. */ - /* check for arguments that have associated an integer variable */ - while(pic16_optionsTable[j].pparameter) { - if(ISOPT( pic16_optionsTable[j].longOpt )) { - (*pic16_optionsTable[j].pparameter)++; - return TRUE; - } - j++; - } - + + /* check for arguments that have associated an integer variable */ + while(pic16_optionsTable[j].pparameter) { + if(ISOPT( pic16_optionsTable[j].longOpt )) { + (*pic16_optionsTable[j].pparameter)++; + return TRUE; + } + j++; + } - if(ISOPT(STACK_MODEL)) { - stkmodel = getStringArg(STACK_MODEL, argv, i, *pargc); - if(STRCASECMP(stkmodel, "small"))pic16_options.stack_model = 0; - else if(STRCASECMP(stkmodel, "large"))pic16_options.stack_model = 1; - else { - fprintf(stderr, "Unknown stack model: %s", stkmodel); - exit(-1); - } - return TRUE; - } + if(ISOPT(STACK_MODEL)) { + stkmodel = getStringArg(STACK_MODEL, argv, i, *pargc); + if(!STRCASECMP(stkmodel, "small"))pic16_options.stack_model = 0; + else if(!STRCASECMP(stkmodel, "large"))pic16_options.stack_model = 1; + else { + fprintf(stderr, "Unknown stack model: %s", stkmodel); + exit(-1); + } + return TRUE; + } - if(ISOPT(OPT_BANKSEL)) { - pic16_options.opt_banksel = getIntArg(OPT_BANKSEL, argv, i, *pargc); - return TRUE; - } + if(ISOPT(OPT_BANKSEL)) { + pic16_options.opt_banksel = getIntArg(OPT_BANKSEL, argv, i, *pargc); + return TRUE; + } - if(ISOPT(REP_UDATA)) { - pic16_sectioninfo.at_udata = Safe_strdup(getStringArg(REP_UDATA, argv, i, *pargc)); - return TRUE; - } + if(ISOPT(REP_UDATA)) { + pic16_sectioninfo.at_udata = Safe_strdup(getStringArg(REP_UDATA, argv, i, *pargc)); + return TRUE; + } - if(ISOPT(ALT_ASM)) { - alt_asm = Safe_strdup(getStringArg(ALT_ASM, argv, i, *pargc)); - return TRUE; - } + if(ISOPT(ALT_ASM)) { + alt_asm = Safe_strdup(getStringArg(ALT_ASM, argv, i, *pargc)); + return TRUE; + } - if(ISOPT(ALT_LINK)) { - alt_link = Safe_strdup(getStringArg(ALT_LINK, argv, i, *pargc)); - return TRUE; - } + if(ISOPT(ALT_LINK)) { + alt_link = Safe_strdup(getStringArg(ALT_LINK, argv, i, *pargc)); + return TRUE; + } - if(ISOPT(IVT_LOC)) { - pic16_options.ivt_loc = getIntArg(IVT_LOC, argv, i, *pargc); - return TRUE; - } + if(ISOPT(IVT_LOC)) { + pic16_options.ivt_loc = getIntArg(IVT_LOC, argv, i, *pargc); + return TRUE; + } + + if(ISOPT(NL_OPT)) { + char *tmp; + + tmp = Safe_strdup( getStringArg(NL_OPT, argv, i, *pargc) ); + if(!STRCASECMP(tmp, "lf"))pic16_nl = 0; + else if(!STRCASECMP(tmp, "crlf"))pic16_nl = 1; + else { + fprintf(stderr, "invalid termination character id\n"); + exit(-1); + } + return TRUE; + } + + if(ISOPT(USE_CRT)) { + pic16_options.no_crt = 0; + pic16_options.crt_name = Safe_strdup( getStringArg(USE_CRT, argv, i, *pargc) ); + + return TRUE; + } + +#if 0 + if(ISOPT(OFMSG_LRSUPPORT)) { + pic16_options.opt_flags |= OF_LR_SUPPORT; + return TRUE; + } +#endif + +#if 1 + if (ISOPT(OPTIMIZE_GOTO)) { + pic16_options.opt_flags |= OF_OPTIMIZE_GOTO; + return TRUE; + } +#endif return FALSE; } +extern set *userIncDirsSet; + static void _pic16_initPaths(void) { char pic16incDir[512]; char pic16libDir[512]; - set *pic16incDirsSet; - set *pic16libDirsSet; + set *pic16incDirsSet=NULL; + set *pic16libDirsSet=NULL; char devlib[512]; - setMainValue("mcu", pic16->name[2] ); - addSet(&preArgvSet, Safe_strdup("-D{mcu}")); + 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); + sprintf(pic16incDir, "%s%cpic16", INCLUDE_DIR_SUFFIX, DIR_SEPARATOR_CHAR); + sprintf(pic16libDir, "%s%cpic16", LIB_DIR_SUFFIX, DIR_SEPARATOR_CHAR); - if(!options.nostdinc) { - /* setup pic16 include directory */ - pic16incDirsSet = appendStrSet(dataDirsSet, NULL, pic16incDir); - mergeSets(&includeDirsSet, pic16incDirsSet); - } - - if(!options.nostdlib) { - /* setup pic16 library directory */ - pic16libDirsSet = appendStrSet(dataDirsSet, NULL, pic16libDir); - mergeSets(&libDirsSet, pic16libDirsSet); - - if(!pic16_options.nodefaultlibs) { - /* now add the library for the device */ - sprintf(devlib, "%s.lib", pic16->name[2]); - addSet(&libFilesSet, Safe_strdup(devlib)); - } + + if(!options.nostdinc) { + /* setup pic16 include directory */ + pic16incDirsSet = appendStrSet(dataDirsSet, NULL, pic16incDir); + includeDirsSet = pic16incDirsSet; +// mergeSets(&includeDirsSet, pic16incDirsSet); + } + /* pic16 port should not search to the SDCC standard include directories, + * so add here the deleted include dirs that user has issued in command line */ + mergeSets(&pic16incDirsSet, userIncDirsSet); + + if(!options.nostdlib) { + /* setup pic16 library directory */ + pic16libDirsSet = appendStrSet(dataDirsSet, NULL, pic16libDir); + libDirsSet = pic16libDirsSet; +// mergeSets(&libDirsSet, pic16libDirsSet); + } + + if(!pic16_options.nodefaultlibs) { + /* now add the library for the device */ + sprintf(devlib, "%s.lib", pic16->name[2]); + addSet(&libFilesSet, Safe_strdup(devlib)); + + /* add the internal SDCC library */ + addSet(&libFilesSet, Safe_strdup( "libsdcc.lib" )); + } +} + +extern set *linkOptionsSet; +char *msprintf(hTab *pvals, const char *pformat, ...); +int my_system(const char *cmd); + +/* custom function to link objects */ +static void _pic16_linkEdit(void) +{ + hTab *linkValues=NULL; + char lfrm[256]; + char *lcmd; + char temp[128]; + set *tSet=NULL; + int ret; + + /* + * link command format: + * {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"); + + mergeSets(&tSet, libDirsSet); + mergeSets(&tSet, libPathsSet); + + shash_add(&linkValues, "incdirs", joinStrSet( appendStrSet(tSet, "-I\"", "\""))); + shash_add(&linkValues, "lflags", joinStrSet(linkOptionsSet)); + + shash_add(&linkValues, "outfile", dstFileName); + + if(fullSrcFileName) { + sprintf(temp, "%s.o", dstFileName); +// addSetHead(&relFilesSet, Safe_strdup(temp)); + shash_add(&linkValues, "user_ofile", temp); } + + if(!pic16_options.no_crt) + shash_add(&linkValues, "spec_ofiles", pic16_options.crt_name); + + shash_add(&linkValues, "ofiles", joinStrSet(relFilesSet)); + + if(!libflags.ignore) { + if(libflags.want_libc) + addSet(&libFilesSet, Safe_strdup("libc18f.lib")); + + if(libflags.want_libm) + addSet(&libFilesSet, Safe_strdup("libm18f.lib")); + + if(libflags.want_libio) { + sprintf(temp, "libio%s.lib", pic16->name[1]); /* build libio18f452.lib name */ + addSet(&libFilesSet, Safe_strdup(temp)); + } + + if(libflags.want_libdebug) + addSet(&libFilesSet, Safe_strdup("libdebug.lib")); + } + + shash_add(&linkValues, "libs", joinStrSet(libFilesSet)); + + lcmd = msprintf(linkValues, lfrm); + + ret = my_system( lcmd ); + + Safe_free( lcmd ); + + if(ret) + exit(1); } /* forward declarations */ extern const char *pic16_linkCmd[]; extern const char *pic16_asmCmd[]; +extern set *asmOptionsSet; static void _pic16_finaliseOptions (void) { - port->mem.default_local_map = data; - port->mem.default_globl_map = data; + port->mem.default_local_map = data; + port->mem.default_globl_map = data; + + /* peepholes are disabled for the time being */ + options.nopeep = 1; - /* peepholes are disabled for the time being */ - options.nopeep = 1; + /* explicit enable peepholes for testing */ + if(pic16_enable_peeps) + options.nopeep = 0; - /* explicit enable peepholes for testing */ - if(pic16_enable_peeps) - options.nopeep = 0; + options.all_callee_saves = 1; // always callee saves - options.all_callee_saves = 1; // always callee saves -// options.float_rent = 1; -// options.intlong_rent = 1; +#if 0 + options.float_rent = 1; + options.intlong_rent = 1; +#endif - if(alt_asm && strlen(alt_asm)) - pic16_asmCmd[0] = alt_asm; + if(alt_asm && strlen(alt_asm)) + pic16_asmCmd[0] = alt_asm; - if(alt_link && strlen(alt_link)) - pic16_linkCmd[0] = alt_link; + if(alt_link && strlen(alt_link)) + pic16_linkCmd[0] = alt_link; + + if(!pic16_options.no_crt) { + pic16_options.omit_ivt = 1; + pic16_options.leave_reset = 0; + } + + if(options.model == MODEL_SMALL) + addSet(&asmOptionsSet, Safe_strdup("-DSDCC_MODEL_SMALL")); + else + if(options.model == MODEL_LARGE) + addSet(&asmOptionsSet, Safe_strdup("-DSDCC_MODEL_LARGE")); + + if(STACK_MODEL_LARGE) { + addSet(&preArgvSet, Safe_strdup("-DSTACK_MODEL_LARGE")); + addSet(&asmOptionsSet, Safe_strdup("-DSTACK_MODEL_LARGE")); + } else { + addSet(&preArgvSet, Safe_strdup("-DSTACK_MODEL_SMALL")); + addSet(&asmOptionsSet, Safe_strdup("-DSTACK_MODEL_SMALL")); + } } -/* all the rest is commented ifdef'd out */ #if 0 - /* Hack-o-matic: if we are using the flat24 model, - * adjust pointer sizes. - */ - if (options.model == MODEL_FLAT24) - { - - fprintf (stderr, "*** WARNING: you should use the '-mds390' option " - "for DS80C390 support. This code generator is " - "badly out of date and probably broken.\n"); - - port->s.fptr_size = 3; - port->s.gptr_size = 4; - port->stack.isr_overhead++; /* Will save dpx on ISR entry. */ -#if 1 - port->stack.call_overhead++; /* This acounts for the extra byte - * of return addres on the stack. - * but is ugly. There must be a - * better way. - */ -#endif - fReturn = fReturn390; - fReturnSize = 5; - } - if (options.model == MODEL_LARGE) { port->mem.default_local_map = xdata; @@ -433,18 +704,28 @@ _pic16_finaliseOptions (void) static void _pic16_setDefaultOptions (void) { - /* initialize to defaults section locations, names and addresses */ - pic16_sectioninfo.at_udata = "udata"; - - /* set pic16 port options to defaults */ - pic16_options.no_banksel = 0; - pic16_options.opt_banksel = 0; - pic16_options.omit_configw = 0; - pic16_options.omit_ivt = 0; - pic16_options.leave_reset = 0; - pic16_options.stack_model = 0; /* 0 for 'small', 1 for 'large' */ - pic16_options.ivt_loc = 0x000000; - pic16_options.nodefaultlibs = 0; + options.stackAuto = 0; /* implicit declaration */ + /* port is not capable yet to allocate separate registers + * dedicated for passing certain parameters */ + + /* initialize to defaults section locations, names and addresses */ + pic16_sectioninfo.at_udata = "udata"; + + /* set pic16 port options to defaults */ + pic16_options.no_banksel = 0; + pic16_options.opt_banksel = 0; + pic16_options.omit_configw = 0; + pic16_options.omit_ivt = 0; + pic16_options.leave_reset = 0; + pic16_options.stack_model = 0; /* 0 for 'small', 1 for 'large' */ + pic16_options.ivt_loc = 0x000000; + pic16_options.nodefaultlibs = 0; + pic16_options.dumpcalltree = 0; + pic16_options.crt_name = "crt0i.o"; /* the default crt to link */ + pic16_options.no_crt = 0; /* use crt by default */ + pic16_options.ip_stack = 1; /* set to 1 to enable ipop/ipush for stack */ + pic16_options.gstack = 0; + pic16_options.debgen = 0; } static const char * @@ -480,19 +761,8 @@ _pic16_genAssemblerPreamble (FILE * of) if(!pic16_options.omit_configw) { pic16_emitConfigRegs(of); -#if 0 - fprintf (of, "\t__config 0x%x,0x%hhx\n", 0x300001, pic16_getConfigWord(0x300001)); - fprintf (of, "\t__config 0x%x,0x%hhx\n", 0x300002, pic16_getConfigWord(0x300002)); - fprintf (of, "\t__config 0x%x,0x%hhx\n", 0x300003, pic16_getConfigWord(0x300003)); - fprintf (of, "\t__config 0x%x,0x%hhx\n", 0x300005, pic16_getConfigWord(0x300005)); - fprintf (of, "\t__config 0x%x,0x%hhx\n", 0x300006, pic16_getConfigWord(0x300006)); - fprintf (of, "\t__config 0x%x,0x%hhx\n", 0x300008, pic16_getConfigWord(0x300008)); - fprintf (of, "\t__config 0x%x,0x%hhx\n", 0x300009, pic16_getConfigWord(0x300009)); - fprintf (of, "\t__config 0x%x,0x%hhx\n", 0x30000a, pic16_getConfigWord(0x30000a)); - fprintf (of, "\t__config 0x%x,0x%hhx\n", 0x30000b, pic16_getConfigWord(0x30000b)); - fprintf (of, "\t__config 0x%x,0x%hhx\n", 0x30000c, pic16_getConfigWord(0x30000c)); - fprintf (of, "\t__config 0x%x,0x%hhx\n", 0x30000d, pic16_getConfigWord(0x30000d)); -#endif + fprintf(of, "\n"); + pic16_emitIDRegs(of); } fprintf (of, "\tradix dec\n"); @@ -544,13 +814,13 @@ static bool _hasNativeMulFor (iCode *ic, sym_link *left, sym_link *right) #if 1 /* multiplication is fixed */ /* support mul for char/int/long */ - if((getSize(OP_SYMBOL(IC_LEFT(ic))->type ) <= 4) - && (ic->op == '*'))return TRUE; + if((ic->op == '*') + && (getSize(OP_SYMBOL(IC_LEFT(ic))->type ) < 2))return TRUE; #endif #if 0 /* support div for char/int/long */ - if((getSize(OP_SYMBOL(IC_LEFT(ic))->type ) <= 0) + if((getSize(OP_SYMBOL(IC_LEFT(ic))->type ) < 0) && (ic->op == '/'))return TRUE; #endif @@ -623,7 +893,7 @@ oclsExpense (struct memmap *oclass) return 0; } -/** $1 is always the basename. +/** $1 is the input object file (PIC16 specific) // >>always the basename<<. $2 is always the output file. $3 -L path and -l libraries $l is the list of extra options that should be there somewhere... @@ -631,7 +901,7 @@ oclsExpense (struct memmap *oclass) */ const char *pic16_linkCmd[] = { - "gplink", "$3", "\"$1.o\"", "-o \"$2\"", "$l", NULL + "gplink", "$l", "-o \"$2\"", "\"$1\"","$3", NULL }; @@ -671,9 +941,9 @@ PORT pic16_port = NULL /* no do_assemble function */ }, { - pic16_linkCmd, /* linker command and arguments */ + NULL, // pic16_linkCmd, /* linker command and arguments */ NULL, /* alternate macro based form */ - NULL, /* no do_link function */ + _pic16_linkEdit, //NULL, /* no do_link function */ ".o", /* extension for object files */ 0 /* no need for linker file */ }, @@ -688,7 +958,7 @@ PORT pic16_port = 4, /* long */ 2, /* ptr */ 3, /* fptr, far pointers (see Microchip) */ - 2, /* gptr */ + 3, /* gptr */ 1, /* bit */ 4, /* float */ 4 /* max */ @@ -699,13 +969,14 @@ PORT pic16_port = "CSEG (CODE)", // code "DSEG (DATA)", // data "ISEG (DATA)", // idata + "PSEG (DATA)", // pdata "XSEG (XDATA)", // xdata "BSEG (BIT)", // bit "RSEG (DATA)", // reg "GSINIT (CODE)", // static "OSEG (OVR,DATA)", // overlay "GSFINAL (CODE)", // post static - "HOME (CODE)", // home + "HOME (CODE)", // home NULL, // xidata NULL, // xinit NULL, // default location for auto vars @@ -732,6 +1003,16 @@ PORT pic16_port = { pic16_emitDebuggerSymbol }, + { + 255/3, /* maxCount */ + 3, /* sizeofElement */ + /* The rest of these costs are bogus. They approximate */ + /* the behavior of src/SDCCicode.c 1.207 and earlier. */ + {4,4,4}, /* sizeofMatchJump[] */ + {0,0,0}, /* sizeofRangeCompare[] */ + 0, /* sizeofSubtract */ + 3, /* sizeofDispatch */ + }, "_", _pic16_init, _pic16_parseOptions,