Initial import

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

diff --git a/src/pic/device.c b/src/pic/device.c
index 68b020e5708c31953e5f9f7206144806cba61252..ab3e15a14f96544df39cd2359b1747be319df994 100644 (file)
--- a/src/pic/device.c
+++ b/src/pic/device.c
@@ -75,6 +75,14 @@ static PIC_device Pics[] = {
     0x180,
   },
 
+  {
+    {"p16f819", "16f819", "pic16f819", "f819"},
+    (memRange *)NULL,
+    (memRange *)NULL,
+    0,
+    0x80,
+  },
+
 };
 
 static int num_of_supported_PICS = sizeof(Pics)/sizeof(PIC_device);
@@ -159,7 +167,7 @@ int isREGinBank(regs *reg, int bank)
   if(!reg || !pic)
     return 0;
 
-  if(((reg->address | reg->alias) & pic->bankMask & bank) == bank)
+  if((int)((reg->address | reg->alias) & pic->bankMask & bank) == bank)
     return 1;
 
   return 0;
@@ -212,7 +220,7 @@ void dump_sfr(FILE *of)
   static int udata_flag=0;
 
   //dump_map();   /* display the register map */
-  fprintf(stdout,";dump_sfr  \n");
+  //fprintf(stdout,";dump_sfr  \n");
   if (pic->maxRAMaddress < 0) {
     fprintf(stderr, "missing \"#pragma maxram\" setting\n");
     return;
@@ -249,10 +257,18 @@ void dump_sfr(FILE *of)
              (!finalMapping[start].instance) && 
             (!finalMapping[start].isSFR)) {
 
-           fprintf(of,"%s\tres\t%i\n",
+           if (finalMapping[start].reg->isFixed) {
+             unsigned i;
+             for (i=0; i<finalMapping[start].reg->size; i++) {
+               fprintf(of,"%s\tEQU\t0x%04x\n",
+                    finalMapping[start].reg->name, 
+                    finalMapping[start].reg->address+i);
+             }
+           } else {
+             fprintf(of,"%s\tres\t%i\n",
                     finalMapping[start].reg->name, 
                     finalMapping[start].reg->size);
-
+           }
            finalMapping[start].reg->isEmitted = 1;
          }
        }
@@ -432,7 +448,7 @@ int validAddress(int address, int reg_size)
 void mapRegister(regs *reg)
 {
 
-  int i;
+  unsigned i;
   int alias;
 
   if(!reg || !reg->size) {
@@ -452,7 +468,7 @@ void mapRegister(regs *reg)
 
     do {
 
-      fprintf(stdout,"mapping %s to address 0x%02x, reg size = %d\n",reg->name, (reg->address+alias+i),reg->size);
+      //fprintf(stdout,"mapping %s to address 0x%02x, reg size = %d\n",reg->name, (reg->address+alias+i),reg->size);
 
       finalMapping[reg->address + alias + i].reg = reg;
       finalMapping[reg->address + alias + i].instance = i;
@@ -466,7 +482,7 @@ void mapRegister(regs *reg)
     } while (alias>=0);
   }
 
-  fprintf(stderr,"%s - %s addr = 0x%03x, size %d\n",__FUNCTION__,reg->name, reg->address,reg->size);
+  //fprintf(stderr,"%s - %s addr = 0x%03x, size %d\n",__FUNCTION__,reg->name, reg->address,reg->size);
 
   reg->isMapped = 1;
 
@@ -478,7 +494,7 @@ int assignRegister(regs *reg, int start_address)
 {
   int i;
 
-  fprintf(stderr,"%s -  %s start_address = 0x%03x\n",__FUNCTION__,reg->name, start_address);
+  //fprintf(stderr,"%s -  %s start_address = 0x%03x\n",__FUNCTION__,reg->name, start_address);
   if(reg->isFixed) {
 
     if (validAddress(reg->address,reg->size)) {
@@ -543,11 +559,32 @@ 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);
-
-    if((!reg->isFixed) && ( used || reg->wasUsed))
-      address = assignRegister(reg,address);
-
+    //fprintf(stdout,"assigning %s isFixed=%d, wasUsed=%d\n",reg->name,reg->isFixed,reg->wasUsed);
+
+    if((!reg->isFixed) && ( used || reg->wasUsed)) {
+      /* If register have been reused then shall not print it a second time. */
+// Undefine REUSE_GPR in files pcode.c & device.c to prevent local function registers being reused.
+#define REUSE_GPR
+#ifdef REUSE_GPR
+      set *s;
+      int done = 0;
+      for (s = regset; s; s = s->next) {
+        regs *r;
+        r = s->item;
+        if (r == reg)
+          break;
+        if((!r->isFixed) && ( used || r->wasUsed)) {
+          if (r->rIdx == reg->rIdx) {
+            reg->address = r->address;
+            done = 1;
+            break;
+          }
+        }
+      }
+      if (!done)
+#endif // REUSE_GPR
+        address = assignRegister(reg,address);
+    }
   }
 
 }