* src/pic16/devices.inc,
[fw/sdcc] / src / pic16 / device.c
index 54e1f8145d3f54ce40054ae38eb5d00f1693318d..84ef0ea4e4c1ac86cb079b7232d3e9d0e8d27ac5 100644 (file)
 #include "newalloc.h"
 
 
+#include "main.h"
 #include "pcode.h"
 #include "ralloc.h"
 #include "device.h"
 
+stats_t statistics = { 0, 0, 0, 0 };
 
-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"},
-    0,
-    0x300,     /* 768 */
-    0x80,
-    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 */  }
-    }
-  },
-  {
-    {"p18f248", "18f248", "pic18f248", "f248"},
-    0,
-    0x300,     /* 768 */
-    0x60,
-    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 */  }
-    }
-  },
-  {
-    {"p18f252", "18f252", "pic18f252", "f252"},
-    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 */  }
-    }
-  },
-  {
-    {"p18f258", "18f258", "pic18f258", "f258"},
-    0,
-    0x600,     /* 1536 */
-    0x60,
-    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 */  }
-    }
-  },
-  {
-    {"p18f442", "18f442", "pic18f442", "f442"},
-    0,
-    0x300,     /* 768 */
-    0x80,
-    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 */  }
-    }
-  },
-  {
-    {"p18f448", "18f448", "pic18f448", "f448"},
-    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 */  }
-    }
-  },
-  {
-    {"p18f452", "18f452", "pic18f452", "f452"},
-    0,
-    0x600,     /* 1536 */
-    0x80,
-    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"},
-    0,
-    0x600,     /* 1536 */
-    0x60,
-    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 */  }
-    }
-  },
-  {
-    {"p18f1220", "18f1220", "pic18f1220", "f1220"},
-    0,
-    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 */  }
-    }
-  },
-  {
-    {"p18f2220", "18f2220", "pic18f2220", "f2220"},
-    0,
-    0x200,     /* 512 */
-    0x80,
-    0,
-    { 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 */  }
-    }
-  },
-  {
-    {"p18f6520", "18f6520", "pic18f6520", "f6520"},
-    0,
-    0x800,     /* 2048 */
-    0x60,
-    0,
-    { 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 */  }
-    }
-  },
-  {
-    {"p18f6620", "18f6620", "pic18f6620", "f6620"},
-    0,
-    0xf00,     /* 3840 */
-    0x60,
-    0,
-    { 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 */  }
-    }
-  },
-  {
-    {"p18f6680", "18f6680", "pic18f6680", "f6680"},
-    0,
-    0xf00,     /* 3840 */
-    0x60,
-    0,
-    { 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 */  }
-    }
-  },
-  {
-    {"p18f8520", "18f8520", "pic18f8520", "f8520"},
-    0,
-    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 */  }
-    }
-  },
-  {
-    {"p18f8620", "18f8620", "pic18f8620", "f8620"},
-    0,
-    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 */  }
-    }
-  },
-  {
-    {"p18f8680", "18f8680", "pic18f8680", "f8680"},
-    0,
-    0xf00,     /* 3840 */
-    0x60,
-    0,
-    { 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 */  }
-    }
-  },
+#define DEVICE_FILE_NAME    "pic16devices.txt"
 
+static PIC16_device default_device = {
+    { "p18f452", "18f452", "pic18f452", "f452" },
+    0x600,
+    0x80,
+    { 0xf80, 0xfff },
+    { /* 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 */ }
+    },
+    { /* ID locations */
+      0x200000, 0x200007,
+      { { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+        { 0, 0 }, { 0, 0 }, { 0, 0 } }
+    },
+    NULL
 };
 
-static int num_of_supported_PICS = sizeof(Pics16)/sizeof(PIC16_device);
-
-#define DEFAULT_PIC "452"
-
-PIC16_device *pic16=NULL;
-unsigned int stackPos = 0;
+PIC16_device *pic16 = &default_device;
+static PIC16_device *devices = NULL;
 
-extern regs* newReg(short type, short pc_type, int rIdx, char *name, int size, int alias, operand *refop);
-
-void pic16_setMaxRAM(int size)
-{
-       pic16->maxRAMaddress = size;
-       stackPos = pic16->RAMsize-1;
-
-       if (pic16->maxRAMaddress < 0) {
-               fprintf(stderr, "invalid \"#pragma maxram 0x%x\" setting\n",
-                       pic16->maxRAMaddress);
-         return;
-       }
-}
+extern set *includeDirsSet;
+extern set *userIncDirsSet;
 
 extern char *iComments2;
 
@@ -426,6 +92,25 @@ 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);
+               statistics.adsize += r->size;
+       }
+}
+
+
 int regCompare(const void *a, const void *b)
 {
   const regs *const *i = a;
@@ -469,12 +154,14 @@ int symCompare(const void *a, const void *b)
 void pic16_dump_usection(FILE *of, set *section, int fix)
 {
   static int abs_usection_no=0;
+  static unsigned int usection_no=0;
   regs *r, *rprev;
-  int init_addr, i;
+  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)) {
@@ -482,7 +169,7 @@ void pic16_dump_usection(FILE *of, set *section, int fix)
        }
        
        if(!i) {
-               if(rlist)free(rlist);
+               if(rlist)Safe_free(rlist);
          return;
        }
 
@@ -490,12 +177,24 @@ void pic16_dump_usection(FILE *of, set *section, int fix)
        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 {
-         int j=0;
+         unsigned int j=0;
          int deb_addr=0;
 
                rprev = NULL;
@@ -519,26 +218,49 @@ void pic16_dump_usection(FILE *of, set *section, int fix)
                        } else {
                                fprintf(of, "%s\tres\t%d\n", r->name, r->size);
                                deb_addr += r->size;
+                               statistics.udsize += r->size;
                        }
                        
                        rprev = r;
                }
        }
-       free(rlist);
+       Safe_free(rlist);
+}
+
+void pic16_dump_gsection(FILE *of, set *sections)
+{
+  regs *r;
+  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)) {
+#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;
+               }
+       }
 }
 
 
 /* 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;
+  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)) {
@@ -546,7 +268,7 @@ void pic16_dump_isection(FILE *of, set *section, int fix)
        }
        
        if(!i) {
-               if(slist)free(slist);
+               if(slist)Safe_free(slist);
          return;
        }
 
@@ -558,12 +280,25 @@ void pic16_dump_isection(FILE *of, set *section, int fix)
        if(!fix) {
                fprintf(of, "\n\n\tidata\n");
                for(s = setFirstItem(section); s; s = setNextItem(section)) {
-                       fprintf(of, "%s", s->rname);
-                       pic16_printIval(s, s->type, s->ival, 'f', (void *)of);
-                       pic16_flushDB('f', (void *)of);
+
+                       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;
+         unsigned int j=0;
          symbol *s1;
          
                sprev = NULL;
@@ -580,14 +315,26 @@ void pic16_dump_isection(FILE *of, set *section, int fix)
                                fprintf(of, "\nistat_%s_%02d\tidata\t0X%04X\n", moduleName, abs_isection_no++, init_addr);
                        }
 
-                       fprintf(of, "%s", s->rname);
-                       pic16_printIval(s, s->type, s->ival, 'f', (void *)of);
-                       pic16_flushDB('f', (void *)of);
+                       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);
+       Safe_free(slist);
 }
 
 
@@ -598,6 +345,7 @@ void pic16_dump_int_registers(FILE *of, set *section)
   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)) {
@@ -608,141 +356,397 @@ void pic16_dump_int_registers(FILE *of, set *section)
        qsort(rlist, elementsInSet(section), sizeof(regs *), regCompare);
        
        if(!i) {
-               if(rlist)free(rlist);
+               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))
+       for(r = setFirstItem(section); r; r = setNextItem(section)) {
                fprintf(of, "%s\tres\t%d\n", r->name, r->size);
+               statistics.intsize += r->size;
+       }
 
-       free(rlist);
+       Safe_free(rlist);
 }
 
-
-#ifdef WORDS_BIGENDIAN
-  #define _ENDIAN(x)  (3-x)
-#else
-  #define _ENDIAN(x)  (x)
-#endif
-
-#define BYTE_IN_LONG(x,b) ((x>>(8*_ENDIAN(b)))&0xff)
-
-
-/*-----------------------------------------------------------------*
- *  void pic16_list_valid_pics(int ncols, int list_alias)
+/**
+ * Find the device structure for the named device.
+ * Consider usind pic16_find_device() instead!
  *
- * Print out a formatted list of valid PIC devices
- *
- * ncols - number of columns in the list.
- *
- * list_alias - if non-zero, print all of the supported aliases
- *              for a device (e.g. F84, 16F84, etc...)
- *-----------------------------------------------------------------*/
-void pic16_list_valid_pics(int ncols, int list_alias)
+ * @param   name
+ *      a name for the desired device
+ * @param   head
+ *      a pointer to the head of the list of devices
+ * @return
+ *      a pointer to the structure for the desired
+ *      device, or NULL
+ */
+static PIC16_device *
+find_in_list(const char *name, PIC16_device *head)
 {
-  int col,longest;
-  int i,j,k,l;
-
-  if(list_alias)
-    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;
-
-  /* Find the device with the longest name */
-  for(i=0,longest=0; i<num_of_supported_PICS; i++) {
-    for(j=0; j<=list_alias; j++) {
-      k = strlen(Pics16[i].name[j]);
-      if(k>longest)
-       longest = k;
-    }
-  }
-
-  col = 0;
-
-  for(i=0;  i < num_of_supported_PICS; i++) {
-    j = 0;
-    do {
-
-      fprintf(stderr,"%s", Pics16[i].name[j]);
-      if(col<ncols) {
-       l = longest + 2 - strlen(Pics16[i].name[j]);
-       for(k=0; k<l; k++)
-         fputc(' ',stderr);
-
-       col++;
-
-      } else {
-       fputc('\n',stderr);
-       col = 0;
-      }
+    int i;
 
-    } while(++j<list_alias);
+    while (head) {
+        for (i = 0; i < 4; i++) {
+            if (0 == strcmp(head->name[i], name)) {
+                return (head);
+            } // if
+        } // for
 
-  }
-  if(col != ncols)
-    fputc('\n',stderr);
+        head = head->next;
+    } // while
 
+    return (NULL);
 }
 
-/*-----------------------------------------------------------------*
- *  
- *-----------------------------------------------------------------*/
-PIC16_device *pic16_find_device(char *name)
+/**
+ * Print a list of supported devices.
+ * If --verbose was given, also emit key characteristics (memory size,
+ * access bank split point, address range of SFRs and config words).
+ *
+ * @param   head
+ *      a pointer to the head of the list of devices
+ */
+static void
+pic16_list_devices(PIC16_device *head)
 {
-
-  int i,j;
-
-  if(!name)
-    return NULL;
-
-  for(i = 0; i<num_of_supported_PICS; i++) {
-
-    for(j=0; j<PROCESSOR_NAMES; j++)
-      if(!STRCASECMP(Pics16[i].name[j], name) )
-       return &Pics16[i];
-  }
-
-  /* not found */
-  return NULL; 
+    int i = 0;
+
+    if (options.verbose) {
+        printf("device        RAM  split        SFRs           config words\n");
+    } // if
+    while (head) {
+        printf("%-10s  ", head->name[0]);
+        if (options.verbose) {
+            printf("%5d   0x%02x    0x%03x..0x%03x    0x%06x..0x%06x\n",
+                    head->RAMsize,
+                    head->acsSplitOfs,
+                    head->sfrRange.sfrLoAddr,
+                    head->sfrRange.sfrHiAddr,
+                    head->cwInfo.confAddrStart,
+                    head->cwInfo.confAddrEnd);
+        } else {
+            i++;
+            if (0 == (i % 6)) {
+                printf("\n");
+            } // if
+        } // if
+        head = head->next;
+    } // while
+    printf("\n");
 }
 
-/*-----------------------------------------------------------------*
- *  
- *-----------------------------------------------------------------*/
-void pic16_init_pic(char *pic_type)
+/**
+ * Read a single line from the given file.
+ * The caller should free() the returned value!
+ *
+ * @param   file
+ *      a pointer to the open file to read
+ * @return
+ *      a pointer to a malloc'ed copy of the (next) line, or NULL
+ */
+static char *
+get_line (FILE *file)
 {
-       pic16 = pic16_find_device(pic_type);
-
-       if(!pic16) {
-               if(pic_type)
-                       fprintf(stderr, "'%s' was not found.\n", pic_type);
-               else
-                       fprintf(stderr, "No processor has been specified (use -pPROCESSOR_NAME)\n");
-
-               fprintf(stderr,"Valid devices are:\n");
+    char *line = NULL;
+    size_t len = 129;
+    size_t done = 0;
+    size_t got = 0;
+
+    while (!feof(file)) {
+        line = (char *) Safe_realloc(line, len);
+        got += fread(&line[done], 1, 128, file);
+        line[got] = 0;
+
+        /* find EOL */
+        while (done < got) {
+            if (('\r' == line[done]) || ('\n' == line[done])) {
+                line[done] = 0;
+                fseek(file, done + 1 - got, SEEK_CUR);
+                return (line);
+            } // if
+            done++;
+        } // while
+
+        len += 128;
+    } // while
+
+    return (line);
+}
 
-               pic16_list_valid_pics(4,0);
-               exit(1);
-       }
+/**
+ * Truncate the given string in place (!) at the first '#' character (if any).
+ *
+ * @param   line
+ *      a pointer to the string to truncate
+ * @return
+ *      a pointer to the truncated string (i.e., line)
+ */
+static char *
+strip_comment (char *line)
+{
+    char *l = line;
+    char c;
+
+    if (!line) {
+        return (line);
+    } // if
+
+    while (0 != (c = *l)) {
+        if ('#' == c) {
+            *l = 0;
+            return (line);
+        } // if
+        l++;
+    } // while
+
+    return (line);
+}
 
-//     printf("PIC processor found and initialized: %s\n", pic_type);
-       pic16_setMaxRAM( 0xfff  );
+/**
+ * Report errors in the device specification.
+ *
+ * @param   msg
+ *      a pointer to the detailed message
+ */
+#define SYNTAX(msg) do {                                \
+    fprintf(stderr, "%s:%d: Syntax error: %s\n",        \
+            DEVICE_FILE_NAME, lineno, msg);             \
+} while (0)
+
+/**
+ * Locate and read in the device specification (if required) and
+ * return the device structure for the named device.
+ *
+ * @param   name
+ *      a pointer to the name of the desired device
+ * @return
+ *      a pointer to the device structure, or NULL
+ */
+static PIC16_device *
+pic16_find_device(const char *name)
+{
+    const char *path;
+    char buffer[PATH_MAX];
+    char *line, *key;
+    const char *sep = " \t\n\r";
+    FILE *f = NULL;
+    PIC16_device *d = NULL, *template;
+    PIC16_device *head = NULL, *tail = NULL;
+    set *_sets[] = { userIncDirsSet, includeDirsSet };
+    set **sets = &_sets[0];
+    int lineno = 0;
+    int res, i;
+    int val[3];
+
+    if (!devices) {
+        //printf("%s: searching %s\n", __func__, DEVICE_FILE_NAME);
+
+        // locate the specification file in the include search paths
+        for (i = 0; (NULL == f) && (i < 2); i++) {
+            for (path = setFirstItem(sets[i]);
+                    (NULL == f) && path;
+                    path = setNextItem(sets[i]))
+            {
+                SNPRINTF(&buffer[0], PATH_MAX, "%s%s%s",
+                        path, DIR_SEPARATOR_STRING, DEVICE_FILE_NAME);
+                //printf("%s: checking %s\n", __func__, &buffer[0]);
+                f = fopen(&buffer[0], "r");
+            } // for
+        } // while
+    } // if
+
+    if (devices) {
+        // list already set up, nothing to do
+    } else if (NULL == f) {
+        fprintf(stderr, "ERROR: device list %s not found, specify its path via -I<path>\n", DEVICE_FILE_NAME);
+        d = &default_device;
+    } else {
+        // parse the specification file and construct a linked list of
+        // supported devices
+        d = NULL;
+        while (NULL != (line = get_line(f))) {
+            strip_comment(line);
+            //printf("%s: read %s\n", __func__, line);
+            lineno++;
+            key = strtok(line, sep);
+            if (!key) {
+                // empty line---ignore
+            } else if (0 == strcmp(key, "name")) {
+                // name %<name>s
+                if (d) {
+                    if (tail) {
+                        tail->next = d;
+                    } else {
+                        head = d;
+                    } // if
+                    tail = d;
+                    d = NULL;
+                } // if
+
+                res = sscanf(&line[1+strlen(key)], " %16s", &buffer[3]);
+                if ((1 < res) || (3 > strlen(&buffer[3]))) {
+                    SYNTAX("<name> (e.g., 18f452) expected.");
+                } else {
+                    d = Safe_calloc(1, sizeof(PIC16_device));
+
+                    // { "p18f452", "18f452", "pic18f452", "f452" }
+                    buffer[0] = 'p';
+                    buffer[1] = 'i';
+                    buffer[2] = 'c';
+                    d->name[3] = Safe_strdup(&buffer[5]);
+                    d->name[2] = Safe_strdup(&buffer[0]);
+                    d->name[1] = Safe_strdup(&buffer[3]);
+                    buffer[2] = 'p';
+                    d->name[0] = Safe_strdup(&buffer[2]);
+                } // if
+            } else if (0 == strcmp(key, "using")) {
+                // using %<name>s
+                res = sscanf(&line[1+strlen(key)], " %16s", &buffer[0]);
+                if ((1 < res) || (3 > strlen(&buffer[3]))) {
+                    SYNTAX("<name> (e.g., 18f452) expected.");
+                } else {
+                    template = find_in_list(&buffer[0], head);
+                    if (!template) {
+                        SYNTAX("<name> (e.g., 18f452) expected.");
+                    } else {
+                        memcpy(&d->RAMsize, &template->RAMsize,
+                                ((char *)&d->next) - ((char *)&d->RAMsize));
+                    } // if
+                } // if
+            } else if (0 == strcmp(key, "ramsize")) {
+                // ramsize %<bytes>i
+                res = sscanf(&line[1+strlen(key)], " %i", &val[0]);
+                if (res < 1) {
+                    SYNTAX("<bytes> (e.g., 256) expected.");
+                } else {
+                    d->RAMsize = val[0];
+                } // if
+            } else if (0 == strcmp(key, "split")) {
+                // split %<offset>i
+                res = sscanf(&line[1+strlen(key)], " %i", &val[0]);
+                if (res < 1) {
+                    SYNTAX("<offset> (e.g., 0x80) expected.");
+                } else {
+                    d->acsSplitOfs = val[0];
+                } // if
+            } else if (0 == strcmp(key, "sfrrange")) {
+                // sfrrange %<first>i %<last>i
+                res = sscanf(&line[1+strlen(key)], " %i %i",
+                        &val[0], &val[1]);
+                if (res < 2) {
+                    SYNTAX("<first> <last> (e.g., 0xf60 0xfff) expected.");
+                } else {
+                    d->sfrRange.sfrLoAddr = val[0];
+                    d->sfrRange.sfrHiAddr = val[1];
+                } // if
+            } else if (0 == strcmp(key, "configrange")) {
+                // configrange %<first>i %<last>i
+                res = sscanf(&line[1+strlen(key)], " %i %i",
+                        &val[0], &val[1]);
+                if (res < 2) {
+                    SYNTAX("<first> <last> (e.g., 0xf60 0xfff) expected.");
+                } else {
+                    d->cwInfo.confAddrStart = val[0];
+                    d->cwInfo.confAddrEnd = val[1];
+                } // if
+            } else if (0 == strcmp(key, "configword")) {
+                // configword %<address>i %<mask>i %<value>i
+                res = sscanf(&line[1+strlen(key)], " %i %i %i",
+                        &val[0], &val[1], &val[2]);
+                if (res < 3) {
+                    SYNTAX("<address> <mask> <value> (e.g., 0x200001 0x0f 0x07) expected.");
+                } else {
+                    val[0] -= d->cwInfo.confAddrStart;
+                    if ((val[0] < 0)
+                            || (val[0] > (d->cwInfo.confAddrEnd - d->cwInfo.confAddrStart))
+                            || (val[0] >= CONFIGURATION_WORDS))
+                    {
+                        SYNTAX("address out of bounds.");
+                    } else {
+                        d->cwInfo.crInfo[val[0]].mask = val[1];
+                        d->cwInfo.crInfo[val[0]].value = val[2];
+                    } // if
+                } // if
+            } else if (0 == strcmp(key, "idlocrange")) {
+                // idlocrange %<first>i %<last>i
+                res = sscanf(&line[1+strlen(key)], " %i %i",
+                        &val[0], &val[1]);
+                if (res < 2) {
+                    SYNTAX("<first> <last> (e.g., 0xf60 0xfff) expected.");
+                } else {
+                    d->idInfo.idAddrStart = val[0];
+                    d->idInfo.idAddrEnd = val[1];
+                } // if
+            } else if (0 == strcmp(key, "idword")) {
+                // idword %<address>i %<value>i
+                res = sscanf(&line[1+strlen(key)], " %i %i",
+                        &val[0], &val[1]);
+                if (res < 2) {
+                    SYNTAX("<address> <value> (e.g., 0x3fffff 0x00) expected.");
+                } else {
+                    val[0] -= d->idInfo.idAddrStart;
+                    if ((val[0] < 0)
+                            || (val[0] > (d->idInfo.idAddrEnd - d->idInfo.idAddrStart))
+                            || (val[0] >= IDLOCATION_BYTES))
+                    {
+                        SYNTAX("address out of bounds.");
+                    } else {
+                        d->idInfo.irInfo[val[0]].value = val[1];
+                    } // if
+                } // if
+            } else {
+                printf("%s: Invalid keyword in %s ignored: %s\n",
+                        __func__, DEVICE_FILE_NAME, key);
+            } // if
+            free(line);
+        } // while
+
+        if (d) {
+            if (tail) {
+                tail->next = d;
+            } else {
+                head = d;
+            } // if
+            tail = d;
+            d = NULL;
+        } // if
+
+        devices = head;
+
+        fclose(f);
+    } // if
+
+    d = find_in_list(name, devices);
+    if (!d) {
+        d = &default_device;
+    } // if
+
+    return (d);
 }
 
 /*-----------------------------------------------------------------*
  *  
  *-----------------------------------------------------------------*/
-int pic16_picIsInitialized(void)
+void pic16_init_pic(const char *pic_type)
 {
-  if(pic16 && pic16->maxRAMaddress > 0)
-    return 1;
-
-  return 0;
-
+    pic16 = pic16_find_device(pic_type);
+
+    if (&default_device == pic16) {
+        if (pic_type) {
+            fprintf(stderr, "'%s' was not found.\n", pic_type);
+        } else {
+            fprintf(stderr, "No processor has been specified (use -pPROCESSOR_NAME)\n");
+        } // if
+
+        if (devices) {
+            fprintf(stderr,"Valid devices are (use --verbose for more details):\n");
+            pic16_list_devices(devices);
+        } // if
+        exit(EXIT_FAILURE);
+    } // if
 }
 
 /*-----------------------------------------------------------------*
@@ -766,6 +770,8 @@ int checkAddReg(set **set, regs *reg)
 {
   regs *tmp;
 
+
+       if(!reg)return 0;
 #if DEBUG_CHECK
        fprintf(stderr, "%s: about to insert REGister: %s ... ", __FUNCTION__, reg->name);
 #endif
@@ -792,6 +798,7 @@ int checkAddSym(set **set, symbol *sym)
 {
   symbol *tmp;
 
+       if(!sym)return 0;
 #if DEBUG_CHECK
        fprintf(stderr, "%s: about to add SYMbol: %s ... ", __FUNCTION__, sym->name);
 #endif
@@ -815,6 +822,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   *
@@ -823,13 +857,18 @@ 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)) {
 
-//             fprintf(stderr, "%s:%d group registers in section, reg: %s\n", __FILE__, __LINE__, reg->name);
-
-               if(reg->wasUsed
-                       && !(reg->regop && SPEC_EXTR(OP_SYM_ETYPE(reg->regop)))) {
+#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 */
@@ -837,11 +876,33 @@ 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;
+                       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);
@@ -852,8 +913,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);
+                               }
                        }
                }
        }
@@ -871,14 +937,30 @@ 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
+                  && (pic16->cwInfo.crInfo[i].mask != -1)
+                  && (pic16->cwInfo.crInfo[i].mask != 0)) {
+
+#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;
@@ -886,3 +968,14 @@ void pic16_assignConfigWordValue(int address, int value)
         }
 }
 
+void pic16_assignIdByteValue(int address, char value)
+{
+  int i;
+
+       for(i=0;i<pic16->idInfo.idAddrEnd-pic16->idInfo.idAddrStart+1;i++) {
+               if(address == pic16->idInfo.idAddrStart+i) {
+                       pic16->idInfo.irInfo[i].value = value;
+                       pic16->idInfo.irInfo[i].emit = 1;
+               }
+       }
+}