pCodeOp *pic16_popCopyGPR2Bit(pCodeOp *pc, int bitval);
void pic16_pCodeRegMapLiveRanges(pBlock *pb);
void OptimizeLocalRegs(void);
+pCodeOp *pic16_popGet2p(pCodeOp *src, pCodeOp *dst);
char *dumpPicOptype(PIC_OPTYPE type);
pCodeOp *pic16_popGetLit2(int, pCodeOp *);
pCodeOp *pic16_popGetLit(int);
pCodeOp *pic16_popGetWithString(char *);
+extern int inWparamList(char *s);
/****************************************************************/
genericPrint},
POC_ADDWF,
"ADDWF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_ADDFW,
"ADDWF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_ADDWFC,
"ADDWFC",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_ADDFWC,
"ADDWFC",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_ADDLW,
"ADDLW",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_ANDLW,
"ANDLW",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_ANDWF,
"ANDWF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_ANDFW,
"ANDWF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_BC,
"BC",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_BCF,
"BCF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_BN,
"BN",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_BNC,
"BNC",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_BNN,
"BNN",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_BNOV,
"BNOV",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_BNZ,
"BNZ",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_BOV,
"BOV",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_BRA,
"BRA",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_BSF,
"BSF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_BTFSC,
"BTFSC",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_BTFSS,
"BTFSS",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_BTG,
"BTG",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_BZ,
"BZ",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_CALL,
"CALL",
+ 4,
NULL, // from branch
NULL, // to branch
NULL, // label
0, // second literal operand
POC_NOP,
PCC_NONE, // inCond
- PCC_NONE , // outCond
+ PCC_NONE, // outCond
PCI_MAGIC
};
genericPrint},
POC_COMF,
"COMF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_COMFW,
"COMF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_CLRF,
"CLRF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_CLRWDT,
"CLRWDT",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_CPFSEQ,
"CPFSEQ",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_CPFSGT,
"CPFSGT",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_CPFSLT,
"CPFSLT",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_DAW,
"DAW",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_DCFSNZ,
"DCFSNZ",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_DCFSNZW,
"DCFSNZ",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_DECF,
"DECF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_DECFW,
"DECF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_DECFSZ,
"DECFSZ",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_DECFSZW,
"DECFSZ",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_GOTO,
"GOTO",
+ 4,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_INCF,
"INCF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_INCFW,
"INCF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_INCFSZ,
"INCFSZ",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_INCFSZW,
"INCFSZ",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_INFSNZ,
"INFSNZ",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_INFSNZW,
"INFSNZ",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_IORWF,
"IORWF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_IORFW,
"IORWF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_IORLW,
"IORLW",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_LFSR,
"LFSR",
+ 4,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_MOVF,
"MOVF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_MOVFW,
"MOVF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_MOVFF,
"MOVFF",
+ 4,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_MOVLB,
"MOVLB",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_MOVLW,
"MOVLW",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_MOVWF,
"MOVWF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_MULLW,
"MULLW",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_MULWF,
"MULWF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_NEGF,
"NEGF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_NOP,
"NOP",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_POP,
"POP",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_PUSH,
"PUSH",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_RCALL,
"RCALL",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_RETFIE,
"RETFIE",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_RETLW,
"RETLW",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_RETURN,
"RETURN",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_RLCF,
"RLCF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_RLCFW,
"RLCF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_RLNCF,
"RLNCF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_RLNCFW,
"RLNCF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_RRCF,
"RRCF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_RRCFW,
"RRCF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_RRNCF,
"RRNCF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_RRNCFW,
"RRNCF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_SETF,
"SETF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_SUBLW,
"SUBLW",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_SUBFWB,
"SUBFWB",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_SUBWF,
"SUBWF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_SUBFW,
"SUBWF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_SUBFWB_D1,
"SUBFWB",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_SUBFWB_D0,
"SUBFWB",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_SUBWFB_D1,
"SUBWFB",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_SUBWFB_D0,
"SUBWFB",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_SWAPF,
"SWAPF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_SWAPFW,
"SWAPF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_TBLRD,
"TBLRD*",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_TBLRD_POSTINC,
"TBLRD*+",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_TBLRD_POSTDEC,
"TBLRD*-",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_TBLRD_PREINC,
"TBLRD+*",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_TBLWT,
"TBLWT*",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_TBLWT_POSTINC,
"TBLWT*+",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_TBLWT_POSTDEC,
"TBLWT*-",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_TBLWT_PREINC,
"TBLWT+*",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_TSTFSZ,
"TSTFSZ",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_XORWF,
"XORWF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_XORFW,
"XORWF",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_XORLW,
"XORLW",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
genericPrint},
POC_BANKSEL,
"BANKSEL",
+ 2,
NULL, // from branch
NULL, // to branch
NULL, // label
}
}
}
+
+
+unsigned long pic16_countInstructions(void)
+{
+ pBlock *pb;
+ pCode *pc;
+ unsigned long isize=0;
+
+ if(!the_pFile)return -1;
+
+ for(pb = the_pFile->pbHead; pb; pb = pb->next) {
+ for(pc = pb->pcHead; pc; pc = pc->next) {
+ if(isPCI(pc) || isPCAD(pc))isize += PCI(pc)->isize;
+ }
+ }
+ return (isize);
+}
+
+
/*-----------------------------------------------------------------*/
/* int RegCond(pCodeOp *pcop) - if pcop points to the STATUS reg- */
/* ister, RegCond will return the bit being referenced. */
if(!pcop)
return 0;
+ if(!pcop->name)return 0;
+
if(pcop->type == PO_GPR_BIT && !strcmp(pcop->name, pic16_pc_status.pcop.name)) {
switch(PCORB(pcop)->bit) {
case PIC_C_BIT:
pcad->pci.pc.type = PC_ASMDIR;
pcad->pci.pc.prev = pcad->pci.pc.next = NULL;
pcad->pci.pc.pb = NULL;
-
+ pcad->pci.isize = 2;
pcad->pci.pc.destruct = genericDestruct;
pcad->pci.pc.print = genericPrint;
char *pic16_get_op(pCodeOp *pcop,char *buffer, size_t size)
{
regs *r;
- static char b[50];
+ static char b[128];
char *s;
int use_buffer = 1; // copy the string to the passed buffer pointer
SAFE_snprintf(&s,&size,"%s",pcop->name);
}
return buffer;
+ case PO_GPR_BIT:
+ s = buffer;
+ if(PCORB(pcop)->subtype == PO_GPR_TEMP) {
+ SAFE_snprintf(&s, &size, "%s", pcop->name);
+ } else {
+ if(PCORB(pcop)->pcor.instance)
+ SAFE_snprintf(&s, &size, "(%s + %d)", pcop->name, PCORB(pcop)->pcor.instance);
+ else
+ SAFE_snprintf(&s, &size, "%s", pcop->name);
+ }
+ return (buffer);
default:
if(pcop->name) {
if(use_buffer) {
}
if(PCI(pc)->isBitInst) {
- if(PCI(pc)->pcop->type == PO_GPR_BIT) {
+ if(PCI(pc)->pcop->type != PO_GPR_BIT) {
if( (((pCodeOpRegBit *)(PCI(pc)->pcop))->inBitSpace) )
SAFE_snprintf(&s,&size,"(%s >> 3), (%s & 7)",
PCI(pc)->pcop->name ,
PCI(pc)->pcop->name );
else
- SAFE_snprintf(&s,&size,"%s,%d", pic16_get_op_from_instruction(PCI(pc)),
+ SAFE_snprintf(&s,&size,"%s,%d", pic16_get_op_from_instruction(PCI(pc)),
+// (((pCodeOpRegBit *)(PCI(pc)->pcop))->pcor.instance),
(((pCodeOpRegBit *)(PCI(pc)->pcop))->bit ));
+
} else if(PCI(pc)->pcop->type == PO_GPR_BIT) {
SAFE_snprintf(&s,&size,"%s,%d", pic16_get_op_from_instruction(PCI(pc)),PCORB(PCI(pc)->pcop)->bit);
}else
}
}
- fprintf(of, "; info ==>");
- switch(((pCodeInfo *)pc)->type) {
- case INF_OPTIMIZATION:
- fprintf(of, " [optimization] %s\n", OPT_TYPE_STR[ PCOO(PCINF(pc)->oper1)->type ]);
- break;
- case INF_LOCALREGS:
- fprintf(of, " [localregs] %s\n", LR_TYPE_STR[ PCOLR(PCINF(pc)->oper1)->type ]);
- break;
- }; break;
+ if(pic16_pcode_verbose) {
+ fprintf(of, "; info ==>");
+ switch(((pCodeInfo *)pc)->type) {
+ case INF_OPTIMIZATION:
+ fprintf(of, " [optimization] %s\n", OPT_TYPE_STR[ PCOO(PCINF(pc)->oper1)->type ]);
+ break;
+ case INF_LOCALREGS:
+ fprintf(of, " [localregs] %s\n", LR_TYPE_STR[ PCOLR(PCINF(pc)->oper1)->type ]);
+ break;
+ }
+ };
+
+ break;
case PC_INLINE:
fprintf(of,"%s\n", ((pCodeComment *)pc)->comment);
int bank = -1;
if(!isPCI(pc))
- return -1;
+ return 0;
if( PCI(pc)->op == POC_MOVLB ||
(( (reg = pic16_getRegFromInstruction(pc)) != NULL) && isBSR_REG(reg))) {
bank = PCOL(pc)->lit;
}
- return bank;
+ return 1;
}
if(!pc || !pcflow)
return 0;
- if(!isPCI(pc) || !PCI(pc)->pcflow || !isPCFL(pcflow) )
+ if((!isPCI(pc) && !isPCAD(pc)) || !PCI(pc)->pcflow || !isPCFL(pcflow) )
return 0;
if( PCI(pc)->pcflow->pc.seq == pcflow->seq)
pic16_pCodeInsertAfter(ppc, npci);
/* extra instructions to handle invertion */
- pcnext = pic16_newpCode(POC_GOTO, pic16_popGetLabel(tlbl->key));
+ pcnext = pic16_newpCode(POC_BRA, pic16_popGetLabel(tlbl->key));
pic16_pCodeInsertAfter(npci, pcnext);
pic16_pCodeInsertAfter(pc->prev, new_pc);
pCodeOp *pic16_popCopyGPR2Bit(pCodeOp *pc, int bitval)
{
- pCodeOp *pcop;
+ pCodeOp *pcop=NULL;
-// fprintf(stderr, "%s:%d pc type: %s\n", __FILE__, __LINE__, pic16_pCodeOpType(pc));
- pcop = pic16_newpCodeOpBit(pc->name, bitval, 0, pc->type);
+// fprintf(stderr, "%s:%d pc type: %s\tname: %s\n", __FILE__, __LINE__, pic16_pCodeOpType(pc), pc->name);
+
+ if(pc->name) {
+ pcop = pic16_newpCodeOpBit(pc->name, bitval, 0, pc->type);
+ } else {
+ if(PCOR(pc)->r)pcop = pic16_newpCodeOpBit(PCOR(pc)->r->name, bitval, 0, pc->type);
+ }
+
+ assert(pcop != NULL);
if( !( (pcop->type == PO_LABEL) ||
(pcop->type == PO_LITERAL) ||
(pcop->type == PO_STR) ))
PCOR(pcop)->r = PCOR(pc)->r; /* This is dangerous... */
PCOR(pcop)->r->wasUsed = 1;
+ PCOR(pcop)->instance = PCOR(pc)->instance;
return pcop;
}
/* for each flow block, determine the register banking
* requirements */
+
+ /* if label, then might come from other point, force banksel */
+ if(isPCL(pc))prevreg = NULL;
+
if(!isPCI(pc))goto loop;
+ if(PCI(pc)->label)prevreg = NULL;
+
if(PCI(pc)->is2MemOp)goto loop;
+
+ /* if goto, then force banksel */
+// if(PCI(pc)->op == POC_GOTO)prevreg = NULL;
reg = pic16_getRegFromInstruction(pc);
if(isPCI_SKIP(pc)) {
// fprintf(stderr, "instruction is SKIP instruction\n");
+// prevreg = NULL;
}
if(reg && isACCESS_BANK(reg))goto loop;
/* if previous instruction is a skip one, then set flag
* to 2 and call insertBankSwitch */
- if(pcprev && isPCI_SKIP(pcprev))flag=2; //goto loop;
+ if(pcprev && isPCI_SKIP(pcprev)) {
+ flag=2; //goto loop
+// prevreg = NULL;
+ }
+ if(pic16_options.opt_banksel>0) {
+ char op1[128], op2[128];
+
+ if(prevreg) {
+ strcpy(op1, pic16_get_op_from_instruction(PCI(pc)));
+ strcpy(op2, pic16_get_op_from_instruction(PCI(pcprev)));
+ if(!strcmp(op1, op2))goto loop;
+ }
+ }
prevreg = reg;
insertBankSwitch(flag, pc);
- pcprev = pc;
// fprintf(stderr, "BANK SWITCH inserted\n");
loop:
+ pcprev = pc;
pc = pc->next;
} while (pc);
}
+/** ADDITIONS BY RAPHAEL NEIDER, 2004-11-16: GOTO OPTIMIZATIONS **/
+
+/* Returns the (maximum of the) number of bytes used by the specified pCode. */
+int instrSize (pCode *pc)
+{
+ if (!pc) return 0;
+
+ if (isPCAD(pc)) {
+ if (!PCAD(pc)->directive || strlen (PCAD(pc)->directive) < 3) return 0;
+ return 4; // assumes only regular instructions using <= 4 bytes
+ }
+
+ if (isPCI(pc)) return PCI(pc)->isize;
+
+ return 0;
+}
+
+/* Returns 1 if pc is referenced by the given label (either
+ * pc is the label itself or is an instruction with an attached
+ * label).
+ * Returns 0 if pc is not preceeded by the specified label.
+ */
+int isLabel (pCode *pc, char *label)
+{
+ if (!pc) return 0;
+
+ // label attached to the pCode?
+ if (isPCI(pc) || isPCAD(pc) || isPCW(pc) || pc->type == PC_INFO) {
+ pBranch *lab = NULL;
+ lab = PCI(pc)->label;
+
+ while (lab) {
+ if (isPCL(lab->pc) && strcmp(PCL(lab->pc)->label, label) == 0) {
+ return 1;
+ }
+ lab = lab->next;
+ } // while
+ } // if
+
+ // is inline assembly label?
+ if (isPCAD(pc) && PCAD(pc)->directive == NULL && PCAD(pc)->arg) {
+ // do not compare trailing ':'
+ if (strncmp (PCAD(pc)->arg, label, strlen (label)) == 0) {
+ return 1;
+ }
+ } // if
+
+ // is pCodeLabel?
+ if (isPCL(pc)) {
+ if (strcmp(PCL(pc)->label,label) == 0) {
+ return 1;
+ }
+ } // if
+
+ // no label/no label attached/wrong label(s)
+ return 0;
+}
+
+/* Returns the distance to the given label in terms of words.
+ * Labels are searched only within -max .. max words from pc.
+ * Returns max if the label could not be found or
+ * its distance from pc in (-max..+max).
+ */
+int findpCodeLabel (pCode *pc, char *label, int max, pCode **target) {
+ int dist = instrSize(pc);
+ pCode *curr = pc;
+
+ // search backwards
+ while (dist < max && curr && !isLabel (curr, label)) {
+ curr = curr->prev;
+ dist += instrSize(curr); // sizeof (instruction)
+ } // while
+ if (curr && dist < max) {
+ if (target != NULL) *target = curr;
+ return -dist;
+ }
+
+ dist = 0;
+ curr = pic16_findNextInstruction (pc->next);
+ //search forwards
+ while (dist < max && curr && !isLabel (curr, label)) {
+ dist += instrSize(curr); // sizeof (instruction)
+ curr = curr->next;
+ } // while
+ if (curr && dist < max) {
+ if (target != NULL) *target = curr;
+ return dist;
+ }
+
+ if (target != NULL) *target = NULL;
+ return max;
+}
+
+/* Returns -1 if pc does NOT denote an instruction like
+ * BTFS[SC] STATUS,i
+ * Otherwise we return
+ * (a) 0x10 + i for BTFSS
+ * (b) 0x00 + i for BTFSC
+ */
+int isSkipOnStatus (pCode *pc)
+{
+ int res = -1;
+ pCodeOp *pcop;
+ if (!pc || !isPCI(pc)) return -1;
+ if (PCI(pc)->op == POC_BTFSS) res = 0x10;
+ else if (PCI(pc)->op == POC_BTFSC) res = 0x00;
+ else return -1;
+
+ pcop = PCI(pc)->pcop;
+
+ if (pcop->type == PO_STATUS || (pcop->type == PO_GPR_BIT && strcmp(pcop->name, "STATUS") == 0)) {
+ return res + ((pCodeOpRegBit *)pcop)->bit;
+ }
+
+ return -1;
+}
+
+/* Returns 1 if pc is one of BC, BZ, BOV, BN, BNC, BNZ, BNOV or BNN,
+ * returns 0 otherwise. */
+int isConditionalBranch (pCode *pc)
+{
+ if (!pc || !isPCI_BRANCH(pc)) return 0;
+
+ switch (PCI(pc)->op) {
+ case POC_BC:
+ case POC_BZ:
+ case POC_BOV:
+ case POC_BN:
+ case POC_BNC:
+ case POC_BNZ:
+ case POC_BNOV:
+ case POC_BNN:
+ return 1;
+ default:
+ break;
+ } // switch
+
+ return 0;
+}
+
+/* Returns 1 if pc has a label attached to it.
+ * This can be either a label stored in the pCode itself (.label)
+ * or a label making up its own pCode preceding this pc.
+ * Returns 0 if pc cannot be reached directly via a label.
+ */
+int hasNoLabel (pCode *pc)
+{
+ pCode *prev;
+ if (!pc) return 1;
+
+ // are there any label pCodes between pc and the previous instruction?
+ prev = pic16_findPrevInstruction (pc->prev);
+ while (pc && pc != prev) {
+ // pCode with attached label?
+ if ((isPCI(pc) || isPCAD(pc) || isPCW(pc) || pc->type == PC_INFO)
+ && PCI(pc)->label) {
+ return 0;
+ }
+ // is inline assembly label?
+ if (isPCAD(pc) && PCAD(pc)->directive == NULL) return 0;
+ if (isPCW(pc) && PCW(pc)->label) return 0;
+
+ // pCodeLabel?
+ if (isPCL(pc)) return 0;
+
+ pc = pc->prev;
+ } // if
+
+ // no label found
+ return 1;
+}
+
+/* Replaces the old pCode with the new one, moving the labels,
+ * C source line and probably flow information to the new pCode.
+ */
+void pic16_pCodeReplace (pCode *oldPC, pCode *newPC) {
+ if (!oldPC || !newPC || !isPCI(oldPC) || !isPCI(newPC))
+ return;
+
+ /* first move all labels from old to new */
+ PCI(newPC)->label = pic16_pBranchAppend (PCI(oldPC)->label, PCI(newPC)->label);
+ PCI(oldPC)->label = NULL;
+
+ /* move C source line (if possible) */
+ if (PCI(oldPC)->cline && !PCI(newPC)->cline)
+ PCI(newPC)->cline = PCI(oldPC)->cline;
+
+ /* insert new pCode into pBlock */
+ pic16_pCodeInsertAfter (oldPC, newPC);
+ pic16_unlinkpCode (oldPC);
+
+ /* TODO: update flow (newPC->from, newPC->to) */
+ PCI(newPC)->pcflow = PCI(oldPC)->pcflow;
+
+ /* destruct replaced pCode */
+ oldPC->destruct (oldPC);
+}
+
+/* Returns the inverted conditional branch (if any) or NULL.
+ * pcop must be set to the new jump target.
+ */
+pCode *getNegatedBcc (pCode *bcc, pCodeOp *pcop)
+{
+ pCode *newBcc;
+
+ if (!bcc || !isPCI(bcc)) return NULL;
+
+ switch (PCI(bcc)->op) {
+ case POC_BC: newBcc = pic16_newpCode (POC_BNC , pcop); break;
+ case POC_BZ: newBcc = pic16_newpCode (POC_BNZ , pcop); break;
+ case POC_BOV: newBcc = pic16_newpCode (POC_BNOV, pcop); break;
+ case POC_BN: newBcc = pic16_newpCode (POC_BNN , pcop); break;
+ case POC_BNC: newBcc = pic16_newpCode (POC_BC , pcop); break;
+ case POC_BNZ: newBcc = pic16_newpCode (POC_BZ , pcop); break;
+ case POC_BNOV: newBcc = pic16_newpCode (POC_BOV , pcop); break;
+ case POC_BNN: newBcc = pic16_newpCode (POC_BN , pcop); break;
+ default:
+ newBcc = NULL;
+ }
+ return newBcc;
+}
+
+#define MAX_DIST_GOTO 0x7FFFFFFF
+#define MAX_DIST_BRA 1020 // maximum offset (in bytes) possible with BRA
+#define MAX_DIST_BCC 120 // maximum offset (in bytes) possible with Bcc
+#define MAX_JUMPCHAIN_DEPTH 16 // number of GOTOs to follow in resolveJumpChain() (to prevent endless loops)
+#define IS_GOTO(arg) ((arg) && isPCI(arg) && (PCI(arg)->op == POC_GOTO || PCI(arg)->op == POC_BRA))
+
+/* Follows GOTO/BRA instructions to their target instructions, stores the
+ * final destination (not a GOTO or BRA instruction) in target and returns
+ * the distance from the original pc to *target.
+ */
+int resolveJumpChain (pCode *pc, pCode **target, pCodeOp **pcop) {
+ pCode *curr = pc;
+ pCode *last = NULL;
+ pCodeOp *lastPCOP = NULL;
+ int dist = 0;
+ int depth = 0;
+
+ //fprintf (stderr, "%s:%d: -=-", __FUNCTION__, __LINE__);
+
+ /* only follow unconditional branches, except for the initial pCode (which may be a conditional branch) */
+ while (curr && (last != curr) && (depth++ < MAX_JUMPCHAIN_DEPTH) && isPCI(curr)
+ && (PCI(curr)->op == POC_GOTO || PCI(curr)->op == POC_BRA || (curr == pc && isConditionalBranch(curr)))) {
+ last = curr;
+ lastPCOP = PCI(curr)->pcop;
+ dist = findpCodeLabel (pc, PCI(curr)->pcop->name, MAX_DIST_GOTO, &curr);
+ //fprintf (stderr, "last:%p, curr:%p, label:%s\n", last, curr, PCI(last)->pcop->name);
+ } // while
+
+ if (target) *target = last;
+ if (pcop) *pcop = lastPCOP;
+ return dist;
+}
+
+/* Returns pc if it is not a OPT_JUMPTABLE_BEGIN INFO pCode.
+ * Otherwise the first pCode after the jumptable (after
+ * the OPT_JUMPTABLE_END tag) is returned.
+ */
+pCode *skipJumptables (pCode *pc, int *isJumptable)
+{
+ *isJumptable = 0;
+ if (!pc) return NULL;
+
+ while (pc->type == PC_INFO && PCINF(pc)->type == INF_OPTIMIZATION && PCOO(PCINF(pc)->oper1)->type == OPT_JUMPTABLE_BEGIN) {
+ *isJumptable = 1;
+ //fprintf (stderr, "SKIPPING jumptable\n");
+ do {
+ //pc->print(stderr, pc);
+ pc = pc->next;
+ } while (pc && (pc->type != PC_INFO || PCINF(pc)->type != INF_OPTIMIZATION
+ || PCOO(PCINF(pc)->oper1)->type != OPT_JUMPTABLE_END));
+ //fprintf (stderr, "<<JUMPTAB:\n");
+ // skip OPT_END as well
+ if (pc) pc = pc->next;
+ } // while
+
+ return pc;
+}
+
+pCode *pic16_findNextInstructionSkipJumptables (pCode *pc, int *isJumptable)
+{
+ int isJumptab;
+ *isJumptable = 0;
+ while (pc && !isPCI(pc) && !isPCAD(pc) && !isPCW(pc)) {
+ // set pc to the first pCode after a jumptable, leave pc untouched otherwise
+ pc = skipJumptables (pc, &isJumptab);
+ if (isJumptab) {
+ // pc is the first pCode after the jumptable
+ *isJumptable = 1;
+ } else {
+ // pc has not been changed by skipJumptables()
+ pc = pc->next;
+ }
+ } // while
+
+ return pc;
+}
+
+/* Turn GOTOs into BRAs if distance between GOTO and label
+ * is less than 1024 bytes.
+ *
+ * This method is especially useful if GOTOs after BTFS[SC]
+ * can be turned into BRAs as GOTO would cost another NOP
+ * if skipped.
+ */
+void pic16_OptimizeJumps ()
+{
+ pCode *pc;
+ pCode *pc_prev = NULL;
+ pCode *pc_next = NULL;
+ pBlock *pb;
+ pCode *target;
+ int change, iteration, isJumptab;
+ int isHandled = 0;
+ char *label;
+ int opt=0, toofar=0, opt_cond = 0, cond_toofar=0, opt_reorder = 0, opt_gotonext = 0, opt_gotochain = 0;
+
+ if (!the_pFile) return;
+
+ //fprintf (stderr, "%s:%d: %s\n", __FILE__, __LINE__, __FUNCTION__);
+
+ for (pb = the_pFile->pbHead; pb != NULL; pb = pb->next) {
+ int matchedInvertRule = 1;
+ iteration = 1;
+ do {
+ //fprintf (stderr, "%s:%d: iterating over pBlock %p\n", __FUNCTION__, __LINE__, pb);
+ change = 0;
+ pc = pic16_findNextInstruction (pb->pcHead);
+
+ while (pc) {
+ pc_next = pic16_findNextInstructionSkipJumptables (pc->next, &isJumptab);
+ if (isJumptab) {
+ // skip jumptable, i.e. start over with no pc_prev!
+ pc_prev = NULL;
+ pc = pc_next;
+ continue;
+ } // if
+
+ /* (1) resolve chained jumps
+ * Do not perform this until pattern (4) is no longer present! Otherwise we will
+ * (a) leave dead code in and
+ * (b) skip over the dead code with an (unneccessary) jump.
+ */
+ if (!matchedInvertRule && (IS_GOTO(pc) || isConditionalBranch(pc))) {
+ pCodeOp *lastTargetOp = NULL;
+ int newDist = resolveJumpChain (pc, &target, &lastTargetOp);
+ int maxDist = MAX_DIST_BCC;
+ if (PCI(pc)->op == POC_BRA) maxDist = MAX_DIST_BRA;
+ if (PCI(pc)->op == POC_GOTO) maxDist = MAX_DIST_GOTO;
+
+ /* be careful NOT to make the jump instruction longer (might break previously shortened jumps!) */
+ if (lastTargetOp && newDist <= maxDist && lastTargetOp != PCI(pc)->pcop
+ && strcmp (lastTargetOp->name, PCI(pc)->pcop->name) != 0) {
+ //fprintf (stderr, "(1) ");pc->print(stderr, pc); fprintf (stderr, " --> %s\n", lastTargetOp->name);
+ if (pic16_pcode_verbose) { pic16_pCodeInsertAfter (pc->prev, pic16_newpCodeCharP("(1) jump chain resolved")); }
+ PCI(pc)->pcop->name = lastTargetOp->name;
+ change++;
+ opt_gotochain++;
+ } // if
+ } // if
+
+
+ if (IS_GOTO(pc)) {
+ int dist;
+ int condBraType = isSkipOnStatus(pc_prev);
+ label = PCI(pc)->pcop->name;
+ dist = findpCodeLabel(pc, label, MAX_DIST_BRA, &target);
+ if (dist < 0) dist = -dist;
+ //fprintf (stderr, "distance: %d (", dist); pc->print(stderr, pc);fprintf (stderr, ")\n");
+ isHandled = 0;
+
+
+ /* (2) remove "GOTO label; label:" */
+ if (isLabel (pc_next, label)) {
+ //fprintf (stderr, "(2) GOTO next instruction: ");pc->print(stderr, pc);fprintf (stderr, " --> ");pc_next->print(stderr, pc_next); fprintf(stderr, "\n");
+ // first remove all preceeding SKIP instructions
+ while (pc_prev && isPCI_SKIP(pc_prev)) {
+ // attach labels on this instruction to pc_next
+ //fprintf (stderr, "(2) preceeding SKIP removed: ");pc_prev->print(stderr, pc_prev);fprintf(stderr, "\n");
+ PCI(pc_next)->label = pic16_pBranchAppend (PCI(pc_prev)->label, PCI(pc_next)->label);
+ PCI(pc_prev)->label = NULL;
+ if (pic16_pcode_verbose) { pic16_pCodeInsertAfter (pc->prev, pic16_newpCodeCharP("(2) SKIP removed")); }
+ pic16_unlinkpCode (pc_prev);
+ pc_prev = pic16_findPrevInstruction (pc);
+ } // while
+ // now remove the redundant goto itself
+ PCI(pc_next)->label = pic16_pBranchAppend (PCI(pc)->label, PCI(pc_next)->label);
+ if (pic16_pcode_verbose) { pic16_pCodeInsertAfter (pc, pic16_newpCodeCharP("(2) GOTO next instruction removed")); }
+ pic16_unlinkpCode (pc);
+ pc = pic16_findPrevInstruction(pc_next->prev);
+ isHandled = 1; // do not perform further optimizations
+ opt_gotonext++;
+ change++;
+ } // if
+
+
+ /* (3) turn BTFSx STATUS,i; GOTO label into Bcc label if possible */
+ if (!isHandled && condBraType != -1 && hasNoLabel(pc)) {
+ if (dist < MAX_DIST_BCC) {
+ pCode *bcc = NULL;
+ switch (condBraType) {
+ case 0x00: bcc = pic16_newpCode (POC_BC, PCI(pc)->pcop);break;
+ // no BDC on DIGIT CARRY available
+ case 0x02: bcc = pic16_newpCode (POC_BZ, PCI(pc)->pcop);break;
+ case 0x03: bcc = pic16_newpCode (POC_BOV, PCI(pc)->pcop);break;
+ case 0x04: bcc = pic16_newpCode (POC_BN, PCI(pc)->pcop);break;
+ case 0x10: bcc = pic16_newpCode (POC_BNC, PCI(pc)->pcop);break;
+ // no BNDC on DIGIT CARRY available
+ case 0x12: bcc = pic16_newpCode (POC_BNZ, PCI(pc)->pcop);break;
+ case 0x13: bcc = pic16_newpCode (POC_BNOV, PCI(pc)->pcop);break;
+ case 0x14: bcc = pic16_newpCode (POC_BNN, PCI(pc)->pcop);break;
+ default:
+ // no replacement possible
+ bcc = NULL;
+ break;
+ } // switch
+ if (bcc) {
+ // ATTENTION: keep labels attached to BTFSx!
+ // HINT: GOTO is label free (checked above)
+ //fprintf (stderr, "%s:%d: (3) turning %s %s into %s %s\n", __FUNCTION__, __LINE__, PCI(pc)->mnemonic, label, PCI(bcc)->mnemonic, label);
+ isHandled = 1; // do not perform further optimizations
+ if (pic16_pcode_verbose) { pic16_pCodeInsertAfter(pc_prev->prev, pic16_newpCodeCharP("(3) conditional branch introduced")); }
+ pic16_pCodeReplace (pc_prev, bcc);
+ pc->destruct(pc);
+ pc = bcc;
+ opt_cond++;
+ change++;
+ } // if
+ } else {
+ //fprintf (stderr, "(%d, too far for Bcc)\n", dist);
+ cond_toofar++;
+ } // if
+ } // if
+
+ if (!isHandled) {
+ // (4) eliminate the following (common) tripel:
+ // <pred.>;
+ // labels1: Bcc label2;
+ // GOTO somewhere; ; <-- instruction referenced by pc
+ // label2: <cont.>
+ // and replace it by
+ // labels1: B#(cc) somewhere; ; #(cc) is the negated condition cc
+ // label2: <cont.>
+ // ATTENTION: all labels pointing to "Bcc label2" must be attached
+ // to <cont.> instead
+ // ATTENTION: This optimization is only valid if <pred.> is
+ // not a skip operation!
+ // ATTENTION: somewhere must be within MAX_DIST_BCC bytes!
+ // ATTENTION: no label may be attached to the GOTO instruction!
+ if (isConditionalBranch(pc_prev)
+ && (!isPCI_SKIP(pic16_findPrevInstruction(pc_prev->prev)))
+ && (dist < MAX_DIST_BCC)
+ && isLabel(pc_next,PCI(pc_prev)->pcop->name)
+ && hasNoLabel(pc)) {
+ pCode *newBcc = getNegatedBcc (pc_prev, PCI(pc)->pcop);
+
+ if (newBcc) {
+ //fprintf (stderr, "%s:%d: (4) turning %s %s into %s %s\n", __FUNCTION__, __LINE__, PCI(pc)->mnemonic, label, PCI(newBcc)->mnemonic, label);
+ isHandled = 1; // do not perform further optimizations
+ if (pic16_pcode_verbose) { pic16_pCodeInsertAfter(pc_prev->prev, pic16_newpCodeCharP("(4) conditional skipping branch inverted")); }
+ pic16_pCodeReplace (pc_prev, newBcc);
+ pc->destruct(pc);
+ pc = newBcc;
+ opt_reorder++;
+ change++;
+ matchedInvertRule++;
+ }
+ }
+ }
+
+ /* (5) now just turn GOTO into BRA */
+ if (!isHandled && (PCI(pc)->op == POC_GOTO)) {
+ if (dist < MAX_DIST_BRA) {
+ pCode *newBra = pic16_newpCode (POC_BRA, PCI(pc)->pcop);
+ //fprintf (stderr, "%s:%d: (5) turning %s %s into %s %s\n", __FUNCTION__, __LINE__, PCI(pc)->mnemonic, label, PCI(newBra)->mnemonic, label);
+ if (pic16_pcode_verbose) { pic16_pCodeInsertAfter(pc->prev, pic16_newpCodeCharP("(5) GOTO replaced by BRA")); }
+ pic16_pCodeReplace (pc, newBra);
+ pc = newBra;
+ opt++;
+ change++;
+ } else {
+ //fprintf (stderr, "(%d, too far for BRA)\n", dist);
+ toofar++;
+ }
+ } // if (!isHandled)
+ } // if
+
+ pc_prev = pc;
+ pc = pc_next;
+ } // while (pc)
+
+ pBlockRemoveUnusedLabels (pb);
+
+ // This line enables goto chain resolution!
+ if (matchedInvertRule > 1) matchedInvertRule = 1; else matchedInvertRule = 0;
+
+ iteration++;
+ } while (change); /* fixpoint iteration per pBlock */
+ } // for (pb)
+
+ // emit some statistics concerning goto-optimization
+ // (maybe this should be moved to the general statistics?)
+ if (pic16_debug_verbose || pic16_pcode_verbose) {
+ fprintf (stderr, "optimize-goto:\n"
+ "\t%5d GOTO->BRA; (%d GOTOs too far)\n"
+ "\t%5d BTFSx, GOTO->Bcc (%d too far)\n"
+ "\t%5d conditional \"skipping\" jumps inverted\n"
+ "\t%5d GOTOs to next instruction removed\n"
+ "\t%5d chained GOTOs resolved\n",
+ opt, toofar, opt_cond, cond_toofar, opt_reorder, opt_gotonext, opt_gotochain);
+ } // if
+ //fprintf (stderr, "%s:%d: %s\n", __FILE__, __LINE__, __FUNCTION__);
+}
+
+#undef IS_GOTO
+#undef MAX_JUMPCHAIN_DEPTH
+#undef MAX_DIST_GOTO
+#undef MAX_DIST_BRA
+#undef MAX_DIST_BCC
+
+/** END OF RAPHAEL NEIDER'S ADDITIONS **/
static void pBlockDestruct(pBlock *pb)
{
pcstart->next = pcend;
pcend->prev = pcstart;
- pic16_pCodeInsertAfter(pcstart, (pct=pic16_newpCode(POC_LFSR, pic16_popGetLit2(0, pic16_popGetWithString(r->name))))); pc = pct;
+ pc = pcstart;
+// if(!entry) {
+// pic16_pCodeInsertAfter(pc, pct = pic16_newpCode(POC_MOVFF, pic16_popGet2p(
+// pic16_popCopyReg(&pic16_pc_fsr0l), pic16_popCopyReg(&pic16_pc_fsr2l)))); pc = pct;
+// }
+
+ pic16_pCodeInsertAfter(pc, pct=pic16_newpCode(POC_LFSR, pic16_popGetLit2(0, pic16_popGetWithString(r->name)))); pc = pct;
pic16_pCodeInsertAfter(pc, pct=pic16_newpCode(POC_MOVLW, pic16_popGetLit( count ))); pc = pct;
- pic16_pCodeInsertAfter(pc, pct=pic16_newpCode(POC_CALL, pic16_popGetWithString( fname[ (entry==1?0:1) ] )));
+ pic16_pCodeInsertAfter(pc, pct=pic16_newpCode(POC_CALL, pic16_popGetWithString( fname[ (entry==1?0:1) ] ))); pc = pct;
+
+// if(!entry) {
+// pic16_pCodeInsertAfter(pc, pct = pic16_newpCode(POC_MOVFF, pic16_popGet2p(
+// pic16_popCopyReg(&pic16_pc_fsr2l), pic16_popCopyReg(&pic16_pc_fsr0l)))); pc = pct;
+// }
+
{
symbol *sym;
}
-
/*-----------------------------------------------------------------*/
/* OptimizeLocalRegs - turn sequence of MOVFF instructions for */
/* local registers to a support function call */
regs *r, *lastr=NULL, *firstr=NULL;
pCode *pcstart=NULL, *pcend=NULL;
int inEntry=0;
+ char *curFunc=NULL;
/* Overview:
* local_regs begin mark
inRegCount = regCount = 0;
firstr = lastr = NULL;
for(pc = pb->pcHead; pc; pc = pc->next) {
+
+ /* hold current function name */
+ if(pc && isPCF(pc))curFunc = PCF(pc)->fname;
+
if(pc && (pc->type == PC_INFO)) {
pci = PCINF(pc);
pcend = pc; //pic16_findPrevInstruction(pc->prev);
#if 1
- if(regCount>2) {
- pic16_convertLocalRegs2Support(pcstart, pcend, regCount,
- firstr, inEntry);
+ if(curFunc && inWparamList(curFunc+1)) {
+ fprintf(stderr, "sdcc: %s: warning: disabling lr-support for functionn %s\n",
+ filename, curFunc);
+ } else {
+ if(regCount>2) {
+ pic16_convertLocalRegs2Support(pcstart, pcend, regCount,
+ firstr, inEntry);
+ }
}
#endif
firstr = lastr = NULL;
projects / fw / sdcc / blobdiff