* device/lib/Makefile.in: fixed bug in target objects-pic16,
[fw/sdcc] / src / pic16 / device.c
index eb66b6e4a9b4028e6fba752c4abb88e56be74a0f..38e1ab6bf50fe57d828675e25435ff3d918689ae 100644 (file)
 #include "newalloc.h"
 
 
+#include "main.h"
 #include "pcode.h"
 #include "ralloc.h"
 #include "device.h"
 
 
 static PIC16_device Pics16[] = {
+//  {
+//    {"p18f242", "18f242", "pic18f242", "f242"},              // aliases
+//    0,
+//    0x300,                                           // RAMsize
+//    0,
+//    { 0xf80, 0xfff },       /* PIC18F242 range of SFR's */
+//     {
+//             /* PIC18F242 configuration words */
+//             0x300001,
+//             0x30000d,
+//             { { 0x27, 0, 0xff } /* 1 */ , { 0x0f, 0, 0xff } /* 2 */ , { 0x0f, 0, 0xff } /* 3 */ , 
+//             { -1, 0, 0xff } /* 4 */  , { 0x01, 0, 0xff } /* 5 */ , { 0x85, 0, 0xff } /* 6 */ , 
+//             { -1, 0, 0xff } /* 7 */  , { 0x03, 0, 0xff } /* 8 */ , { 0xc0, 0, 0xff } /* 9 */ , 
+//             { 0x03, 0, 0xff } /* a */ , { 0xe0, 0, 0xff } /* b */ , { 0x03, 0, 0xff } /* c */ , 
+//             { 0x40, 0, 0xff } /* d */ } 
+//     }
+//  },
+
   {
-    {"p18f242", "18f242", "pic18f242", "f242"},                // aliases
+    {"p18f242", "18f242", "pic18f242", "f242"},
+    0,
+    0x300,     /* 768 */
+    0x80,
     0,
-    0x300,                                             // bank mask
-    0x300,                                             // RAMsize
-    0
+    { 0xf80, 0xfff },  /* PIC18F242 range of SFR's */
+    {
+    /* PIC18F242 configuration words */
+      0x300001,
+      0x30000d,
+      { { 0x27, 0, 0xff } /* 1 */ , { 0x0f, 0, 0xff } /* 2 */ , { 0x0f, 0, 0xff } /* 3 */ , 
+      { -1, 0, 0xff } /* 4 */  , { 0x01, 0, 0xff } /* 5 */ , { 0x85, 0, 0xff } /* 6 */ , 
+      { -1, 0, 0xff } /* 7 */  , { 0x03, 0, 0xff } /* 8 */ , { 0xc0, 0, 0xff } /* 9 */ , 
+      { 0x03, 0, 0xff } /* a */ , { 0xe0, 0, 0xff } /* b */ , { 0x03, 0, 0xff } /* c */ , 
+      { 0x40, 0, 0xff } /* d */  }
+    }
   },
-
   {
-    {"p18f252", "18f252", "pic18f252", "f252"},                // aliases
+    {"p18f248", "18f248", "pic18f248", "f248"},
+    0,
+    0x300,     /* 768 */
+    0x60,
     0,
-    0x600,                                             // bank mask
-    0x600,                                             // RAMsize
-    0
+    { 0xf00, 0xfff },  /* PIC18F248 range of SFR's */
+    {
+    /* PIC18F248 configuration words */
+      0x300001,
+      0x30000d,
+      { { 0x27, 0, 0xff } /* 1 */ , { 0x0f, 0, 0xff } /* 2 */ , { 0x0f, 0, 0xff } /* 3 */ , 
+      { -1, 0, 0xff } /* 4 */  , { -1, 0, 0xff } /* 5 */  , { 0x85, 0, 0xff } /* 6 */ , 
+      { -1, 0, 0xff } /* 7 */  , { 0x03, 0, 0xff } /* 8 */ , { 0xc0, 0, 0xff } /* 9 */ , 
+      { 0x03, 0, 0xff } /* a */ , { 0xe0, 0, 0xff } /* b */ , { 0x03, 0, 0xff } /* c */ , 
+      { 0x40, 0, 0xff } /* d */  }
+    }
   },
-
   {
-    {"p18f442", "18f442", "pic18f442", "f442"},                // aliases
+    {"p18f252", "18f252", "pic18f252", "f252"},
     0,
-    0x300,                                             // bank mask
-    0x300,                                             // RAMsize
-    0
+    0x600,     /* 1536 */
+    0x80,
+    0,
+    { 0xf80, 0xfff },  /* PIC18F252 range of SFR's */
+    {
+    /* PIC18F252 configuration words */
+      0x300001,
+      0x30000d,
+      { { 0x27, 0, 0xff } /* 1 */ , { 0x0f, 0, 0xff } /* 2 */ , { 0x0f, 0, 0xff } /* 3 */ , 
+      { -1, 0, 0xff } /* 4 */  , { 0x01, 0, 0xff } /* 5 */ , { 0x85, 0, 0xff } /* 6 */ , 
+      { -1, 0, 0xff } /* 7 */  , { 0x0f, 0, 0xff } /* 8 */ , { 0xc0, 0, 0xff } /* 9 */ , 
+      { 0x0f, 0, 0xff } /* a */ , { 0xe0, 0, 0xff } /* b */ , { 0x0f, 0, 0xff } /* c */ , 
+      { 0x40, 0, 0xff } /* d */  }
+    }
   },
-
   {
-    {"p18f452", "18f452", "pic18f452", "f452"},                // aliases
+    {"p18f258", "18f258", "pic18f258", "f258"},
+    0,
+    0x600,     /* 1536 */
+    0x60,
     0,
-    0x600,                                             // bank mask
-    0x600,                                             // RAMsize
-    0
+    { 0xf00, 0xfff },  /* PIC18F258 range of SFR's */
+    {
+    /* PIC18F258 configuration words */
+      0x300001,
+      0x30000d,
+      { { 0x27, 0, 0xff } /* 1 */ , { 0x0f, 0, 0xff } /* 2 */ , { 0x0f, 0, 0xff } /* 3 */ , 
+      { -1, 0, 0xff } /* 4 */  , { -1, 0, 0xff } /* 5 */  , { 0x85, 0, 0xff } /* 6 */ , 
+      { -1, 0, 0xff } /* 7 */  , { 0x0f, 0, 0xff } /* 8 */ , { 0xc0, 0, 0xff } /* 9 */ , 
+      { 0x0f, 0, 0xff } /* a */ , { 0xe0, 0, 0xff } /* b */ , { 0x0f, 0, 0xff } /* c */ , 
+      { 0x40, 0, 0xff } /* d */  }
+    }
   },
-
   {
-    {"p18f248", "18f248", "pic18f248", "f248"},                // aliases
+    {"p18f442", "18f442", "pic18f442", "f442"},
+    0,
+    0x300,     /* 768 */
+    0x80,
     0,
-    0x300,                                             // bank mask
-    0x300,                                             // RAMsize
-    0
+    { 0xf80, 0xfff },  /* PIC18F442 range of SFR's */
+    {
+    /* PIC18F442 configuration words */
+      0x300001,
+      0x30000d,
+      { { 0x27, 0, 0xff } /* 1 */ , { 0x0f, 0, 0xff } /* 2 */ , { 0x0f, 0, 0xff } /* 3 */ , 
+      { -1, 0, 0xff } /* 4 */  , { 0x01, 0, 0xff } /* 5 */ , { 0x85, 0, 0xff } /* 6 */ , 
+      { -1, 0, 0xff } /* 7 */  , { 0x03, 0, 0xff } /* 8 */ , { 0xc0, 0, 0xff } /* 9 */ , 
+      { 0x03, 0, 0xff } /* a */ , { 0xe0, 0, 0xff } /* b */ , { 0x03, 0, 0xff } /* c */ , 
+      { 0x40, 0, 0xff } /* d */  }
+    }
   },
-
   {
-    {"p18f258", "18f258", "pic18f258", "f258"},                // aliases
+    {"p18f448", "18f448", "pic18f448", "f448"},
     0,
-    0x600,                                             // bank mask
-    0x600,                                             // RAMsize
-    0
+    0x300,     /* 768 */
+    0x60,
+    0,
+    { 0xf00, 0xfff },  /* PIC18F448 range of SFR's */
+    {
+    /* PIC18F448 configuration words */
+      0x300001,
+      0x30000d,
+      { { 0x27, 0, 0xff } /* 1 */ , { 0x0f, 0, 0xff } /* 2 */ , { 0x0f, 0, 0xff } /* 3 */ , 
+      { -1, 0, 0xff } /* 4 */  , { -1, 0, 0xff } /* 5 */  , { 0x85, 0, 0xff } /* 6 */ , 
+      { -1, 0, 0xff } /* 7 */  , { 0x03, 0, 0xff } /* 8 */ , { 0xc0, 0, 0xff } /* 9 */ , 
+      { 0x03, 0, 0xff } /* a */ , { 0xe0, 0, 0xff } /* b */ , { 0x03, 0, 0xff } /* c */ , 
+      { 0x40, 0, 0xff } /* d */  }
+    }
   },
-
   {
-    {"p18f448", "18f448", "pic18f448", "f448"},                // aliases
+    {"p18f452", "18f452", "pic18f452", "f452"},
+    0,
+    0x600,     /* 1536 */
+    0x80,
     0,
-    0x300,                                             // bank mask
-    0x300,                                             // RAMsize
-    0
+    { 0xf80, 0xfff },  /* PIC18F452 range of SFR's */
+    {
+    /* PIC18F452 configuration words */
+      0x300001,
+      0x30000d,
+      { { 0x27, 0, 0xff } /* 1 */ , { 0x0f, 0, 0xff } /* 2 */ , { 0x0f, 0, 0xff } /* 3 */ , 
+      { -1, 0, 0xff } /* 4 */  , { 0x01, 0, 0xff } /* 5 */ , { 0x85, 0, 0xff } /* 6 */ , 
+      { -1, 0, 0xff } /* 7 */  , { 0x0f, 0, 0xff } /* 8 */ , { 0xc0, 0, 0xff } /* 9 */ , 
+      { 0x0f, 0, 0xff } /* a */ , { 0xe0, 0, 0xff } /* b */ , { 0x0f, 0, 0xff } /* c */ , 
+      { 0x40, 0, 0xff } /* d */  }
+    }
   },
-
   {
-    {"p18f458", "18f458", "pic18f458", "f458"},                // aliases
+    {"p18f458", "18f458", "pic18f458", "f458"},
+    0,
+    0x600,     /* 1536 */
+    0x60,
     0,
-    0x600,                                             // bank mask
-    0x600,                                             // RAMsize
-    0
+    { 0xf00, 0xfff },  /* PIC18F458 range of SFR's */
+    {
+    /* PIC18F458 configuration words */
+      0x300001,
+      0x30000d,
+      { { 0x27, 0, 0xff } /* 1 */ , { 0x0f, 0, 0xff } /* 2 */ , { 0x0f, 0, 0xff } /* 3 */ , 
+      { -1, 0, 0xff } /* 4 */  , { -1, 0, 0xff } /* 5 */  , { 0x85, 0, 0xff } /* 6 */ , 
+      { -1, 0, 0xff } /* 7 */  , { 0x0f, 0, 0xff } /* 8 */ , { 0xc0, 0, 0xff } /* 9 */ , 
+      { 0x0f, 0, 0xff } /* a */ , { 0xe0, 0, 0xff } /* b */ , { 0x0f, 0, 0xff } /* c */ , 
+      { 0x40, 0, 0xff } /* d */  }
+    }
   },
-
   {
-    {"p18f6520", "18f6520", "pic18f6520", "f6520"},    // aliases
+    {"p18f1220", "18f1220", "pic18f1220", "f1220"},
     0,
-    0x800,                                             // bank mask
-    0x800,                                             // RAMsize
-    1
+    0x100,     /* 256 */
+    0x80,
+    0,
+    { 0xf80, 0xfff },  /* PIC18F1220 range of SFR's */
+    {
+    /* PIC18F1220 configuration words */
+      0x300001,
+      0x30000d,
+      { { 0xcf, 0, 0xff } /* 1 */ , { 0x0f, 0, 0xff } /* 2 */ , { 0x1f, 0, 0xff } /* 3 */ , 
+      { -1, 0, 0xff } /* 4 */  , { 0x80, 0, 0xff } /* 5 */ , { 0x85, 0, 0xff } /* 6 */ , 
+      { -1, 0, 0xff } /* 7 */  , { 0x03, 0, 0xff } /* 8 */ , { 0xc0, 0, 0xff } /* 9 */ , 
+      { 0x03, 0, 0xff } /* a */ , { 0xe0, 0, 0xff } /* b */ , { 0x03, 0, 0xff } /* c */ , 
+      { 0x40, 0, 0xff } /* d */  }
+    }
   },
-
   {
-    {"p18f6620", "18f6620", "pic18f6620", "f6620"},    // aliases
+    {"p18f2220", "18f2220", "pic18f2220", "f2220"},
+    0,
+    0x200,     /* 512 */
+    0x80,
     0,
-    0xf00,                                             // bank mask
-    0xf00,                                             // RAMsize
-    1
+    { 0xf80, 0xfff },  /* PIC18F2220 range of SFR's */
+    {
+    /* PIC18F2220 configuration words */
+      0x300001,
+      0x30000d,
+      { { 0xcf, 0, 0xff } /* 1 */ , { 0x0f, 0, 0xff } /* 2 */ , { 0x1f, 0, 0xff } /* 3 */ , 
+      { -1, 0, 0xff } /* 4 */  , { 0x83, 0, 0xff } /* 5 */ , { 0x85, 0, 0xff } /* 6 */ , 
+      { -1, 0, 0xff } /* 7 */  , { 0x03, 0, 0xff } /* 8 */ , { 0xc0, 0, 0xff } /* 9 */ , 
+      { 0x03, 0, 0xff } /* a */ , { 0xe0, 0, 0xff } /* b */ , { 0x03, 0, 0xff } /* c */ , 
+      { 0x40, 0, 0xff } /* d */  }
+    }
   },
   {
-    {"p18f6680", "18f6680", "pic18f6680", "f6680"},    // aliases
+    {"p18f6520", "18f6520", "pic18f6520", "f6520"},
+    0,
+    0x800,     /* 2048 */
+    0x60,
     0,
-    0xc00,                                             // bank mask
-    0xc00,                                             // RAMsize
-    1
+    { 0xf6b, 0xfff },  /* PIC18F6520 range of SFR's */
+    {
+    /* PIC18F6520 configuration words */
+      0x300001,
+      0x30000d,
+      { { 0x27, 0, 0xff } /* 1 */ , { 0x0f, 0, 0xff } /* 2 */ , { 0x0f, 0, 0xff } /* 3 */ , 
+      { 0x80, 0, 0xff } /* 4 */ , { 0x88, 0, 0xff } /* 5 */ , { -1, 0, 0xff } /* 6 */  , 
+      { -1, 0, 0xff } /* 7 */  , { 0x0f, 0, 0xff } /* 8 */ , { 0xc0, 0, 0xff } /* 9 */ , 
+      { 0x0f, 0, 0xff } /* a */ , { 0xe0, 0, 0xff } /* b */ , { 0x0f, 0, 0xff } /* c */ , 
+      { 0x40, 0, 0xff } /* d */  }
+    }
   },
   {
-    {"p18f6720", "18f6720", "pic18f6720", "f6720"},    // aliases
+    {"p18f6620", "18f6620", "pic18f6620", "f6620"},
+    0,
+    0xf00,     /* 3840 */
+    0x60,
     0,
-    0xf00,                                             // bank mask
-    0xf00,                                             // RAMsize
-    1
+    { 0xf6b, 0xfff },  /* PIC18F6620 range of SFR's */
+    {
+    /* PIC18F6620 configuration words */
+      0x300001,
+      0x30000d,
+      { { 0x27, 0, 0xff } /* 1 */ , { 0x0f, 0, 0xff } /* 2 */ , { 0x0f, 0, 0xff } /* 3 */ , 
+      { -1, 0, 0xff } /* 4 */  , { 0x01, 0, 0xff } /* 5 */ , { 0x85, 0, 0xff } /* 6 */ , 
+      { -1, 0, 0xff } /* 7 */  , { 0x0f, 0, 0xff } /* 8 */ , { 0xc0, 0, 0xff } /* 9 */ , 
+      { 0x0f, 0, 0xff } /* a */ , { 0xe0, 0, 0xff } /* b */ , { 0x0f, 0, 0xff } /* c */ , 
+      { 0x40, 0, 0xff } /* d */  }
+    }
   },
   {
-    {"p18f8520", "18f8520", "pic18f8520", "f8520"},    // aliases
+    {"p18f6680", "18f6680", "pic18f6680", "f6680"},
+    0,
+    0xf00,     /* 3840 */
+    0x60,
     0,
-    0x800,                                             // bank mask
-    0x800,                                             // RAMsize
-    1
+    { 0xf00, 0xfff },  /* PIC18F6680 range of SFR's */
+    {
+    /* PIC18F6680 configuration words */
+      0x300001,
+      0x30000d,
+      { { 0x2f, 0, 0xff } /* 1 */ , { 0x0f, 0, 0xff } /* 2 */ , { 0x1f, 0, 0xff } /* 3 */ , 
+      { -1, 0, 0xff } /* 4 */  , { 0x83, 0, 0xff } /* 5 */ , { 0x85, 0, 0xff } /* 6 */ , 
+      { -1, 0, 0xff } /* 7 */  , { 0x0f, 0, 0xff } /* 8 */ , { 0xc0, 0, 0xff } /* 9 */ , 
+      { 0x0f, 0, 0xff } /* a */ , { 0xe0, 0, 0xff } /* b */ , { 0x0f, 0, 0xff } /* c */ , 
+      { 0x40, 0, 0xff } /* d */  }
+    }
+  },
+  {
+    {"p18f6720", "18f6720", "pic18f6720", "f6720"},
+    0,
+    0xf00,     /* 3840 */
+    0x60,
+    0,
+    { 0xf6b, 0xfff },  /* PIC18F6720 range of SFR's */
+    {
+    /* PIC18F6720 configuration words */
+      0x300001,
+      0x30000d,
+      { { 0x27, 0, 0xff } /* 1 */ , { 0x0f, 0, 0xff } /* 2 */ , { 0x0f, 0, 0xff } /* 3 */ , 
+      { -1, 0, 0xff } /* 4 */  , { 0x01, 0, 0xff } /* 5 */ , { 0x85, 0, 0xff } /* 6 */ , 
+      { -1, 0, 0xff } /* 7 */  , { 0xff, 0, 0xff } /* 8 */ , { 0xc0, 0, 0xff } /* 9 */ , 
+      { 0xff, 0, 0xff } /* a */ , { 0xe0, 0, 0xff } /* b */ , { 0xff, 0, 0xff } /* c */ , 
+      { 0x40, 0, 0xff } /* d */  }
+    }
   },
   {
-    {"p18f8620", "18f8620", "pic18f8620", "f8620"},    // aliases
+    {"p18f8520", "18f8520", "pic18f8520", "f8520"},
     0,
-    0xf00,                                             // bank mask
-    0xf00,                                             // RAMsize
-    1
+    0x800,     /* 2048 */
+    0x60,
+    1,
+    { 0xf6b, 0xfff },  /* PIC18F8520 range of SFR's */
+    {
+    /* PIC18F8520 configuration words */
+      0x300001,
+      0x30000d,
+      { { 0x27, 0, 0xff } /* 1 */ , { 0x0f, 0, 0xff } /* 2 */ , { 0x0f, 0, 0xff } /* 3 */ , 
+      { 0x83, 0, 0xff } /* 4 */ , { 0x88, 0, 0xff } /* 5 */ , { -1, 0, 0xff } /* 6 */  , 
+      { -1, 0, 0xff } /* 7 */  , { 0x0f, 0, 0xff } /* 8 */ , { 0xc0, 0, 0xff } /* 9 */ , 
+      { 0x0f, 0, 0xff } /* a */ , { 0xe0, 0, 0xff } /* b */ , { 0x0f, 0, 0xff } /* c */ , 
+      { 0x40, 0, 0xff } /* d */  }
+    }
   },
   {
-    {"p18f8680", "18f8680", "pic18f8680", "f8680"},    // aliases
+    {"p18f8620", "18f8620", "pic18f8620", "f8620"},
     0,
-    0xc00,                                             // bank mask
-    0x800,                                             // RAMsize
-    1
+    0xf00,     /* 3840 */
+    0x60,
+    1,
+    { 0xf6b, 0xfff },  /* PIC18F8620 range of SFR's */
+    {
+    /* PIC18F8620 configuration words */
+      0x300001,
+      0x30000d,
+      { { 0x27, 0, 0xff } /* 1 */ , { 0x0f, 0, 0xff } /* 2 */ , { 0x0f, 0, 0xff } /* 3 */ , 
+      { 0x83, 0, 0xff } /* 4 */ , { 0x01, 0, 0xff } /* 5 */ , { 0x85, 0, 0xff } /* 6 */ , 
+      { -1, 0, 0xff } /* 7 */  , { 0x0f, 0, 0xff } /* 8 */ , { 0xc0, 0, 0xff } /* 9 */ , 
+      { 0x0f, 0, 0xff } /* a */ , { 0xe0, 0, 0xff } /* b */ , { 0x0f, 0, 0xff } /* c */ , 
+      { 0x40, 0, 0xff } /* d */  }
+    }
   },
   {
-    {"p18f8720", "18f8720", "pic18f8720", "f8720"},    // aliases
+    {"p18f8680", "18f8680", "pic18f8680", "f8680"},
+    0,
+    0xf00,     /* 3840 */
+    0x60,
     0,
-    0xf00,                                             // bank mask
-    0xf00,                                             // RAMsize
-    1
+    { 0xf00, 0xfff },  /* PIC18F8680 range of SFR's */
+    {
+    /* PIC18F8680 configuration words */
+      0x300001,
+      0x30000d,
+      { { 0x2f, 0, 0xff } /* 1 */ , { 0x0f, 0, 0xff } /* 2 */ , { 0x1f, 0, 0xff } /* 3 */ , 
+      { 0x83, 0, 0xff } /* 4 */ , { 0x83, 0, 0xff } /* 5 */ , { 0x85, 0, 0xff } /* 6 */ , 
+      { -1, 0, 0xff } /* 7 */  , { 0x0f, 0, 0xff } /* 8 */ , { 0xc0, 0, 0xff } /* 9 */ , 
+      { 0x0f, 0, 0xff } /* a */ , { 0xe0, 0, 0xff } /* b */ , { 0x0f, 0, 0xff } /* c */ , 
+      { 0x40, 0, 0xff } /* d */  }
+    }
   },
+  {
+    {"p18f8720", "18f8720", "pic18f8720", "f8720"},
+    0,
+    0xf00,     /* 3840 */
+    0x60,
+    1,
+    { 0xf6b, 0xfff },  /* PIC18F8720 range of SFR's */
+    {
+    /* PIC18F8720 configuration words */
+      0x300001,
+      0x30000d,
+      { { 0x27, 0, 0xff } /* 1 */ , { 0x0f, 0, 0xff } /* 2 */ , { 0x0f, 0, 0xff } /* 3 */ , 
+      { 0x83, 0, 0xff } /* 4 */ , { 0x01, 0, 0xff } /* 5 */ , { 0x85, 0, 0xff } /* 6 */ , 
+      { -1, 0, 0xff } /* 7 */  , { 0xff, 0, 0xff } /* 8 */ , { 0xc0, 0, 0xff } /* 9 */ , 
+      { 0xff, 0, 0xff } /* a */ , { 0xe0, 0, 0xff } /* b */ , { 0xff, 0, 0xff } /* c */ , 
+      { 0x40, 0, 0xff } /* d */  }
+    }
+  }
 
 };
 
@@ -170,54 +392,6 @@ static int num_of_supported_PICS = sizeof(Pics16)/sizeof(PIC16_device);
 #define DEFAULT_PIC "452"
 
 PIC16_device *pic16=NULL;
-
-#define DEFAULT_CONFIG_BYTE 0xff
-
-#define CONFIG1H_WORD_ADDRESS 0x300001
-#define DEFAULT_CONFIG1H_WORD DEFAULT_CONFIG_BYTE
-
-#define CONFIG2L_WORD_ADDRESS 0x300002
-#define DEFAULT_CONFIG2L_WORD DEFAULT_CONFIG_BYTE
-
-#define CONFIG2H_WORD_ADDRESS 0x300003
-#define DEFAULT_CONFIG2H_WORD DEFAULT_CONFIG_BYTE
-
-#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;
-
 unsigned int stackPos = 0;
 
 extern regs* newReg(short type, short pc_type, int rIdx, char *name, int size, int alias, operand *refop);
@@ -263,19 +437,43 @@ int regCompare(const void *a, const void *b)
        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 symCompare(const void *a, const void *b)
+{
+  const symbol *const *i = a;
+  const symbol *const *j = b;
+
+       /* 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;
+
+       /* finally if in same address and same size sort by name */
+       return (strcmp( (*i)->rname, (*j)->rname));
 
   return 0;
 }
 
-void pic16_dump_section(FILE *of, set *section, int fix)
+void pic16_dump_usection(FILE *of, set *section, int fix)
 {
-  static int abs_section_no=0;
+  static int abs_usection_no=0;
   regs *r, *rprev;
   int init_addr, i;
   regs **rlist;
+  regs *r1;
 
        /* put all symbols in an array */
        rlist = Safe_calloc(elementsInSet(section), sizeof(regs *));
@@ -299,25 +497,145 @@ void pic16_dump_section(FILE *of, set *section, int fix)
                }
        } else {
          int j=0;
-                 
+         int deb_addr=0;
+
                rprev = NULL;
                init_addr = rlist[j]->address;
-               fprintf(of, "\n\nstatic_%s_%02d\tudata\t0X%04X\n", moduleName, abs_section_no++, init_addr);
+               deb_addr = init_addr;
+               fprintf(of, "\n\nustat_%s_%02d\tudata\t0X%04X\n", moduleName, abs_usection_no++, init_addr);
        
                for(j=0;j<i;j++) {
                        r = rlist[j];
+                       if(j < i-1)r1 = rlist[j+1]; else r1 = NULL;
+                       
                        init_addr = r->address;
-                       if(rprev && (init_addr != (rprev->address + rprev->size))) {
-                               fprintf(of, "\nstatic_%s_%02d\tudata\t0X%04X\n", moduleName, abs_section_no++, init_addr);
+                       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);
                        }
 
-                       fprintf(of, "%s\tres\t%d\n", r->name, r->size);
+                       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;
+                       }
+                       
                        rprev = r;
                }
        }
        free(rlist);
 }
 
+void pic16_dump_gsection(FILE *of, set *sections)
+{
+  regs *r;
+  sectName *sname;
+
+       for(sname = setFirstItem(sections); sname; sname = setNextItem(sections)) {
+               fprintf(of, "\n\n%s\tudata\n", sname->name);
+
+               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);
+               }
+       }
+}
+
+
+/* forward declaration */
+void pic16_printIval(symbol * sym, sym_link * type, initList * ilist, char ptype, void *p);
+extern void pic16_pCodeConstString(char *name, char *value);
+
+void pic16_dump_isection(FILE *of, set *section, int fix)
+{
+  static int abs_isection_no=0;
+  symbol *s, *sprev;
+  int init_addr, i;
+  symbol **slist;
+
+       /* put all symbols in an array */
+       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)free(slist);
+         return;
+       }
+
+       /* 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 {
+         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;j<i;j++) {
+                       s = slist[j];
+                       if(j < i-1)s1 = slist[j+1]; else s1 = NULL;
+                       
+                       init_addr = SPEC_ADDR(s->etype);
+
+                       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;
+               }
+       }
+       free(slist);
+}
+
+
 void pic16_dump_int_registers(FILE *of, set *section)
 {
   regs *r, *rprev;
@@ -357,126 +675,6 @@ void pic16_dump_int_registers(FILE *of, set *section)
 
 #define BYTE_IN_LONG(x,b) ((x>>(8*_ENDIAN(b)))&0xff)
 
-/*-----------------------------------------------------------------*/
-/* printIvalType - generates ival for int/char                     */
-/*-----------------------------------------------------------------*/
-void print_idataType (FILE *of, symbol *sym, sym_link * type, initList * ilist)
-{
-  value *val;
-  unsigned long ulval;
-
-  //fprintf(stderr, "%s\n",__FUNCTION__);
-
-  /* if initList is deep */
-  if (ilist->type == INIT_DEEP)
-    ilist = ilist->init.deep;
-
-  if (!IS_AGGREGATE(sym->type) && getNelements(type, ilist)>1) {
-    werror (W_EXCESS_INITIALIZERS, "scalar", sym->name, sym->lineDef);
-  }
-
-  if (!(val = list2val (ilist))) {
-    // assuming a warning has been thrown
-    val=constVal("0");
-  }
-
-  if (val->type != type) {
-    val = valCastLiteral(type, floatFromVal(val));
-  }
-
-  if(val) 
-    ulval = (unsigned long) floatFromVal (val);
-  else
-    ulval =0;
-
-  switch (getSize (type)) {
-    case 1:
-       fprintf(of, "%s\tdata\t0x%02x\n", sym->name, (unsigned char)BYTE_IN_LONG(ulval, 0));
-//     pic16_addpCode2pBlock(pb,pic16_newpCode(POC_RETLW,pic16_newpCodeOpLit(BYTE_IN_LONG(ulval,0))));
-       break;
-
-    case 2:
-//     fprintf(of, "%s\tdw\t0x%04x\n", sym->name, (unsigned int)(BYTE_IN_LONG(ulval, 0)
-//                                     + (BYTE_IN_LONG(ulval, 1) << 8)));
-       fprintf(of, "%s\tdata\t0x%02x,0x%02x\n", sym->name, (unsigned char)BYTE_IN_LONG(ulval, 0),
-                                       (unsigned char)(BYTE_IN_LONG(ulval, 1) << 8));
-//     pic16_addpCode2pBlock(pb,pic16_newpCode(POC_RETLW,pic16_newpCodeOpLit(BYTE_IN_LONG(ulval,0))));
-//     pic16_addpCode2pBlock(pb,pic16_newpCode(POC_RETLW,pic16_newpCodeOpLit(BYTE_IN_LONG(ulval,1))));
-       break;
-
-    case 4:
-       fprintf(of, "%s\tdw\t0x%04x,0x%04x\n", sym->name, (unsigned int)(BYTE_IN_LONG(ulval, 0)
-                                       + (BYTE_IN_LONG(ulval, 1) << 8)),
-                                       (unsigned)(BYTE_IN_LONG(ulval, 2)
-                                       + (BYTE_IN_LONG(ulval, 3) << 8)));
-//     pic16_addpCode2pBlock(pb,pic16_newpCode(POC_RETLW,pic16_newpCodeOpLit(BYTE_IN_LONG(ulval,0))));
-//     pic16_addpCode2pBlock(pb,pic16_newpCode(POC_RETLW,pic16_newpCodeOpLit(BYTE_IN_LONG(ulval,1))));
-//     pic16_addpCode2pBlock(pb,pic16_newpCode(POC_RETLW,pic16_newpCodeOpLit(BYTE_IN_LONG(ulval,2))));
-//     pic16_addpCode2pBlock(pb,pic16_newpCode(POC_RETLW,pic16_newpCodeOpLit(BYTE_IN_LONG(ulval,3))));
-       break;
-  }
-}
-
-
-
-/*-----------------------------------------------------------------*/
-/* printIval - generates code for initial value                    */
-/*-----------------------------------------------------------------*/
-void print_idata(FILE *of, symbol * sym, sym_link * type, initList * ilist)
-{
-  if (!ilist)
-    return;
-
-  /* if structure then    */
-  if (IS_STRUCT (type))
-    {
-      //fprintf(stderr,"%s struct\n",__FUNCTION__);
-      //printIvalStruct (sym, type, ilist, oFile);
-      return;
-    }
-
-  /* if this is a pointer */
-  if (IS_PTR (type))
-    {
-      //fprintf(stderr,"%s pointer\n",__FUNCTION__);
-      //printIvalPtr (sym, type, ilist, oFile);
-      return;
-    }
-
-  /* if this is an array   */
-  if (IS_ARRAY (type))
-    {
-      //fprintf(stderr,"%s array\n",__FUNCTION__);
-//      printIvalArray (sym, type, ilist, pb);
-      return;
-    }
-
-  /* if type is SPECIFIER */
-  if (IS_SPEC (type))
-    {
-//     fprintf(stderr,"%s spec\n",__FUNCTION__);
-      print_idataType(of, sym, type, ilist);
-      return;
-    }
-}
-
-
-void pic16_dump_idata(FILE *of, set *idataSymSet)
-{
-  int i;
-  symbol *ids;
-  
-
-       i = elementsInSet(idataSymSet);
-       if(!i)return;
-       
-       fprintf(of, "\n\n; Initialised data (idata)\n");
-       fprintf(of, "\tidata\n");
-       for(ids = setFirstItem(idataSymSet); ids; ids = setNextItem(idataSymSet))
-             print_idata(of, ids, ids->type, ids->ival);
-
-}
-
 
 /*-----------------------------------------------------------------*
  *  void pic16_list_valid_pics(int ncols, int list_alias)
@@ -670,6 +868,8 @@ int checkAddSym(set **set, symbol *sym)
 void pic16_groupRegistersInSection(set *regset)
 {
   regs *reg;
+  sectSym *ssym;
+  int docontinue=0;
 
        for(reg=setFirstItem(regset); reg; reg = setNextItem(regset)) {
 
@@ -677,11 +877,34 @@ void pic16_groupRegistersInSection(set *regset)
 
                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\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) );
+#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);
+                                       addSet(&ssym->section->regsSet, reg);
+                                       docontinue=1;
+                               }
+                       }
+
+                       if(docontinue)continue;
 
-//                     fprintf(stderr, "%s:%d register %s alias:%d fix:%d\n",
-//                             __FILE__, __LINE__, reg->name, reg->alias, reg->isFixed);
+//                     fprintf(stderr, "%s:%d reg: %s\n", __FILE__, __LINE__, reg->name);
 
-                       if(reg->alias) {
+                       if(reg->alias == 0x80) {
                                checkAddReg(&pic16_equ_data, reg);
                        } else
                        if(reg->isFixed) {
@@ -709,82 +932,18 @@ void pic16_groupRegistersInSection(set *regset)
  * This routine will assign a value to that address.
  *
  *-----------------------------------------------------------------*/
-
 void pic16_assignConfigWordValue(int address, 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;
-  }
-
-       fprintf(stderr,"setting config word to 0x%x\n",value);
-
-}
-/*-----------------------------------------------------------------*
- * int pic16_getConfigWord(int address)
- *
- * Get the current value of the config word.
- *
- *-----------------------------------------------------------------*/
+  int i;
 
-int pic16_getConfigWord(int address)
-{
-  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;
-  }
+        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
+                        pic16->cwInfo.crInfo[i].value = value;
+                        pic16->cwInfo.crInfo[i].emit = 1;
+                        return;
+                }
+        }
 }