* minor corrections between previous commit

[fw/sdcc] / src / pic16 / device.c

diff --git a/src/pic16/device.c b/src/pic16/device.c
index 1126b69bec4bbc11a005d4e7eed2cf127a1322fa..904e5f65b1355e92316175f7e025fcad5cd9ac3c 100644 (file)
--- a/src/pic16/device.c
+++ b/src/pic16/device.c
@@ -465,6 +465,7 @@ static int num_of_supported_PICS = sizeof(Pics16)/sizeof(PIC16_device);
 
 PIC16_device *pic16=NULL;
 unsigned int stackPos = 0;
+unsigned int stackLen = 0;
 
 extern regs* newReg(short type, short pc_type, int rIdx, char *name, int size, int alias, operand *refop);
 
@@ -499,6 +500,24 @@ void pic16_dump_equates(FILE *of, set *equs)
 }
 
 
+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);
+       }
+}
+
+
 int regCompare(const void *a, const void *b)
 {
   const regs *const *i = a;
@@ -606,6 +625,7 @@ void pic16_dump_gsection(FILE *of, set *sections)
   sectName *sname;
 
        for(sname = setFirstItem(sections); sname; sname = setNextItem(sections)) {
+               if(!strcmp(sname->name, "access"))continue;
                fprintf(of, "\n\n%s\tudata\n", sname->name);
 
                for(r=setFirstItem(sname->regsSet); r; r=setNextItem(sname->regsSet)) {
@@ -935,6 +955,33 @@ int checkAddSym(set **set, symbol *sym)
   return 0;
 }
 
+int checkSym(set *set, symbol *sym)
+{
+  symbol *tmp;
+
+       if(!sym)return 0;
+       
+#if DEUG_CHECK
+       fprintf(stderr, "%s: about to search for SYMbol: %s ... ", __FUNCTION__, sym->name);
+#endif
+
+       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;
+}
 
 /*-----------------------------------------------------------------*
  * void pic16_groupRegistersInSection - add each register to its   *
@@ -962,10 +1009,11 @@ void pic16_groupRegistersInSection(set *regset)
                                continue;
 
 #if 0
-                       fprintf(stderr, "%s:%d register %s alias:%d fix:%d ival=%i level=%i\n",
+                       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?(OP_SYMBOL(reg->regop)->level):-1),
+                                       (reg->regop?(IS_CODE(OP_SYM_ETYPE(reg->regop))):-1) );
 #endif
                        
                        docontinue=0;
@@ -973,8 +1021,15 @@ void pic16_groupRegistersInSection(set *regset)
                                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);
-                                       addSet(&ssym->section->regsSet, reg);
-                                       docontinue=1;
+                                       if(strcmp(ssym->section->name, "access")) {
+                                               addSet(&ssym->section->regsSet, reg);
+                                               docontinue=1;
+                                               break;
+                                       } else {
+                                               docontinue=0;
+                                               reg->accessBank = 1;
+                                               break;
+                                       }
                                }
                        }
 
@@ -991,8 +1046,13 @@ void pic16_groupRegistersInSection(set *regset)
                        if(!reg->isFixed) {
                                if(reg->pc_type == PO_GPR_TEMP)
                                        checkAddReg(&pic16_int_regs, reg);
-                               else
-                                       checkAddReg(&pic16_rel_udata, reg);
+                               else {
+                                       if(reg->accessBank) {
+                                               if(reg->alias != 0x40)
+                                                       checkAddReg(&pic16_acs_udata, reg);
+                                       } else
+                                               checkAddReg(&pic16_rel_udata, reg);
+                               }
                        }
                }
        }
@@ -1010,14 +1070,26 @@ void pic16_groupRegistersInSection(set *regset)
  * This routine will assign a value to that address.
  *
  *-----------------------------------------------------------------*/
-void pic16_assignConfigWordValue(int address, int value)
+void pic16_assignConfigWordValue(int address, unsigned int value)
 {
   int i;
 
         for(i=0;i<pic16->cwInfo.confAddrEnd-pic16->cwInfo.confAddrStart+1;i++) {
                 if((address == pic16->cwInfo.confAddrStart+i)
                   && (pic16->cwInfo.crInfo[i].mask != -1)) {
-//                        fprintf(stderr, "setting location 0x%X to value 0x%x\n", /*address*/ pic16->cwInfo.confAddrStart+i, val
+
+#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((((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;
+                       }
                         pic16->cwInfo.crInfo[i].value = value;
                         pic16->cwInfo.crInfo[i].emit = 1;
                         return;