X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fpic%2Fmain.c;h=8707cc99921c3e0b91d9b59222c59cb6bbab304a;hb=04a66f4aa0c6a3cf27d0b5339a74ed8e4f92f1a6;hp=dcb0aca0b107f5633b6ab04dca61dc7abb345c6b;hpb=4aaeb0f34f305307c495ba6ce9c25eb492f131c1;p=fw%2Fsdcc diff --git a/src/pic/main.c b/src/pic/main.c index dcb0aca0..8707cc99 100644 --- a/src/pic/main.c +++ b/src/pic/main.c @@ -5,24 +5,50 @@ it easier to set a breakpoint using the debugger. */ #include "common.h" -#include "main.h" -#include "ralloc.h" +#include "MySystem.h" +#include "SDCCmacro.h" + #include "device.h" -#include "SDCCutil.h" +#include "gen.h" #include "glue.h" -//#include "gen.h" +#include "main.h" +#include "pcode.h" +#include "ralloc.h" + +/* + * Imports + */ +extern set *dataDirsSet; +extern set *includeDirsSet; +extern set *libDirsSet; +extern set *libPathsSet; +extern set *linkOptionsSet; + + +pic14_options_t pic14_options; +int debug_verbose = 0; +#define OPTION_STACK_SIZE "--stack-size" + static char _defaultRules[] = { #include "peeph.rul" }; -/* list of key words used by msc51 */ +static OPTION _pic14_poptions[] = + { + { 0, "--debug-xtra", &debug_verbose, "show more debug info in assembly output" }, + { 0, "--no-pcode-opt", &pic14_options.disable_df, "disable (slightly faulty) optimization on pCode" }, + { 0, OPTION_STACK_SIZE, &options.stack_size, "sets the size if the argument passing stack (default: 16, minimum: 4)", CLAT_INTEGER }, + { 0, NULL, NULL, NULL } + }; + +/* list of key words used by pic14 */ static char *_pic14_keywords[] = { "at", - "bit", + //"bit", "code", "critical", "data", @@ -33,7 +59,7 @@ static char *_pic14_keywords[] = "pdata", "reentrant", "sfr", - "sbit", + //"sbit", "using", "xdata", "_data", @@ -46,191 +72,96 @@ static char *_pic14_keywords[] = NULL }; -void pCodeInitRegisters(void); +static int regParmFlg = 0; /* determine if we can register a parameter */ -void pic14_assignRegisters (eBBlock ** ebbs, int count); -static int regParmFlg = 0; /* determine if we can register a parameter */ +/** $1 is always the basename. + $2 is always the output file. + $3 varies + $l is the list of extra options that should be there somewhere... + MUST be terminated with a NULL. +*/ +static const char *_linkCmd[] = +{ + "gplink", "$l", "-w", "-r", "-o \"$2\"", "\"$1\"", "$3", NULL +}; + +static const char *_asmCmd[] = +{ + "gpasm", "$l", "$3", "-c", "\"$1.asm\"", NULL +}; static void _pic14_init (void) { asm_addTree (&asm_asxxxx_mapping); - pCodeInitRegisters(); + memset (&pic14_options, 0, sizeof (pic14_options)); } static void -_pic14_reset_regparm () +_pic14_reset_regparm (void) { regParmFlg = 0; } static int -_pic14_regparm (sym_link * l) +_pic14_regparm (sym_link * l, bool reentrant) { - /* for this processor it is simple - can pass only the first parameter in a register */ +/* for this processor it is simple + can pass only the first parameter in a register */ //if (regParmFlg) // return 0; - + regParmFlg++;// = 1; return 1; } -static int -_process_pragma(const char *sz) -{ - static const char *WHITE = " \t"; - char *ptr = strtok((char *)sz, WHITE); - - if (startsWith (ptr, "memmap")) - { - char *start; - char *end; - char *type; - char *alias; - - start = strtok((char *)NULL, WHITE); - end = strtok((char *)NULL, WHITE); - type = strtok((char *)NULL, WHITE); - alias = strtok((char *)NULL, WHITE); - - if (start != (char *)NULL - && end != (char *)NULL - && type != (char *)NULL) { - value *startVal = constVal(start); - value *endVal = constVal(end); - value *aliasVal; - memRange r; - - if (alias == (char *)NULL) { - aliasVal = constVal(0); - } else { - aliasVal = constVal(alias); - } - - r.start_address = (int)floatFromVal(startVal); - r.end_address = (int)floatFromVal(endVal); - r.alias = (int)floatFromVal(aliasVal); - r.bank = (r.start_address >> 7) & 3; - - if (strcmp(type, "RAM") == 0) { - addMemRange(&r, 0); - } else if (strcmp(type, "SFR") == 0) { - addMemRange(&r, 1); - } else { - return 1; - } - } - - return 0; - } else if (startsWith (ptr, "maxram")) { - char *maxRAM = strtok((char *)NULL, WHITE); - - if (maxRAM != (char *)NULL) { - int maxRAMaddress; - value *maxRAMVal; - - maxRAMVal = constVal(maxRAM); - maxRAMaddress = (int)floatFromVal(maxRAMVal); - setMaxRAM(maxRAMaddress); - } - - return 0; - } - return 1; -} - -extern char *udata_section_name; - static bool _pic14_parseOptions (int *pargc, char **argv, int *i) { - char buf[128]; - - /* TODO: allow port-specific command line options to specify - * segment names here. - */ - - /* This is a temporary hack, to solve problems with some processors - * that do not have udata section. It will be changed when a more - * robust solution is figured out -- VR 27-11-2003 FIXME - */ - strcpy(buf, "--udata-section-name"); - if(!strncmp(buf, argv[ *i ], strlen(buf))) { - if(strlen(argv[ *i ]) <= strlen(buf)+1) { - fprintf(stderr, "WARNING: no `%s' entered\n", buf+2); - exit(-1); - } else { - udata_section_name = strdup( strchr(argv[*i], '=') + 1 ); - } - return 1; - } - - return FALSE; + /* TODO: allow port-specific command line options to specify + * segment names here. + */ + return FALSE; } +/* pic14 port uses include/pic and lib/pic instead of + * include/pic14 and lib/pic14 as indicated by SDCCmain.c's + * setIncludePaths routine. */ static void -_pic14_finaliseOptions (void) +_pic14_initPaths (void) { + char *p; + char *p2=NULL; + set *tempSet=NULL; - port->mem.default_local_map = data; - port->mem.default_globl_map = data; -#if 0 - /* Hack-o-matic: if we are using the flat24 model, - * adjust pointer sizes. - */ - if (options.model == MODEL_FLAT24) - { + if (options.nostdinc) + return; - 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; - } + tempSet = appendStrSet(dataDirsSet, NULL, INCLUDE_DIR_SUFFIX DIR_SEPARATOR_STRING "pic"); + mergeSets(&includeDirsSet, tempSet); - if (options.model == MODEL_LARGE) - { - port->mem.default_local_map = xdata; - port->mem.default_globl_map = xdata; - } - else + if ((p = getenv(SDCC_INCLUDE_NAME)) != NULL) + { + addSetHead(&includeDirsSet, p); + p2=Safe_alloc(strlen(p)+strlen(DIR_SEPARATOR_STRING)+strlen("pic")+1); + if(p2!=NULL) { - port->mem.default_local_map = data; - port->mem.default_globl_map = data; + strcpy(p2, p); + strcat(p2, DIR_SEPARATOR_STRING); + strcat(p2, "pic"); + addSetHead(&includeDirsSet, p2); } + } +} - if (options.stack10bit) - { - if (options.model != MODEL_FLAT24) - { - fprintf (stderr, - "*** warning: 10 bit stack mode is only supported in flat24 model.\n"); - fprintf (stderr, "\t10 bit stack mode disabled.\n"); - options.stack10bit = 0; - } - else - { - /* Fixup the memory map for the stack; it is now in - * far space and requires a FPOINTER to access it. - */ - istack->fmap = 1; - istack->ptrType = FPOINTER; - } - } -#endif +static void +_pic14_finaliseOptions (void) +{ + pCodeInitRegisters(); + + port->mem.default_local_map = data; + port->mem.default_globl_map = data; } static void @@ -246,98 +177,44 @@ _pic14_getRegName (struct regs *reg) return "err"; } -extern char *processor_base_name(void); - static void _pic14_genAssemblerPreamble (FILE * of) { char * name = processor_base_name(); - + if(!name) { - - name = "p16f877"; + + name = "16f877"; fprintf(stderr,"WARNING: No Pic has been selected, defaulting to %s\n",name); } - - fprintf (of, "\tlist\tp=%s\n",&name[1]); - fprintf (of, "\tradix dec"); - fprintf (of, "\ninclude \"%s.inc\"\n",name); + + fprintf (of, "\tlist\tp=%s\n",name); + fprintf (of, "\tradix dec\n"); + fprintf (of, "\tinclude \"p%s.inc\"\n",name); } /* Generate interrupt vector table. */ static int -_pic14_genIVT (FILE * of, symbol ** interrupts, int maxInterrupts) +_pic14_genIVT (struct dbuf_s * oBuf, symbol ** interrupts, int maxInterrupts) { - int i; - - if (options.model != MODEL_FLAT24) - { - /* Let the default code handle it. */ - return FALSE; - } - - fprintf (of, "\t;ajmp\t__sdcc_gsinit_startup\n"); - - /* now for the other interrupts */ - for (i = 0; i < maxInterrupts; i++) - { - if (interrupts[i]) - { - fprintf (of, "\t;ljmp\t%s\n\t.ds\t4\n", interrupts[i]->rname); - } - else - { - fprintf (of, "\t;reti\n\t.ds\t7\n"); - } - } - - return TRUE; + /* Let the default code handle it. */ + return FALSE; } static bool _hasNativeMulFor (iCode *ic, sym_link *left, sym_link *right) { -/* - sym_link *test = NULL; - value *val; -*/ - - fprintf(stderr,"checking for native mult\n"); - if ( ic->op != '*') - { - return FALSE; - } - - return TRUE; -/* - if ( IS_LITERAL (left)) - { - fprintf(stderr,"left is lit\n"); - test = left; - val = OP_VALUE (IC_LEFT (ic)); - } - else if ( IS_LITERAL (right)) - { - fprintf(stderr,"right is lit\n"); - test = left; - val = OP_VALUE (IC_RIGHT (ic)); - } - else - { - fprintf(stderr,"oops, neither is lit so no\n"); - return FALSE; - } - - if ( getSize (test) <= 2) - { - fprintf(stderr,"yep\n"); - return TRUE; - } - fprintf(stderr,"nope\n"); - + { + return FALSE; + } + + /* multiply chars in-place */ + if (getSize(left) == 1 && getSize(right) == 1) + return TRUE; + + /* use library functions for more complex maths */ return FALSE; -*/ } /* Indicate which extended bit operations this port supports */ @@ -345,9 +222,9 @@ static bool hasExtBitOp (int op, int size) { if (op == RRC - || op == RLC - /* || op == GETHBIT */ /* GETHBIT doesn't look complete for PIC */ - ) + || op == RLC + /* || op == GETHBIT */ /* GETHBIT doesn't look complete for PIC */ + ) return TRUE; else return FALSE; @@ -362,55 +239,99 @@ oclsExpense (struct memmap *oclass) /* free to remove this test -- EEP */ if (IN_FARSPACE(oclass)) return 1; - + return 0; } -/** $1 is always the basename. - $2 is always the output file. - $3 varies - $l is the list of extra options that should be there somewhere... - MUST be terminated with a NULL. -*/ -static const char *_linkCmd[] = +static void _pic14_do_link (void) { - "gplink", "-o $2", "\"$1.o\"", "$l", NULL -}; + hTab *linkValues=NULL; + char lfrm[256]; + char *lcmd; + char temp[128]; + set *tSet=NULL; + int ret; + char * procName; + + /* + * link command format: + * {linker} {incdirs} {lflags} -o {outfile} {spec_ofiles} {ofiles} {libs} + * + */ -static const char *_asmCmd[] = -{ - "gpasm", "$l", "-c", "\"$1.asm\"", NULL + sprintf(lfrm, "{linker} {incdirs} {sysincdirs} {lflags} -w -r -o {outfile} {user_ofile} {spec_ofiles} {ofiles} {libs}"); -}; + shash_add(&linkValues, "linker", "gplink"); + + /* LIBRARY SEARCH DIRS */ + mergeSets(&tSet, libPathsSet); + mergeSets(&tSet, libDirsSet); + shash_add(&linkValues, "incdirs", joinStrSet(appendStrSet(tSet, "-I\"", "\""))); + + SNPRINTF (&temp[0], 128, "%cpic\"", DIR_SEPARATOR_CHAR); + joinStrSet(appendStrSet(libDirsSet, "-I\"", &temp[0])); + shash_add(&linkValues, "sysincdirs", joinStrSet(appendStrSet(libDirsSet, "-I\"", &temp[0]))); + + shash_add(&linkValues, "lflags", joinStrSet(linkOptionsSet)); + + shash_add(&linkValues, "outfile", fullDstFileName ? fullDstFileName : dstFileName); + + if(fullSrcFileName) { + sprintf(temp, "%s.o", fullDstFileName ? fullDstFileName : dstFileName ); + shash_add(&linkValues, "user_ofile", temp); + } + + shash_add(&linkValues, "ofiles", joinStrSet(relFilesSet)); + + /* LIBRARIES */ + procName = processor_base_name(); + if (!procName) { + procName = "16f877"; + } + + addSet(&libFilesSet, "libsdcc.lib"); + SNPRINTF(&temp[0], 128, "pic%s.lib", procName); + addSet(&libFilesSet, temp); + shash_add(&linkValues, "libs", joinStrSet(libFilesSet)); + + lcmd = msprintf(linkValues, lfrm); + + ret = my_system( lcmd ); + + Safe_free( lcmd ); + + if(ret) + exit(1); +} /* Globals */ PORT pic_port = { TARGET_ID_PIC, "pic14", - "MCU pic", /* Target name */ - "", /* Processor */ + "MCU pic", /* Target name */ + "", /* Processor */ { picglue, - TRUE, /* Emit glue around main */ + TRUE, /* Emit glue around main */ MODEL_SMALL | MODEL_LARGE | MODEL_FLAT24, MODEL_SMALL }, { _asmCmd, NULL, - NULL, - NULL, - //"-plosgffc", /* Options with debug */ - //"-plosgff", /* Options without debug */ + "-g", /* options with --debug */ + NULL, /* options without --debug */ + //"-plosgffc", /* Options with debug */ + //"-plosgff", /* Options without debug */ 0, ".asm", - NULL /* no do_assemble function */ + NULL /* no do_assemble function */ }, { _linkCmd, NULL, - NULL, + _pic14_do_link, /* own do link function */ ".o", 0 }, @@ -418,19 +339,22 @@ PORT pic_port = _defaultRules }, { - /* Sizes: char, short, int, long, ptr, fptr, gptr, bit, float, max */ - 1, 2, 2, 4, 2, 2, 2, 1, 4, 4 - /* TSD - I changed the size of gptr from 3 to 1. However, it should be - 2 so that we can accomodate the PIC's with 4 register banks (like the - 16f877) - */ + /* Sizes: char, short, int, long, ptr, fptr, gptr, bit, float, max */ + 1, 2, 2, 4, 2, 2, 3, 1, 4, 4 + /* TSD - I changed the size of gptr from 3 to 1. However, it should be + 2 so that we can accomodate the PIC's with 4 register banks (like the + 16f877) + */ }, + /* tags for generic pointers */ + { 0x00, 0x00, 0x00, 0x80 }, /* far, near, xstack, code */ { "XSEG (XDATA)", "STACK (DATA)", "code", "DSEG (DATA)", "ISEG (DATA)", + NULL, /* pdata */ "XSEG (XDATA)", "BSEG (BIT)", "RSEG (DATA)", @@ -440,6 +364,10 @@ PORT pic_port = "HOME (CODE)", 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, NULL, 1 // code is read only @@ -452,39 +380,56 @@ PORT pic_port = { 1, -1 }, + { + pic14_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 */ + }, "_", _pic14_init, _pic14_parseOptions, - NULL, + _pic14_poptions, + _pic14_initPaths, _pic14_finaliseOptions, _pic14_setDefaultOptions, pic14_assignRegisters, _pic14_getRegName, _pic14_keywords, _pic14_genAssemblerPreamble, - NULL, /* no genAssemblerEnd */ + NULL, /* no genAssemblerEnd */ _pic14_genIVT, NULL, // _pic14_genXINIT + NULL, /* genInitStartup */ _pic14_reset_regparm, _pic14_regparm, - _process_pragma, /* process a pragma */ + NULL, /* process a pragma */ NULL, _hasNativeMulFor, - hasExtBitOp, /* hasExtBitOp */ - oclsExpense, /* oclsExpense */ + hasExtBitOp, /* hasExtBitOp */ + oclsExpense, /* oclsExpense */ FALSE, - TRUE, /* little endian */ - 0, /* leave lt */ - 0, /* leave gt */ - 1, /* transform <= to ! > */ - 1, /* transform >= to ! < */ - 1, /* transform != to !(a == b) */ - 0, /* leave == */ - FALSE, /* No array initializer support. */ - 0, /* no CSE cost estimation yet */ - NULL, /* no builtin functions */ - GPOINTER, /* treat unqualified pointers as "generic" pointers */ - 1, /* reset labelKey to 1 */ - 1, /* globals & local static allowed */ +// TRUE, /* little endian */ + FALSE, /* little endian - PIC code enumlates big endian */ + 0, /* leave lt */ + 0, /* leave gt */ + 1, /* transform <= to ! > */ + 1, /* transform >= to ! < */ + 1, /* transform != to !(a == b) */ + 0, /* leave == */ + FALSE, /* No array initializer support. */ + 0, /* no CSE cost estimation yet */ + NULL, /* no builtin functions */ + GPOINTER, /* treat unqualified pointers as "generic" pointers */ + 1, /* reset labelKey to 1 */ + 1, /* globals & local static allowed */ PORT_MAGIC }; +