* configure.in, configure: have device/lib/pic configured

[fw/sdcc] / src / pic / pcode.c

diff --git a/src/pic/pcode.c b/src/pic/pcode.c
index f2783431ed262243bd2cf396b457a72f273a82b6..40d2e50ee7cb5dfd994c233344670613302dbc71 100644 (file)
--- a/src/pic/pcode.c
+++ b/src/pic/pcode.c
@@ -1397,7 +1397,7 @@ void  pCodeInitRegisters(void)
 /*                                                                 */
 /*-----------------------------------------------------------------*/
 
-int mnem2key(char const *mnem)
+int mnem2key(unsigned char const *mnem)
 {
        int key = 0;
        
@@ -2067,7 +2067,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 +2080,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 );
@@ -2793,13 +2793,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 +2857,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
@@ -3194,7 +3174,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) {
@@ -3308,7 +3289,8 @@ static void genericPrint(FILE *of, pCode *pc)
     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: