X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fpic%2Fdevice.c;h=b8deafeb2211064278521f8fdffe729ef1c80eaa;hb=4fa52c899d3553b51d56db35d035f17b7e22e66b;hp=67b168d329df16425d58fcffbe358a7d7bfefba8;hpb=cec76eccf6ccffcd833c6108053bc2f90d84b842;p=fw%2Fsdcc diff --git a/src/pic/device.c b/src/pic/device.c index 67b168d3..b8deafeb 100644 --- a/src/pic/device.c +++ b/src/pic/device.c @@ -19,104 +19,402 @@ -------------------------------------------------------------------------*/ #include +#include +#include #include "common.h" // Include everything in the SDCC src directory #include "newalloc.h" +#include "main.h" #include "pcode.h" #include "ralloc.h" #include "device.h" #if defined(__BORLANDC__) || defined(_MSC_VER) #define STRCASECMP stricmp +#define STRNCASECMP strnicmp #else #define STRCASECMP strcasecmp +#define STRNCASECMP strncasecmp #endif -static PIC_device Pics[] = { - { - {"p16f627", "16f627", "pic16f627", "f627"}, /* processor name */ - (memRange *)NULL, - (memRange *)NULL, - 0, /* max ram address (calculated) */ - 0x1ff, /* default max ram address */ - 0x80, /* Bank Mask */ - }, +extern int Gstack_base_addr; +extern int Gstack_size; + +#define MAX_PICLIST 200 +static PIC_device *Pics[MAX_PICLIST]; +static int num_of_supported_PICS = 0; + +static PIC_device *pic=NULL; + +int maxRAMaddress = 0; +AssignedMemory *finalMapping=NULL; + +#define CONFIG_WORD_ADDRESS 0x2007 +#define CONFIG2_WORD_ADDRESS 0x2008 +#define DEFAULT_CONFIG_WORD 0x3fff +#define DEFAULT_CONFIG2_WORD 0x3ffc + +#define DEVICE_FILE_NAME "pic14devices.txt" +#define PIC14_STRING_LEN 256 +#define SPLIT_WORDS_MAX 16 + +static unsigned int config_word = DEFAULT_CONFIG_WORD; +static unsigned int config2_word = DEFAULT_CONFIG2_WORD; + +extern int pic14_is_shared (regs *reg); +extern void emitSymbolToFile (FILE *of, const char *name, const char *section_type, int size, int addr, int useEQU, int globalize); + + +/* parse a value from the configuration file */ +static int parse_config_value(char *str) +{ + if (str[strlen(str) - 1] == 'K') + return atoi(str) * 1024; /* like "1K" */ + + else if (STRNCASECMP(str, "0x", 2) == 0) + return strtol(str+2, NULL, 16); /* like "0x400" */ - { - {"p16f628", "16f628", "pic16f628", "f628"}, - (memRange *)NULL, - (memRange *)NULL, - 0, - 0x1ff, - 0x80, - }, + else + return atoi(str); /* like "1024" */ +} + + +/* split a line into words */ +static int split_words(char result_word[SPLIT_WORDS_MAX][PIC14_STRING_LEN], char *str) +{ + char *pos = str; + int num_words = 0; + int ccount; - { - {"p16f84", "16f84", "pic16f84", "f84"}, - (memRange *)NULL, - (memRange *)NULL, - 0, - 0xcf, - 0x80, - }, + while (*pos != '\0' && num_words < SPLIT_WORDS_MAX) { + /* remove leading spaces */ + while (isspace(*pos) || *pos == ',') + pos++; - { - {"p16f873", "16f873", "pic16f873", "f873"}, - (memRange *)NULL, - (memRange *)NULL, - 0, - 0x1ff, - 0x180, - }, + /* copy everything up until the first space or comma */ + for (ccount = 0; *pos != '\0' && !isspace(*pos) && *pos != ',' && ccount < PIC14_STRING_LEN-1; ccount++, pos++) + result_word[num_words][ccount] = *pos; + result_word[num_words][ccount] = '\0'; + + num_words++; + } + + return num_words; +} - { - {"p16f877", "16f877", "pic16f877", "f877"}, - (memRange *)NULL, - (memRange *)NULL, - 0, - 0x1ff, - 0x180, - }, + +/* remove annoying prefixes from the processor name */ +static char *sanitise_processor_name(char *name) +{ + char *proc_pos = name; + + if (name == NULL) + return NULL; - { - {"p16f819", "16f819", "pic16f819", "f819"}, - (memRange *)NULL, - (memRange *)NULL, - 0, - 0x1ff, - 0x80, - }, + if (STRNCASECMP(proc_pos, "pic", 3) == 0) + proc_pos += 3; -}; + else if (tolower(*proc_pos) == 'p') + proc_pos += 1; + + return proc_pos; +} -static int num_of_supported_PICS = sizeof(Pics)/sizeof(PIC_device); -#define DEFAULT_PIC "f877" +/* create a structure for a pic processor */ +static PIC_device *create_pic(char *pic_name, int maxram, int bankmsk, int confsiz, int program, int data, int eeprom, int io) +{ + PIC_device *new_pic; + char *simple_pic_name = sanitise_processor_name(pic_name); + + new_pic = Safe_calloc(1, sizeof(PIC_device)); + new_pic->name = Safe_calloc(strlen(simple_pic_name)+1, sizeof(char)); + strcpy(new_pic->name, simple_pic_name); + + new_pic->defMaxRAMaddrs = maxram; + new_pic->bankMask = bankmsk; + new_pic->hasSecondConfigReg = confsiz > 1; + + new_pic->programMemSize = program; + new_pic->dataMemSize = data; + new_pic->eepromMemSize = eeprom; + new_pic->ioPins = io; + + Pics[num_of_supported_PICS] = new_pic; + num_of_supported_PICS++; + + return new_pic; +} -static PIC_device *pic=NULL; -AssignedMemory *finalMapping=NULL; +/* mark some registers as being duplicated across banks */ +static void register_map(int num_words, char word[SPLIT_WORDS_MAX][PIC14_STRING_LEN]) +{ + memRange r; + int pcount; + + if (num_words < 3) { + fprintf(stderr, "WARNING: not enough values in %s regmap directive\n", DEVICE_FILE_NAME); + return; + } + + r.alias = parse_config_value(word[1]); -#define CONFIG_WORD_ADDRESS 0x2007 -#define DEFAULT_CONFIG_WORD 0x3fff + for (pcount = 2; pcount < num_words; pcount++) { + + r.start_address = parse_config_value(word[pcount]); + r.end_address = parse_config_value(word[pcount]); + r.bank = (r.start_address >> 7) & 3; + + addMemRange(&r, 1); + } +} -static unsigned int config_word = DEFAULT_CONFIG_WORD; + +/* define ram areas - may be duplicated across banks */ +static void ram_map(int num_words, char word[SPLIT_WORDS_MAX][PIC14_STRING_LEN]) +{ + memRange r; + + if (num_words < 4) { + fprintf(stderr, "WARNING: not enough values in %s memmap directive\n", DEVICE_FILE_NAME); + return; + } + + r.start_address = parse_config_value(word[1]); + r.end_address = parse_config_value(word[2]); + r.alias = parse_config_value(word[3]); + r.bank = (r.start_address >> 7) & 3; + + addMemRange(&r, 0); +} + +extern set *includeDirsSet; +extern set *userIncDirsSet; +extern set *libDirsSet; +extern set *libPathsSet; + +/* read the file with all the pic14 definitions and pick out the definition for a processor + * if specified. if pic_name is NULL reads everything */ +static PIC_device *find_device(char *pic_name) +{ + FILE *pic_file; + char pic_buf[PIC14_STRING_LEN]; + char *pic_buf_pos; + int found_processor = FALSE; + int done = FALSE; + char processor_name[SPLIT_WORDS_MAX][PIC14_STRING_LEN]; + int num_processor_names = 0; + int pic_maxram = 0; + int pic_bankmsk = 0; + int pic_confsiz = 0; + int pic_program = 0; + int pic_data = 0; + int pic_eeprom = 0; + int pic_io = 0; + char *simple_pic_name; + char *dir; + char filename[512]; + int len = 512; + + /* allow abbreviations of the form "f877" - convert to "16f877" */ + simple_pic_name = sanitise_processor_name(pic_name); + num_of_supported_PICS = 0; + + /* open the piclist file */ + /* first scan all include directories */ + pic_file = NULL; + //fprintf( stderr, "%s: searching %s\n", __FUNCTION__, DEVICE_FILE_NAME ); + for (dir = setFirstItem(includeDirsSet); + !pic_file && dir; + dir = setNextItem(includeDirsSet)) + { + //fprintf( stderr, "searching1 %s\n", dir ); + SNPRINTF(&filename[0], len, "%s%s%s", dir, DIR_SEPARATOR_STRING, DEVICE_FILE_NAME); + pic_file = fopen( filename, "rt" ); + if (pic_file) break; + } // for + for (dir = setFirstItem(userIncDirsSet); + !pic_file && dir; + dir = setNextItem(userIncDirsSet)) + { + //fprintf( stderr, "searching2 %s\n", dir ); + SNPRINTF(&filename[0], len, "%s%s%s", dir, DIR_SEPARATOR_STRING, DEVICE_FILE_NAME); + pic_file = fopen( filename, "rt" ); + if (pic_file) break; + } // for + for (dir = setFirstItem(libDirsSet); + !pic_file && dir; + dir = setNextItem(libDirsSet)) + { + //fprintf( stderr, "searching3 %s\n", dir ); + SNPRINTF(&filename[0], len, "%s%s%s", dir, DIR_SEPARATOR_STRING, DEVICE_FILE_NAME); + pic_file = fopen( filename, "rt" ); + if (pic_file) break; + } // for + for (dir = setFirstItem(libPathsSet); + !pic_file && dir; + dir = setNextItem(libPathsSet)) + { + //fprintf( stderr, "searching4 %s\n", dir ); + SNPRINTF(&filename[0], len, "%s%s%s", dir, DIR_SEPARATOR_STRING, DEVICE_FILE_NAME); + pic_file = fopen( filename, "rt" ); + if (pic_file) break; + } // for + if (!pic_file) { + pic_file = fopen(DATADIR LIB_DIR_SUFFIX DIR_SEPARATOR_STRING "pic" DIR_SEPARATOR_STRING DEVICE_FILE_NAME, "rt"); + } + if (pic_file == NULL) { + /* this second attempt is used when initially building the libraries */ + pic_file = fopen(".." DIR_SEPARATOR_STRING ".." DIR_SEPARATOR_STRING ".." DIR_SEPARATOR_STRING ".." + DIR_SEPARATOR_STRING "src" DIR_SEPARATOR_STRING "pic" DIR_SEPARATOR_STRING + DEVICE_FILE_NAME, "rt"); + if (pic_file == NULL) { + fprintf(stderr, "can't find %s\n", DATADIR LIB_DIR_SUFFIX DIR_SEPARATOR_STRING "pic" + DIR_SEPARATOR_STRING DEVICE_FILE_NAME); + return NULL; + } + } + + /* read line by line */ + pic_buf[sizeof(pic_buf)-1] = '\0'; + while (fgets(pic_buf, sizeof(pic_buf)-1, pic_file) != NULL && !done) { + + /* remove trailing spaces */ + while (isspace(pic_buf[strlen(pic_buf)-1])) + pic_buf[strlen(pic_buf)-1] = '\0'; + + /* remove leading spaces */ + for (pic_buf_pos = pic_buf; isspace(*pic_buf_pos); pic_buf_pos++) + {} + + /* ignore comment / empty lines */ + if (*pic_buf_pos != '\0' && *pic_buf_pos != '#') { + + /* split into fields */ + char pic_word[SPLIT_WORDS_MAX][PIC14_STRING_LEN]; + int num_pic_words; + int wcount; + + num_pic_words = split_words(pic_word, pic_buf_pos); + + if (STRCASECMP(pic_word[0], "processor") == 0) { + + if (pic_name == NULL) { + /* this is the mode where we read all the processors in - store the names for now */ + if (num_processor_names > 0) { + /* store away all the previous processor definitions */ + int dcount; + + for (dcount = 1; dcount < num_processor_names; dcount++) + create_pic(processor_name[dcount], pic_maxram, pic_bankmsk, + pic_confsiz, pic_program, pic_data, pic_eeprom, pic_io); + } + + num_processor_names = split_words(processor_name, pic_buf_pos); + } + else { + /* if we've just completed reading a processor definition stop now */ + if (found_processor) + done = TRUE; + else { + /* check if this processor name is a match */ + for (wcount = 1; wcount < num_pic_words; wcount++) { + + /* skip uninteresting prefixes */ + char *found_name = sanitise_processor_name(pic_word[wcount]); + + if (STRCASECMP(found_name, simple_pic_name) == 0) + found_processor = TRUE; + } + } + } + } + + else { + if (found_processor || pic_name == NULL) { + /* only parse a processor section if we've found the one we want */ + if (STRCASECMP(pic_word[0], "maxram") == 0 && num_pic_words > 1) { + pic_maxram = parse_config_value(pic_word[1]); + setMaxRAM(pic_maxram); + } + else if (STRCASECMP(pic_word[0], "bankmsk") == 0 && num_pic_words > 1) + pic_bankmsk = parse_config_value(pic_word[1]); + + else if (STRCASECMP(pic_word[0], "confsiz") == 0 && num_pic_words > 1) + pic_confsiz = parse_config_value(pic_word[1]); + + else if (STRCASECMP(pic_word[0], "program") == 0 && num_pic_words > 1) + pic_program = parse_config_value(pic_word[1]); + + else if (STRCASECMP(pic_word[0], "data") == 0 && num_pic_words > 1) + pic_data = parse_config_value(pic_word[1]); + + else if (STRCASECMP(pic_word[0], "eeprom") == 0 && num_pic_words > 1) + pic_eeprom = parse_config_value(pic_word[1]); + + else if (STRCASECMP(pic_word[0], "io") == 0 && num_pic_words > 1) + pic_io = parse_config_value(pic_word[1]); + + else if (STRCASECMP(pic_word[0], "regmap") == 0 && num_pic_words > 2) { + if (found_processor) + register_map(num_pic_words, pic_word); + } + else if (STRCASECMP(pic_word[0], "memmap") == 0 && num_pic_words > 2) { + if (found_processor) + ram_map(num_pic_words, pic_word); + } + else { + fprintf(stderr, "WARNING: %s: bad syntax `%s'\n", DEVICE_FILE_NAME, pic_word[0]); + } + } + } + } + } + + fclose(pic_file); + + /* if we're in read-the-lot mode then create the final processor definition */ + if (pic_name == NULL) { + + if (num_processor_names > 0) { + /* store away all the previous processor definitions */ + int dcount; + + for (dcount = 1; dcount < num_processor_names; dcount++) + create_pic(processor_name[dcount], pic_maxram, pic_bankmsk, + pic_confsiz, pic_program, pic_data, pic_eeprom, pic_io); + } + } + else { + /* in search mode */ + if (found_processor) { + /* create a new pic entry */ + return create_pic(pic_name, pic_maxram, pic_bankmsk, + pic_confsiz, pic_program, pic_data, pic_eeprom, pic_io); + } + } + + return NULL; +} void addMemRange(memRange *r, int type) { int i; int alias = r->alias; - if (pic->maxRAMaddress < 0) { - fprintf(stderr, "missing \"#pragma maxram\" setting\n"); + if (maxRAMaddress < 0) { + fprintf(stderr, "missing maxram setting in %s\n", DEVICE_FILE_NAME); return; } do { for (i=r->start_address; i<= r->end_address; i++) { - if ((i|alias) <= pic->maxRAMaddress) { + if ((i|alias) <= maxRAMaddress) { + /* if we haven't seen this address before, enter it */ + if (!finalMapping[i | alias].isValid) { finalMapping[i | alias].isValid = 1; finalMapping[i | alias].alias = r->alias; finalMapping[i | alias].bank = r->bank; @@ -126,9 +424,10 @@ void addMemRange(memRange *r, int type) } else { finalMapping[i | alias].isSFR = 0; } + } } else { fprintf(stderr, "WARNING: %s:%s memory at 0x%x is beyond max ram = 0x%x\n", - __FILE__,__FUNCTION__,(i|alias), pic->maxRAMaddress); + __FILE__,__FUNCTION__,(i|alias), maxRAMaddress); } } @@ -145,22 +444,23 @@ void addMemRange(memRange *r, int type) void setMaxRAM(int size) { int i; - pic->maxRAMaddress = size; + maxRAMaddress = size; - if (pic->maxRAMaddress < 0) { - fprintf(stderr, "invalid \"#pragma maxram 0x%x\" setting\n", - pic->maxRAMaddress); + if (maxRAMaddress < 0) { + fprintf(stderr, "invalid maxram 0x%x setting in %s\n", + maxRAMaddress, DEVICE_FILE_NAME); return; } - finalMapping = Safe_calloc(1+pic->maxRAMaddress, + finalMapping = Safe_calloc(1+maxRAMaddress, sizeof(AssignedMemory)); /* Now initialize the finalMapping array */ - for(i=0; i<=pic->maxRAMaddress; i++) { + for(i=0; i<=maxRAMaddress; i++) { finalMapping[i].reg = NULL; finalMapping[i].isValid = 0; + finalMapping[i].bank = (i>>7); } } @@ -194,6 +494,16 @@ int REGallBanks(regs *reg) /*-----------------------------------------------------------------* *-----------------------------------------------------------------*/ +int isSFR(int address) +{ + + if( (address > maxRAMaddress) || !finalMapping[address].isSFR) + return 0; + + return 1; + +} + /* * dump_map -- debug stuff */ @@ -202,7 +512,7 @@ void dump_map(void) { int i; - for(i=0; i<=pic->maxRAMaddress; i++) { + for(i=0; i<=maxRAMaddress; i++) { //fprintf(stdout , "addr 0x%02x is %s\n", i, ((finalMapping[i].isValid) ? "valid":"invalid")); if(finalMapping[i].isValid) { @@ -219,21 +529,44 @@ void dump_map(void) void dump_sfr(FILE *of) { - +#if 0 int start=-1; - int addr=0; int bank_base; static int udata_flag=0; +#endif + int addr=0; //dump_map(); /* display the register map */ //fprintf(stdout,";dump_sfr \n"); - if (pic->maxRAMaddress < 0) { - fprintf(stderr, "missing \"#pragma maxram\" setting\n"); + if (maxRAMaddress < 0) { + fprintf(stderr, "missing maxram setting in %s\n", DEVICE_FILE_NAME); return; } - do { + for (addr = 0; addr <= maxRAMaddress; addr++) + { + regs *reg = finalMapping[addr].reg; + if (reg && !reg->isEmitted) + { + if (pic14_options.isLibrarySource && pic14_is_shared (reg)) + { + /* rely on external declarations for the non-fixed stack */ + /* Update: We always emit the STACK symbols into a + * udata_shr section, so no extern declaration is + * required. */ + //fprintf (of, "\textern\t%s\n", reg->name); + } else { + emitSymbolToFile (of, reg->name, "udata", reg->size, reg->isFixed ? reg->address : -1, 0, pic14_is_shared (reg)); + } + + reg->isEmitted = 1; + } + } // for + +#if 0 + do { + if(finalMapping[addr].reg && !finalMapping[addr].reg->isEmitted) { if(start<0) @@ -241,9 +574,9 @@ void dump_sfr(FILE *of) } else { if(start>=0) { - /* clear the lower 7-bits of the start address of the first - * variable declared in this bank. The upper bits for the mid - * range pics are the bank select bits. + /* clear the lower 7-bits of the start address of the first + * variable declared in this bank. The upper bits for the mid + * range pics are the bank select bits. */ bank_base = start & 0xfff8; @@ -271,9 +604,12 @@ void dump_sfr(FILE *of) finalMapping[start].reg->address+i); } } else { + emitSymbolToFile (of, finalMapping[start].reg->name, finalMapping[start].reg->size); +#if 0 fprintf(of,"%s\tres\t%i\n", finalMapping[start].reg->name, finalMapping[start].reg->size); +#endif } finalMapping[start].reg->isEmitted = 1; } @@ -286,9 +622,10 @@ void dump_sfr(FILE *of) addr++; - } while(addr <= pic->maxRAMaddress); - - + } while(addr <= maxRAMaddress); + + +#endif } /*-----------------------------------------------------------------* @@ -301,73 +638,71 @@ void dump_sfr(FILE *of) * list_alias - if non-zero, print all of the supported aliases * for a device (e.g. F84, 16F84, etc...) *-----------------------------------------------------------------*/ -void list_valid_pics(int ncols, int list_alias) +void list_valid_pics(int ncols) { - int col,longest; - int i,j,k,l; + int col=0,longest; + int i,k,l; - if(list_alias) - list_alias = sizeof(Pics[0].name) / sizeof(Pics[0].name[0]); + if (num_of_supported_PICS == 0) + find_device(NULL); /* load all the definitions */ /* decrement the column number if it's greater than zero */ ncols = (ncols > 1) ? ncols-1 : 4; /* Find the device with the longest name */ for(i=0,longest=0; ilongest) - longest = k; - } + k = strlen(Pics[i]->name); + if(k>longest) + longest = k; } +#if 1 + /* heading */ + fprintf(stderr, "\nPIC14 processors and their characteristics:\n\n"); + fprintf(stderr, " processor"); + for(k=0; kname); + l = longest + 2 - strlen(Pics[i]->name); + for(k=0; kprogramMemSize % 1024 == 0) + fprintf(stderr, "%4dK", Pics[i]->programMemSize / 1024); + else + fprintf(stderr, "%5d", Pics[i]->programMemSize); + + fprintf(stderr, " %5d %5d %4d\n", + Pics[i]->dataMemSize, Pics[i]->eepromMemSize, Pics[i]->ioPins); + } + col = 0; + fprintf(stderr, "\nPIC14 processors supported:\n"); for(i=0; i < num_of_supported_PICS; i++) { - j = 0; - do { - fprintf(stderr,"%s", Pics[i].name[j]); - if(colname); + if(colname); + for(k=0; kmaxRAMaddress = -1; } /*-----------------------------------------------------------------* @@ -397,7 +735,7 @@ void init_pic(char *pic_type) *-----------------------------------------------------------------*/ int picIsInitialized(void) { - if(pic && pic->maxRAMaddress > 0) + if(pic && maxRAMaddress > 0) return 1; return 0; @@ -413,17 +751,7 @@ char *processor_base_name(void) if(!pic) return NULL; - return pic->name[0]; -} - -int isSFR(int address) -{ - - if( (address > pic->maxRAMaddress) || !finalMapping[address].isSFR) - return 0; - - return 1; - + return pic->name; } /*-----------------------------------------------------------------* @@ -432,12 +760,13 @@ int validAddress(int address, int reg_size) { int i; - if (pic->maxRAMaddress < 0) { - fprintf(stderr, "missing \"#pragma maxram\" setting\n"); + if (maxRAMaddress < 0) { + fprintf(stderr, "missing maxram setting in %s\n", DEVICE_FILE_NAME); return 0; } // fprintf(stderr, "validAddress: Checking 0x%04x\n",address); - if(address > pic->maxRAMaddress) + assert (reg_size > 0); + if(address + (reg_size - 1) > maxRAMaddress) return 0; for (i=0; imaxRAMaddress < 0) { - fprintf(stderr, "missing \"#pragma maxram\" setting\n"); + if (maxRAMaddress < 0) { + fprintf(stderr, "missing maxram setting in %s\n", DEVICE_FILE_NAME); return; } @@ -514,8 +843,8 @@ int assignRegister(regs *reg, int start_address) return reg->address; } - //fprintf(stderr, "WARNING: Ignoring Out of Range register assignment at fixed address %d, %s\n", - // reg->address, reg->name); + fprintf(stderr, "WARNING: Ignoring Out of Range register assignment at fixed address %d, %s\n", + reg->address, reg->name); } else { @@ -523,7 +852,7 @@ int assignRegister(regs *reg, int start_address) * so we'll search through all availble ram address and * assign the first one */ - for (i=start_address; i<=pic->maxRAMaddress; i++) { + for (i=start_address; i<=maxRAMaddress; i++) { if (validAddress(i,reg->size)) { reg->address = i; @@ -565,9 +894,9 @@ void assignRelocatableRegisters(set *regset, int used) for (reg = setFirstItem(regset) ; reg ; reg = setNextItem(regset)) { - //fprintf(stdout,"assigning %s isFixed=%d, wasUsed=%d\n",reg->name,reg->isFixed,reg->wasUsed); + //fprintf(stdout,"assigning %s (%d) isFixed=%d, wasUsed=%d\n",reg->name,reg->size,reg->isFixed,reg->wasUsed); - if((!reg->isFixed) && ( used || reg->wasUsed)) { + if((!reg->isExtern) && (!reg->isFixed) && ( used || reg->wasUsed)) { /* If register have been reused then shall not print it a second time. */ set *s; int done = 0; @@ -591,44 +920,124 @@ void assignRelocatableRegisters(set *regset, int used) } +/* Keep track of whether we found an assignment to the __config words. */ +static int pic14_hasSetConfigWord = 0; /*-----------------------------------------------------------------* -* void assignConfigWordValue(int address, int value) -* -* All midrange PICs have one config word at address 0x2007. -* This routine will assign a value to that address. -* -*-----------------------------------------------------------------*/ + * void assignConfigWordValue(int address, int value) + * + * Most midrange PICs have one config word at address 0x2007. + * Newer PIC14s have a second config word at address 0x2008. + * This routine will assign values to those addresses. + * + *-----------------------------------------------------------------*/ -void assignConfigWordValue(int address, int value) +void pic14_assignConfigWordValue(int address, int value) { - if(CONFIG_WORD_ADDRESS == address) + if (CONFIG_WORD_ADDRESS == address) config_word = value; - //fprintf(stderr,"setting config word to 0x%x\n",value); + else if (CONFIG2_WORD_ADDRESS == address) + config2_word = value; + //fprintf(stderr,"setting config word 0x%x to 0x%x\n", address, value); + pic14_hasSetConfigWord = 1; } + /*-----------------------------------------------------------------* -* int getConfigWord(int address) -* -* Get the current value of the config word. -* -*-----------------------------------------------------------------*/ + * int pic14_emitConfigWord (FILE * vFile) + * + * Emit the __config directives iff we found a previous assignment + * to the config word. + *-----------------------------------------------------------------*/ +extern char *iComments2; +int pic14_emitConfigWord (FILE * vFile) +{ + if (pic14_hasSetConfigWord) + { + fprintf (vFile, "%s", iComments2); + fprintf (vFile, "; config word \n"); + fprintf (vFile, "%s", iComments2); + if (pic14_getHasSecondConfigReg()) + { + fprintf (vFile, "\t__config _CONFIG1, 0x%x\n", pic14_getConfigWord(0x2007)); + fprintf (vFile, "\t__config _CONFIG2, 0x%x\n", pic14_getConfigWord(0x2008)); + } + else + fprintf (vFile, "\t__config 0x%x\n", pic14_getConfigWord(0x2007)); -int getConfigWord(int address) + return 1; + } + return 0; +} + +/*-----------------------------------------------------------------* + * int pic14_getConfigWord(int address) + * + * Get the current value of a config word. + * + *-----------------------------------------------------------------*/ + +int pic14_getConfigWord(int address) { - if(CONFIG_WORD_ADDRESS == address) + switch (address) + { + case CONFIG_WORD_ADDRESS: return config_word; - else - return 0; + case CONFIG2_WORD_ADDRESS: + return config2_word; + default: + return 0; + } } /*-----------------------------------------------------------------* * *-----------------------------------------------------------------*/ -void setDefMaxRam(void) +unsigned pic14_getMaxRam(void) { - setMaxRAM(pic->defMaxRAMaddrs); // Max RAM has not been included, so use default setting + return pic->defMaxRAMaddrs; } + + +/*-----------------------------------------------------------------* +* int getHasSecondConfigReg(void) - check if the device has a +* second config register, rather than just one. +*-----------------------------------------------------------------*/ +int pic14_getHasSecondConfigReg(void) +{ + if(!pic) + return 0; + else + return pic->hasSecondConfigReg; +} + +/*-----------------------------------------------------------------* + * Query the size of the sharebank of the selected device. + * FIXME: Currently always returns 16. + *-----------------------------------------------------------------*/ +int pic14_getSharebankSize(void) +{ + return 16; +} + +/*-----------------------------------------------------------------* + * Query the highest byte address occupied by the sharebank of the + * selected device. + * FIXME: Currently always returns 0x7f. + * THINK: Might not be needed, if we assign all shareable objects to + * a `udata_shr' section and let the linker do the rest... + * Tried it, but yields `no target memory available' for pic16f877... + *-----------------------------------------------------------------*/ +int pic14_getSharebankAddress(void) +{ + int sharebankAddress = 0x7f; + /* If total RAM is less than 0x7f as with 16f84 then reduce + * sharebankAddress to fit */ + if ((unsigned)sharebankAddress > pic14_getMaxRam()) + sharebankAddress = (int)pic14_getMaxRam(); + return sharebankAddress; +} +