* device/include/asm/pic16/features.h,

[fw/sdcc] / device / include / pic16 / pic18f8680.h

diff --git a/device/include/pic16/pic18f8680.h b/device/include/pic16/pic18f8680.h
index c9387369070c36fa039324ffd2ead8f0a763bc35..a3ef85a8389f24093a127c33680b2bc1387b906c 100644 (file)
--- a/device/include/pic16/pic18f8680.h
+++ b/device/include/pic16/pic18f8680.h
@@ -15,8 +15,8 @@
 #ifndef __PIC18F8680_H__
 #define __PIC18F8680_H__
 
-extern sfr at 0xf00 RXF0SIDH;
-extern sfr at 0xf01 RXF0SIDL;
+extern __sfr __at 0xf00 RXF0SIDH;
+extern __sfr __at 0xf01 RXF0SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -30,12 +30,12 @@ typedef union {
        };
 } __RXF0SIDLbits_t;
 
-extern volatile __RXF0SIDLbits_t at 0xf01 RXF0SIDLbits;
+extern volatile __RXF0SIDLbits_t __at 0xf01 RXF0SIDLbits;
 
-extern sfr at 0xf02 RXF0EIDH;
-extern sfr at 0xf03 RXF0EIDL;
-extern sfr at 0xf04 RXF1SIDH;
-extern sfr at 0xf05 RXF1SIDL;
+extern __sfr __at 0xf02 RXF0EIDH;
+extern __sfr __at 0xf03 RXF0EIDL;
+extern __sfr __at 0xf04 RXF1SIDH;
+extern __sfr __at 0xf05 RXF1SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -49,14 +49,14 @@ typedef union {
        };
 } __RXF1SIDLbits_t;
 
-extern volatile __RXF1SIDLbits_t at 0xf05 RXF1SIDLbits;
+extern volatile __RXF1SIDLbits_t __at 0xf05 RXF1SIDLbits;
 
-extern sfr at 0xf06 RXF1EIDH;
-extern sfr at 0xf07 RXF1EIDL;
-extern sfr at 0xf08 RXF2SIDH;
-extern sfr at 0xf09 RXF2SIDL;
-extern sfr at 0xf0a RXF2EIDH;
-extern sfr at 0xf0b RXF2EIDL;
+extern __sfr __at 0xf06 RXF1EIDH;
+extern __sfr __at 0xf07 RXF1EIDL;
+extern __sfr __at 0xf08 RXF2SIDH;
+extern __sfr __at 0xf09 RXF2SIDL;
+extern __sfr __at 0xf0a RXF2EIDH;
+extern __sfr __at 0xf0b RXF2EIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -70,10 +70,10 @@ typedef union {
        };
 } __RXF2EIDLbits_t;
 
-extern volatile __RXF2EIDLbits_t at 0xf0b RXF2EIDLbits;
+extern volatile __RXF2EIDLbits_t __at 0xf0b RXF2EIDLbits;
 
-extern sfr at 0xf0c RXF3SIDH;
-extern sfr at 0xf0d RXF3SIDL;
+extern __sfr __at 0xf0c RXF3SIDH;
+extern __sfr __at 0xf0d RXF3SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -87,12 +87,12 @@ typedef union {
        };
 } __RXF3SIDLbits_t;
 
-extern volatile __RXF3SIDLbits_t at 0xf0d RXF3SIDLbits;
+extern volatile __RXF3SIDLbits_t __at 0xf0d RXF3SIDLbits;
 
-extern sfr at 0xf0e RXF3EIDH;
-extern sfr at 0xf0f RXF3EIDL;
-extern sfr at 0xf10 RXF4SIDH;
-extern sfr at 0xf11 RXF4SIDL;
+extern __sfr __at 0xf0e RXF3EIDH;
+extern __sfr __at 0xf0f RXF3EIDL;
+extern __sfr __at 0xf10 RXF4SIDH;
+extern __sfr __at 0xf11 RXF4SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -106,12 +106,12 @@ typedef union {
        };
 } __RXF4SIDLbits_t;
 
-extern volatile __RXF4SIDLbits_t at 0xf11 RXF4SIDLbits;
+extern volatile __RXF4SIDLbits_t __at 0xf11 RXF4SIDLbits;
 
-extern sfr at 0xf12 RXF4EIDH;
-extern sfr at 0xf13 RXF4EIDL;
-extern sfr at 0xf14 RXF5SIDH;
-extern sfr at 0xf15 RXF5SIDL;
+extern __sfr __at 0xf12 RXF4EIDH;
+extern __sfr __at 0xf13 RXF4EIDL;
+extern __sfr __at 0xf14 RXF5SIDH;
+extern __sfr __at 0xf15 RXF5SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -125,12 +125,12 @@ typedef union {
        };
 } __RXF5SIDLbits_t;
 
-extern volatile __RXF5SIDLbits_t at 0xf15 RXF5SIDLbits;
+extern volatile __RXF5SIDLbits_t __at 0xf15 RXF5SIDLbits;
 
-extern sfr at 0xf16 RXF5EIDH;
-extern sfr at 0xf17 RXF5EIDL;
-extern sfr at 0xf18 RXM0SIDH;
-extern sfr at 0xf19 RXM0SIDL;
+extern __sfr __at 0xf16 RXF5EIDH;
+extern __sfr __at 0xf17 RXF5EIDL;
+extern __sfr __at 0xf18 RXM0SIDH;
+extern __sfr __at 0xf19 RXM0SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -144,12 +144,12 @@ typedef union {
        };
 } __RXM0SIDLbits_t;
 
-extern volatile __RXM0SIDLbits_t at 0xf19 RXM0SIDLbits;
+extern volatile __RXM0SIDLbits_t __at 0xf19 RXM0SIDLbits;
 
-extern sfr at 0xf1a RXM0EIDH;
-extern sfr at 0xf1b RXM0EIDL;
-extern sfr at 0xf1c RXM1SIDH;
-extern sfr at 0xf1d RXM1SIDL;
+extern __sfr __at 0xf1a RXM0EIDH;
+extern __sfr __at 0xf1b RXM0EIDL;
+extern __sfr __at 0xf1c RXM1SIDH;
+extern __sfr __at 0xf1d RXM1SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -163,11 +163,11 @@ typedef union {
        };
 } __RXM1SIDLbits_t;
 
-extern volatile __RXM1SIDLbits_t at 0xf1d RXM1SIDLbits;
+extern volatile __RXM1SIDLbits_t __at 0xf1d RXM1SIDLbits;
 
-extern sfr at 0xf1e RXM1EIDH;
-extern sfr at 0xf1f RXM1EIDL;
-extern sfr at 0xf20 TXB2CON;
+extern __sfr __at 0xf1e RXM1EIDH;
+extern __sfr __at 0xf1f RXM1EIDL;
+extern __sfr __at 0xf20 TXB2CON;
 typedef union {
        struct {
                unsigned TXPRI0:1;
@@ -181,10 +181,10 @@ typedef union {
        };
 } __TXB2CONbits_t;
 
-extern volatile __TXB2CONbits_t at 0xf20 TXB2CONbits;
+extern volatile __TXB2CONbits_t __at 0xf20 TXB2CONbits;
 
-extern sfr at 0xf21 TXB2SIDH;
-extern sfr at 0xf22 TXB2SIDL;
+extern __sfr __at 0xf21 TXB2SIDH;
+extern __sfr __at 0xf22 TXB2SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -198,11 +198,11 @@ typedef union {
        };
 } __TXB2SIDLbits_t;
 
-extern volatile __TXB2SIDLbits_t at 0xf22 TXB2SIDLbits;
+extern volatile __TXB2SIDLbits_t __at 0xf22 TXB2SIDLbits;
 
-extern sfr at 0xf23 TXB2EIDH;
-extern sfr at 0xf24 TXB2EIDL;
-extern sfr at 0xf25 TXB2DLC;
+extern __sfr __at 0xf23 TXB2EIDH;
+extern __sfr __at 0xf24 TXB2EIDL;
+extern __sfr __at 0xf25 TXB2DLC;
 typedef union {
        struct {
                unsigned DLC0:1;
@@ -216,18 +216,18 @@ typedef union {
        };
 } __TXB2DLCbits_t;
 
-extern volatile __TXB2DLCbits_t at 0xf25 TXB2DLCbits;
+extern volatile __TXB2DLCbits_t __at 0xf25 TXB2DLCbits;
 
-extern sfr at 0xf26 TXB2D0;
-extern sfr at 0xf27 TXB2D1;
-extern sfr at 0xf28 TXB2D2;
-extern sfr at 0xf29 TXB2D3;
-extern sfr at 0xf2a TXB2D4;
-extern sfr at 0xf2b TXB2D5;
-extern sfr at 0xf2c TXB2D6;
-extern sfr at 0xf2d TXB2D7;
-extern sfr at 0xf2e CANSTATRO3;
-extern sfr at 0xf30 TXB1CON;
+extern __sfr __at 0xf26 TXB2D0;
+extern __sfr __at 0xf27 TXB2D1;
+extern __sfr __at 0xf28 TXB2D2;
+extern __sfr __at 0xf29 TXB2D3;
+extern __sfr __at 0xf2a TXB2D4;
+extern __sfr __at 0xf2b TXB2D5;
+extern __sfr __at 0xf2c TXB2D6;
+extern __sfr __at 0xf2d TXB2D7;
+extern __sfr __at 0xf2e CANSTATRO3;
+extern __sfr __at 0xf30 TXB1CON;
 typedef union {
        struct {
                unsigned TXPRI0:1;
@@ -241,10 +241,10 @@ typedef union {
        };
 } __TXB1CONbits_t;
 
-extern volatile __TXB1CONbits_t at 0xf30 TXB1CONbits;
+extern volatile __TXB1CONbits_t __at 0xf30 TXB1CONbits;
 
-extern sfr at 0xf31 TXB1SIDH;
-extern sfr at 0xf32 TXB1SIDL;
+extern __sfr __at 0xf31 TXB1SIDH;
+extern __sfr __at 0xf32 TXB1SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -258,11 +258,11 @@ typedef union {
        };
 } __TXB1SIDLbits_t;
 
-extern volatile __TXB1SIDLbits_t at 0xf32 TXB1SIDLbits;
+extern volatile __TXB1SIDLbits_t __at 0xf32 TXB1SIDLbits;
 
-extern sfr at 0xf33 TXB1EIDH;
-extern sfr at 0xf34 TXB1EIDL;
-extern sfr at 0xf35 TXB1DLC;
+extern __sfr __at 0xf33 TXB1EIDH;
+extern __sfr __at 0xf34 TXB1EIDL;
+extern __sfr __at 0xf35 TXB1DLC;
 typedef union {
        struct {
                unsigned DLC0:1;
@@ -276,18 +276,18 @@ typedef union {
        };
 } __TXB1DLCbits_t;
 
-extern volatile __TXB1DLCbits_t at 0xf35 TXB1DLCbits;
+extern volatile __TXB1DLCbits_t __at 0xf35 TXB1DLCbits;
 
-extern sfr at 0xf36 TXB1D0;
-extern sfr at 0xf37 TXB1D1;
-extern sfr at 0xf38 TXB1D2;
-extern sfr at 0xf39 TXB1D3;
-extern sfr at 0xf3a TXB1D4;
-extern sfr at 0xf3b TXB1D5;
-extern sfr at 0xf3c TXB1D6;
-extern sfr at 0xf3d TXB1D7;
-extern sfr at 0xf3e CANSTATRO2;
-extern sfr at 0xf40 TXB0CON;
+extern __sfr __at 0xf36 TXB1D0;
+extern __sfr __at 0xf37 TXB1D1;
+extern __sfr __at 0xf38 TXB1D2;
+extern __sfr __at 0xf39 TXB1D3;
+extern __sfr __at 0xf3a TXB1D4;
+extern __sfr __at 0xf3b TXB1D5;
+extern __sfr __at 0xf3c TXB1D6;
+extern __sfr __at 0xf3d TXB1D7;
+extern __sfr __at 0xf3e CANSTATRO2;
+extern __sfr __at 0xf40 TXB0CON;
 typedef union {
        struct {
                unsigned TXPRI0:1;
@@ -301,13 +301,13 @@ typedef union {
        };
 } __TXB0CONbits_t;
 
-extern volatile __TXB0CONbits_t at 0xf40 TXB0CONbits;
+extern volatile __TXB0CONbits_t __at 0xf40 TXB0CONbits;
 
-extern sfr at 0xf41 TXB0SIDH;
-extern sfr at 0xf42 TXB0SIDL;
-extern sfr at 0xf43 TXB0EIDH;
-extern sfr at 0xf44 TXB0EIDL;
-extern sfr at 0xf45 TXB0DLC;
+extern __sfr __at 0xf41 TXB0SIDH;
+extern __sfr __at 0xf42 TXB0SIDL;
+extern __sfr __at 0xf43 TXB0EIDH;
+extern __sfr __at 0xf44 TXB0EIDL;
+extern __sfr __at 0xf45 TXB0DLC;
 typedef union {
        struct {
                unsigned DLC0:1;
@@ -321,18 +321,18 @@ typedef union {
        };
 } __TXB0DLCbits_t;
 
-extern volatile __TXB0DLCbits_t at 0xf45 TXB0DLCbits;
+extern volatile __TXB0DLCbits_t __at 0xf45 TXB0DLCbits;
 
-extern sfr at 0xf46 TXB0D0;
-extern sfr at 0xf47 TXB0D1;
-extern sfr at 0xf48 TXB0D2;
-extern sfr at 0xf49 TXB0D3;
-extern sfr at 0xf4a TXB0D4;
-extern sfr at 0xf4b TXB0D5;
-extern sfr at 0xf4c TXB0D6;
-extern sfr at 0xf4d TXB0D7;
-extern sfr at 0xf4e CANSTATRO1;
-extern sfr at 0xf50 RXB1CON;
+extern __sfr __at 0xf46 TXB0D0;
+extern __sfr __at 0xf47 TXB0D1;
+extern __sfr __at 0xf48 TXB0D2;
+extern __sfr __at 0xf49 TXB0D3;
+extern __sfr __at 0xf4a TXB0D4;
+extern __sfr __at 0xf4b TXB0D5;
+extern __sfr __at 0xf4c TXB0D6;
+extern __sfr __at 0xf4d TXB0D7;
+extern __sfr __at 0xf4e CANSTATRO1;
+extern __sfr __at 0xf50 RXB1CON;
 typedef union {
        struct {
                unsigned :1;
@@ -346,10 +346,10 @@ typedef union {
        };
 } __RXB1CONbits_t;
 
-extern volatile __RXB1CONbits_t at 0xf50 RXB1CONbits;
+extern volatile __RXB1CONbits_t __at 0xf50 RXB1CONbits;
 
-extern sfr at 0xf51 RXB1SIDH;
-extern sfr at 0xf52 RXB1SIDL;
+extern __sfr __at 0xf51 RXB1SIDH;
+extern __sfr __at 0xf52 RXB1SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -363,11 +363,11 @@ typedef union {
        };
 } __RXB1SIDLbits_t;
 
-extern volatile __RXB1SIDLbits_t at 0xf52 RXB1SIDLbits;
+extern volatile __RXB1SIDLbits_t __at 0xf52 RXB1SIDLbits;
 
-extern sfr at 0xf53 RXB1EIDH;
-extern sfr at 0xf54 RXB1EIDL;
-extern sfr at 0xf55 RXB1DLC;
+extern __sfr __at 0xf53 RXB1EIDH;
+extern __sfr __at 0xf54 RXB1EIDL;
+extern __sfr __at 0xf55 RXB1DLC;
 typedef union {
        struct {
                unsigned DLC0:1;
@@ -381,18 +381,18 @@ typedef union {
        };
 } __RXB1DLCbits_t;
 
-extern volatile __RXB1DLCbits_t at 0xf55 RXB1DLCbits;
+extern volatile __RXB1DLCbits_t __at 0xf55 RXB1DLCbits;
 
-extern sfr at 0xf56 RXB1D0;
-extern sfr at 0xf57 RXB1D1;
-extern sfr at 0xf58 RXB1D2;
-extern sfr at 0xf59 RXB1D3;
-extern sfr at 0xf5a RXB1D4;
-extern sfr at 0xf5b RXB1D5;
-extern sfr at 0xf5c RXB1D6;
-extern sfr at 0xf5d RXB1D7;
-extern sfr at 0xf5e CANSTATRO0;
-extern sfr at 0xf60 RXB0CON;
+extern __sfr __at 0xf56 RXB1D0;
+extern __sfr __at 0xf57 RXB1D1;
+extern __sfr __at 0xf58 RXB1D2;
+extern __sfr __at 0xf59 RXB1D3;
+extern __sfr __at 0xf5a RXB1D4;
+extern __sfr __at 0xf5b RXB1D5;
+extern __sfr __at 0xf5c RXB1D6;
+extern __sfr __at 0xf5d RXB1D7;
+extern __sfr __at 0xf5e CANSTATRO0;
+extern __sfr __at 0xf60 RXB0CON;
 typedef union {
        struct {
                unsigned FILHIT0:1;
@@ -406,10 +406,10 @@ typedef union {
        };
 } __RXB0CONbits_t;
 
-extern volatile __RXB0CONbits_t at 0xf60 RXB0CONbits;
+extern volatile __RXB0CONbits_t __at 0xf60 RXB0CONbits;
 
-extern sfr at 0xf61 RXB0SIDH;
-extern sfr at 0xf62 RXB0SIDL;
+extern __sfr __at 0xf61 RXB0SIDH;
+extern __sfr __at 0xf62 RXB0SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -423,20 +423,20 @@ typedef union {
        };
 } __RXB0SIDLbits_t;
 
-extern volatile __RXB0SIDLbits_t at 0xf62 RXB0SIDLbits;
+extern volatile __RXB0SIDLbits_t __at 0xf62 RXB0SIDLbits;
 
-extern sfr at 0xf63 RXB0EIDH;
-extern sfr at 0xf64 RXB0EIDL;
-extern sfr at 0xf65 RXB0DLC;
-extern sfr at 0xf66 RXB0D0;
-extern sfr at 0xf67 RXB0D1;
-extern sfr at 0xf68 RXB0D2;
-extern sfr at 0xf69 RXB0D3;
-extern sfr at 0xf6a RXB0D4;
-extern sfr at 0xf6b RXB0D5;
-extern sfr at 0xf6c RXB0D6;
-extern sfr at 0xf6d RXB0D7;
-extern sfr at 0xf6e CANSTAT;
+extern __sfr __at 0xf63 RXB0EIDH;
+extern __sfr __at 0xf64 RXB0EIDL;
+extern __sfr __at 0xf65 RXB0DLC;
+extern __sfr __at 0xf66 RXB0D0;
+extern __sfr __at 0xf67 RXB0D1;
+extern __sfr __at 0xf68 RXB0D2;
+extern __sfr __at 0xf69 RXB0D3;
+extern __sfr __at 0xf6a RXB0D4;
+extern __sfr __at 0xf6b RXB0D5;
+extern __sfr __at 0xf6c RXB0D6;
+extern __sfr __at 0xf6d RXB0D7;
+extern __sfr __at 0xf6e CANSTAT;
 typedef union {
        struct {
                unsigned :1;
@@ -450,9 +450,9 @@ typedef union {
        };
 } __CANSTATbits_t;
 
-extern volatile __CANSTATbits_t at 0xf6e CANSTATbits;
+extern volatile __CANSTATbits_t __at 0xf6e CANSTATbits;
 
-extern sfr at 0xf6f CANCON;
+extern __sfr __at 0xf6f CANCON;
 typedef union {
        struct {
                unsigned :1;
@@ -466,9 +466,9 @@ typedef union {
        };
 } __CANCONbits_t;
 
-extern volatile __CANCONbits_t at 0xf6f CANCONbits;
+extern volatile __CANCONbits_t __at 0xf6f CANCONbits;
 
-extern sfr at 0xf70 BRGCON1;
+extern __sfr __at 0xf70 BRGCON1;
 typedef union {
        struct {
                unsigned BRP0:1;
@@ -482,9 +482,9 @@ typedef union {
        };
 } __BRGCON1bits_t;
 
-extern volatile __BRGCON1bits_t at 0xf70 BRGCON1bits;
+extern volatile __BRGCON1bits_t __at 0xf70 BRGCON1bits;
 
-extern sfr at 0xf71 BRGCON2;
+extern __sfr __at 0xf71 BRGCON2;
 typedef union {
        struct {
                unsigned PRSEG0:1;
@@ -498,9 +498,9 @@ typedef union {
        };
 } __BRGCON2bits_t;
 
-extern volatile __BRGCON2bits_t at 0xf71 BRGCON2bits;
+extern volatile __BRGCON2bits_t __at 0xf71 BRGCON2bits;
 
-extern sfr at 0xf72 BRGCON3;
+extern __sfr __at 0xf72 BRGCON3;
 typedef union {
        struct {
                unsigned SEG2PH0:1;
@@ -514,9 +514,9 @@ typedef union {
        };
 } __BRGCON3bits_t;
 
-extern volatile __BRGCON3bits_t at 0xf72 BRGCON3bits;
+extern volatile __BRGCON3bits_t __at 0xf72 BRGCON3bits;
 
-extern sfr at 0xf73 CIOCON;
+extern __sfr __at 0xf73 CIOCON;
 typedef union {
        struct {
                unsigned :1;
@@ -530,9 +530,9 @@ typedef union {
        };
 } __CIOCONbits_t;
 
-extern volatile __CIOCONbits_t at 0xf73 CIOCONbits;
+extern volatile __CIOCONbits_t __at 0xf73 CIOCONbits;
 
-extern sfr at 0xf74 COMSTAT;
+extern __sfr __at 0xf74 COMSTAT;
 typedef union {
        struct {
                unsigned EWARN:1;
@@ -546,9 +546,9 @@ typedef union {
        };
 } __COMSTATbits_t;
 
-extern volatile __COMSTATbits_t at 0xf74 COMSTATbits;
+extern volatile __COMSTATbits_t __at 0xf74 COMSTATbits;
 
-extern sfr at 0xf75 RXERRCNT;
+extern __sfr __at 0xf75 RXERRCNT;
 typedef union {
        struct {
                unsigned REC0:1;
@@ -562,9 +562,9 @@ typedef union {
        };
 } __RXERRCNTbits_t;
 
-extern volatile __RXERRCNTbits_t at 0xf75 RXERRCNTbits;
+extern volatile __RXERRCNTbits_t __at 0xf75 RXERRCNTbits;
 
-extern sfr at 0xf76 TXERRCNT;
+extern __sfr __at 0xf76 TXERRCNT;
 typedef union {
        struct {
                unsigned TEC0:1;
@@ -578,9 +578,9 @@ typedef union {
        };
 } __TXERRCNTbits_t;
 
-extern volatile __TXERRCNTbits_t at 0xf76 TXERRCNTbits;
+extern volatile __TXERRCNTbits_t __at 0xf76 TXERRCNTbits;
 
-extern sfr at 0xf80 PORTA;
+extern __sfr __at 0xf80 PORTA;
 typedef union {
        struct {
                unsigned RA0:1;
@@ -627,9 +627,9 @@ typedef union {
        };
 } __PORTAbits_t;
 
-extern volatile __PORTAbits_t at 0xf80 PORTAbits;
+extern volatile __PORTAbits_t __at 0xf80 PORTAbits;
 
-extern sfr at 0xf81 PORTB;
+extern __sfr __at 0xf81 PORTB;
 typedef union {
        struct {
                unsigned RB0:1;
@@ -654,9 +654,9 @@ typedef union {
        };
 } __PORTBbits_t;
 
-extern volatile __PORTBbits_t at 0xf81 PORTBbits;
+extern volatile __PORTBbits_t __at 0xf81 PORTBbits;
 
-extern sfr at 0xf82 PORTC;
+extern __sfr __at 0xf82 PORTC;
 typedef union {
        struct {
                unsigned RC0:1;
@@ -692,9 +692,9 @@ typedef union {
        };
 } __PORTCbits_t;
 
-extern volatile __PORTCbits_t at 0xf82 PORTCbits;
+extern volatile __PORTCbits_t __at 0xf82 PORTCbits;
 
-extern sfr at 0xf83 PORTD;
+extern __sfr __at 0xf83 PORTD;
 typedef union {
        struct {
                unsigned RD0:1;
@@ -719,9 +719,9 @@ typedef union {
        };
 } __PORTDbits_t;
 
-extern volatile __PORTDbits_t at 0xf83 PORTDbits;
+extern volatile __PORTDbits_t __at 0xf83 PORTDbits;
 
-extern sfr at 0xf84 PORTE;
+extern __sfr __at 0xf84 PORTE;
 typedef union {
        struct {
                unsigned RE0:1;
@@ -757,9 +757,9 @@ typedef union {
        };
 } __PORTEbits_t;
 
-extern volatile __PORTEbits_t at 0xf84 PORTEbits;
+extern volatile __PORTEbits_t __at 0xf84 PORTEbits;
 
-extern sfr at 0xf85 PORTF;
+extern __sfr __at 0xf85 PORTF;
 typedef union {
        struct {
                unsigned RF0:1;
@@ -773,9 +773,9 @@ typedef union {
        };
 } __PORTFbits_t;
 
-extern volatile __PORTFbits_t at 0xf85 PORTFbits;
+extern volatile __PORTFbits_t __at 0xf85 PORTFbits;
 
-extern sfr at 0xf86 PORTG;
+extern __sfr __at 0xf86 PORTG;
 typedef union {
        struct {
                unsigned RG0:1;
@@ -789,9 +789,9 @@ typedef union {
        };
 } __PORTGbits_t;
 
-extern volatile __PORTGbits_t at 0xf86 PORTGbits;
+extern volatile __PORTGbits_t __at 0xf86 PORTGbits;
 
-extern sfr at 0xf87 PORTH;
+extern __sfr __at 0xf87 PORTH;
 typedef union {
        struct {
                unsigned RH0:1;
@@ -805,9 +805,9 @@ typedef union {
        };
 } __PORTHbits_t;
 
-extern volatile __PORTHbits_t at 0xf87 PORTHbits;
+extern volatile __PORTHbits_t __at 0xf87 PORTHbits;
 
-extern sfr at 0xf88 PORTJ;
+extern __sfr __at 0xf88 PORTJ;
 typedef union {
        struct {
                unsigned RJ0:1;
@@ -821,9 +821,9 @@ typedef union {
        };
 } __PORTJbits_t;
 
-extern volatile __PORTJbits_t at 0xf88 PORTJbits;
+extern volatile __PORTJbits_t __at 0xf88 PORTJbits;
 
-extern sfr at 0xf89 LATA;
+extern __sfr __at 0xf89 LATA;
 typedef union {
        struct {
                unsigned LATA0:1;
@@ -837,9 +837,9 @@ typedef union {
        };
 } __LATAbits_t;
 
-extern volatile __LATAbits_t at 0xf89 LATAbits;
+extern volatile __LATAbits_t __at 0xf89 LATAbits;
 
-extern sfr at 0xf8a LATB;
+extern __sfr __at 0xf8a LATB;
 typedef union {
        struct {
                unsigned LATB0:1;
@@ -853,9 +853,9 @@ typedef union {
        };
 } __LATBbits_t;
 
-extern volatile __LATBbits_t at 0xf8a LATBbits;
+extern volatile __LATBbits_t __at 0xf8a LATBbits;
 
-extern sfr at 0xf8b LATC;
+extern __sfr __at 0xf8b LATC;
 typedef union {
        struct {
                unsigned LATC0:1;
@@ -869,9 +869,9 @@ typedef union {
        };
 } __LATCbits_t;
 
-extern volatile __LATCbits_t at 0xf8b LATCbits;
+extern volatile __LATCbits_t __at 0xf8b LATCbits;
 
-extern sfr at 0xf8c LATD;
+extern __sfr __at 0xf8c LATD;
 typedef union {
        struct {
                unsigned LATD0:1;
@@ -885,9 +885,9 @@ typedef union {
        };
 } __LATDbits_t;
 
-extern volatile __LATDbits_t at 0xf8c LATDbits;
+extern volatile __LATDbits_t __at 0xf8c LATDbits;
 
-extern sfr at 0xf8d LATE;
+extern __sfr __at 0xf8d LATE;
 typedef union {
        struct {
                unsigned LATE0:1;
@@ -901,9 +901,9 @@ typedef union {
        };
 } __LATEbits_t;
 
-extern volatile __LATEbits_t at 0xf8d LATEbits;
+extern volatile __LATEbits_t __at 0xf8d LATEbits;
 
-extern sfr at 0xf8e LATF;
+extern __sfr __at 0xf8e LATF;
 typedef union {
        struct {
                unsigned LATF0:1;
@@ -917,9 +917,9 @@ typedef union {
        };
 } __LATFbits_t;
 
-extern volatile __LATFbits_t at 0xf8e LATFbits;
+extern volatile __LATFbits_t __at 0xf8e LATFbits;
 
-extern sfr at 0xf8f LATG;
+extern __sfr __at 0xf8f LATG;
 typedef union {
        struct {
                unsigned LATG0:1;
@@ -933,9 +933,9 @@ typedef union {
        };
 } __LATGbits_t;
 
-extern volatile __LATGbits_t at 0xf8f LATGbits;
+extern volatile __LATGbits_t __at 0xf8f LATGbits;
 
-extern sfr at 0xf90 LATH;
+extern __sfr __at 0xf90 LATH;
 typedef union {
        struct {
                unsigned LATH0:1;
@@ -949,9 +949,9 @@ typedef union {
        };
 } __LATHbits_t;
 
-extern volatile __LATHbits_t at 0xf90 LATHbits;
+extern volatile __LATHbits_t __at 0xf90 LATHbits;
 
-extern sfr at 0xf91 LATJ;
+extern __sfr __at 0xf91 LATJ;
 typedef union {
        struct {
                unsigned LATJ0:1;
@@ -965,9 +965,9 @@ typedef union {
        };
 } __LATJbits_t;
 
-extern volatile __LATJbits_t at 0xf91 LATJbits;
+extern volatile __LATJbits_t __at 0xf91 LATJbits;
 
-extern sfr at 0xf92 TRISA;
+extern __sfr __at 0xf92 TRISA;
 typedef union {
        struct {
                unsigned TRISA0:1;
@@ -981,9 +981,9 @@ typedef union {
        };
 } __TRISAbits_t;
 
-extern volatile __TRISAbits_t at 0xf92 TRISAbits;
+extern volatile __TRISAbits_t __at 0xf92 TRISAbits;
 
-extern sfr at 0xf93 TRISB;
+extern __sfr __at 0xf93 TRISB;
 typedef union {
        struct {
                unsigned TRISB0:1;
@@ -997,9 +997,9 @@ typedef union {
        };
 } __TRISBbits_t;
 
-extern volatile __TRISBbits_t at 0xf93 TRISBbits;
+extern volatile __TRISBbits_t __at 0xf93 TRISBbits;
 
-extern sfr at 0xf94 TRISC;
+extern __sfr __at 0xf94 TRISC;
 typedef union {
        struct {
                unsigned TRISC0:1;
@@ -1013,9 +1013,9 @@ typedef union {
        };
 } __TRISCbits_t;
 
-extern volatile __TRISCbits_t at 0xf94 TRISCbits;
+extern volatile __TRISCbits_t __at 0xf94 TRISCbits;
 
-extern sfr at 0xf95 TRISD;
+extern __sfr __at 0xf95 TRISD;
 typedef union {
        struct {
                unsigned TRISD0:1;
@@ -1029,9 +1029,9 @@ typedef union {
        };
 } __TRISDbits_t;
 
-extern volatile __TRISDbits_t at 0xf95 TRISDbits;
+extern volatile __TRISDbits_t __at 0xf95 TRISDbits;
 
-extern sfr at 0xf96 TRISE;
+extern __sfr __at 0xf96 TRISE;
 typedef union {
        struct {
                unsigned TRISE0:1;
@@ -1045,9 +1045,9 @@ typedef union {
        };
 } __TRISEbits_t;
 
-extern volatile __TRISEbits_t at 0xf96 TRISEbits;
+extern volatile __TRISEbits_t __at 0xf96 TRISEbits;
 
-extern sfr at 0xf97 TRISF;
+extern __sfr __at 0xf97 TRISF;
 typedef union {
        struct {
                unsigned TRISF0:1;
@@ -1061,9 +1061,9 @@ typedef union {
        };
 } __TRISFbits_t;
 
-extern volatile __TRISFbits_t at 0xf97 TRISFbits;
+extern volatile __TRISFbits_t __at 0xf97 TRISFbits;
 
-extern sfr at 0xf98 TRISG;
+extern __sfr __at 0xf98 TRISG;
 typedef union {
        struct {
                unsigned TRISG0:1;
@@ -1077,9 +1077,9 @@ typedef union {
        };
 } __TRISGbits_t;
 
-extern volatile __TRISGbits_t at 0xf98 TRISGbits;
+extern volatile __TRISGbits_t __at 0xf98 TRISGbits;
 
-extern sfr at 0xf99 TRISH;
+extern __sfr __at 0xf99 TRISH;
 typedef union {
        struct {
                unsigned TRISH0:1;
@@ -1093,9 +1093,9 @@ typedef union {
        };
 } __TRISHbits_t;
 
-extern volatile __TRISHbits_t at 0xf99 TRISHbits;
+extern volatile __TRISHbits_t __at 0xf99 TRISHbits;
 
-extern sfr at 0xf9a TRISJ;
+extern __sfr __at 0xf9a TRISJ;
 typedef union {
        struct {
                unsigned TRISJ0:1;
@@ -1109,9 +1109,9 @@ typedef union {
        };
 } __TRISJbits_t;
 
-extern volatile __TRISJbits_t at 0xf9a TRISJbits;
+extern volatile __TRISJbits_t __at 0xf9a TRISJbits;
 
-extern sfr at 0xf9c MEMCON;
+extern __sfr __at 0xf9c MEMCON;
 typedef union {
        struct {
                unsigned WM0:1;
@@ -1125,9 +1125,9 @@ typedef union {
        };
 } __MEMCONbits_t;
 
-extern volatile __MEMCONbits_t at 0xf9c MEMCONbits;
+extern volatile __MEMCONbits_t __at 0xf9c MEMCONbits;
 
-extern sfr at 0xf9d PIE1;
+extern __sfr __at 0xf9d PIE1;
 typedef union {
        struct {
                unsigned TMR1IE:1;
@@ -1141,9 +1141,9 @@ typedef union {
        };
 } __PIE1bits_t;
 
-extern volatile __PIE1bits_t at 0xf9d PIE1bits;
+extern volatile __PIE1bits_t __at 0xf9d PIE1bits;
 
-extern sfr at 0xf9e PIR1;
+extern __sfr __at 0xf9e PIR1;
 typedef union {
        struct {
                unsigned TMR1IF:1;
@@ -1157,9 +1157,9 @@ typedef union {
        };
 } __PIR1bits_t;
 
-extern volatile __PIR1bits_t at 0xf9e PIR1bits;
+extern volatile __PIR1bits_t __at 0xf9e PIR1bits;
 
-extern sfr at 0xf9f IPR1;
+extern __sfr __at 0xf9f IPR1;
 typedef union {
        struct {
                unsigned TMR1IP:1;
@@ -1173,9 +1173,9 @@ typedef union {
        };
 } __IPR1bits_t;
 
-extern volatile __IPR1bits_t at 0xf9f IPR1bits;
+extern volatile __IPR1bits_t __at 0xf9f IPR1bits;
 
-extern sfr at 0xfa0 PIE2;
+extern __sfr __at 0xfa0 PIE2;
 typedef union {
        struct {
                unsigned CCP2IE:1;
@@ -1189,9 +1189,9 @@ typedef union {
        };
 } __PIE2bits_t;
 
-extern volatile __PIE2bits_t at 0xfa0 PIE2bits;
+extern volatile __PIE2bits_t __at 0xfa0 PIE2bits;
 
-extern sfr at 0xfa1 PIR2;
+extern __sfr __at 0xfa1 PIR2;
 typedef union {
        struct {
                unsigned CCP2IF:1;
@@ -1205,9 +1205,9 @@ typedef union {
        };
 } __PIR2bits_t;
 
-extern volatile __PIR2bits_t at 0xfa1 PIR2bits;
+extern volatile __PIR2bits_t __at 0xfa1 PIR2bits;
 
-extern sfr at 0xfa2 IPR2;
+extern __sfr __at 0xfa2 IPR2;
 typedef union {
        struct {
                unsigned CCP2IP:1;
@@ -1221,9 +1221,9 @@ typedef union {
        };
 } __IPR2bits_t;
 
-extern volatile __IPR2bits_t at 0xfa2 IPR2bits;
+extern volatile __IPR2bits_t __at 0xfa2 IPR2bits;
 
-extern sfr at 0xfa3 PIE3;
+extern __sfr __at 0xfa3 PIE3;
 typedef union {
        struct {
                unsigned RX0IE:1;
@@ -1237,9 +1237,9 @@ typedef union {
        };
 } __PIE3bits_t;
 
-extern volatile __PIE3bits_t at 0xfa3 PIE3bits;
+extern volatile __PIE3bits_t __at 0xfa3 PIE3bits;
 
-extern sfr at 0xfa4 PIR3;
+extern __sfr __at 0xfa4 PIR3;
 typedef union {
        struct {
                unsigned RX0IF:1;
@@ -1253,9 +1253,9 @@ typedef union {
        };
 } __PIR3bits_t;
 
-extern volatile __PIR3bits_t at 0xfa4 PIR3bits;
+extern volatile __PIR3bits_t __at 0xfa4 PIR3bits;
 
-extern sfr at 0xfa5 IPR3;
+extern __sfr __at 0xfa5 IPR3;
 typedef union {
        struct {
                unsigned RX0IP:1;
@@ -1269,9 +1269,9 @@ typedef union {
        };
 } __IPR3bits_t;
 
-extern volatile __IPR3bits_t at 0xfa5 IPR3bits;
+extern volatile __IPR3bits_t __at 0xfa5 IPR3bits;
 
-extern sfr at 0xfa6 EECON1;
+extern __sfr __at 0xfa6 EECON1;
 typedef union {
        struct {
                unsigned RD:1;
@@ -1285,13 +1285,13 @@ typedef union {
        };
 } __EECON1bits_t;
 
-extern volatile __EECON1bits_t at 0xfa6 EECON1bits;
+extern volatile __EECON1bits_t __at 0xfa6 EECON1bits;
 
-extern sfr at 0xfa7 EECON2;
-extern sfr at 0xfa8 EEDATA;
-extern sfr at 0xfa9 EEADR;
-extern sfr at 0xfaa EEADRH;
-extern sfr at 0xfab RCSTA;
+extern __sfr __at 0xfa7 EECON2;
+extern __sfr __at 0xfa8 EEDATA;
+extern __sfr __at 0xfa9 EEADR;
+extern __sfr __at 0xfaa EEADRH;
+extern __sfr __at 0xfab RCSTA;
 typedef union {
        struct {
                unsigned RX9D:1;
@@ -1305,9 +1305,9 @@ typedef union {
        };
 } __RCSTAbits_t;
 
-extern volatile __RCSTAbits_t at 0xfab RCSTAbits;
+extern volatile __RCSTAbits_t __at 0xfab RCSTAbits;
 
-extern sfr at 0xfac TXSTA;
+extern __sfr __at 0xfac TXSTA;
 typedef union {
        struct {
                unsigned TX9D:1;
@@ -1321,12 +1321,12 @@ typedef union {
        };
 } __TXSTAbits_t;
 
-extern volatile __TXSTAbits_t at 0xfac TXSTAbits;
+extern volatile __TXSTAbits_t __at 0xfac TXSTAbits;
 
-extern sfr at 0xfad TXREG;
-extern sfr at 0xfae RCREG;
-extern sfr at 0xfaf SPBRG;
-extern sfr at 0xfb0 PSPCON;
+extern __sfr __at 0xfad TXREG;
+extern __sfr __at 0xfae RCREG;
+extern __sfr __at 0xfaf SPBRG;
+extern __sfr __at 0xfb0 PSPCON;
 typedef union {
        struct {
                unsigned :1;
@@ -1340,9 +1340,9 @@ typedef union {
        };
 } __PSPCONbits_t;
 
-extern volatile __PSPCONbits_t at 0xfb0 PSPCONbits;
+extern volatile __PSPCONbits_t __at 0xfb0 PSPCONbits;
 
-extern sfr at 0xfb1 T3CON;
+extern __sfr __at 0xfb1 T3CON;
 typedef union {
        struct {
                unsigned TMR3ON:1;
@@ -1356,11 +1356,11 @@ typedef union {
        };
 } __T3CONbits_t;
 
-extern volatile __T3CONbits_t at 0xfb1 T3CONbits;
+extern volatile __T3CONbits_t __at 0xfb1 T3CONbits;
 
-extern sfr at 0xfb2 TMR3L;
-extern sfr at 0xfb3 TMR3H;
-extern sfr at 0xfb4 CMCON;
+extern __sfr __at 0xfb2 TMR3L;
+extern __sfr __at 0xfb3 TMR3H;
+extern __sfr __at 0xfb4 CMCON;
 typedef union {
        struct {
                unsigned CM0:1;
@@ -1374,9 +1374,9 @@ typedef union {
        };
 } __CMCONbits_t;
 
-extern volatile __CMCONbits_t at 0xfb4 CMCONbits;
+extern volatile __CMCONbits_t __at 0xfb4 CMCONbits;
 
-extern sfr at 0xfb5 CVRCON;
+extern __sfr __at 0xfb5 CVRCON;
 typedef union {
        struct {
                unsigned CVR0:1;
@@ -1390,9 +1390,9 @@ typedef union {
        };
 } __CVRCONbits_t;
 
-extern volatile __CVRCONbits_t at 0xfb5 CVRCONbits;
+extern volatile __CVRCONbits_t __at 0xfb5 CVRCONbits;
 
-extern sfr at 0xfb6 ECCPAS;
+extern __sfr __at 0xfb6 ECCPAS;
 typedef union {
        struct {
                unsigned PSSBD0:1;
@@ -1406,9 +1406,9 @@ typedef union {
        };
 } __ECCPASbits_t;
 
-extern volatile __ECCPASbits_t at 0xfb6 ECCPASbits;
+extern volatile __ECCPASbits_t __at 0xfb6 ECCPASbits;
 
-extern sfr at 0xfb7 ECCP1DEL;
+extern __sfr __at 0xfb7 ECCP1DEL;
 typedef union {
        struct {
                unsigned EPDC0:1;
@@ -1422,9 +1422,9 @@ typedef union {
        };
 } __ECCP1DELbits_t;
 
-extern volatile __ECCP1DELbits_t at 0xfb7 ECCP1DELbits;
+extern volatile __ECCP1DELbits_t __at 0xfb7 ECCP1DELbits;
 
-extern sfr at 0xfba ECCP1CON;
+extern __sfr __at 0xfba ECCP1CON;
 typedef union {
        struct {
                unsigned ECCP1M0:1;
@@ -1438,9 +1438,9 @@ typedef union {
        };
 } __ECCP1CONbits_t;
 
-extern volatile __ECCP1CONbits_t at 0xfba ECCP1CONbits;
+extern volatile __ECCP1CONbits_t __at 0xfba ECCP1CONbits;
 
-extern sfr at 0xfba CCP2CON;
+extern __sfr __at 0xfba CCP2CON;
 typedef union {
        struct {
                unsigned CCP2M0:1;
@@ -1454,13 +1454,13 @@ typedef union {
        };
 } __CCP2CONbits_t;
 
-extern volatile __CCP2CONbits_t at 0xfba CCP2CONbits;
+extern volatile __CCP2CONbits_t __at 0xfba CCP2CONbits;
 
-extern sfr at 0xfbb ECCPR1L;
-extern sfr at 0xfbb CCPR2L;
-extern sfr at 0xfbc ECCPR1H;
-extern sfr at 0xfbc CCPR2H;
-extern sfr at 0xfc0 ADCON2;
+extern __sfr __at 0xfbb ECCPR1L;
+extern __sfr __at 0xfbb CCPR2L;
+extern __sfr __at 0xfbc ECCPR1H;
+extern __sfr __at 0xfbc CCPR2H;
+extern __sfr __at 0xfc0 ADCON2;
 typedef union {
        struct {
                unsigned ADCS0:1;
@@ -1474,9 +1474,9 @@ typedef union {
        };
 } __ADCON2bits_t;
 
-extern volatile __ADCON2bits_t at 0xfc0 ADCON2bits;
+extern volatile __ADCON2bits_t __at 0xfc0 ADCON2bits;
 
-extern sfr at 0xfc1 ADCON1;
+extern __sfr __at 0xfc1 ADCON1;
 typedef union {
        struct {
                unsigned PCFG0:1;
@@ -1490,9 +1490,9 @@ typedef union {
        };
 } __ADCON1bits_t;
 
-extern volatile __ADCON1bits_t at 0xfc1 ADCON1bits;
+extern volatile __ADCON1bits_t __at 0xfc1 ADCON1bits;
 
-extern sfr at 0xfc2 ADCON0;
+extern __sfr __at 0xfc2 ADCON0;
 typedef union {
        struct {
                unsigned ADON:1;
@@ -1506,11 +1506,11 @@ typedef union {
        };
 } __ADCON0bits_t;
 
-extern volatile __ADCON0bits_t at 0xfc2 ADCON0bits;
+extern volatile __ADCON0bits_t __at 0xfc2 ADCON0bits;
 
-extern sfr at 0xfc3 ADRESL;
-extern sfr at 0xfc4 ADRESH;
-extern sfr at 0xfc5 SSPCON2;
+extern __sfr __at 0xfc3 ADRESL;
+extern __sfr __at 0xfc4 ADRESH;
+extern __sfr __at 0xfc5 SSPCON2;
 typedef union {
        struct {
                unsigned SEN:1;
@@ -1524,9 +1524,9 @@ typedef union {
        };
 } __SSPCON2bits_t;
 
-extern volatile __SSPCON2bits_t at 0xfc5 SSPCON2bits;
+extern volatile __SSPCON2bits_t __at 0xfc5 SSPCON2bits;
 
-extern sfr at 0xfc6 SSPCON1;
+extern __sfr __at 0xfc6 SSPCON1;
 typedef union {
        struct {
                unsigned SSPM0:1;
@@ -1540,9 +1540,9 @@ typedef union {
        };
 } __SSPCON1bits_t;
 
-extern volatile __SSPCON1bits_t at 0xfc6 SSPCON1bits;
+extern volatile __SSPCON1bits_t __at 0xfc6 SSPCON1bits;
 
-extern sfr at 0xfc7 SSPSTAT;
+extern __sfr __at 0xfc7 SSPSTAT;
 typedef union {
        struct {
                unsigned BF:1;
@@ -1556,11 +1556,11 @@ typedef union {
        };
 } __SSPSTATbits_t;
 
-extern volatile __SSPSTATbits_t at 0xfc7 SSPSTATbits;
+extern volatile __SSPSTATbits_t __at 0xfc7 SSPSTATbits;
 
-extern sfr at 0xfc8 SSPADD;
-extern sfr at 0xfc9 SSPBUF;
-extern sfr at 0xfca T2CON;
+extern __sfr __at 0xfc8 SSPADD;
+extern __sfr __at 0xfc9 SSPBUF;
+extern __sfr __at 0xfca T2CON;
 typedef union {
        struct {
                unsigned T2CKPS0:1;
@@ -1574,11 +1574,11 @@ typedef union {
        };
 } __T2CONbits_t;
 
-extern volatile __T2CONbits_t at 0xfca T2CONbits;
+extern volatile __T2CONbits_t __at 0xfca T2CONbits;
 
-extern sfr at 0xfcb PR2;
-extern sfr at 0xfcc TMR2;
-extern sfr at 0xfcd T1CON;
+extern __sfr __at 0xfcb PR2;
+extern __sfr __at 0xfcc TMR2;
+extern __sfr __at 0xfcd T1CON;
 typedef union {
        struct {
                unsigned TMR1ON:1;
@@ -1592,11 +1592,11 @@ typedef union {
        };
 } __T1CONbits_t;
 
-extern volatile __T1CONbits_t at 0xfcd T1CONbits;
+extern volatile __T1CONbits_t __at 0xfcd T1CONbits;
 
-extern sfr at 0xfce TMR1L;
-extern sfr at 0xfcf TMR1H;
-extern sfr at 0xfd0 RCON;
+extern __sfr __at 0xfce TMR1L;
+extern __sfr __at 0xfcf TMR1H;
+extern __sfr __at 0xfd0 RCON;
 typedef union {
        struct {
                unsigned BOR:1;
@@ -1610,9 +1610,9 @@ typedef union {
        };
 } __RCONbits_t;
 
-extern volatile __RCONbits_t at 0xfd0 RCONbits;
+extern volatile __RCONbits_t __at 0xfd0 RCONbits;
 
-extern sfr at 0xfd1 WDTCON;
+extern __sfr __at 0xfd1 WDTCON;
 typedef union {
        struct {
                unsigned SWDTEN:1;
@@ -1637,9 +1637,9 @@ typedef union {
        };
 } __WDTCONbits_t;
 
-extern volatile __WDTCONbits_t at 0xfd1 WDTCONbits;
+extern volatile __WDTCONbits_t __at 0xfd1 WDTCONbits;
 
-extern sfr at 0xfd2 LVDCON;
+extern __sfr __at 0xfd2 LVDCON;
 typedef union {
        struct {
                unsigned LVDL0:1;
@@ -1664,9 +1664,9 @@ typedef union {
        };
 } __LVDCONbits_t;
 
-extern volatile __LVDCONbits_t at 0xfd2 LVDCONbits;
+extern volatile __LVDCONbits_t __at 0xfd2 LVDCONbits;
 
-extern sfr at 0xfd3 OSCCON;
+extern __sfr __at 0xfd3 OSCCON;
 typedef union {
        struct {
                unsigned SCS:1;
@@ -1680,12 +1680,12 @@ typedef union {
        };
 } __OSCCONbits_t;
 
-extern volatile __OSCCONbits_t at 0xfd3 OSCCONbits;
+extern volatile __OSCCONbits_t __at 0xfd3 OSCCONbits;
 
-extern sfr at 0xfd5 T0CON;
-extern sfr at 0xfd6 TMR0L;
-extern sfr at 0xfd7 TMR0H;
-extern sfr at 0xfd8 STATUS;
+extern __sfr __at 0xfd5 T0CON;
+extern __sfr __at 0xfd6 TMR0L;
+extern __sfr __at 0xfd7 TMR0H;
+extern __sfr __at 0xfd8 STATUS;
 typedef union {
        struct {
                unsigned C:1;
@@ -1699,32 +1699,32 @@ typedef union {
        };
 } __STATUSbits_t;
 
-extern volatile __STATUSbits_t at 0xfd8 STATUSbits;
-
-extern sfr at 0xfd9 FSR2L;
-extern sfr at 0xfda FSR2H;
-extern sfr at 0xfdb PLUSW2;
-extern sfr at 0xfdc PREINC2;
-extern sfr at 0xfdd POSTDEC2;
-extern sfr at 0xfde POSTINC2;
-extern sfr at 0xfdf INDF2;
-extern sfr at 0xfe0 BSR;
-extern sfr at 0xfe1 FSR1L;
-extern sfr at 0xfe2 FSR1H;
-extern sfr at 0xfe3 PLUSW1;
-extern sfr at 0xfe4 PREINC1;
-extern sfr at 0xfe5 POSTDEC1;
-extern sfr at 0xfe6 POSTINC1;
-extern sfr at 0xfe7 INDF1;
-extern sfr at 0xfe8 WREG;
-extern sfr at 0xfe9 FSR0L;
-extern sfr at 0xfea FSR0H;
-extern sfr at 0xfeb PLUSW0;
-extern sfr at 0xfec PREINC0;
-extern sfr at 0xfed POSTDEC0;
-extern sfr at 0xfee POSTINC0;
-extern sfr at 0xfef INDF0;
-extern sfr at 0xff0 INTCON3;
+extern volatile __STATUSbits_t __at 0xfd8 STATUSbits;
+
+extern __sfr __at 0xfd9 FSR2L;
+extern __sfr __at 0xfda FSR2H;
+extern __sfr __at 0xfdb PLUSW2;
+extern __sfr __at 0xfdc PREINC2;
+extern __sfr __at 0xfdd POSTDEC2;
+extern __sfr __at 0xfde POSTINC2;
+extern __sfr __at 0xfdf INDF2;
+extern __sfr __at 0xfe0 BSR;
+extern __sfr __at 0xfe1 FSR1L;
+extern __sfr __at 0xfe2 FSR1H;
+extern __sfr __at 0xfe3 PLUSW1;
+extern __sfr __at 0xfe4 PREINC1;
+extern __sfr __at 0xfe5 POSTDEC1;
+extern __sfr __at 0xfe6 POSTINC1;
+extern __sfr __at 0xfe7 INDF1;
+extern __sfr __at 0xfe8 WREG;
+extern __sfr __at 0xfe9 FSR0L;
+extern __sfr __at 0xfea FSR0H;
+extern __sfr __at 0xfeb PLUSW0;
+extern __sfr __at 0xfec PREINC0;
+extern __sfr __at 0xfed POSTDEC0;
+extern __sfr __at 0xfee POSTINC0;
+extern __sfr __at 0xfef INDF0;
+extern __sfr __at 0xff0 INTCON3;
 typedef union {
        struct {
                unsigned INT1F:1;
@@ -1749,9 +1749,9 @@ typedef union {
        };
 } __INTCON3bits_t;
 
-extern volatile __INTCON3bits_t at 0xff0 INTCON3bits;
+extern volatile __INTCON3bits_t __at 0xff0 INTCON3bits;
 
-extern sfr at 0xff1 INTCON2;
+extern __sfr __at 0xff1 INTCON2;
 typedef union {
        struct {
                unsigned RBIP:1;
@@ -1765,9 +1765,9 @@ typedef union {
        };
 } __INTCON2bits_t;
 
-extern volatile __INTCON2bits_t at 0xff1 INTCON2bits;
+extern volatile __INTCON2bits_t __at 0xff1 INTCON2bits;
 
-extern sfr at 0xff2 INTCON;
+extern __sfr __at 0xff2 INTCON;
 typedef union {
        struct {
                unsigned RBIF:1;
@@ -1781,18 +1781,18 @@ typedef union {
        };
 } __INTCONbits_t;
 
-extern volatile __INTCONbits_t at 0xff2 INTCONbits;
+extern volatile __INTCONbits_t __at 0xff2 INTCONbits;
 
-extern sfr at 0xff3 PRODL;
-extern sfr at 0xff4 PRODH;
-extern sfr at 0xff5 TABLAT;
-extern sfr at 0xff6 TBLPTRL;
-extern sfr at 0xff7 TBLPTRH;
-extern sfr at 0xff8 TBLPTRU;
-extern sfr at 0xff9 PCL;
-extern sfr at 0xffa PCLATH;
-extern sfr at 0xffb PCLATU;
-extern sfr at 0xffc STKPTR;
+extern __sfr __at 0xff3 PRODL;
+extern __sfr __at 0xff4 PRODH;
+extern __sfr __at 0xff5 TABLAT;
+extern __sfr __at 0xff6 TBLPTRL;
+extern __sfr __at 0xff7 TBLPTRH;
+extern __sfr __at 0xff8 TBLPTRU;
+extern __sfr __at 0xff9 PCL;
+extern __sfr __at 0xffa PCLATH;
+extern __sfr __at 0xffb PCLATU;
+extern __sfr __at 0xffc STKPTR;
 typedef union {
        struct {
                unsigned STKPTR0:1;
@@ -1806,11 +1806,11 @@ typedef union {
        };
 } __STKPTRbits_t;
 
-extern volatile __STKPTRbits_t at 0xffc STKPTRbits;
+extern volatile __STKPTRbits_t __at 0xffc STKPTRbits;
 
-extern sfr at 0xffd TOSL;
-extern sfr at 0xffe TOSH;
-extern sfr at 0xfff TOSU;
+extern __sfr __at 0xffd TOSL;
+extern __sfr __at 0xffe TOSH;
+extern __sfr __at 0xfff TOSU;
 
 
 /* Configuration registers locations */