PIC PORT - &, |, ^

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@515 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/src/pic/gen.c b/src/pic/gen.c
index 6ce86d5575dea3ec717d6aff6aef378e18d1ac86..941990611bc30764eee388967daf2ee3abfe966b 100644 (file)
--- a/src/pic/gen.c
+++ b/src/pic/gen.c
@@ -895,10 +895,11 @@ static char *aopGet (asmop *aop, int offset, bool bit16, bool dname)
       return "bit";
        
     case AOP_ACC:
-        DEBUGemitcode(";","%d",__LINE__);
-       if (!offset && dname)
-           return "acc";
-       return aop->aopu.aop_str[offset];
+        DEBUGemitcode(";Warning -pic port ignoring get(AOP_ACC)","%d",__LINE__);
+       //if (!offset && dname)
+       //    return "acc";
+       //return aop->aopu.aop_str[offset];
+       return "AOP_accumulator_bug";
 
     case AOP_LIT:
         DEBUGemitcode(";","%d",__LINE__);
@@ -1281,7 +1282,10 @@ static void toBoolean(operand *oper)
     int offset = 1;
 
     DEBUGemitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    emitcode("movf","%s,w",aopGet(AOP(oper),0,FALSE,FALSE));
+
+    if ( AOP_TYPE(oper) != AOP_ACC)
+      emitcode("movf","%s,w",aopGet(AOP(oper),0,FALSE,FALSE));
+
     while (size--) 
         emitcode("iorwf","%s,w",aopGet(AOP(oper),offset++,FALSE,FALSE));
 }
@@ -3543,7 +3547,7 @@ static void genSkip(iCode *ifx,int status_bit)
 }
 
 /*-----------------------------------------------------------------*/
-/* genSkip                                                         */
+/* genSkipc                                                        */
 /*-----------------------------------------------------------------*/
 static void genSkipc(iCode *ifx, int condition)
 {
@@ -3562,6 +3566,25 @@ static void genSkipc(iCode *ifx, int condition)
 
 }
 
+/*-----------------------------------------------------------------*/
+/* genSkipz                                                        */
+/*-----------------------------------------------------------------*/
+static void genSkipz(iCode *ifx, int condition)
+{
+  if(!ifx)
+    return;
+
+  if(condition)
+    emitcode("skpnz","");
+  else
+    emitcode("skpz","");
+
+  if ( IC_TRUE(ifx) )
+    emitcode("goto","_%05d_DS_",IC_TRUE(ifx)->key+100+labelOffset);
+  else
+    emitcode("goto","_%05d_DS_",IC_FALSE(ifx)->key+100+labelOffset);
+
+}
 /*-----------------------------------------------------------------*/
 /* genCmp :- greater or less than comparison                       */
 /*-----------------------------------------------------------------*/
@@ -3569,7 +3592,7 @@ static void genCmp (operand *left,operand *right,
                     operand *result, iCode *ifx, int sign)
 {
   int size, offset = 0 ;
-  unsigned long lit = 0L;
+  unsigned long lit = 0L,i = 0;
 
   DEBUGemitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
   /* if left & right are bit variables */
@@ -3601,9 +3624,16 @@ static void genCmp (operand *left,operand *right,
        lit = (unsigned long)floatFromVal(AOP(right)->aopu.aop_lit);
        //default:
        while(size--) {
-         emitcode("movlw","0x%x",(lit >> (size*8)) & 0xff);
-         emitcode("subwf","%s,w",aopGet(AOP(left),size,FALSE,FALSE));
-         genSkipc(ifx,IC_TRUE(ifx) == NULL);
+         i = (lit >> (size*8)) & 0xff;
+         if(i == 0) {
+           emitcode("movf","%s,w",aopGet(AOP(left),size,FALSE,FALSE));
+           genSkipz(ifx,IC_TRUE(ifx) == NULL);
+         } else {
+           emitcode("movlw","0x%x",i);
+           emitcode("subwf","%s,w",aopGet(AOP(left),size,FALSE,FALSE));
+           genSkipc(ifx,IC_TRUE(ifx) == NULL);
+         }
+
        }
        ifx->generated = 1;
        return;
@@ -3616,9 +3646,19 @@ static void genCmp (operand *left,operand *right,
 
        //default:
        while(size--) {
-         emitcode("movlw","0x%x",(lit >> (size*8)) & 0xff);
-         emitcode("subwf","%s,w",aopGet(AOP(right),size,FALSE,FALSE));
-         genSkipc(ifx,IC_TRUE(ifx) != NULL);
+         i = (lit >> (size*8)) & 0xff;
+         if(i == 0) {
+           emitcode("movf","%s,w",aopGet(AOP(right),size,FALSE,FALSE));
+           genSkipz(ifx,IC_TRUE(ifx) != NULL);
+         } else if( i == 1 ) {
+           emitcode("decf","%s,w",aopGet(AOP(right),size,FALSE,FALSE));
+           genSkipz(ifx,IC_TRUE(ifx) != NULL);
+
+         } else {
+           emitcode("movlw","0x%x",i);
+           emitcode("subwf","%s,w",aopGet(AOP(right),size,FALSE,FALSE));
+           genSkipc(ifx,IC_TRUE(ifx) != NULL);
+         }
        }
        ifx->generated = 1;
        return;
@@ -4159,6 +4199,11 @@ static void genAndOp (iCode *ic)
 /*-----------------------------------------------------------------*/
 /* genOrOp - for || operation                                      */
 /*-----------------------------------------------------------------*/
+/*
+  tsd pic port -
+  modified this code, but it doesn't appear to ever get called
+*/
+
 static void genOrOp (iCode *ic)
 {
     operand *left,*right, *result;
@@ -4175,15 +4220,23 @@ static void genOrOp (iCode *ic)
     /* if both are bit variables */
     if (AOP_TYPE(left) == AOP_CRY &&
         AOP_TYPE(right) == AOP_CRY ) {
-        emitcode("mov","c,%s",AOP(left)->aopu.aop_dir);
-        emitcode("orl","c,%s",AOP(right)->aopu.aop_dir);
-        outBitC(result);
+      emitcode("clrc","");
+      emitcode("btfss","(%s >> 3), (%s & 7)",
+              AOP(left)->aopu.aop_dir,
+              AOP(left)->aopu.aop_dir);
+      emitcode("btfsc","(%s >> 3), (%s & 7)",
+              AOP(right)->aopu.aop_dir,
+              AOP(right)->aopu.aop_dir);
+      emitcode("setc","");
+
     } else {
         tlbl = newiTempLabel(NULL);
         toBoolean(left);
-        emitcode("jnz","%05d_DS_",tlbl->key+100);
+       emitcode("skpz","");
+        emitcode("goto","%05d_DS_",tlbl->key+100);
         toBoolean(right);
         emitcode("","%05d_DS_:",tlbl->key+100);
+
         outBitAcc(result);
     }
 
@@ -4412,37 +4465,40 @@ static void genAnd (iCode *ic, iCode *ifx)
 
     /* if left is same as result */
     if(sameRegs(AOP(result),AOP(left))){
-        for(;size--; offset++) {
-            if(AOP_TYPE(right) == AOP_LIT){
-                if((bytelit = (int)((lit >> (offset*8)) & 0x0FFL)) == 0x0FF)
-                    continue;
-                else 
-                   if (bytelit == 0)
-                       aopPut(AOP(result),zero,offset);
-                   else 
-                       if (IS_AOP_PREG(result)) {
-                           MOVA(aopGet(AOP(right),offset,FALSE,FALSE));
-                           emitcode("anl","a,%s",aopGet(AOP(left),offset,FALSE,TRUE));
-                           aopPut(AOP(result),"a",offset);
-                       } else
-                           emitcode("anl","%s,%s",
-                                    aopGet(AOP(left),offset,FALSE,TRUE),
-                                    aopGet(AOP(right),offset,FALSE,FALSE));
-            } else {
-               if (AOP_TYPE(left) == AOP_ACC)
-                   emitcode("anl","a,%s",aopGet(AOP(right),offset,FALSE,FALSE));
-               else {
-                   MOVA(aopGet(AOP(right),offset,FALSE,FALSE));
-                   if (IS_AOP_PREG(result)) {
-                       emitcode("anl","a,%s",aopGet(AOP(left),offset,FALSE,TRUE));
-                       aopPut(AOP(result),"a",offset);
+      for(;size--; offset++,lit>>=8) {
+       if(AOP_TYPE(right) == AOP_LIT){
+         switch(lit & 0xff) {
+         case 0x00:
+           /*  and'ing with 0 has clears the result */
+           emitcode("clrf","%s",aopGet(AOP(result),offset,FALSE,FALSE));
+           break;
+         case 0xff:
+           emitcode("movf","%s,w",aopGet(AOP(right),offset,FALSE,FALSE));
+           break;
+
+         default:
+           {
+             int p = my_powof2( (~lit) & 0xff );
+             if(p>=0) {
+               /* only one bit is set in the literal, so use a bcf instruction */
+               emitcode("bcf","%s,%d",aopGet(AOP(left),offset,FALSE,TRUE),p);
+             } else {
+               emitcode("movlw","0x%x", (lit & 0xff));
+               emitcode("andwf","%s,f",aopGet(AOP(left),offset,FALSE,TRUE),p);
+             }
+           }    
+         }
+       } else {
+         if (AOP_TYPE(left) == AOP_ACC) 
+           emitcode("iorwf","%s,w",aopGet(AOP(right),offset,FALSE,FALSE));
+         else {                    
+           emitcode("movf","%s,w",aopGet(AOP(right),offset,FALSE,FALSE));
+           emitcode("iorwf","%s,f",aopGet(AOP(left),offset,FALSE,FALSE));
+
+         }
+       }
+      }
 
-                   } else
-                       emitcode("anl","%s,a",
-                                aopGet(AOP(left),offset,FALSE,TRUE));
-               }
-            }
-        }
     } else {
         // left & result in different registers
         if(AOP_TYPE(result) == AOP_CRY){
@@ -4467,31 +4523,42 @@ static void genAnd (iCode *ic, iCode *ifx)
             } else if(ifx)
                 jmpTrueOrFalse(ifx, tlbl);
         } else {
-           for(;(size--);offset++) {
-               // normal case
-               // result = left & right
-               if(AOP_TYPE(right) == AOP_LIT){
-                   if((bytelit = (int)((lit >> (offset*8)) & 0x0FFL)) == 0x0FF){
-                       aopPut(AOP(result),
-                              aopGet(AOP(left),offset,FALSE,FALSE),
-                              offset);
-                       continue;
-                   } else if(bytelit == 0){
-                       aopPut(AOP(result),zero,offset);
-                       continue;
-                   }
-               }
-               // faster than result <- left, anl result,right
-               // and better if result is SFR
-               if (AOP_TYPE(left) == AOP_ACC) 
-                   emitcode("anl","a,%s",aopGet(AOP(right),offset,FALSE,FALSE));
-               else {
-                   MOVA(aopGet(AOP(right),offset,FALSE,FALSE));
-                   emitcode("anl","a,%s",
-                            aopGet(AOP(left),offset,FALSE,FALSE));
-               }
-               aopPut(AOP(result),"a",offset);
+         for(;(size--);offset++) {
+           // normal case
+           // result = left & right
+           if(AOP_TYPE(right) == AOP_LIT){
+             int t = (lit >> (offset*8)) & 0x0FFL;
+             switch(t) { 
+             case 0x00:
+               emitcode("clrf","%s",
+                        aopGet(AOP(result),offset,FALSE,FALSE));
+               break;
+             case 0xff:
+               emitcode("movf","%s,w",
+                        aopGet(AOP(left),offset,FALSE,FALSE));
+               emitcode("movwf","%s",
+                        aopGet(AOP(result),offset,FALSE,FALSE));
+               break;
+             default:
+               emitcode("movlw","0x%x",t);
+               emitcode("andwf","%s,w",
+                        aopGet(AOP(left),offset,FALSE,FALSE));
+               emitcode("movwf","%s",
+                        aopGet(AOP(result),offset,FALSE,FALSE));
+             
+             }
+             continue;
            }
+
+           if (AOP_TYPE(left) == AOP_ACC) 
+             emitcode("andwf","%s,w",aopGet(AOP(right),offset,FALSE,FALSE));
+           else {
+             emitcode("movf","%s,w",aopGet(AOP(right),offset,FALSE,FALSE));
+             emitcode("andwf","%s,w",
+                      aopGet(AOP(left),offset,FALSE,FALSE));
+           }
+           emitcode("movwf","%s",aopGet(AOP(result),offset,FALSE,FALSE));
+         }
        }
     }
 
@@ -4516,14 +4583,6 @@ static void genOr (iCode *ic, iCode *ifx)
     aopOp((right= IC_RIGHT(ic)),ic,FALSE);
     aopOp((result=IC_RESULT(ic)),ic,TRUE);
 
-#ifdef DEBUG_TYPE
-    emitcode("","; Type res[%d] = l[%d]&r[%d]",
-             AOP_TYPE(result),
-             AOP_TYPE(left), AOP_TYPE(right));
-    emitcode("","; Size res[%d] = l[%d]&r[%d]",
-             AOP_SIZE(result),
-             AOP_SIZE(left), AOP_SIZE(right));
-#endif
 
     /* if left is a literal & right is not then exchange them */
     if ((AOP_TYPE(left) == AOP_LIT && AOP_TYPE(right) != AOP_LIT) ||
@@ -4721,27 +4780,39 @@ static void genOr (iCode *ic, iCode *ifx)
             } else if(ifx)
                 jmpTrueOrFalse(ifx, tlbl);
         } else for(;(size--);offset++){
-            // normal case
-            // result = left & right
-            if(AOP_TYPE(right) == AOP_LIT){
-                if(((lit >> (offset*8)) & 0x0FFL) == 0x00L){
-                    aopPut(AOP(result),
-                           aopGet(AOP(left),offset,FALSE,FALSE),
-                           offset);
-                    continue;
-                }
-            }
-            // faster than result <- left, anl result,right
-            // and better if result is SFR
-           if (AOP_TYPE(left) == AOP_ACC) 
-               emitcode("iorwf","%s,w",aopGet(AOP(right),offset,FALSE,FALSE));
-           else {
-               emitcode("movf","%s,w",aopGet(AOP(right),offset,FALSE,FALSE));
-               emitcode("iorwf","%s,w",
-                        aopGet(AOP(left),offset,FALSE,FALSE));
+         // normal case
+         // result = left & right
+         if(AOP_TYPE(right) == AOP_LIT){
+           int t = (lit >> (offset*8)) & 0x0FFL;
+           switch(t) { 
+           case 0x00:
+             emitcode("movf","%s,w",
+                      aopGet(AOP(left),offset,FALSE,FALSE));
+             emitcode("movwf","%s",
+                      aopGet(AOP(result),offset,FALSE,FALSE));
+             break;
+           default:
+             emitcode("movlw","0x%x",t);
+             emitcode("iorwf","%s,w",
+                      aopGet(AOP(left),offset,FALSE,FALSE));
+             emitcode("movwf","%s",
+                      aopGet(AOP(result),offset,FALSE,FALSE));
+             
            }
-           emitcode("movwf","%s",aopGet(AOP(result),offset,FALSE,FALSE));
-        }
+           continue;
+         }
+
+         // faster than result <- left, anl result,right
+         // and better if result is SFR
+         if (AOP_TYPE(left) == AOP_ACC) 
+           emitcode("iorwf","%s,w",aopGet(AOP(right),offset,FALSE,FALSE));
+         else {
+           emitcode("movf","%s,w",aopGet(AOP(right),offset,FALSE,FALSE));
+           emitcode("iorwf","%s,w",
+                    aopGet(AOP(left),offset,FALSE,FALSE));
+         }
+         emitcode("movwf","%s",aopGet(AOP(result),offset,FALSE,FALSE));
+       }
     }
 
 release :
@@ -4765,15 +4836,6 @@ static void genXor (iCode *ic, iCode *ifx)
     aopOp((right= IC_RIGHT(ic)),ic,FALSE);
     aopOp((result=IC_RESULT(ic)),ic,TRUE);
 
-#ifdef DEBUG_TYPE
-    emitcode("","; Type res[%d] = l[%d]&r[%d]",
-             AOP_TYPE(result),
-             AOP_TYPE(left), AOP_TYPE(right));
-    emitcode("","; Size res[%d] = l[%d]&r[%d]",
-             AOP_SIZE(result),
-             AOP_SIZE(left), AOP_SIZE(right));
-#endif
-
     /* if left is a literal & right is not ||
        if left needs acc & right does not */
     if ((AOP_TYPE(left) == AOP_LIT && AOP_TYPE(right) != AOP_LIT) ||
@@ -4934,23 +4996,41 @@ static void genXor (iCode *ic, iCode *ifx)
             // normal case
             // result = left & right
             if(AOP_TYPE(right) == AOP_LIT){
-                if(((lit >> (offset*8)) & 0x0FFL) == 0x00L){
-                    aopPut(AOP(result),
-                           aopGet(AOP(left),offset,FALSE,FALSE),
-                           offset);
-                    continue;
-                }
+             int t = (lit >> (offset*8)) & 0x0FFL;
+             switch(t) { 
+             case 0x00:
+               emitcode("movf","%s,w",
+                        aopGet(AOP(left),offset,FALSE,FALSE));
+               emitcode("movwf","%s",
+                        aopGet(AOP(result),offset,FALSE,FALSE));
+               break;
+             case 0xff:
+               emitcode("comf","%s,w",
+                        aopGet(AOP(left),offset,FALSE,FALSE));
+               emitcode("movwf","%s",
+                        aopGet(AOP(result),offset,FALSE,FALSE));
+               break;
+             default:
+               emitcode("movlw","0x%x",t);
+               emitcode("xorwf","%s,w",
+                        aopGet(AOP(left),offset,FALSE,FALSE));
+               emitcode("movwf","%s",
+                        aopGet(AOP(result),offset,FALSE,FALSE));
+
+             }
+             continue;
             }
+
             // faster than result <- left, anl result,right
             // and better if result is SFR
            if (AOP_TYPE(left) == AOP_ACC)
-               emitcode("xrl","a,%s",aopGet(AOP(right),offset,FALSE,FALSE));
+               emitcode("xorwf","%s,w",aopGet(AOP(right),offset,FALSE,FALSE));
            else {
-               MOVA(aopGet(AOP(right),offset,FALSE,FALSE));
-               emitcode("xrl","a,%s",
-                        aopGet(AOP(left),offset,FALSE,TRUE));
+               emitcode("movf","%s,w",aopGet(AOP(right),offset,FALSE,FALSE));
+               emitcode("xorwf","%s,w",aopGet(AOP(left),offset,FALSE,FALSE));
            }
-           aopPut(AOP(result),"a",offset);
+           if ( AOP_TYPE(result) != AOP_ACC)
+             emitcode("movwf","%s",aopGet(AOP(result),offset,FALSE,FALSE));
         }
     }
 

diff --git a/src/pic/peeph.def b/src/pic/peeph.def
index 79f176337a06896c21533fdc09b848a8362abadc..f86f8323191a80fafec5133aba26b41f8eaeb7d3 100644 (file)
--- a/src/pic/peeph.def
+++ b/src/pic/peeph.def
@@ -69,6 +69,21 @@ replace restart {
 %1:
 }
 
+// like peep5
+replace restart {
+        skpc
+        goto   %1
+%2:
+       incf   %3,f
+%1:
+} by {
+       ;peep 5a
+       skpnc
+%2:
+       incf   %3,f
+%1:
+}
+
 // peep 6
 replace restart {
         skpnc
@@ -81,3 +96,4 @@ replace restart {
        incf   %2,f
 %1:
 }
+

diff --git a/src/regression/b.c b/src/regression/b.c
index d082a4e14c6f7a6a277f32af285645a847b23b7c..dc0a7f3cec6aba6cdc6afac0669aef700211ab3d 100644 (file)
--- a/src/regression/b.c
+++ b/src/regression/b.c
@@ -17,145 +17,120 @@ void done()
 
 }
 
-
-
-void char_lt_char(void)
+void bool_or1(void)
 {
-  if(achar0 < achar1)
-    failures++;
-}
 
-void char_gt_char(void)
-{
-  if(achar1 > achar0)
+  if( (achar0 >0) || (achar1 >0 ))
     failures++;
 }
 
-void char_lte_char(void)
+void bool_or2(void)
 {
-  if(achar0 <= achar1)
-    failures++;
-}
 
-void char_gte_char(void)
-{
-  if(achar1 >= achar0)
+  if( achar0 || achar1)
     failures++;
 }
 
-void char_lt_lit(void)
+void bool_test1(void)
 {
-  if(achar1 < 0x10)
-    failures++;
-}
 
-void char_gt_lit(void)
-{
-  if(achar1 > 0x10)
+  if( (achar0==0) || achar1)
     failures++;
 }
 
-void char_lte_lit(void)
+
+void bool_test2(void)
 {
-  if(achar1 <= 0x0f)
+
+  if( (achar0==0) || aint0)
     failures++;
 }
 
-void char_gte_lit(void)
+void bool_and1(void)
 {
-  if(achar1 >= 0x11)
+
+  if( achar0 && achar1)
     failures++;
 }
 
+void bin_or1(void)
+{
 
-/* ints */
+  char t;
 
-void int_lt_int(void)
-{
-  if(aint0 < aint1)
+  t = achar0 | achar1;
+  if(t)
     failures++;
 }
 
-void int_gt_int(void)
+void bin_xor1(void)
 {
-  if(aint1 > aint0)
-    failures++;
-}
 
-void int_lte_int(void)
-{
-  if(aint0 <= aint1)
+  if(achar0 ^ achar1)
     failures++;
 }
 
-void int_gte_int(void)
-{
-  if(aint1 >= aint0)
-    failures++;
-}
 
-void int_lt_lit(void)
+void bool_test3(void)
 {
-  if(aint1 < 0x10)
-    failures++;
-}
 
-void int_gt_lit(void)
-{
-  if(aint1 > 0x10)
+  if((achar0 == 0x42) || (achar1 == 42))
     failures++;
 }
 
-void int_lte_lit(void)
+
+void bool_or_lit1(void)
 {
-  if(aint1 <= 0x0f)
+
+  achar0 |= 0x0f;
+
+  if(achar0 > 0x10)
     failures++;
-}
 
-void int_gte_lit(void)
-{
-  if(aint1 >= 0x11)
+  if( (achar0 | 0x10) > 0xf0)
     failures++;
+
 }
 
+void bool_and_lit1(void)
+{
 
+  achar0 &= 0xf0;
 
+  if(achar0 > 0x10)
+    failures++;
 
+  if( (achar0 & 0x10) > 0xf0)
+    failures++;
 
+  achar0 &= 0xef;
 
+}
 
 void main(void)
 {
 
-  char_lt_char();
-  char_gt_char();
+  bool_or1();
+  bool_or2();
+  bool_and1();
+  bin_or1();
+  bin_xor1();
 
   achar0++;
-  char_lt_char();
-  char_gt_char();
-  char_gte_char();
-  char_lte_char();
-
-  achar1 = 0x10;
-  char_lt_lit();
-  char_gt_lit();
-  char_lte_lit();
-  char_gte_lit();
-
+  bool_and1();
+  bool_test1();
+  bool_test2();
+  bool_test3();
 
 
-  int_lt_int();
-  int_gt_int();
+  achar0--; achar1++;
+  bool_and1();
 
-  aint0++;
-  int_lt_int();
-  int_gt_int();
-  int_gte_int();
-  int_lte_int();
+  achar0=0;
+  achar1=0;
 
-  aint1 = 0x10;
-  int_lt_lit();
-  int_gt_lit();
+  bool_or_lit1();
+  bool_and_lit1();
 
   success = failures;
   done();