X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fpic16%2Fdevice.c;h=8878ed0799935e17bef44c6935179b32d819da93;hb=2745002e3c90e900346eef85749b7af622c06cd8;hp=3996e4508974501265bbf26a9895fe20a23e9d05;hpb=fab1b2b01944a97bc9a7275a2df59fe22f42d81f;p=fw%2Fsdcc diff --git a/src/pic16/device.c b/src/pic16/device.c index 3996e450..8878ed07 100644 --- a/src/pic16/device.c +++ b/src/pic16/device.c @@ -1,6 +1,7 @@ /*------------------------------------------------------------------------- - device.c - Accomodates subtle variations in PIC16 devices + device.c - Accomodates subtle variations in PIC16 devices + Written By - Scott Dattalo scott@dattalo.com Ported to PIC16 By - Martin Dubuc m.dubuc@rogers.com @@ -19,301 +20,362 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -------------------------------------------------------------------------*/ + +/* + VR - Began writing code to make PIC16 C source files independent from + the header file (created by the inc2h.pl) + + - adding maximum RAM memory into PIC_Device structure + +*/ + #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 -#else -#define STRCASECMP strcasecmp -#endif - -static PIC_device Pics[] = { - { - {"p18f242", "18f242", "pic18f242", "f242"}, - (memRange *)NULL, - (memRange *)NULL, - 0, - 0x300, - }, - - { - {"p18f252", "18f252", "pic18f252", "f252"}, - (memRange *)NULL, - (memRange *)NULL, - 0, - 0x600, - }, - - { - {"p18f442", "18f442", "pic18f442", "f442"}, - (memRange *)NULL, - (memRange *)NULL, - 0, - 0x300, - }, - - { - {"p18f452", "18f452", "pic18f452", "f452"}, - (memRange *)NULL, - (memRange *)NULL, - 0, - 0x600, - }, +static PIC16_device Pics16[] = { +/* Device descriptions are now generated by scripts. + * For simplicities sake we just include them here. + * Manual overrides may be inserted on top of devices.inc + * or right here BEFORE inclusion of devices.inc. */ +#include "devices.inc" }; -static int num_of_supported_PICS = sizeof(Pics)/sizeof(PIC_device); - -#define DEFAULT_PIC "f452" - -static PIC_device *pic=NULL; - -AssignedMemory *pic16_finalMapping=NULL; -int pic16_finalMappingSize=0; - -#define DEFAULT_CONFIG_BYTE 0xff +static int num_of_supported_PICS = sizeof(Pics16)/sizeof(PIC16_device); -#define CONFIG1H_WORD_ADDRESS 0x300001 -#define DEFAULT_CONFIG1H_WORD DEFAULT_CONFIG_BYTE +stats_t statistics = { 0, 0, 0, 0 }; -#define CONFIG2L_WORD_ADDRESS 0x300002 -#define DEFAULT_CONFIG2L_WORD DEFAULT_CONFIG_BYTE +#define DEFAULT_PIC "452" -#define CONFIG2H_WORD_ADDRESS 0x300003 -#define DEFAULT_CONFIG2H_WORD DEFAULT_CONFIG_BYTE +PIC16_device *pic16=NULL; +unsigned int stackPos = 0; +unsigned int stackLen = 0; -#define CONFIG3H_WORD_ADDRESS 0x300005 -#define DEFAULT_CONFIG3H_WORD DEFAULT_CONFIG_BYTE - -#define CONFIG4L_WORD_ADDRESS 0x300006 -#define DEFAULT_CONFIG4L_WORD DEFAULT_CONFIG_BYTE - -#define CONFIG5L_WORD_ADDRESS 0x300008 -#define DEFAULT_CONFIG5L_WORD DEFAULT_CONFIG_BYTE - -#define CONFIG5H_WORD_ADDRESS 0x300009 -#define DEFAULT_CONFIG5H_WORD DEFAULT_CONFIG_BYTE - -#define CONFIG6L_WORD_ADDRESS 0x30000a -#define DEFAULT_CONFIG6L_WORD DEFAULT_CONFIG_BYTE - -#define CONFIG6H_WORD_ADDRESS 0x30000b -#define DEFAULT_CONFIG6H_WORD DEFAULT_CONFIG_BYTE - -#define CONFIG7L_WORD_ADDRESS 0x30000c -#define DEFAULT_CONFIG7L_WORD DEFAULT_CONFIG_BYTE - -#define CONFIG7H_WORD_ADDRESS 0x30000d -#define DEFAULT_CONFIG7H_WORD DEFAULT_CONFIG_BYTE - -static unsigned int config1h_word = DEFAULT_CONFIG1H_WORD; -static unsigned int config2l_word = DEFAULT_CONFIG2L_WORD; -static unsigned int config2h_word = DEFAULT_CONFIG2H_WORD; -static unsigned int config3h_word = DEFAULT_CONFIG3H_WORD; -static unsigned int config4l_word = DEFAULT_CONFIG4L_WORD; -static unsigned int config5l_word = DEFAULT_CONFIG5L_WORD; -static unsigned int config5h_word = DEFAULT_CONFIG5H_WORD; -static unsigned int config6l_word = DEFAULT_CONFIG6L_WORD; -static unsigned int config6h_word = DEFAULT_CONFIG6H_WORD; -static unsigned int config7l_word = DEFAULT_CONFIG7L_WORD; -static unsigned int config7h_word = DEFAULT_CONFIG7H_WORD; - -void pic16_addMemRange(memRange *r, int type) +void pic16_setMaxRAM(int size) { - int i; - int alias = r->alias; + pic16->maxRAMaddress = size; + stackPos = pic16->RAMsize-1; - if (pic->maxRAMaddress < 0) { - fprintf(stderr, "missing \"#pragma maxram\" setting\n"); - return; - } - - do { - for (i=r->start_address; i<= r->end_address; i++) { - if ((i|alias) <= pic->maxRAMaddress) { - pic16_finalMapping[i | alias].isValid = 1; - pic16_finalMapping[i | alias].alias = r->alias; - pic16_finalMapping[i | alias].bank = r->bank; - if(type) { - /* hack for now */ - pic16_finalMapping[i | alias].isSFR = 1; - } else { - pic16_finalMapping[i | alias].isSFR = 0; + if (pic16->maxRAMaddress < 0) { + fprintf(stderr, "invalid \"#pragma maxram 0x%x\" setting\n", + pic16->maxRAMaddress); + return; } - } else { - fprintf(stderr, "WARNING: %s:%s memory at 0x%x is beyond max ram = 0x%x\n", - __FILE__,__FUNCTION__,(i|alias), pic->maxRAMaddress); - } - } - - /* Decrement alias */ - if (alias) { - alias -= ((alias & (alias - 1)) ^ alias); - } else { - alias--; - } - - } while (alias >= 0); } -void pic16_setMaxRAM(int size) -{ - int i; - pic->maxRAMaddress = size; - - if (pic->maxRAMaddress < 0) { - fprintf(stderr, "invalid \"#pragma maxram 0x%x\" setting\n", - pic->maxRAMaddress); - return; - } - - pic16_finalMapping = Safe_calloc(1+pic->maxRAMaddress, - sizeof(AssignedMemory)); - - /* Now initialize the pic16_finalMapping array */ +extern char *iComments2; - for(i=0; i<=pic->maxRAMaddress; i++) { - pic16_finalMapping[i].reg = NULL; - pic16_finalMapping[i].isValid = 0; - } +void pic16_dump_equates(FILE *of, set *equs) +{ + regs *r; + + r = setFirstItem(equs); + if(!r)return; + + fprintf(of, "%s", iComments2); + fprintf(of, ";\tEquates to used internal registers\n"); + fprintf(of, "%s", iComments2); + + for(; r; r = setNextItem(equs)) { + fprintf(of, "%s\tequ\t0x%02x\n", r->name, r->address); + } } -/*-----------------------------------------------------------------* - *-----------------------------------------------------------------*/ -int pic16_isREGinBank(regs *reg, int bank) +void pic16_dump_access(FILE *of, set *section) { + regs *r; + + r = setFirstItem(section); + if(!r)return; + + fprintf(of, "%s", iComments2); + fprintf(of, ";\tAccess bank symbols\n"); + fprintf(of, "%s", iComments2); + + fprintf(of, "\tudata_acs\n"); + for(; r; r = setNextItem(section)) { + fprintf(of, "%s\tres\t%d\n", r->name, r->size); + statistics.adsize += r->size; + } +} - if(!reg || !pic) - return 0; - if(pic16_finalMapping[reg->address].bank == bank) - return 1; +int regCompare(const void *a, const void *b) +{ + const regs *const *i = a; + const regs *const *j = b; + + /* sort primarily by the address */ + if( (*i)->address > (*j)->address)return 1; + if( (*i)->address < (*j)->address)return -1; + + /* and secondarily by size */ + /* register size sorting may have strange results use with care */ + if( (*i)->size > (*j)->size)return 1; + if( (*i)->size < (*j)->size)return -1; + + /* finally if in same address and same size sort by name */ + return (strcmp( (*i)->name, (*j)->name)); return 0; } -/*-----------------------------------------------------------------* - *-----------------------------------------------------------------*/ -int pic16_REGallBanks(regs *reg) +int symCompare(const void *a, const void *b) { + const symbol *const *i = a; + const symbol *const *j = b; - if(!reg || !pic) - return 0; - - if (reg->address > pic->maxRAMaddress) - return 0; + /* sort primarily by the address */ + if( SPEC_ADDR((*i)->etype) > SPEC_ADDR((*j)->etype))return 1; + if( SPEC_ADDR((*i)->etype) < SPEC_ADDR((*j)->etype))return -1; + + /* and secondarily by size */ + /* register size sorting may have strange results use with care */ + if( getSize((*i)->etype) > getSize((*j)->etype))return 1; + if( getSize((*i)->etype) < getSize((*j)->etype))return -1; - return 1; + /* finally if in same address and same size sort by name */ + return (strcmp( (*i)->rname, (*j)->rname)); + return 0; } -/*-----------------------------------------------------------------* - *-----------------------------------------------------------------*/ - -/* - * pic16_dump_map -- debug stuff - */ - -void pic16_dump_map(void) +void pic16_dump_usection(FILE *of, set *section, int fix) { - int i; - - for(i=0; i<=pic->maxRAMaddress; i++) { - //fprintf(stdout , "addr 0x%02x is %s\n", i, ((pic16_finalMapping[i].isValid) ? "valid":"invalid")); - - if(pic16_finalMapping[i].isValid) { - fprintf(stderr,"addr: 0x%02x",i); - if(pic16_finalMapping[i].isSFR) - fprintf(stderr," isSFR"); - if(pic16_finalMapping[i].reg) - fprintf( stderr, " reg %s", pic16_finalMapping[i].reg->name); - fprintf(stderr, "\n"); - } - } + static int abs_usection_no=0; + static unsigned int usection_no=0; + regs *r, *rprev; + unsigned int init_addr, i; + regs **rlist; + regs *r1; + + /* put all symbols in an array */ + if (!elementsInSet(section)) return; + rlist = Safe_calloc(elementsInSet(section), sizeof(regs *)); + r = rlist[0]; i = 0; + for(rprev = setFirstItem(section); rprev; rprev = setNextItem(section)) { + rlist[i] = rprev; i++; + } + + if(!i) { + if(rlist)Safe_free(rlist); + return; + } + /* sort symbols according to their address */ + qsort(rlist, i /*elementsInSet(section)*/, sizeof(regs *), regCompare); + + if(!fix) { + +#define EMIT_SINGLE_UDATA_SECTION 0 +#if EMIT_SINGLE_UDATA_SECTION + fprintf(of, "\n\n\tudata\n"); + for(r = setFirstItem(section); r; r = setNextItem(section)) { + fprintf(of, "%s\tres\t%d\n", r->name, r->size); + statistics.udsize += r->size; + } +#else + for(r = setFirstItem(section); r; r = setNextItem(section)) { + //fprintf(of, "\nudata_%s_%s\tudata\n", moduleName, r->name); + fprintf(of, "\nudata_%s_%u\tudata\n", moduleName, usection_no++); + fprintf(of, "%s\tres\t%d\n", r->name, r->size); + statistics.udsize += r->size; + } +#endif + } else { + unsigned int j=0; + int deb_addr=0; + + rprev = NULL; + init_addr = rlist[j]->address; + deb_addr = init_addr; + fprintf(of, "\n\nustat_%s_%02d\tudata\t0X%04X\n", moduleName, abs_usection_no++, init_addr); + + for(j=0;jaddress; + deb_addr = init_addr; + + if((rprev && (init_addr > (rprev->address + rprev->size)))) { + fprintf(of, "\n\nustat_%s_%02d\tudata\t0X%04X\n", moduleName, abs_usection_no++, init_addr); + } + + if(r1 && (init_addr == r1->address)) { + fprintf(of, "\n%s\tres\t0\n", r->name); + } else { + fprintf(of, "%s\tres\t%d\n", r->name, r->size); + deb_addr += r->size; + statistics.udsize += r->size; + } + + rprev = r; + } + } + Safe_free(rlist); } -void pic16_dump_cblock(FILE *of) +void pic16_dump_gsection(FILE *of, set *sections) { - int start=-1; - int addr=0; - int bank_base; - - //pic16_dump_map(); /* display the register map */ - - if (pic->maxRAMaddress < 0) { - fprintf(stderr, "missing \"#pragma maxram\" setting\n"); - return; - } - - do { - - if(pic16_finalMapping[addr].reg && !pic16_finalMapping[addr].reg->isEmitted) { + regs *r; + sectName *sname; - if(start<0) - start = addr; - } else { - if(start>=0) { + for(sname = setFirstItem(sections); sname; sname = setNextItem(sections)) { + if(!strcmp(sname->name, "access"))continue; + fprintf(of, "\n\n%s\tudata\n", sname->name); - /* 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; - - /* The bank number printed in the cblock comment tacitly - * assumes that the first register in the contiguous group - * of registers represents the bank for the whole group */ + for(r=setFirstItem(sname->regsSet); r; r=setNextItem(sname->regsSet)) { +#if 0 + fprintf(stderr, "%s:%d emitting variable %s for section %s (%p)\n", __FILE__, __LINE__, + r->name, sname->name, sname); +#endif + fprintf(of, "%s\tres\t%d\n", r->name, r->size); + statistics.udsize += r->size; + } + } +} - if ((pic16_finalMapping[start].bank == 0 && start <= 0x7f) || - pic16_finalMapping[start].isSFR) - fprintf(of," cblock 0X%04X\t; Access Bank\n",start); - else - fprintf(of," cblock 0X%04X\t; Bank %d\n",start,pic16_finalMapping[start].bank); - for( ; start < addr; start++) { - if((pic16_finalMapping[start].reg) && !pic16_finalMapping[start].reg->isEmitted ) { - fprintf(of,"\t%s",pic16_finalMapping[start].reg->name); +/* forward declaration */ +void pic16_printIval(symbol * sym, sym_link * type, initList * ilist, char ptype, void *p); +extern void pic16_pCodeConstString(char *name, char *value); - /* If this register is aliased in multiple banks, then - * mangle the variable name with the alias address: */ - if(pic16_finalMapping[start].alias & start) - fprintf(of,"_%x",bank_base); +void pic16_dump_isection(FILE *of, set *section, int fix) +{ + static int abs_isection_no=0; + symbol *s, *sprev; + unsigned int init_addr, i; + symbol **slist; + + /* put all symbols in an array */ + if (!elementsInSet(section)) return; + slist = Safe_calloc(elementsInSet(section), sizeof(symbol *)); + s = slist[0]; i = 0; + for(sprev = setFirstItem(section); sprev; sprev = setNextItem(section)) { + slist[i] = sprev; i++; + } + + if(!i) { + if(slist)Safe_free(slist); + return; + } - if(pic16_finalMapping[start].instance) - fprintf(of,"_%d",pic16_finalMapping[start].instance); + /* sort symbols according to their address */ + qsort(slist, i, sizeof(symbol *), symCompare); + + pic16_initDB(); + + if(!fix) { + fprintf(of, "\n\n\tidata\n"); + for(s = setFirstItem(section); s; s = setNextItem(section)) { + + if(s->ival) { + fprintf(of, "%s", s->rname); + pic16_printIval(s, s->type, s->ival, 'f', (void *)of); + pic16_flushDB('f', (void *)of); + } else { + if (IS_ARRAY (s->type) && IS_CHAR (s->type->next) + && SPEC_CVAL (s->etype).v_char) { + +// fprintf(stderr, "%s:%d printing code string from %s\n", __FILE__, __LINE__, s->rname); + pic16_pCodeConstString(s->rname , SPEC_CVAL (s->etype).v_char); + } else { + assert(0); + } + } + + } + } else { + unsigned int j=0; + symbol *s1; + + sprev = NULL; + init_addr = SPEC_ADDR(slist[j]->etype); + fprintf(of, "\n\nistat_%s_%02d\tidata\t0X%04X\n", moduleName, abs_isection_no++, init_addr); + + for(j=0;jetype); + + if(sprev && (init_addr > (SPEC_ADDR(sprev->etype) + getSize(sprev->etype)))) { + fprintf(of, "\nistat_%s_%02d\tidata\t0X%04X\n", moduleName, abs_isection_no++, init_addr); + } + + if(s->ival) { + fprintf(of, "%s", s->rname); + pic16_printIval(s, s->type, s->ival, 'f', (void *)of); + pic16_flushDB('f', (void *)of); + } else { + if (IS_ARRAY (s->type) && IS_CHAR (s->type->next) + && SPEC_CVAL (s->etype).v_char) { + +// fprintf(stderr, "%s:%d printing code string from %s\n", __FILE__, __LINE__, s->rname); + pic16_pCodeConstString(s->rname , SPEC_CVAL (s->etype).v_char); + } else { + assert(0); + } + } + + + sprev = s; + } + } + Safe_free(slist); +} - - fputc('\n',of); -//#warning why is the following line commented out?! (VR) -// pic16_finalMapping[start].reg->isEmitted = 1; - } +void pic16_dump_int_registers(FILE *of, set *section) +{ + regs *r, *rprev; + int i; + regs **rlist; + + /* put all symbols in an array */ + if (!elementsInSet(section)) return; + rlist = Safe_calloc(elementsInSet(section), sizeof(regs *)); + r = rlist[0]; i = 0; + for(rprev = setFirstItem(section); rprev; rprev = setNextItem(section)) { + rlist[i] = rprev; i++; } - fprintf(of," endc\n"); - - start = -1; - } + /* sort symbols according to their address */ + qsort(rlist, elementsInSet(section), sizeof(regs *), regCompare); + + if(!i) { + if(rlist)Safe_free(rlist); + return; + } + + fprintf(of, "\n\n; Internal registers\n"); + + fprintf(of, "%s\tudata_ovr\t0x0000\n", ".registers"); + for(r = setFirstItem(section); r; r = setNextItem(section)) { + fprintf(of, "%s\tres\t%d\n", r->name, r->size); + statistics.intsize += r->size; + } - } + Safe_free(rlist); +} - addr++; - } while(addr <= pic->maxRAMaddress); - +#ifdef WORDS_BIGENDIAN + #define _ENDIAN(x) (3-x) +#else + #define _ENDIAN(x) (x) +#endif -} /*-----------------------------------------------------------------* * void pic16_list_valid_pics(int ncols, int list_alias) @@ -331,7 +393,7 @@ void pic16_list_valid_pics(int ncols, int list_alias) int i,j,k,l; if(list_alias) - list_alias = sizeof(Pics[0].name) / sizeof(Pics[0].name[0]); + list_alias = sizeof(Pics16[0].name) / sizeof(Pics16[0].name[0]); /* decrement the column number if it's greater than zero */ ncols = (ncols > 1) ? ncols-1 : 4; @@ -339,7 +401,7 @@ void pic16_list_valid_pics(int ncols, int list_alias) /* Find the device with the longest name */ for(i=0,longest=0; ilongest) longest = k; } @@ -351,9 +413,9 @@ void pic16_list_valid_pics(int ncols, int list_alias) j = 0; do { - fprintf(stderr,"%s", Pics[i].name[j]); + fprintf(stderr,"%s", Pics16[i].name[j]); if(colmaxRAMaddress = -1; +// printf("PIC processor found and initialized: %s\n", pic_type); + pic16_setMaxRAM( 0xfff ); } /*-----------------------------------------------------------------* @@ -421,7 +484,7 @@ void pic16_init_pic(char *pic_type) *-----------------------------------------------------------------*/ int pic16_picIsInitialized(void) { - if(pic && pic->maxRAMaddress > 0) + if(pic16 && pic16->maxRAMaddress > 0) return 1; return 0; @@ -434,170 +497,178 @@ int pic16_picIsInitialized(void) char *pic16_processor_base_name(void) { - if(!pic) + if(!pic16) return NULL; - return pic->name[0]; + return pic16->name[0]; } -static int isSFR(int address) -{ - - if( (address > pic->maxRAMaddress) || !pic16_finalMapping[address].isSFR) - return 0; - - return 1; +#define DEBUG_CHECK 0 -} - -/*-----------------------------------------------------------------* - *-----------------------------------------------------------------*/ -static int validAddress(int address, int reg_size) +/* + * return 1 if register wasn't found and added, 0 otherwise + */ +int checkAddReg(set **set, regs *reg) { - int i; + regs *tmp; - if (pic->maxRAMaddress < 0) { - fprintf(stderr, "missing \"#pragma maxram\" setting\n"); - return 0; - } -// fprintf(stderr, "validAddress: Checking 0x%04x (max=0x%04x) (reg_size = %d)\n",address, pic->maxRAMaddress, reg_size); - if(address > pic->maxRAMaddress) - return 0; - for (i=0; iname); +#endif - return 1; + for(tmp = setFirstItem(*set); tmp; tmp = setNextItem(*set)) { + if(!strcmp(tmp->name, reg->name))break; + } + + if(!tmp) { + addSet(set, reg); +#if DEBUG_CHECK + fprintf(stderr, "added\n"); +#endif + return 1; + } + +#if DEBUG_CHECK + fprintf(stderr, "already added\n"); +#endif + return 0; } -/*-----------------------------------------------------------------* - *-----------------------------------------------------------------*/ -static void mapRegister(regs *reg) +int checkAddSym(set **set, symbol *sym) { + symbol *tmp; - int i; - int alias; - - if(!reg || !reg->size) { - fprintf(stderr,"WARNING: %s:%s:%d Bad register\n",__FILE__,__FUNCTION__,__LINE__); - return; - } - - if (pic->maxRAMaddress < 0) { - fprintf(stderr, "missing \"#pragma maxram\" setting\n"); - return; - } - - for(i=0; isize; i++) { - - alias = pic16_finalMapping[reg->address].alias; - reg->alias = alias; - - do { - -// fprintf(stdout,"mapping %s to address 0x%02x, reg size = %d\n",reg->name, (reg->address+alias+i),reg->size); - - pic16_finalMapping[reg->address + alias + i].reg = reg; - pic16_finalMapping[reg->address + alias + i].instance = i; - - /* Decrement alias */ - if(alias) - alias -= ((alias & (alias - 1)) ^ alias); - else - alias--; - - } while (alias>=0); - } + if(!sym)return 0; +#if DEBUG_CHECK + fprintf(stderr, "%s: about to add SYMbol: %s ... ", __FUNCTION__, sym->name); +#endif - // fprintf(stderr,"%s - %s addr = 0x%03x, size %d\n",__FUNCTION__,reg->name, reg->address,reg->size); + for(tmp = setFirstItem( *set ); tmp; tmp = setNextItem(*set)) { + if(!strcmp(tmp->name, sym->name))break; + } + + if(!tmp) { + addSet(set, sym); +#if DEBUG_CHECK + fprintf(stderr, "added\n"); +#endif + return 1; + } - reg->isMapped = 1; +#if DEBUG_CHECK + fprintf(stderr, "already added\n"); +#endif + return 0; } -/*-----------------------------------------------------------------* - *-----------------------------------------------------------------*/ -static int assignRegister(regs *reg, int start_address) +int checkSym(set *set, symbol *sym) { - int i; - - //fprintf(stderr,"%s - %s start_address = 0x%03x\n",__FUNCTION__,reg->name, start_address); - if(reg->isFixed) { + symbol *tmp; - if (validAddress(reg->address,reg->size)) { - //fprintf(stderr,"%s - %s address = 0x%03x\n",__FUNCTION__,reg->name, reg->address); - mapRegister(reg); - return reg->address; - } - - if( isSFR(reg->address)) { - mapRegister(reg); - return reg->address; - } - - //fprintf(stderr, "WARNING: Ignoring Out of Range register assignment at fixed address %d, %s\n", - // reg->address, reg->name); - - } else { - - /* This register does not have a fixed address requirement - * so we'll search through all availble ram address and - * assign the first one */ - - for (i=start_address; i<=pic->maxRAMaddress; i++) { - - if (validAddress(i,reg->size)) { -// fprintf(stderr, "found valid address = 0x%04x\n", i); - reg->address = i; - mapRegister(reg); - return i; - } - } + if(!sym)return 0; + +#if DEUG_CHECK + fprintf(stderr, "%s: about to search for SYMbol: %s ... ", __FUNCTION__, sym->name); +#endif - fprintf(stderr, "WARNING: No more RAM available for %s\n",reg->name); + for(tmp = setFirstItem( set ); tmp; tmp = setNextItem( set )) { + if(!strcmp(tmp->name, sym->name))break; + } + + if(!tmp) { +#if DEBUG_CHECK + fprintf(stderr, "not found\n"); +#endif + return 0; + } - } +#if DEBUG_CHECK + fprintf(stderr, "found\n"); +#endif - return -1; + return 1; } /*-----------------------------------------------------------------* + * void pic16_groupRegistersInSection - add each register to its * + * corresponding section * *-----------------------------------------------------------------*/ -void pic16_assignFixedRegisters(set *regset) +void pic16_groupRegistersInSection(set *regset) { regs *reg; + sectSym *ssym; + int docontinue=0; - for (reg = setFirstItem(regset) ; reg ; - reg = setNextItem(regset)) { - - if(reg->isFixed) - assignRegister(reg,0); - } + for(reg=setFirstItem(regset); reg; reg = setNextItem(regset)) { +#if 0 + fprintf(stderr, "%s:%d group registers in section, reg: %s (used: %d, %p)\n", + __FILE__, __LINE__, reg->name, reg->wasUsed, reg); +#endif + if((reg->wasUsed + && !(reg->regop && SPEC_EXTR(OP_SYM_ETYPE(reg->regop)))) + ) { + + /* avoid grouping registers that have an initial value, + * they will be added later in idataSymSet */ + if(reg->regop && (OP_SYMBOL(reg->regop)->ival && !OP_SYMBOL(reg->regop)->level)) + continue; + +#if 0 + fprintf(stderr, "%s:%d register %s alias:%d fix:%d ival=%i level=%i code=%i\n", + __FILE__, __LINE__, reg->name, reg->alias, reg->isFixed, + (reg->regop?(OP_SYMBOL(reg->regop)->ival?1:0):-1), + (reg->regop?(OP_SYMBOL(reg->regop)->level):-1), + (reg->regop?(IS_CODE(OP_SYM_ETYPE(reg->regop))):-1) ); +#endif + + docontinue=0; + for(ssym=setFirstItem(sectSyms);ssym;ssym=setNextItem(sectSyms)) { + if(!strcmp(ssym->name, reg->name)) { +// fprintf(stderr, "%s:%d section found %s (%p) with var %s\n", +// __FILE__, __LINE__, ssym->section->name, ssym->section, ssym->name); + if(strcmp(ssym->section->name, "access")) { + addSet(&ssym->section->regsSet, reg); + docontinue=1; + break; + } else { + docontinue=0; + reg->accessBank = 1; + break; + } + } + } + + if(docontinue)continue; + +// fprintf(stderr, "%s:%d reg: %s\n", __FILE__, __LINE__, reg->name); + + if(reg->alias == 0x80) { + checkAddReg(&pic16_equ_data, reg); + } else + if(reg->isFixed) { + checkAddReg(&pic16_fix_udata, reg); + } else + if(!reg->isFixed) { + if(reg->pc_type == PO_GPR_TEMP) + checkAddReg(&pic16_int_regs, reg); + else { + if(reg->accessBank) { + if(reg->alias != 0x40) + checkAddReg(&pic16_acs_udata, reg); + } else + checkAddReg(&pic16_rel_udata, reg); + } + } + } + } } -/*-----------------------------------------------------------------* - *-----------------------------------------------------------------*/ -void pic16_assignRelocatableRegisters(set *regset, int used) -{ - - regs *reg; - int address = 0; - - for (reg = setFirstItem(regset) ; reg ; - reg = setNextItem(regset)) { - - //fprintf(stdout,"assigning %s isFixed=%d, wasUsed=%d\n",reg->name,reg->isFixed,reg->wasUsed); - - if((!reg->isFixed) && (used || reg->wasUsed)) - address = assignRegister(reg,address); - } -} /*-----------------------------------------------------------------* @@ -608,82 +679,44 @@ void pic16_assignRelocatableRegisters(set *regset, int used) * This routine will assign a value to that address. * *-----------------------------------------------------------------*/ - -void pic16_assignConfigWordValue(int address, int value) +void pic16_assignConfigWordValue(int address, unsigned int value) { - switch(address) { - case CONFIG1H_WORD_ADDRESS: - config1h_word = value; - break; - case CONFIG2L_WORD_ADDRESS: - config2l_word = value; - break; - case CONFIG2H_WORD_ADDRESS: - config2h_word = value; - break; - case CONFIG3H_WORD_ADDRESS: - config3h_word = value; - break; - case CONFIG4L_WORD_ADDRESS: - config4l_word = value; - break; - case CONFIG5L_WORD_ADDRESS: - config5l_word = value; - break; - case CONFIG5H_WORD_ADDRESS: - config5h_word = value; - break; - case CONFIG6L_WORD_ADDRESS: - config6l_word = value; - break; - case CONFIG6H_WORD_ADDRESS: - config6h_word = value; - break; - case CONFIG7L_WORD_ADDRESS: - config7l_word = value; - break; - case CONFIG7H_WORD_ADDRESS: - config7h_word = value; - break; - } + int i; + + for(i=0;icwInfo.confAddrEnd-pic16->cwInfo.confAddrStart+1;i++) { + if((address == pic16->cwInfo.confAddrStart+i) + && (pic16->cwInfo.crInfo[i].mask != -1)) { - //fprintf(stderr,"setting config word to 0x%x\n",value); +#if 0 + fprintf(stderr, "setting location 0x%X to value 0x%x\tmask: 0x%x\ttest: 0x%x\n", + /*address*/ pic16->cwInfo.confAddrStart+i, (~value)&0xff, + pic16->cwInfo.crInfo[i].mask, + (pic16->cwInfo.crInfo[i].mask) & (~value)); +#endif + +#if 0 + if((((pic16->cwInfo.crInfo[i].mask) & (~value))&0xff) != ((~value)&0xff)) { + fprintf(stderr, "%s:%d a wrong value has been given for configuration register 0x%x\n", + __FILE__, __LINE__, address); + return; + } +#endif + pic16->cwInfo.crInfo[i].value = value; + pic16->cwInfo.crInfo[i].emit = 1; + return; + } + } } -/*-----------------------------------------------------------------* - * int pic16_getConfigWord(int address) - * - * Get the current value of the config word. - * - *-----------------------------------------------------------------*/ -int pic16_getConfigWord(int address) +void pic16_assignIdByteValue(int address, char value) { - switch(address) { - case CONFIG1H_WORD_ADDRESS: - return config1h_word; - case CONFIG2L_WORD_ADDRESS: - return config2l_word; - case CONFIG2H_WORD_ADDRESS: - return config2h_word; - case CONFIG3H_WORD_ADDRESS: - return config3h_word; - case CONFIG4L_WORD_ADDRESS: - return config4l_word; - case CONFIG5L_WORD_ADDRESS: - return config5l_word; - case CONFIG5H_WORD_ADDRESS: - return config5h_word; - case CONFIG6L_WORD_ADDRESS: - return config6l_word; - case CONFIG6H_WORD_ADDRESS: - return config6h_word; - case CONFIG7L_WORD_ADDRESS: - return config7l_word; - case CONFIG7H_WORD_ADDRESS: - return config7h_word; - default: - return 0; - } -} + int i; + for(i=0;iidInfo.idAddrEnd-pic16->idInfo.idAddrStart+1;i++) { + if(address == pic16->idInfo.idAddrStart+i) { + pic16->idInfo.irInfo[i].value = value; + pic16->idInfo.irInfo[i].emit = 1; + } + } +}