X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fpic%2Fpcode.c;h=c37d6ff85359a323aaba0e2892a1e7fb0bdc0eba;hb=ccadc6c89f74c72232dc551f6d7047285c658b7f;hp=a4e6e473fcb084fbfb953cb03b40151c8c3f68dc;hpb=3f966c0865df4d1f37576d9e7f93db5f0f749528;p=fw%2Fsdcc diff --git a/src/pic/pcode.c b/src/pic/pcode.c index a4e6e473..c37d6ff8 100644 --- a/src/pic/pcode.c +++ b/src/pic/pcode.c @@ -71,11 +71,10 @@ static hTab *pic14MnemonicsHash = NULL; static hTab *pic14pCodePeepCommandsHash = NULL; -static pFile *the_pFile = NULL; +pFile *the_pFile = NULL; static pBlock *pb_dead_pcodes = NULL; /* Hardcoded flags to change the behavior of the PIC port */ -static int peepOptimizing = 1; /* run the peephole optimizer if nonzero */ static int functionInlining = 1; /* inline functions if nonzero */ int debug_verbose = 0; /* Set true to inundate .asm file */ @@ -150,7 +149,7 @@ pCodeInstruction pciADDWF = { 0, // literal operand POC_NOP, (PCC_W | PCC_REGISTER), // inCond - (PCC_REGISTER | PCC_Z) // outCond + (PCC_REGISTER | PCC_C | PCC_DC | PCC_Z) // outCond }; pCodeInstruction pciADDFW = { @@ -172,7 +171,7 @@ pCodeInstruction pciADDFW = { 0, // literal operand POC_NOP, (PCC_W | PCC_REGISTER), // inCond - (PCC_W | PCC_Z) // outCond + (PCC_W | PCC_C | PCC_DC | PCC_Z) // outCond }; pCodeInstruction pciADDLW = { @@ -281,8 +280,8 @@ pCodeInstruction pciBCF = { 0,0, // branch, skip 0, // literal operand POC_BSF, - (PCC_REGISTER | PCC_EXAMINE_PCOP), // inCond - PCC_REGISTER // outCond + (PCC_REGISTER | PCC_EXAMINE_PCOP), // inCond + (PCC_REGISTER | PCC_EXAMINE_PCOP) // outCond }; pCodeInstruction pciBSF = { @@ -303,8 +302,8 @@ pCodeInstruction pciBSF = { 0,0, // branch, skip 0, // literal operand POC_BCF, - (PCC_REGISTER | PCC_EXAMINE_PCOP), // inCond - (PCC_REGISTER | PCC_EXAMINE_PCOP) // outCond + (PCC_REGISTER | PCC_EXAMINE_PCOP), // inCond + (PCC_REGISTER | PCC_EXAMINE_PCOP) // outCond }; pCodeInstruction pciBTFSC = { @@ -325,8 +324,8 @@ pCodeInstruction pciBTFSC = { 1,1, // branch, skip 0, // literal operand POC_BTFSS, - (PCC_REGISTER | PCC_EXAMINE_PCOP), // inCond - PCC_EXAMINE_PCOP // outCond + (PCC_REGISTER | PCC_EXAMINE_PCOP), // inCond + PCC_NONE // outCond }; pCodeInstruction pciBTFSS = { @@ -348,7 +347,7 @@ pCodeInstruction pciBTFSS = { 0, // literal operand POC_BTFSC, (PCC_REGISTER | PCC_EXAMINE_PCOP), // inCond - PCC_EXAMINE_PCOP // outCond + PCC_NONE // outCond }; pCodeInstruction pciCALL = { @@ -369,8 +368,8 @@ pCodeInstruction pciCALL = { 1,0, // branch, skip 0, // literal operand POC_NOP, - PCC_NONE, // inCond - PCC_NONE // outCond + (PCC_NONE | PCC_W), // inCond, reads argument from WREG + (PCC_NONE | PCC_W | PCC_C | PCC_DC | PCC_Z) // outCond, flags are destroyed by called function }; pCodeInstruction pciCOMF = { @@ -392,7 +391,7 @@ pCodeInstruction pciCOMF = { 0, // literal operand POC_NOP, PCC_REGISTER, // inCond - PCC_REGISTER // outCond + PCC_REGISTER | PCC_Z // outCond }; pCodeInstruction pciCOMFW = { @@ -414,7 +413,7 @@ pCodeInstruction pciCOMFW = { 0, // literal operand POC_NOP, PCC_REGISTER, // inCond - PCC_W // outCond + PCC_W | PCC_Z // outCond }; pCodeInstruction pciCLRF = { @@ -436,7 +435,7 @@ pCodeInstruction pciCLRF = { 0, // literal operand POC_NOP, PCC_NONE, // inCond - PCC_REGISTER // outCond + PCC_REGISTER | PCC_Z // outCond }; pCodeInstruction pciCLRW = { @@ -458,7 +457,7 @@ pCodeInstruction pciCLRW = { 0, // literal operand POC_NOP, PCC_NONE, // inCond - PCC_W // outCond + PCC_W | PCC_Z // outCond }; pCodeInstruction pciCLRWDT = { @@ -502,7 +501,7 @@ pCodeInstruction pciDECF = { 0, // literal operand POC_NOP, PCC_REGISTER, // inCond - PCC_REGISTER // outCond + PCC_REGISTER | PCC_Z // outCond }; pCodeInstruction pciDECFW = { @@ -524,7 +523,7 @@ pCodeInstruction pciDECFW = { 0, // literal operand POC_NOP, PCC_REGISTER, // inCond - PCC_W // outCond + PCC_W | PCC_Z // outCond }; pCodeInstruction pciDECFSZ = { @@ -612,7 +611,7 @@ pCodeInstruction pciINCF = { 0, // literal operand POC_NOP, PCC_REGISTER, // inCond - PCC_REGISTER // outCond + PCC_REGISTER | PCC_Z // outCond }; pCodeInstruction pciINCFW = { @@ -634,7 +633,7 @@ pCodeInstruction pciINCFW = { 0, // literal operand POC_NOP, PCC_REGISTER, // inCond - PCC_W // outCond + PCC_W | PCC_Z // outCond }; pCodeInstruction pciINCFSZ = { @@ -874,7 +873,7 @@ pCodeInstruction pciRETFIE = { 0, // literal operand POC_NOP, PCC_NONE, // inCond - PCC_NONE // outCond (not true... affects the GIE bit too) + (PCC_NONE | PCC_C | PCC_DC | PCC_Z) // outCond (not true... affects the GIE bit too), STATUS bit are retored }; pCodeInstruction pciRETLW = { @@ -896,7 +895,7 @@ pCodeInstruction pciRETLW = { 1, // literal operand POC_NOP, PCC_LITERAL, // inCond - PCC_W // outCond + (PCC_W| PCC_C | PCC_DC | PCC_Z) // outCond, STATUS bits are irrelevant after RETLW }; pCodeInstruction pciRETURN = { @@ -917,8 +916,8 @@ pCodeInstruction pciRETURN = { 1,0, // branch, skip 0, // literal operand POC_NOP, - PCC_NONE, // inCond - PCC_NONE // outCond + PCC_NONE | PCC_W, // inCond, return value is possibly present in W + (PCC_NONE | PCC_C | PCC_DC | PCC_Z) // outCond, STATUS bits are irrelevant after RETURN }; pCodeInstruction pciRLF = { @@ -940,7 +939,7 @@ pCodeInstruction pciRLF = { 0, // literal operand POC_NOP, (PCC_C | PCC_REGISTER), // inCond - (PCC_REGISTER | PCC_Z | PCC_C | PCC_DC) // outCond + (PCC_REGISTER | PCC_C ) // outCond }; pCodeInstruction pciRLFW = { @@ -962,7 +961,7 @@ pCodeInstruction pciRLFW = { 0, // literal operand POC_NOP, (PCC_C | PCC_REGISTER), // inCond - (PCC_W | PCC_Z | PCC_C | PCC_DC) // outCond + (PCC_W | PCC_C) // outCond }; pCodeInstruction pciRRF = { @@ -984,7 +983,7 @@ pCodeInstruction pciRRF = { 0, // literal operand POC_NOP, (PCC_C | PCC_REGISTER), // inCond - (PCC_REGISTER | PCC_Z | PCC_C | PCC_DC) // outCond + (PCC_REGISTER | PCC_C) // outCond }; pCodeInstruction pciRRFW = { @@ -1006,7 +1005,7 @@ pCodeInstruction pciRRFW = { 0, // literal operand POC_NOP, (PCC_C | PCC_REGISTER), // inCond - (PCC_W | PCC_Z | PCC_C | PCC_DC) // outCond + (PCC_W | PCC_C) // outCond }; pCodeInstruction pciSUBWF = { @@ -1028,7 +1027,7 @@ pCodeInstruction pciSUBWF = { 0, // literal operand POC_NOP, (PCC_W | PCC_REGISTER), // inCond - (PCC_REGISTER | PCC_Z) // outCond + (PCC_REGISTER | PCC_C | PCC_DC | PCC_Z) // outCond }; pCodeInstruction pciSUBFW = { @@ -1050,7 +1049,7 @@ pCodeInstruction pciSUBFW = { 0, // literal operand POC_NOP, (PCC_W | PCC_REGISTER), // inCond - (PCC_W | PCC_Z) // outCond + (PCC_W | PCC_C | PCC_DC | PCC_Z) // outCond }; pCodeInstruction pciSUBLW = { @@ -1137,8 +1136,8 @@ pCodeInstruction pciTRIS = { 0,0, // branch, skip 0, // literal operand POC_NOP, - PCC_NONE, // inCond - PCC_REGISTER // outCond + PCC_NONE, // inCond /* FIXME: what's TRIS doing? */ + PCC_REGISTER // outCond /* FIXME: what's TRIS doing */ }; pCodeInstruction pciXORWF = { @@ -1204,7 +1203,7 @@ pCodeInstruction pciXORLW = { 1, // literal operand POC_NOP, (PCC_W | PCC_LITERAL), // inCond - (PCC_W | PCC_Z | PCC_C | PCC_DC) // outCond + (PCC_W | PCC_Z) // outCond }; @@ -1227,7 +1226,7 @@ pCodeInstruction pciBANKSEL = { 0, // literal operand POC_NOP, PCC_NONE, // inCond - PCC_REGISTER // outCond + PCC_NONE // outCond }; pCodeInstruction pciPAGESEL = { @@ -1249,7 +1248,7 @@ pCodeInstruction pciPAGESEL = { 0, // literal operand POC_NOP, PCC_NONE, // inCond - PCC_REGISTER // outCond + PCC_NONE // outCond }; pCodeInstruction *pic14Mnemonics[MAX_PIC14MNEMONICS]; @@ -1338,7 +1337,7 @@ void SAFE_snprintf(char **str, size_t *size, const char *format, ...) extern void initStack(int base_address, int size); extern regs *allocProcessorRegister(int rIdx, char * name, short po_type, int alias); -extern regs *allocInternalRegister(int rIdx, char * name, short po_type, int alias); +extern regs *allocInternalRegister(int rIdx, char * name, PIC_OPTYPE po_type, int alias); extern void init_pic(char *); void pCodeInitRegisters(void) @@ -1351,11 +1350,18 @@ void pCodeInitRegisters(void) initialized = 1; init_pic(port->processor); - shareBankAddress = 0x7f; /* FIXME - some PIC ICs like 16C7X which do not have a shared bank need a different approach. */ - if ((unsigned)shareBankAddress > getMaxRam()) /* If total RAM is less than 0x7f as with 16f84 then reduce shareBankAddress to fit */ - shareBankAddress = (int)getMaxRam(); - stkSize = 15; /* Set pseudo stack size to 15, on multi memory bank ICs this leaves room for WSAVE (used for interrupts) to fit into the shared portion of the memory bank */ - initStack(shareBankAddress, stkSize); /* Putting the pseudo stack in shared memory so all modules use the same register when passing fn parameters */ + /* FIXME - some PIC ICs like 16C7X which do not have a shared bank + * need a different approach. + * The fixed address might not be needed anyway, possibly the + * linker will assign udata_shr sections correctly... */ + shareBankAddress = pic14_getSharebankAddress(); + /* Set pseudo stack size to SHAREBANKSIZE - 3. + * On multi memory bank ICs this leaves room for WSAVE/SSAVE/PSAVE + * (used for interrupts) to fit into the shared portion of the + * memory bank */ + stkSize = pic14_getSharebankSize()-3; + /* Putting the pseudo stack in shared memory so all modules use the same register when passing fn parameters */ + initStack(shareBankAddress, stkSize); pc_status.r = allocProcessorRegister(IDX_STATUS,"STATUS", PO_STATUS, 0x180); pc_pcl.r = allocProcessorRegister(IDX_PCL,"PCL", PO_PCL, 0x80); @@ -1397,7 +1403,7 @@ void pCodeInitRegisters(void) /* */ /*-----------------------------------------------------------------*/ -int mnem2key(char const *mnem) +int mnem2key(unsigned char const *mnem) { int key = 0; @@ -1481,7 +1487,7 @@ void pic14initMnemonics(void) for(i=0; imnemonic), pic14Mnemonics[i]); + hTabAddItem(&pic14MnemonicsHash, mnem2key((unsigned char *)pic14Mnemonics[i]->mnemonic), pic14Mnemonics[i]); pci = hTabFirstItem(pic14MnemonicsHash, &key); while(pci) { @@ -1498,7 +1504,7 @@ int getpCode(char *mnem,unsigned dest) { pCodeInstruction *pci; - int key = mnem2key(mnem); + int key = mnem2key((unsigned char *)mnem); if(!mnemonics_initialized) pic14initMnemonics(); @@ -1532,7 +1538,7 @@ void pic14initpCodePeepCommands(void) i = 0; do { hTabAddItem(&pic14pCodePeepCommandsHash, - mnem2key(peepCommands[i].cmd), &peepCommands[i]); + mnem2key((unsigned char *)peepCommands[i].cmd), &peepCommands[i]); i++; } while (peepCommands[i].cmd); @@ -1554,7 +1560,7 @@ int getpCodePeepCommand(char *cmd) { peepCommand *pcmd; - int key = mnem2key(cmd); + int key = mnem2key((unsigned char *)cmd); pcmd = hTabFirstItemWK(pic14pCodePeepCommandsHash, key); @@ -1724,16 +1730,17 @@ static int RegCond(pCodeOp *pcop) char *name = pcop->name; if (!name) name = PCOR(pcop)->r->name; - // if (strcmp(name, pc_status.pcop.name) != 0) { <<< This breaks the peep 2 optimisation - switch(PCORB(pcop)->bit) { - case PIC_C_BIT: - return PCC_C; - case PIC_DC_BIT: - return PCC_DC; - case PIC_Z_BIT: - return PCC_Z; + if (strcmp(name, pc_status.pcop.name) == 0) + { + switch(PCORB(pcop)->bit) { + case PIC_C_BIT: + return PCC_C; + case PIC_DC_BIT: + return PCC_DC; + case PIC_Z_BIT: + return PCC_Z; + } } - // } } return 0; @@ -2067,7 +2074,7 @@ pCode *newpCodeAsmDir(char *asdir, char *argfmt, ...) if(asdir && *asdir) { - while(isspace(*asdir))asdir++; // strip any white space from the beginning + while(isspace((unsigned char)*asdir))asdir++; // strip any white space from the beginning pcad->directive = Safe_strdup( asdir ); } @@ -2080,7 +2087,7 @@ pCode *newpCodeAsmDir(char *asdir, char *argfmt, ...) va_end(ap); - while(isspace(*lbp))lbp++; + while(isspace((unsigned char)*lbp))lbp++; if(lbp && *lbp) pcad->arg = Safe_strdup( lbp ); @@ -2227,12 +2234,12 @@ pCodeOp *newpCodeOpLit(int lit) pcop->name = NULL; if(lit>=0) { - sprintf(s,"0x%02x",lit); + sprintf(s,"0x%02x", (unsigned char)lit); if(s) pcop->name = Safe_strdup(s); } - ((pCodeOpLit *)pcop)->lit = lit; + ((pCodeOpLit *)pcop)->lit = (unsigned char)lit; return pcop; } @@ -2793,13 +2800,53 @@ pCodeOp *pCodeOpCopy(pCodeOp *pcop) return NULL; switch(pcop->type) { + case PO_NONE: + case PO_STR: + pcopnew = Safe_calloc (1, sizeof (pCodeOp)); + memcpy (pcopnew, pcop, sizeof (pCodeOp)); + break; + + case PO_W: + case PO_STATUS: + case PO_FSR: + case PO_INDF: + case PO_INTCON: + case PO_GPR_REGISTER: + case PO_GPR_TEMP: + case PO_GPR_POINTER: + case PO_SFR_REGISTER: + case PO_PCL: + case PO_PCLATH: + case PO_DIR: + //DFPRINTF((stderr,"pCodeOpCopy GPR register\n")); + pcopnew = Safe_calloc(1,sizeof(pCodeOpReg) ); + memcpy (pcopnew, pcop, sizeof (pCodeOpReg)); + DFPRINTF((stderr," register index %d\n", PCOR(pcop)->r->rIdx)); + break; + + case PO_LITERAL: + //DFPRINTF((stderr,"pCodeOpCopy lit\n")); + pcopnew = Safe_calloc(1,sizeof(pCodeOpLit) ); + memcpy (pcopnew, pcop, sizeof (pCodeOpLit)); + break; + + case PO_IMMEDIATE: + pcopnew = Safe_calloc(1,sizeof(pCodeOpImmd) ); + memcpy (pcopnew, pcop, sizeof (pCodeOpImmd)); + break; + + case PO_GPR_BIT: case PO_CRY: case PO_BIT: //DFPRINTF((stderr,"pCodeOpCopy bit\n")); pcopnew = Safe_calloc(1,sizeof(pCodeOpRegBit) ); - PCORB(pcopnew)->bit = PCORB(pcop)->bit; - PCORB(pcopnew)->inBitSpace = PCORB(pcop)->inBitSpace; - + memcpy (pcopnew, pcop, sizeof (pCodeOpRegBit)); + break; + + case PO_LABEL: + //DFPRINTF((stderr,"pCodeOpCopy label\n")); + pcopnew = Safe_calloc(1,sizeof(pCodeOpLabel) ); + memcpy (pcopnew, pcop, sizeof(pCodeOpLabel)); break; case PO_WILD: @@ -2817,72 +2864,12 @@ pCodeOp *pCodeOpCopy(pCodeOp *pcop) return pcopnew; break; - - case PO_LABEL: - //DFPRINTF((stderr,"pCodeOpCopy label\n")); - pcopnew = Safe_calloc(1,sizeof(pCodeOpLabel) ); - PCOLAB(pcopnew)->key = PCOLAB(pcop)->key; - break; - - case PO_IMMEDIATE: - pcopnew = Safe_calloc(1,sizeof(pCodeOpImmd) ); - PCOI(pcopnew)->index = PCOI(pcop)->index; - PCOI(pcopnew)->offset = PCOI(pcop)->offset; - PCOI(pcopnew)->_const = PCOI(pcop)->_const; - PCOI(pcopnew)->_function = PCOI(pcop)->_function; - break; - - case PO_LITERAL: - //DFPRINTF((stderr,"pCodeOpCopy lit\n")); - pcopnew = Safe_calloc(1,sizeof(pCodeOpLit) ); - PCOL(pcopnew)->lit = PCOL(pcop)->lit; - break; - - case PO_GPR_BIT: - - pcopnew = newpCodeOpBit(pcop->name, PCORB(pcop)->bit,PCORB(pcop)->inBitSpace); - PCOR(pcopnew)->r = PCOR(pcop)->r; - PCOR(pcopnew)->rIdx = PCOR(pcop)->rIdx; - DFPRINTF((stderr," pCodeOpCopy Bit -register index\n")); - return pcopnew; - break; - - case PO_GPR_POINTER: - case PO_GPR_REGISTER: - case PO_GPR_TEMP: - case PO_FSR: - case PO_INDF: - //DFPRINTF((stderr,"pCodeOpCopy GPR register\n")); - pcopnew = Safe_calloc(1,sizeof(pCodeOpReg) ); - PCOR(pcopnew)->r = PCOR(pcop)->r; - PCOR(pcopnew)->rIdx = PCOR(pcop)->rIdx; - PCOR(pcopnew)->instance = PCOR(pcop)->instance; - DFPRINTF((stderr," register index %d\n", PCOR(pcop)->r->rIdx)); - break; - - case PO_DIR: - //fprintf(stderr,"pCodeOpCopy PO_DIR\n"); - pcopnew = Safe_calloc(1,sizeof(pCodeOpReg) ); - PCOR(pcopnew)->r = PCOR(pcop)->r; - PCOR(pcopnew)->rIdx = PCOR(pcop)->rIdx; - PCOR(pcopnew)->instance = PCOR(pcop)->instance; + + default: + assert ( !"unhandled pCodeOp type copied" ); break; - case PO_STATUS: - DFPRINTF((stderr,"pCodeOpCopy PO_STATUS\n")); - case PO_SFR_REGISTER: - case PO_STR: - case PO_NONE: - case PO_W: - case PO_INTCON: - case PO_PCL: - case PO_PCLATH: - - //DFPRINTF((stderr,"pCodeOpCopy register type %d\n", pcop->type)); - pcopnew = Safe_calloc(1,sizeof(pCodeOp) ); - - } + } // switch - pcopnew->type = pcop->type; if(pcop->name) pcopnew->name = Safe_strdup(pcop->name); else @@ -3032,7 +3019,7 @@ char *get_op(pCodeOp *pcop,char *buffer, size_t size) } else SAFE_snprintf(&s,&size,"LOW (%s+%d)",pcop->name,PCOI(pcop)->index); } else { - if( !PCOI(pcop)->offset) { // && PCOI(pcc->pcop)->offset<4) { + if( !PCOI(pcop)->offset) { // && PCOI(pcc->pcop)->offset<4) SAFE_snprintf(&s,&size,"(%s + %d)", pcop->name, PCOI(pcop)->index); @@ -3076,7 +3063,7 @@ char *get_op(pCodeOp *pcop,char *buffer, size_t size) SAFE_snprintf(&s,&size,"%s",pcop->name); } return buffer; - + case PO_GPR_BIT: if(PCOR(pcop)->r) { if(use_buffer) { @@ -3098,9 +3085,8 @@ char *get_op(pCodeOp *pcop,char *buffer, size_t size) } } - printf("PIC port internal warning: (%s:%d) %s not found\n", - __FUNCTION__, - __LINE__, + printf("PIC port internal warning: (%s:%d(%s)) %s not found\n", + __FILE__, __LINE__, __FUNCTION__, pCodeOpType(pcop)); return "NO operand"; @@ -3194,7 +3180,8 @@ char *pCode2str(char *str, size_t size, pCode *pc) SAFE_snprintf(&s,&size,";\t--FLOW change\n"); break; case PC_CSOURCE: - SAFE_snprintf(&s,&size,";#CSRC\t%s %d\n; %s\n", PCCS(pc)->file_name, PCCS(pc)->line_number, PCCS(pc)->line); +// SAFE_snprintf(&s,&size,";#CSRC\t%s %d\n; %s\n", PCCS(pc)->file_name, PCCS(pc)->line_number, PCCS(pc)->line); + SAFE_snprintf(&s,&size,"%s\t.line\t%d; \"%s\"\t%s\n",(options.debug?"":";"),PCCS(pc)->line_number, PCCS(pc)->file_name, PCCS(pc)->line); break; case PC_ASMDIR: if(PCAD(pc)->directive) { @@ -3252,7 +3239,7 @@ static void genericPrint(FILE *of, pCode *pc) /* Debug */ if(debug_verbose) { pCodeOpReg *pcor = PCOR(pci->pcop); - fprintf(of, "\t;id=%u,key=%03x",pc->id,pc->seq); + fprintf(of, "\t;id=%u,key=%03x,inCond:%x,outCond:%x",pc->id,pc->seq, pci->inCond, pci->outCond); if(pci->pcflow) fprintf(of,",flow seq=%03x",pci->pcflow->pc.seq); if (pcor && pcor->pcop.type==PO_GPR_TEMP && !pcor->r->isFixed) @@ -3304,11 +3291,29 @@ static void genericPrint(FILE *of, pCode *pc) if(PCFL(pc)->ancestor) fprintf(of," ancestor = 0x%x", PCODE(PCFL(pc)->ancestor)->seq); fprintf(of,"\n"); + fprintf(of,"; from: "); + { + pCodeFlowLink *link; + for (link = setFirstItem(PCFL(pc)->from); link; link = setNextItem (PCFL(pc)->from)) + { + fprintf(of,"%03x ",link->pcflow->pc.seq); + } + } + fprintf(of,"; to: "); + { + pCodeFlowLink *link; + for (link = setFirstItem(PCFL(pc)->to); link; link = setNextItem (PCFL(pc)->to)) + { + fprintf(of,"%03x ",link->pcflow->pc.seq); + } + } + fprintf(of,"\n"); } break; case PC_CSOURCE: - fprintf(of,";#CSRC\t%s %d\n; %s\n", PCCS(pc)->file_name, PCCS(pc)->line_number, PCCS(pc)->line); +// fprintf(of,";#CSRC\t%s %d\n; %s\n", PCCS(pc)->file_name, PCCS(pc)->line_number, PCCS(pc)->line); + fprintf(of,"%s\t.line\t%d; \"%s\"\t%s\n", (options.debug?"":";"), PCCS(pc)->line_number, PCCS(pc)->file_name, PCCS(pc)->line); break; case PC_ASMDIR: @@ -3819,34 +3824,33 @@ regs * getRegFromInstruction(pCode *pc) return NULL; switch(PCI(pc)->pcop->type) { - case PO_INDF: + case PO_STATUS: case PO_FSR: - return PCOR(PCI(pc)->pcop)->r; - + case PO_INDF: + case PO_INTCON: case PO_BIT: case PO_GPR_TEMP: + case PO_SFR_REGISTER: + case PO_PCL: + case PO_PCLATH: return PCOR(PCI(pc)->pcop)->r; - - case PO_IMMEDIATE: - r = PCOI(PCI(pc)->pcop)->r; - if (r) - return r; - return dirregWithName(PCI(pc)->pcop->name); - + + case PO_GPR_REGISTER: case PO_GPR_BIT: + case PO_DIR: r = PCOR(PCI(pc)->pcop)->r; if (r) return r; return dirregWithName(PCI(pc)->pcop->name); - case PO_GPR_REGISTER: - case PO_DIR: - r = PCOR(PCI(pc)->pcop)->r; + case PO_LITERAL: + break; + + case PO_IMMEDIATE: + r = PCOI(PCI(pc)->pcop)->r; if (r) return r; return dirregWithName(PCI(pc)->pcop->name); - case PO_LITERAL: - break; default: break; @@ -3972,14 +3976,38 @@ void BuildFlow(pBlock *pb) PCI(pc)->pcflow = PCFL(pflow); //fprintf(stderr," build: "); + //pc->print(stderr, pc); //pflow->print(stderr,pflow); - if( PCI(pc)->isSkip) { + if (checkLabel(pc)) { + + /* This instruction marks the beginning of a + * new flow segment */ + + pc->seq = 0; + seq = 1; + + /* If the previous pCode is not a flow object, then + * insert a new flow object. (This check prevents + * two consecutive flow objects from being insert in + * the case where a skip instruction preceeds an + * instruction containing a label.) */ + + last_pci = findPrevInstruction (pc->prev); + + if(last_pci && (PCI(last_pci)->pcflow == PCFL(pflow))) + InsertpFlow(last_pci, &pflow); + + PCI(pc)->pcflow = PCFL(pflow); + + } + + if(isPCI_SKIP(pc)) { /* The two instructions immediately following this one * mark the beginning of a new flow segment */ - while(pc && PCI(pc)->isSkip) { + while(pc && isPCI_SKIP(pc)) { PCI(pc)->pcflow = PCFL(pflow); pc->seq = seq-1; @@ -3998,31 +4026,13 @@ void BuildFlow(pBlock *pb) pc->seq = 0; InsertpFlow(pc, &pflow); - } else if ( PCI(pc)->isBranch && !checkLabel(findNextInstruction(pc->next))) { + } else if ( isPCI_BRANCH(pc) && !checkLabel(findNextInstruction(pc->next))) { InsertpFlow(pc, &pflow); seq = 0; - } else if (checkLabel(pc)) { - - /* This instruction marks the beginning of a - * new flow segment */ - - pc->seq = 0; - seq = 1; - - /* If the previous pCode is not a flow object, then - * insert a new flow object. (This check prevents - * two consecutive flow objects from being insert in - * the case where a skip instruction preceeds an - * instruction containing a label.) */ - - if(last_pci && (PCI(last_pci)->pcflow == PCFL(pflow))) - InsertpFlow(findPrevInstruction(pc->prev), &pflow); - - PCI(pc)->pcflow = PCFL(pflow); - } + last_pci = pc; pc = pc->next; } @@ -4241,7 +4251,17 @@ static void FillFlow(pCodeFlow *pcflow) void LinkFlow_pCode(pCodeInstruction *from, pCodeInstruction *to) { pCodeFlowLink *fromLink, *toLink; - +#if 0 + fprintf(stderr, "%s: linking ", __FUNCTION__ ); + if (from) from->pc.print(stderr, &from->pc); + else fprintf(stderr, "(null)"); + fprintf(stderr, " -(%u)-> with -(%u)-> ", + from && from->pcflow ? from->pcflow->pc.seq : 0, + to && to->pcflow ? to->pcflow->pc.seq : 0); + if (to) to->pc.print(stderr, &to->pc); + else fprintf(stderr, "(null)"); +#endif + if(!from || !to || !to->pcflow || !from->pcflow) return; @@ -4282,9 +4302,16 @@ void LinkFlow(pBlock *pb) //FillFlow(PCFL(pcflow)); - pc = PCFL(pcflow)->end; + /* find last instruction in flow */ + pc = findPrevInstruction (PCFL(pcflow)->end); + if (!pc) { + fprintf(stderr, "%s: flow without end (%u)?\n", + __FUNCTION__, pcflow->seq ); + continue; + } //fprintf(stderr, "LinkFlow - flow block (seq=%d) ", pcflow->seq); + //pc->print(stderr, pc); if(isPCI_SKIP(pc)) { //fprintf(stderr, "ends with skip\n"); //pc->print(stderr,pc); @@ -4300,23 +4327,27 @@ void LinkFlow(pBlock *pb) //fprintf(stderr, "ends with branch\n "); //pc->print(stderr,pc); - + if(!(pcol && isPCOLAB(pcol))) { - if((PCI(pc)->op != POC_RETLW) && (PCI(pc)->op != POC_RETURN) && (PCI(pc)->op != POC_CALL) && (PCI(pc)->op != POC_RETFIE) ) { + if((PCI(pc)->op != POC_RETLW) + && (PCI(pc)->op != POC_RETURN) + && (PCI(pc)->op != POC_CALL) + && (PCI(pc)->op != POC_RETFIE) ) + { pc->print(stderr,pc); fprintf(stderr, "ERROR: %s, branch instruction doesn't have label\n",__FUNCTION__); } - continue; - } - - if( (pct = findLabelinpBlock(pb,pcol)) != NULL) - LinkFlow_pCode(PCI(pc),PCI(pct)); - else - fprintf(stderr, "ERROR: %s, couldn't find label. key=%d,lab=%s\n", - __FUNCTION__,pcol->key,((PCOP(pcol)->name)?PCOP(pcol)->name:"-")); - //fprintf(stderr,"newpCodeOpLabel: key=%d, name=%s\n",key,((s)?s:"")); + } else { - continue; + if( (pct = findLabelinpBlock(pb,pcol)) != NULL) + LinkFlow_pCode(PCI(pc),PCI(pct)); + else + fprintf(stderr, "ERROR: %s, couldn't find label. key=%d,lab=%s\n", + __FUNCTION__,pcol->key,((PCOP(pcol)->name)?PCOP(pcol)->name:"-")); + //fprintf(stderr,"newpCodeOpLabel: key=%d, name=%s\n",key,((s)?s:"")); + } + /* link CALLs to next instruction */ + if (PCI(pc)->op != POC_CALL) continue; } if(isPCI(pc)) { @@ -4334,7 +4365,7 @@ void LinkFlow(pBlock *pb) continue; } - //fprintf(stderr, "ends with nothing: ERROR\n"); + fprintf(stderr, "ends with nothing: ERROR\n"); } } @@ -4446,11 +4477,32 @@ static void BanksUsedFlow(pBlock *pb) } */ +void pCodeReplace (pCode *old, pCode *new) +{ + pCodeInsertAfter (old, new); + + /* special handling for pCodeInstructions */ + if (isPCI(new) && isPCI(old)) + { + assert (!PCI(new)->from && !PCI(new)->to && !PCI(new)->label && /*!PCI(new)->pcflow && */!PCI(new)->cline); + PCI(new)->from = PCI(old)->from; + PCI(new)->to = PCI(old)->to; + PCI(new)->label = PCI(old)->label; + PCI(new)->pcflow = PCI(old)->pcflow; + PCI(new)->cline = PCI(old)->cline; + } // if + + old->destruct (old); +} + /*-----------------------------------------------------------------*/ /* Inserts a new pCodeInstruction before an existing one */ /*-----------------------------------------------------------------*/ static void insertPCodeInstruction(pCodeInstruction *pci, pCodeInstruction *new_pci) { + pCode *pcprev; + + pcprev = findPrevInstruction(pci->pc.prev); pCodeInsertAfter(pci->pc.prev, &new_pci->pc); @@ -4470,11 +4522,26 @@ static void insertPCodeInstruction(pCodeInstruction *pci, pCodeInstruction *new_ /* The new instruction has the same pcflow block */ new_pci->pcflow = pci->pcflow; - + + /* Arrrrg: is pci's previous instruction is a skip, we need to + * change that into a jump (over pci and the new instruction) ... */ + if (pcprev && isPCI_SKIP(pcprev)) + { + symbol *lbl = newiTempLabel (NULL); + pCode *label = newpCodeLabel (NULL, lbl->key); + pCode *jump = newpCode(POC_GOTO, newpCodeOpLabel(NULL, lbl->key)); + + pCodeInsertAfter (pcprev, jump); + + pCodeReplace (pcprev, pCodeInstructionCopy (PCI(pcprev), 1)); + pcprev = NULL; + pCodeInsertAfter((pCode*)pci, label); + } } /*-----------------------------------------------------------------*/ /*-----------------------------------------------------------------*/ +#if 0 static void insertBankSwitch(pCodeInstruction *pci, int Set_Clear, int RP_BankBit) { pCode *new_pc; @@ -4483,14 +4550,19 @@ static void insertBankSwitch(pCodeInstruction *pci, int Set_Clear, int RP_BankBi insertPCodeInstruction(pci, PCI(new_pc)); } - +#endif /*-----------------------------------------------------------------*/ /*-----------------------------------------------------------------*/ static void insertBankSel(pCodeInstruction *pci, const char *name) { pCode *new_pc; - pCodeOp *pcop = popCopyReg(PCOR(pci->pcop)); + pCodeOp *pcop; + + // This is a NOP for single-banked devices. + if (pic14_getMaxRam() < 0x80) return; + + pcop = popCopyReg(PCOR(pci->pcop)); pcop->type = PO_GPR_REGISTER; // Sometimes the type is set to legacy 8051 - so override it if (pcop->name == 0) pcop->name = strdup(name); @@ -4509,9 +4581,15 @@ static void insertBankSel(pCodeInstruction *pci, const char *name) /* Therefore banksel is only called for external registers or the */ /* first time a local register is encountered. */ /*-----------------------------------------------------------------*/ -static int LastRegIdx; /* If the previous register is the same one again then no need to change bank. */ +static int LastRegIdx = -1; /* If the previous register is the same one again then no need to change bank. */ static int BankSelect(pCodeInstruction *pci, int cur_bank, regs *reg) { +#if 1 + /* Always insert BANKSELs rather than try to be clever: + * Too many bugs in optimized banksels... */ + insertBankSel(pci, reg->name); // Let linker choose the bank selection + return 'L'; +#else int bank; int a = reg->alias>>7; if ((a&3) == 3) { @@ -4536,6 +4614,8 @@ static int BankSelect(pCodeInstruction *pci, int cur_bank, regs *reg) LastRegIdx = reg->rIdx; #endif + /* Optimized code---unfortunately this turns out to be buggy + * (at least on devices with more than two banks). */ if (reg->isFixed) { bank = REG_BANK(reg); } else if (reg->isExtern) { @@ -4543,15 +4623,11 @@ static int BankSelect(pCodeInstruction *pci, int cur_bank, regs *reg) } else { bank = 'L'; // Unfixed local registers are allocated by the linker therefore its bank is unknown } - if ((cur_bank == 'L')&&(bank == 'L')) { // If current bank and new bank are both allocated locally by the linker, then assume it is in same bank. - return 'L'; // Local registers are presumed to be in same linker assigned bank - } else if ((bank == 'L')&&(cur_bank != 'L')) { // Reg is now local and linker to assign bank - insertBankSel(pci, reg->name); // Let linker choose the bank selection - } else if (bank == 'E') { // Reg is now extern and linker to assign bank + if (bank == 'E' || bank == 'L') { // Reg is now extern and linker to assign bank insertBankSel(pci, reg->name); // Let linker choose the bank selection } else if ((cur_bank == -1)||(cur_bank == 'L')||(cur_bank == 'E')) { // Current bank unknown and new register bank is known then can set bank bits insertBankSwitch(pci, bank&1, PIC_RP0_BIT); - if (getMaxRam()&0x100) + if (pic14_getMaxRam()&0x100) insertBankSwitch(pci, bank&2, PIC_RP1_BIT); } else { // Current bank and new register banks known - can set bank bits switch((cur_bank^bank) & 3) { @@ -4565,13 +4641,14 @@ static int BankSelect(pCodeInstruction *pci, int cur_bank, regs *reg) break; case 3: insertBankSwitch(pci, bank&1, PIC_RP0_BIT); - if (getMaxRam()&0x100) + if (pic14_getMaxRam()&0x100) insertBankSwitch(pci, bank&2, PIC_RP1_BIT); break; } } return bank; +#endif } /*-----------------------------------------------------------------*/ @@ -4678,6 +4755,11 @@ static int DoBankSelect(pCode *pc, int cur_bank) { } reg = getRegFromInstruction(pc); + if (!reg && isPCI(pc) && + ((PCI(pc)->inCond | PCI(pc)->outCond) & PCC_REGISTER)) + { + assert(!"Could not get register from instruction."); + } if (reg) { if (IsBankChange(pc,reg,&cur_bank)) return cur_bank; @@ -4687,11 +4769,12 @@ static int DoBankSelect(pCode *pc, int cur_bank) { * not a skip type instruction */ pcprev = findPrevpCode(pc->prev, PC_OPCODE); - if(!pcprev || (pcprev && !isPCI_SKIP(pcprev))) { + /* This approach does not honor the presence of labels at this instruction... */ + //if(!pcprev || (pcprev && !isPCI_SKIP(pcprev))) { cur_bank = BankSelect(PCI(pc),cur_bank,reg); - } else { - cur_bank = BankSelect(PCI(pcprev),cur_bank,reg); - } + //} else { + // cur_bank = BankSelect(PCI(pcprev),cur_bank,reg); + //} if (!PCI(pc)->pcflow) fprintf(stderr,"PCI ID=%d missing flow pointer ???\n",pc->id); else @@ -4993,7 +5076,7 @@ int OptimizepBlock(pBlock *pb) pCode *pc, *pcprev; int matches =0; - if(!pb || !peepOptimizing) + if(!pb || options.nopeep) return 0; DFPRINTF((stderr," Optimizing pBlock: %c\n",getpBlock_dbName(pb))); @@ -5506,8 +5589,7 @@ void AnalyzeFlow(int level) OptimizepCode('*'); - - /* + /* for(pb = the_pFile->pbHead; pb; pb = pb->next) DumpFlow(pb); */ @@ -5545,11 +5627,14 @@ void AnalyzeFlow(int level) void AnalyzeBanking(void) { pBlock *pb; - + if(!picIsInitialized()) { - setDefMaxRam(); // Max RAM has not been included, so use default setting + werror(E_FILE_OPEN_ERR, "no memory size is known for this processor"); + exit(1); } + if (!the_pFile) return; + /* Phase x - Flow Analysis - Used Banks * * In this phase, the individual flow blocks are examined @@ -5585,7 +5670,9 @@ DEFSETFUNC (resetrIdx) void InitReuseReg(void) { /* Find end of statically allocated variables for start idx */ - unsigned maxIdx = 0x20; /* Start from begining of GPR. Note may not be 0x20 on some PICs */ + /* Start from begining of GPR. Note may not be 0x20 on some PICs */ + /* XXX: Avoid clashes with fixed registers, start late. */ + unsigned maxIdx = 0x1000; regs *r; for (r = setFirstItem(dynDirectRegs); r; r = setNextItem(dynDirectRegs)) { if (r->type != REG_SFR) { @@ -5669,6 +5756,7 @@ static unsigned register_reassign(pBlock *pb, unsigned idx) void ReuseReg(void) { pBlock *pb; + if (!the_pFile) return; InitReuseReg(); for(pb = the_pFile->pbHead; pb; pb = pb->next) { /* Non static functions can be called from other modules so their registers must reassign */ @@ -5797,7 +5885,7 @@ void AnalyzepCode(char dbName) pBlockMergeLabels(pb); AnalyzepBlock(pb); } else { - DFPRINTF((stderr," skipping block analysis dbName=%c blockname=%c\n",dbName,getpBlock_dbName)); + DFPRINTF((stderr," skipping block analysis dbName=%c blockname=%c\n",dbName,getpBlock_dbName(pb))); } }