- Register banking wasn't working for bit variables were.

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

diff --git a/src/pic/device.h b/src/pic/device.h
index 591181a80cee4dd2851faa0a544511f234dd04cc..8ee30e43846061ab580ecf442df1db381438df56 100644 (file)
--- a/src/pic/device.h
+++ b/src/pic/device.h
@@ -86,9 +86,10 @@ typedef struct PIC_device {
 } PIC_device;
 
 /* Given a pointer to a register, this macro returns the bank that it is in */
-#define REG_BANK(r)        (finalMapping[(r)->address].bank)
-#define REG_isALIASED(r)   (finalMapping[(r)->address].alias != 0)
-#define REG_isVALID(r)     (finalMapping[(r)->address].isValid)
+#define REG_ADDR(r)        ((r)->isBitField ? (((r)->address)>>3) : (r)->address)
+#define REG_BANK(r)        (finalMapping[REG_ADDR(r)].bank)
+#define REG_isALIASED(r)   (finalMapping[REG_ADDR(r)].alias != 0)
+#define REG_isVALID(r)     (finalMapping[REG_ADDR(r)].isValid)
 
 
 /****************************************/