MSVC 6 does not support macro variable arguments

[fw/sdcc] / src / pic16 / genarith.c

diff --git a/src/pic16/genarith.c b/src/pic16/genarith.c
index f8d34fbd7b57d4dcce5f9d301d1b9916a0375860..ff6e1d62325fd3ea20a67f82e1865ed2d18f9789 100644 (file)
--- a/src/pic16/genarith.c
+++ b/src/pic16/genarith.c
@@ -48,10 +48,6 @@
 #include "pcode.h"
 #include "gen.h"
 
-//#define D_POS(txt) DEBUGpic16_emitcode ("; TECODEV::: " txt, " (%s:%d (%s))", __FILE__, __LINE__, __FUNCTION__)
-
-#define D_POS(msg)     DEBUGpic16_emitcode("; ", msg, "%s:%d (%s)", __FILE__, __LINE__, __FUNCTION__)
-
 #if 1
 #define pic16_emitcode DEBUGpic16_emitcode
 #endif
@@ -167,10 +163,11 @@ const char *pic16_pCodeOpSubType(pCodeOp *pcop)
 /*-----------------------------------------------------------------*/
 bool pic16_genPlusIncr (iCode *ic)
 {
-    unsigned int icount ;
-    unsigned int size = pic16_getDataSize(IC_RESULT(ic));
+  unsigned int icount ;
+  unsigned int size = pic16_getDataSize(IC_RESULT(ic));
+
+    FENTRY;
 
-    DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
     DEBUGpic16_emitcode ("; ","result %s, left %s, right %s",
                         pic16_AopType(AOP_TYPE(IC_RESULT(ic))),
                         pic16_AopType(AOP_TYPE(IC_LEFT(ic))),
@@ -280,8 +277,7 @@ void pic16_outBitAcc(operand *result)
 /*-----------------------------------------------------------------*/
 void pic16_genPlusBits (iCode *ic)
 {
-
-  DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  FENTRY;
 
   DEBUGpic16_emitcode ("; ","result %s, left %s, right %s",
                       pic16_AopType(AOP_TYPE(IC_RESULT(ic))),
@@ -425,7 +421,8 @@ static void adjustArithmeticResult(iCode *ic)
 /*-----------------------------------------------------------------*/
 static void genAddLit2byte (operand *result, int offr, int lit)
 {
-
+  FENTRY;
+  
   switch(lit & 0xff) {
   case 0:
     break;
@@ -465,7 +462,7 @@ static void genAddLit (iCode *ic, int lit)
   operand *result;
   operand *left;
 
-  DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+    FENTRY;
 
 
   left = IC_LEFT(ic);
@@ -532,7 +529,6 @@ static void genAddLit (iCode *ic, int lit)
          pic16_emitpcode(POC_INCF, pic16_popGet(AOP(result),MSB16));
          break;
        default: /* 0x01LL */
-         D_POS("FIXED: added default case for adding 0x01??");
          pic16_emitpcode(POC_MOVLW,pic16_popGetLit(lo));
          pic16_emitpcode(POC_ADDWF,pic16_popGet(AOP(result),0));
          emitSKPNC;
@@ -577,11 +573,9 @@ static void genAddLit (iCode *ic, int lit)
          genAddLit2byte (result, MSB16, hi);
          break;
        case 1:  /* 0xHH01 */
-         D_POS(">>> IMPROVED");
          pic16_emitpcode(POC_INCF, pic16_popGet(AOP(result),0));
          pic16_emitpcode(POC_MOVLW,pic16_popGetLit(hi));
          pic16_emitpcode(POC_ADDWFC,pic16_popGet(AOP(result),MSB16));
-         D_POS("<<< IMPROVED");
          break;
 /*     case 0xff: * 0xHHff *
          pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(result),0,FALSE,FALSE));
@@ -593,9 +587,7 @@ static void genAddLit (iCode *ic, int lit)
          pic16_emitpcode(POC_MOVLW,pic16_popGetLit(lo));
          pic16_emitpcode(POC_ADDWF, pic16_popGet(AOP(result),0));
          pic16_emitpcode(POC_MOVLW,pic16_popGetLit(hi));
-         D_POS(">>> IMPROVED");
          pic16_emitpcode(POC_ADDWFC,pic16_popGet(AOP(result),MSB16));
-         D_POS("<<< IMPROVED");
          break;
        }
 
@@ -610,26 +602,8 @@ static void genAddLit (iCode *ic, int lit)
        lo = BYTEofLONG(lit,0);
 
        if(carry_info) {
-         switch(lo) {
-         case 0:
-           D_POS(">>> IMPROVED and compacted 0");
-           emitSKPNC;
-           pic16_emitpcode(POC_INCF, pic16_popGet(AOP(result),offset));
-           D_POS("<<< IMPROVED and compacted");
-           break;
-         case 0xff:
-           pic16_emitpcode(POC_MOVLW,pic16_popGetLit(lo));
-           D_POS(">>> Changed from SKPZ/SKPC to always SKPC");
-           emitSKPC;
-           pic16_emitpcode(POC_ADDWF, pic16_popGet(AOP(result),offset));
-           break;
-         default:
-           D_POS(">>> IMPROVED and compacted - default");
-           pic16_emitpcode(POC_MOVLW,pic16_popGetLit(lo));
-           pic16_emitpcode(POC_ADDWFC, pic16_popGet(AOP(result),offset));
-           D_POS("<<< IMPROVED and compacted");
-           break;
-         }
+         pic16_emitpcode(POC_MOVLW,pic16_popGetLit(lo));
+         pic16_emitpcode(POC_ADDWFC, pic16_popGet(AOP(result),offset));
        }else {
          /* no carry info from previous step */
          /* this means this is the first time to add */
@@ -701,9 +675,8 @@ static void genAddLit (iCode *ic, int lit)
        /* left addend is in a register */
        switch(lit & 0xff) {
        case 0:
-         pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(left),0));
+         pic16_mov2w(AOP(left),0);
          emitMOVWF(result, 0);
-         D_POS(">>> REMOVED double assignment");
          break;
        case 1:
          pic16_emitpcode(POC_INCFW, pic16_popGet(AOP(left),0));
@@ -731,7 +704,7 @@ static void genAddLit (iCode *ic, int lit)
        pic16_emitpcode(POC_MOVLW, pic16_popGetLit(lit & 0xff));
        pic16_emitpcode(POC_ADDFW, pic16_popGet(AOP(left),0));
       } else {
-       pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(left),0));
+       pic16_mov2w(AOP(left),0);
        /* We don't know the state of the carry bit at this point */
        clear_carry = 1;
       }
@@ -747,26 +720,20 @@ static void genAddLit (iCode *ic, int lit)
 
            pic16_emitpcode(POC_MOVLW, pic16_popGetLit(lit & 0xff));
            pic16_emitpcode(POC_ADDFW,  pic16_popGet(AOP(left),offset));
-           D_POS(">>> FIXED from left to result");
            pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result),offset));
-           D_POS("<<< FIXED from left to result");
 
            clear_carry = 0;
 
          } else {
-           D_POS(">>> FIXED");
            pic16_emitpcode(POC_MOVLW, pic16_popGetLit(lit & 0xff));
            pic16_emitpcode(POC_ADDFWC, pic16_popGet(AOP(left),offset));
            pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result),offset));
-           D_POS("<<< FIXED");
          }
 
        } else {
-         D_POS(">>> IMPROVED");
          pic16_emitpcode(POC_CLRF,  pic16_popGet(AOP(result),offset));
-         pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(left),offset));
+         pic16_mov2w(AOP(left),offset);
          pic16_emitpcode(POC_ADDWFC, pic16_popGet(AOP(result),offset));
-         D_POS("<<< IMPROVED");
        }
        offset++;
       }
@@ -779,13 +746,12 @@ static void genAddLit (iCode *ic, int lit)
 /*-----------------------------------------------------------------*/
 void pic16_genPlus (iCode *ic)
 {
-       int i, size, offset = 0;
-       operand *result, *left, *right;
-
-       /* special cases :- */
-       DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-
+  int i, size, offset = 0;
+  operand *result, *left, *right;
 
+    FENTRY;
+    
+    /* special cases :- */
        result = IC_RESULT(ic);
        left = IC_LEFT(ic);
        right = IC_RIGHT(ic);
@@ -824,11 +790,15 @@ void pic16_genPlus (iCode *ic)
                                pic16_emitpcode(POC_XORWF, pic16_popGet(AOP(result),0));
                        }
                } else {
+                       unsigned long lit = (unsigned long)floatFromVal (AOP(right)->aopu.aop_lit);
                        size = pic16_getDataSize(result);
                        while (size--) {
-                               MOVA(pic16_aopGet(AOP(right),offset,FALSE,FALSE));  
-                               pic16_emitcode("addc","a,#00  ;%d",__LINE__);
-                               pic16_aopPut(AOP(result),"a",offset++);
+                               pic16_emitpcode (POC_CLRF, pic16_popGet (AOP(result), offset));
+                               pic16_emitpcode (POC_MOVLW, pic16_popGetLit ((lit >> (8*offset)) & 0xFF));
+                               pic16_emitpcode (POC_ADDWFC, pic16_popGet(AOP(result), offset++));
+                               //MOVA(pic16_aopGet(AOP(right),offset,FALSE,FALSE));  
+                               //pic16_emitcode("addc","a,#00  ;%d",__LINE__);
+                               //pic16_aopPut(AOP(result),"a",offset++);
                        }
                }
        goto release ;
@@ -881,7 +851,7 @@ void pic16_genPlus (iCode *ic)
                                        AOP(IC_RIGHT(ic))->aopu.aop_dir);
                                        pic16_emitcode(" xorlw","1");
                                } else {
-                                       pic16_emitpcode(POC_MOVFW , pic16_popGet(AOP(IC_LEFT(ic)),0));
+                                       pic16_mov2w(AOP(IC_LEFT(ic)),0);
                                        pic16_emitpcode(POC_BTFSC , pic16_popGet(AOP(IC_RIGHT(ic)),0));
                                        pic16_emitpcode(POC_INCFW , pic16_popGet(AOP(IC_LEFT(ic)),0));
 
@@ -923,7 +893,7 @@ void pic16_genPlus (iCode *ic)
 
                        } else {
                                emitCLRZ; // needed here as well: INCFW is not always executed, Z is undefined then
-                               pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(IC_LEFT(ic)),0));
+                               pic16_mov2w(AOP(IC_LEFT(ic)),0);
                                pic16_emitpcode(POC_BTFSC, pic16_popGet(AOP(IC_RIGHT(ic)),0));
                                pic16_emitpcode(POC_INCFW, pic16_popGet(AOP(IC_LEFT(ic)),0));
                                //pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(IC_RIGHT(ic)),0,FALSE,FALSE));
@@ -1014,9 +984,7 @@ void pic16_genPlus (iCode *ic)
                                // right is signed, oh dear ...
                                for(i=size; i< AOP_SIZE(result); i++) {
                                        pic16_emitpcode(POC_CLRF, pic16_popGet(AOP(result),i));
-                                       D_POS(">>> FIXED sign test from result to right");
                                        pic16_emitpcode(POC_BTFSC, pic16_newpCodeOpBit(pic16_aopGet(AOP(right),size-1,FALSE,FALSE),7,0, PO_GPR_REGISTER));
-                                       D_POS("<<< FIXED sign test from result to right");
                                        pic16_emitpcode(POC_COMF, pic16_popGet(AOP(result),i));
                                        pic16_emitpcode(POC_MOVLW, pic16_popGet(AOP(left),i));
                                        pic16_emitpcode(POC_ADDWFC, pic16_popGet(AOP(result),i));
@@ -1031,7 +999,7 @@ void pic16_genPlus (iCode *ic)
                        // add first bytes
                        for(i=0; i<size; i++) {
                                if (AOP_TYPE(right) != AOP_ACC)
-                                       pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(right),i));
+                                 pic16_mov2w(AOP(right),i);
                                if (pic16_sameRegs(AOP(left), AOP(result)))
                                {
                                        if(i) { // add with carry
@@ -1058,11 +1026,9 @@ void pic16_genPlus (iCode *ic)
                                                pic16_emitpcode(POC_CLRF, pic16_popCopyReg(&pic16_pc_wreg));
                                                pic16_emitpcode(POC_ADDWFC, pic16_popGet(AOP(left),i));
                                        } else { // not same
-                                               D_POS (">>> FIXED added to uninitialized result");
                                                pic16_emitpcode(POC_CLRF, pic16_popCopyReg(&pic16_pc_wreg));
                                                pic16_emitpcode(POC_ADDFWC, pic16_popGet(AOP(left),i));
                                                pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result),i));
-                                               D_POS ("<<< FIXED");
                                        }
                                }
                        } else {
@@ -1153,7 +1119,7 @@ bool pic16_genMinusDec (iCode *ic)
     unsigned int icount ;
     unsigned int size = pic16_getDataSize(IC_RESULT(ic));
 
-    DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+    FENTRY;
     /* will try to generate an increment */
     /* if the right side is not a literal 
     we cannot */
@@ -1286,7 +1252,8 @@ void pic16_addSign(operand *result, int offset, int sign)
 void pic16_genMinusBits (iCode *ic)
 {
     symbol *lbl = newiTempLabel(NULL);
-    DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+
+    FENTRY;
     if (AOP_TYPE(IC_RESULT(ic)) == AOP_CRY){
         pic16_emitcode("mov","c,%s",AOP(IC_LEFT(ic))->aopu.aop_dir);
         pic16_emitcode("jnb","%s,%05d_DS_",AOP(IC_RIGHT(ic))->aopu.aop_dir,(lbl->key+100));
@@ -1313,7 +1280,7 @@ void pic16_genMinus (iCode *ic)
   int size, offset = 0, same=0;
   unsigned long lit = 0L;
 
-  DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+    FENTRY;
   pic16_aopOp (IC_LEFT(ic),ic,FALSE);
   pic16_aopOp (IC_RIGHT(ic),ic,FALSE);
   pic16_aopOp (IC_RESULT(ic),ic,TRUE);
@@ -1422,7 +1389,6 @@ void pic16_genMinus (iCode *ic)
          if(AOP_TYPE(IC_RESULT(ic)) == AOP_CRY) {
            if (pic16_sameRegs(AOP(IC_RIGHT(ic)), AOP(IC_RESULT(ic))) ) {
              if(lit & 1) {
-               D_POS(">>> FIXED from MOVLW right(=result) to MOVLW left(=literal,left&1==1)");
                pic16_emitpcode(POC_MOVLW , pic16_popGetLit(1));
                pic16_emitpcode(POC_XORWF , pic16_popGet(AOP(IC_RIGHT(ic)),0));
              }
@@ -1439,13 +1405,12 @@ void pic16_genMinus (iCode *ic)
            pic16_emitpcode(POC_MOVLW , pic16_popGetLit(lit & 0xff));
            pic16_emitpcode(POC_BTFSC , pic16_popGet(AOP(IC_RIGHT(ic)),0));
            pic16_emitpcode(POC_MOVLW , pic16_popGetLit((lit-1) & 0xff));
-           D_POS(">>> IMPROVED removed following assignment W-->result");
            //pic16_emitpcode(POC_MOVWF , pic16_popGet(AOP(IC_RESULT(ic)),0));
 
          }
 
        } else {
-         pic16_emitpcode(POC_MOVFW , pic16_popGet(AOP(IC_LEFT(ic)),0));
+         pic16_mov2w(AOP(IC_LEFT(ic)),0);
          pic16_emitpcode(POC_BTFSC , pic16_popGet(AOP(IC_RIGHT(ic)),0));
          pic16_emitpcode(POC_DECFW , pic16_popGet(AOP(IC_LEFT(ic)),0));
        }
@@ -1480,9 +1445,7 @@ void pic16_genMinus (iCode *ic)
     if( (size == 1) && ((lit & 0xff) == 0) ) {
       /* res = 0 - right */
       if (pic16_sameRegs(AOP(IC_RIGHT(ic)), AOP(IC_RESULT(ic))) ) {
-       D_POS(">>> IMPROVED changed comf,incf to negf");
        pic16_emitpcode(POC_NEGF,  pic16_popGet(AOP(IC_RIGHT(ic)),0));
-       D_POS("<<< IMPROVED changed comf,incf to negf");
       } else { 
        pic16_emitpcode(POC_COMFW,  pic16_popGet(AOP(IC_RIGHT(ic)),0));
        pic16_emitpcode(POC_MOVWF,  pic16_popGet(AOP(IC_RESULT(ic)),0));
@@ -1491,7 +1454,7 @@ void pic16_genMinus (iCode *ic)
       goto release;
     }
 
-    pic16_emitpcode(POC_MOVFW,  pic16_popGet(AOP(IC_RIGHT(ic)),0));
+    pic16_mov2w(AOP(IC_RIGHT(ic)),0);
     pic16_emitpcode(POC_SUBLW, pic16_popGetLit(lit & 0xff));    
     pic16_emitpcode(POC_MOVWF,pic16_popGet(AOP(IC_RESULT(ic)),0));
 
@@ -1500,7 +1463,6 @@ void pic16_genMinus (iCode *ic)
     while(--size) {
       lit >>= 8;
       offset++;
-      D_POS(">>> FIXED and compacted");
       if(same) {
        // here we have x = lit - x   for sizeof(x)>1
        pic16_emitpcode(POC_MOVLW, pic16_popGetLit(lit & 0xff));
@@ -1510,7 +1472,6 @@ void pic16_genMinus (iCode *ic)
        pic16_emitpcode(POC_SUBFWB_D0,  pic16_popGet(AOP(IC_RIGHT(ic)),offset));
        pic16_emitpcode(POC_MOVWF,  pic16_popGet(AOP(IC_RESULT(ic)),offset));
       }
-      D_POS("<<< FIXED and compacted");
     }
   
 
@@ -1531,7 +1492,7 @@ void pic16_genMinus (iCode *ic)
 
        DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
        if(AOP_TYPE(IC_RIGHT(ic)) != AOP_ACC) 
-         pic16_emitpcode(POC_MOVFW,pic16_popGet(AOP(IC_RIGHT(ic)),0));
+         pic16_mov2w(AOP(IC_RIGHT(ic)),0);
 
        if (pic16_sameRegs(AOP(IC_LEFT(ic)), AOP(IC_RESULT(ic))) )
          pic16_emitpcode(POC_SUBWF, pic16_popGet(AOP(IC_LEFT(ic)),0));
@@ -1568,13 +1529,10 @@ void pic16_genMinus (iCode *ic)
 
     while(size--){
       if (pic16_sameRegs(AOP(IC_LEFT(ic)), AOP(IC_RESULT(ic)))) {
-       pic16_emitpcode(POC_MOVFW,  pic16_popGet(AOP(IC_RIGHT(ic)),offset));
-       D_POS(">>> IMPROVED by replacing emitSKPC, incfszw by subwfb");
+       pic16_mov2w(AOP(IC_RIGHT(ic)),offset);
        pic16_emitpcode(POC_SUBWFB_D1,  pic16_popGet(AOP(IC_RESULT(ic)),offset));
-       D_POS("<<< IMPROVED by replacing emitSKPC, incfszw by subwfb");
       } else {
-       D_POS(">>> FIXED for same regs right and result");
-       pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(IC_RIGHT(ic)),offset));
+       pic16_mov2w(AOP(IC_RIGHT(ic)),offset);
        pic16_emitpcode(POC_SUBWFB_D0,  pic16_popGet(AOP(IC_LEFT(ic)),offset));
        pic16_emitpcode(POC_MOVWF,  pic16_popGet(AOP(IC_RESULT(ic)),offset));
       }        
@@ -1604,11 +1562,12 @@ void pic16_genUMult8XLit_8 (operand *left,
 {
   unsigned int lit;
   int same;
+  int size = AOP_SIZE(result);
+  int i;
 
-
-       DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+    FENTRY;
        DEBUGpic16_pic16_AopType(__LINE__,left,right,result);
-  
+
        if (AOP_TYPE(right) != AOP_LIT){
                fprintf(stderr,"%s %d - right operand is not a literal\n",__FILE__,__LINE__);
                exit(1);
@@ -1623,12 +1582,19 @@ void pic16_genUMult8XLit_8 (operand *left,
        if(same) {
                switch(lit) {
                        case 0:
-                               pic16_emitpcode(POC_CLRF,  pic16_popGet(AOP(result),0));
+                               while (size--) {
+                                 pic16_emitpcode(POC_CLRF,  pic16_popGet(AOP(result),size));
+                               } // while
                                return;
                        case 2:
                                // its faster to left shift
+                               for (i=1; i < size; i++) {
+                                 pic16_emitpcode(POC_CLRF,  pic16_popGet(AOP(result),i));
+                               } // for
                                emitCLRC;
                                pic16_emitpcode(POC_RLCF, pic16_popGet(AOP(left),0));
+                               if (size > 1)
+                                 pic16_emitpcode(POC_RLCF, pic16_popGet(AOP(result),1));
                                return;
 
                        default:
@@ -1637,18 +1603,32 @@ void pic16_genUMult8XLit_8 (operand *left,
                                pic16_emitpcode(POC_MULLW, pic16_popGetLit(lit));
                                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(pic16_popCopyReg(&pic16_pc_prodl),
                                        pic16_popGet(AOP(result), 0)));
+                               if (size > 1) {
+                                 pic16_emitpcode(POC_MOVFF, pic16_popGet2p(pic16_popCopyReg(&pic16_pc_prodh),
+                                                                           pic16_popGet(AOP(result), 1)));
+                                 for (i=2; i < size; i++) {
+                                   pic16_emitpcode(POC_CLRF,  pic16_popGet(AOP(result),i));
+                                 } // for
+                               } // if
                                return;
                }
        } else {
                // operands different
                switch(lit) {
                        case 0:
-                               pic16_emitpcode(POC_CLRF, pic16_popGet(AOP(result), 0));
+                               while (size--) {
+                                 pic16_emitpcode(POC_CLRF,  pic16_popGet(AOP(result),size));
+                               } // while
                                return;
                        case 2:
+                               for (i=1; i < size; i++) {
+                                 pic16_emitpcode(POC_CLRF,  pic16_popGet(AOP(result),i));
+                               } // for
                                emitCLRC;
                                pic16_emitpcode(POC_RLCFW, pic16_popGet(AOP(left), 0));
                                pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), 0));
+                               if (size > 1)
+                                 pic16_emitpcode(POC_RLCF, pic16_popGet(AOP(result),1));
                                return;
                        default:
                                if(AOP_TYPE(left) != AOP_ACC)
@@ -1656,6 +1636,14 @@ void pic16_genUMult8XLit_8 (operand *left,
                                pic16_emitpcode(POC_MULLW, pic16_popGetLit(lit));
                                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(pic16_popCopyReg(&pic16_pc_prodl),
                                        pic16_popGet(AOP(result), 0)));
+
+                               if (size > 1) {
+                                 pic16_emitpcode(POC_MOVFF, pic16_popGet2p(pic16_popCopyReg(&pic16_pc_prodh),
+                                                                           pic16_popGet(AOP(result), 1)));
+                                 for (i=2; i < size; i++) {
+                                   pic16_emitpcode(POC_CLRF,  pic16_popGet(AOP(result),i));
+                                 } // for
+                               } // if
                                return;
                }
        }
@@ -1673,8 +1661,8 @@ void pic16_genUMult16XLit_16 (operand *left,
   int same;
 
 
-       DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-
+    FENTRY;
+    
        if (AOP_TYPE(right) != AOP_LIT){
                fprintf(stderr,"%s %d - right operand is not a literal\n",__FILE__,__LINE__);
                exit(1);
@@ -1785,8 +1773,8 @@ void pic16_genUMult8X8_8 (operand *left,
                           operand *result)
 
 {
-       DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-
+  FENTRY;
+  
 
        if (AOP_TYPE(right) == AOP_LIT) {
                pic16_genUMult8XLit_8(left,right,result);
@@ -1810,7 +1798,7 @@ void pic16_genUMult8X8_8 (operand *left,
        if(AOP_TYPE(left) != AOP_ACC) {
                // left is not WREG
                if(AOP_TYPE(right) != AOP_ACC) {
-                       pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(left), 0));
+                       pic16_mov2w(AOP(left), 0);
                        pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(right), 0));
                } else {
                        pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(left), 0));
@@ -1850,7 +1838,7 @@ void pic16_genUMult16X16_16 (operand *left,
 {
   pCodeOp *pct1, *pct2, *pct3, *pct4;
 
-       DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+    FENTRY;
 
 
        if (AOP_TYPE(right) == AOP_LIT) {
@@ -1878,7 +1866,7 @@ void pic16_genUMult16X16_16 (operand *left,
                pct3 = pic16_popGetTempReg(1);
                pct4 = pic16_popGetTempReg(1);
 
-               pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(left), 0));
+               pic16_mov2w(AOP(left), 0);
                pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(right), 0));
                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
                        pic16_popCopyReg(&pic16_pc_prodl), pic16_pCodeOpCopy(pct1)));
@@ -1890,7 +1878,7 @@ void pic16_genUMult16X16_16 (operand *left,
                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
                        pic16_popCopyReg(&pic16_pc_prodl), pic16_pCodeOpCopy(pct3)));
                
-               pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(left), 1));
+               pic16_mov2w(AOP(left), 1);
                pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(right), 0));
                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
                        pic16_popCopyReg(&pic16_pc_prodl), pic16_pCodeOpCopy(pct4)));
@@ -1910,7 +1898,7 @@ void pic16_genUMult16X16_16 (operand *left,
 
        } else {
 
-               pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(left), 0));
+               pic16_mov2w(AOP(left), 0);
                pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(right), 0));
                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
                        pic16_popCopyReg(&pic16_pc_prodl), pic16_popGet(AOP(result), 0)));
@@ -1922,7 +1910,7 @@ void pic16_genUMult16X16_16 (operand *left,
                pic16_emitpcode(POC_MOVFW, pic16_popCopyReg(&pic16_pc_prodl));
                pic16_emitpcode(POC_ADDWF, pic16_popGet(AOP(result), 1));
                
-               pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(left), 1));
+               pic16_mov2w(AOP(left), 1);
                pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(right), 0));
                pic16_emitpcode(POC_MOVFW, pic16_popCopyReg(&pic16_pc_prodl));
                pic16_emitpcode(POC_ADDWFC, pic16_popGet(AOP(result), 1));
@@ -1963,7 +1951,7 @@ void pic16_genSMult8X8_8 (operand *left,
 #if 0
   pic16_emitpcode(POC_BTFSC, pic16_newpCodeOpBit(pic16_aopGet(AOP(left),0,FALSE,FALSE),7,0, PO_GPR_REGISTER));
   pic16_emitpcode(POC_SUBWF, pic16_popCopyReg(result_hi));
-  pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(left),0));
+  pic16_mov2w(AOP(left),0);
   pic16_emitpcode(POC_BTFSC, pic16_newpCodeOpBit(pic16_aopGet(AOP(right),0,FALSE,FALSE),7,0, PO_GPR_REGISTER));
   pic16_emitpcode(POC_SUBWF, pic16_popGet(AOP(result),1));
 #endif
@@ -1977,12 +1965,12 @@ void pic16_genMult8X8_8 (operand *left,
                         operand *right,
                         operand *result)
 {
-       DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-
-       if(AOP_TYPE(right) == AOP_LIT)
-               pic16_genUMult8XLit_8(left,right,result);
-       else
-               pic16_genUMult8X8_8(left,right,result);
+  FENTRY;
+  
+  if(AOP_TYPE(right) == AOP_LIT)
+    pic16_genUMult8XLit_8(left,right,result);
+  else
+    pic16_genUMult8X8_8(left,right,result);
 }
 
 
@@ -1993,13 +1981,12 @@ void pic16_genMult16X16_16 (operand *left,
                         operand *right,
                         operand *result)
 {
-       DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-
-       if (AOP_TYPE(right) == AOP_LIT)
-               pic16_genUMult16XLit_16(left,right,result);
-       else
-               pic16_genUMult16X16_16(left,right,result);
-
+  FENTRY;
+  
+  if (AOP_TYPE(right) == AOP_LIT)
+    pic16_genUMult16XLit_16(left,right,result);
+  else
+    pic16_genUMult16X16_16(left,right,result);
 }
 
 
@@ -2017,8 +2004,8 @@ void pic16_genUMult32XLit_32 (operand *left,
   int same;
 
 
-       DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-
+    FENTRY;
+    
        if (AOP_TYPE(right) != AOP_LIT){
                fprintf(stderr,"%s %d - right operand is not a literal\n",__FILE__,__LINE__);
                exit(1);
@@ -2129,9 +2116,8 @@ void pic16_genUMult32X32_32 (operand *left,
 {
   pCodeOp *pct1, *pct2, *pct3, *pct4;
 
-       DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-
-
+    FENTRY;
+    
        if (AOP_TYPE(right) == AOP_LIT) {
                pic16_genUMult8XLit_8(left,right,result);
          return;
@@ -2157,7 +2143,7 @@ void pic16_genUMult32X32_32 (operand *left,
                pct3 = pic16_popGetTempReg(1);
                pct4 = pic16_popGetTempReg(1);
 
-               pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(left), 0));
+               pic16_mov2w(AOP(left), 0);
                pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(right), 0));
                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
                        pic16_popCopyReg(&pic16_pc_prodl), pic16_pCodeOpCopy(pct1)));
@@ -2169,7 +2155,7 @@ void pic16_genUMult32X32_32 (operand *left,
                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
                        pic16_popCopyReg(&pic16_pc_prodl), pic16_pCodeOpCopy(pct3)));
                
-               pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(left), 1));
+               pic16_mov2w(AOP(left), 1);
                pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(right), 0));
                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
                        pic16_popCopyReg(&pic16_pc_prodl), pic16_pCodeOpCopy(pct4)));
@@ -2189,7 +2175,7 @@ void pic16_genUMult32X32_32 (operand *left,
 
        } else {
 
-               pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(left), 0));
+               pic16_mov2w(AOP(left), 0);
                pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(right), 0));
                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
                        pic16_popCopyReg(&pic16_pc_prodl), pic16_popGet(AOP(result), 0)));
@@ -2201,7 +2187,7 @@ void pic16_genUMult32X32_32 (operand *left,
                pic16_emitpcode(POC_MOVFW, pic16_popCopyReg(&pic16_pc_prodl));
                pic16_emitpcode(POC_ADDWF, pic16_popGet(AOP(result), 1));
                
-               pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(left), 1));
+               pic16_mov2w(AOP(left), 1);
                pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(right), 0));
                pic16_emitpcode(POC_MOVFW, pic16_popCopyReg(&pic16_pc_prodl));
                pic16_emitpcode(POC_ADDWFC, pic16_popGet(AOP(result), 1));
@@ -2216,13 +2202,12 @@ void pic16_genMult32X32_32 (operand *left,
                         operand *right,
                         operand *result)
 {
-       DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-
-       if (AOP_TYPE(right) == AOP_LIT)
-               pic16_genUMult32XLit_32(left,right,result);
-       else
-               pic16_genUMult32X32_32(left,right,result);
-
+  FENTRY;
+  
+  if (AOP_TYPE(right) == AOP_LIT)
+    pic16_genUMult32XLit_32(left,right,result);
+  else
+    pic16_genUMult32X32_32(left,right,result);
 }