* src/pic16/gen.c (pic16_aopGet): fixed handling of offsets in

[fw/sdcc] / src / pic16 / gen.h

diff --git a/src/pic16/gen.h b/src/pic16/gen.h
index 84af5945cfec479c45eaafd117b94c130f7f0678..0225b917a3f8132028641166052775d6b2a3470e 100644 (file)
--- a/src/pic16/gen.h
+++ b/src/pic16/gen.h
@@ -156,7 +156,8 @@ extern unsigned pic16_fReturnSizePic;
 #define emitTOGC    pic16_emitpcode(POC_BTG,  pic16_popCopyGPR2Bit(PCOP(&pic16_pc_status),PIC_C_BIT))
 
 int pic16_getDataSize(operand *op);
-void pic16_emitpcode(PIC_OPCODE poc, pCodeOp *pcop);
+void pic16_emitpcode_real(PIC_OPCODE poc, pCodeOp *pcop);
+#define pic16_emitpcode(poc,pcop)      do { if (pic16_pcode_verbose) pic16_emitpcomment ("%s:%u(%s):", __FILE__, __LINE__, __FUNCTION__); pic16_emitpcode_real(poc,pcop); } while(0)
 void pic16_emitpLabel(int key);
 void pic16_emitcode (char *inst,char *fmt, ...);
 void DEBUGpic16_emitcode (char *inst,char *fmt, ...);
@@ -188,7 +189,7 @@ pCodeOp *pic16_popGetLit2(int lit, pCodeOp *arg2);
 pCodeOp *popGetWithString(char *str);
 pCodeOp *pic16_popGet (asmop *aop, int offset);//, bool bit16, bool dname);
 pCodeOp *pic16_popGetTempReg(int lock);
-pCodeOp *pic16_popGetTempRegCond(bitVect *, int lock);
+pCodeOp *pic16_popGetTempRegCond(bitVect *, bitVect *, int lock);
 void pic16_popReleaseTempReg(pCodeOp *pcop, int lock);
 
 pCodeOp *pic16_popCombine2(pCodeOpReg *src, pCodeOpReg *dst, int noalloc);
@@ -202,23 +203,32 @@ void pic16_freeAsmop (operand *op, asmop *aaop, iCode *ic, bool pop);
 const char *pic16_pCodeOpType(  pCodeOp *pcop);
 int pic16_my_powof2 (unsigned long num);
 
-void mov2w (asmop *aop, int offset);
+void pic16_mov2w (asmop *aop, int offset);
+void pic16_mov2f(asmop *dst, asmop *src, int offset);
 
 void dumpiCode(iCode *lic);
 
 int inWparamList(char *s);
 
+#include "device.h"
+
 #define DUMP_FUNCTION_ENTRY    1
 #define DUMP_FUNCTION_EXIT     0
 
 #if DUMP_FUNCTION_ENTRY
-#define FENTRY pic16_emitpcomment("**{\t%d %s", __LINE__, __FUNCTION__)
+#define FENTRY if(pic16_options.debgen&2)pic16_emitpcomment("**{\t%d %s", __LINE__, __FUNCTION__)
 #define FENTRY2 if(pic16_options.debgen&2)pic16_emitpcomment("**{\t%d %s", __LINE__, __FUNCTION__)
+#else
+#define FENTRY
+#define FENTRY2
 #endif
 
 #if DUMP_FUNCTION_EXIT
-#define FEXIT  pic16_emitpcomment("; **}", "%d %s", __LINE__, __FUNCTION__)
+#define FEXIT  if(pic16_options.debgen&2)pic16_emitpcomment("; **}", "%d %s", __LINE__, __FUNCTION__)
 #define FEXIT2 if(pic16_options.debgen&2)pic16_emitpcomment("**{\t%d %s", __LINE__, __FUNCTION__)
+#else
+#define FEXIT
+#define FEXIT2
 #endif
 
 #define ERROR  werror(W_POSSBUG2, __FILE__, __LINE__)