X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fpic16%2Fpcode.c;h=9cb878feae768e03fe634fe363563249122bfa45;hb=3062f96ccb55d1d05caf9c8782f4961f87b341ce;hp=84947452baa7e0018c4191d85b649f05e9bebe15;hpb=1b6bfcdfbcf663c2558de8c37f2bc43538fb84ea;p=fw%2Fsdcc diff --git a/src/pic16/pcode.c b/src/pic16/pcode.c index 84947452..9cb878fe 100644 --- a/src/pic16/pcode.c +++ b/src/pic16/pcode.c @@ -35,10 +35,7 @@ extern char *pic16_aopGet (struct asmop *aop, int offset, bool bit16, bool dname); #if defined(__BORLANDC__) || defined(_MSC_VER) -#define STRCASECMP stricmp #define inline -#else -#define STRCASECMP strcasecmp #endif #define DUMP_DF_GRAPHS 0 @@ -4286,7 +4283,7 @@ pCodeOp *pic16_newpCodeOpReg(int rIdx) if(!r) { fprintf(stderr, "%s:%d Could not find a free GPR register\n", __FUNCTION__, __LINE__); - exit(-1); + exit(EXIT_FAILURE); } } @@ -4959,7 +4956,7 @@ char *pic16_pCode2str(char *str, size_t size, pCode *pc) if(isPCI(pc) && (PCI(pc)->pci_magic != PCI_MAGIC)) { fprintf(stderr, "%s:%d: pCodeInstruction initialization error in instruction %s, magic is %x (defaut: %x)\n", __FILE__, __LINE__, PCI(pc)->mnemonic, PCI(pc)->pci_magic, PCI_MAGIC); -// exit(-1); +// exit(EXIT_FAILURE); } #endif @@ -5022,7 +5019,7 @@ char *pic16_pCode2str(char *str, size_t size, pCode *pc) r = pic16_getRegFromInstruction(pc); // fprintf(stderr, "%s:%d reg = %p\tname= %s, accessBank= %d\n", -// __FUNCTION__, __LINE__, r, (r)?r->name:"", (r)?r->accessBank:-1); +// __FUNCTION__, __LINE__, r, (r)?r->name:"", (r)?isACCESS_BANK(r):-1); if(PCI(pc)->isAccess) { static char *bank_spec[2][2] = { @@ -5030,7 +5027,7 @@ char *pic16_pCode2str(char *str, size_t size, pCode *pc) { ", B", ", BANKED" }/* MPASM (should) use BANKED by default */ }; - SAFE_snprintf(&s,&size,"%s", bank_spec[(r && !r->accessBank) ? 1 : 0][pic16_mplab_comp ? 1 : 0]); + SAFE_snprintf(&s,&size,"%s", bank_spec[(r && !isACCESS_BANK(r)) ? 1 : 0][pic16_mplab_comp ? 1 : 0]); } } //