Fixed BITFIELD problems

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

diff --git a/src/ds390/gen.c b/src/ds390/gen.c
index bc8cd0a2b48ce8bdc6f86bfe8642271aab06538a..bf1432330e5f27d192c8d07605e468c0f0c23803 100644 (file)
--- a/src/ds390/gen.c
+++ b/src/ds390/gen.c
@@ -6705,7 +6705,7 @@ static void genUnpackBits (operand *result, char *rname, int ptype)
 
        rlen -= 8;            
        /* if we are done */
-       if ( rlen <= 0 )
+       if ( rlen < 8 )
            break ;
        
        aopPut(AOP(result),"a",offset++);
@@ -6713,7 +6713,7 @@ static void genUnpackBits (operand *result, char *rname, int ptype)
     }
     
     if (rlen) {
-       emitcode("anl","a,#0x%02x",((unsigned char)-1)>>(-rlen));
+       emitcode("anl","a,#0x%02x",((unsigned char)-1)>>(rlen));
        aopPut(AOP(result),"a",offset);        
     }
     
@@ -6760,13 +6760,14 @@ static void genNearPointerGet (operand *left,
     asmop *aop = NULL;
     regs *preg = NULL ;
     char *rname ;
-    link *rtype, *retype;
+    link *rtype, *retype, *letype;
     link *ltype = operandType(left);    
     char buffer[80];
 
     rtype = operandType(result);
     retype= getSpec(rtype);
-    
+    letype= getSpec(ltype);
+
     aopOp(left,ic,FALSE, FALSE);
     
     /* if left is rematerialisable and
@@ -6775,6 +6776,7 @@ static void genNearPointerGet (operand *left,
        lower 128 bytes of space */
     if (AOP_TYPE(left) == AOP_IMMD &&
        !IS_BITVAR(retype)         &&
+       !IS_BITVAR(letype)         &&
        DCL_TYPE(ltype) == POINTER) {
        genDataPointerGet (left,result,ic);
        return ;
@@ -6797,7 +6799,7 @@ static void genNearPointerGet (operand *left,
     aopOp (result,ic,FALSE, FALSE);
     
       /* if bitfield then unpack the bits */
-    if (IS_BITVAR(retype)) 
+    if (IS_BITVAR(retype) || IS_BITVAR(letype)) 
        genUnpackBits (result,rname,POINTER);
     else {
        /* we have can just get the values */
@@ -6853,12 +6855,12 @@ static void genPagedPointerGet (operand *left,
 {
     asmop *aop = NULL;
     regs *preg = NULL ;
-    char *rname ;
-    link *rtype, *retype;    
+    char *rname;
+    link *rtype, *retype, *letype;    
 
     rtype = operandType(result);
     retype= getSpec(rtype);
-    
+    letype= getSpec(operandType(left));
     aopOp(left,ic,FALSE, FALSE);
 
   /* if the value is already in a pointer register
@@ -6878,7 +6880,7 @@ static void genPagedPointerGet (operand *left,
     aopOp (result,ic,FALSE, FALSE);
 
     /* if bitfield then unpack the bits */
-    if (IS_BITVAR(retype)) 
+    if (IS_BITVAR(retype) || IS_BITVAR(letype)) 
        genUnpackBits (result,rname,PPOINTER);
     else {
        /* we have can just get the values */
@@ -6931,7 +6933,7 @@ static void genFarPointerGet (operand *left,
 {
     int size, offset ;
     link *retype = getSpec(operandType(result));
-
+    link *letype = getSpec(operandType(left));
     D(emitcode(";", "genFarPointerGet"););
 
     aopOp(left,ic,FALSE, FALSE);
@@ -6972,7 +6974,7 @@ static void genFarPointerGet (operand *left,
     aopOp(result,ic,FALSE, TRUE);
 
     /* if bit then unpack */
-    if (IS_BITVAR(retype)) 
+    if (IS_BITVAR(retype) || IS_BITVAR(letype)) 
         genUnpackBits(result,"dptr",FPOINTER);
     else {
         size = AOP_SIZE(result);
@@ -7058,6 +7060,7 @@ static void genGenPointerGet (operand *left,
 {
     int size, offset ;
     link *retype = getSpec(operandType(result));
+    link *letype = getSpec(operandType(left));
 
     aopOp(left,ic,FALSE, TRUE);
 
@@ -7090,7 +7093,7 @@ static void genGenPointerGet (operand *left,
     aopOp(result,ic,FALSE, TRUE);
 
     /* if bit then unpack */
-    if (IS_BITVAR(retype)) 
+    if (IS_BITVAR(retype) || IS_BITVAR(letype)) 
         genUnpackBits(result,"dptr",GPOINTER);
     else {
         size = AOP_SIZE(result);
@@ -7131,21 +7134,6 @@ static void genPointerGet (iCode *ic)
     else {
        /* we have to go by the storage class */
        p_type = PTR_TYPE(SPEC_OCLS(etype));
-
-/*     if (SPEC_OCLS(etype)->codesp ) { */
-/*         p_type = CPOINTER ;  */
-/*     } */
-/*     else */
-/*         if (SPEC_OCLS(etype)->fmap && !SPEC_OCLS(etype)->paged) */
-/*             p_type = FPOINTER ; */
-/*         else */
-/*             if (SPEC_OCLS(etype)->fmap && SPEC_OCLS(etype)->paged) */
-/*                 p_type = PPOINTER; */
-/*             else */
-/*                 if (SPEC_OCLS(etype) == idata ) */
-/*                     p_type = IPOINTER; */
-/*                 else */
-/*                     p_type = POINTER ; */
     }
 
     /* now that we have the pointer type we assign
@@ -7261,7 +7249,7 @@ static void genPackBits (link    *etype ,
         l = aopGet(AOP(right),offset++,FALSE,TRUE,FALSE);
 
         rLen -= 8 ;
-        if (rLen <= 0 )
+        if (rLen < 8 )
             break ;
 
         switch (p_type) {
@@ -7310,7 +7298,7 @@ static void genPackBits (link    *etype ,
                 break;
         }
 
-        emitcode ("anl","a,#0x%02x",((unsigned char)-1 << -rLen) );
+        emitcode ("anl","a,#0x%02x",((unsigned char)-1 << rLen) );
         emitcode ("orl","a,b");
     }
 
@@ -7369,10 +7357,11 @@ static void genNearPointerSet (operand *right,
     asmop *aop = NULL;
     regs *preg = NULL ;
     char *rname , *l;
-    link *retype;
+    link *retype, *letype;
     link *ptype = operandType(result);
     
     retype= getSpec(operandType(right));
+    letype= getSpec(ptype);
 
     aopOp(result,ic,FALSE, FALSE);
     
@@ -7380,7 +7369,8 @@ static void genNearPointerSet (operand *right,
        in data space & not a bit variable */
     if (AOP_TYPE(result) == AOP_IMMD &&
        DCL_TYPE(ptype) == POINTER   &&
-       !IS_BITVAR(retype)) {
+       !IS_BITVAR(retype) &&
+       !IS_BITVAR(letype)) {
        genDataPointerSet (right,result,ic);
        return;
     }
@@ -7402,8 +7392,8 @@ static void genNearPointerSet (operand *right,
     aopOp (right,ic,FALSE, FALSE);
 
     /* if bitfield then unpack the bits */
-    if (IS_BITVAR(retype)) 
-        genPackBits (retype,right,rname,POINTER);
+    if (IS_BITVAR(retype) || IS_BITVAR(letype)) 
+        genPackBits ((IS_BITVAR(retype) ? retype : letype),right,rname,POINTER);
     else {
         /* we have can just get the values */
         int size = AOP_SIZE(right);
@@ -7458,9 +7448,10 @@ static void genPagedPointerSet (operand *right,
     asmop *aop = NULL;
     regs *preg = NULL ;
     char *rname , *l;
-    link *retype;
+    link *retype, *letype;
        
     retype= getSpec(operandType(right));
+    letype= getSpec(operandType(result));
     
     aopOp(result,ic,FALSE, FALSE);
     
@@ -7481,8 +7472,8 @@ static void genPagedPointerSet (operand *right,
     aopOp (right,ic,FALSE, FALSE);
 
     /* if bitfield then unpack the bits */
-    if (IS_BITVAR(retype)) 
-       genPackBits (retype,right,rname,PPOINTER);
+    if (IS_BITVAR(retype) || IS_BITVAR(letype)) 
+       genPackBits ((IS_BITVAR(retype) ? retype : letype) ,right,rname,PPOINTER);
     else {
        /* we have can just get the values */
        int size = AOP_SIZE(right);
@@ -7535,6 +7526,7 @@ static void genFarPointerSet (operand *right,
 {
     int size, offset ;
     link *retype = getSpec(operandType(right));
+    link *letype = getSpec(operandType(result));
 
     aopOp(result,ic,FALSE, FALSE);
 
@@ -7572,8 +7564,8 @@ static void genFarPointerSet (operand *right,
     aopOp(right,ic,FALSE, TRUE);
 
     /* if bit then unpack */
-    if (IS_BITVAR(retype)) 
-        genPackBits(retype,right,"dptr",FPOINTER);
+    if (IS_BITVAR(retype) || IS_BITVAR(letype)) 
+        genPackBits((IS_BITVAR(retype)?retype:letype),right,"dptr",FPOINTER);
     else {
         size = AOP_SIZE(right);
         offset = 0 ;
@@ -7604,6 +7596,7 @@ static void genGenPointerSet (operand *right,
 {
     int size, offset ;
     link *retype = getSpec(operandType(right));
+    link *letype = getSpec(operandType(result));
 
     aopOp(result,ic,FALSE, TRUE);
 
@@ -7629,8 +7622,8 @@ static void genGenPointerSet (operand *right,
     aopOp(right,ic,FALSE, TRUE);
 
     /* if bit then unpack */
-    if (IS_BITVAR(retype)) 
-        genPackBits(retype,right,"dptr",GPOINTER);
+    if (IS_BITVAR(retype) || IS_BITVAR(letype)) 
+        genPackBits((IS_BITVAR(retype)?retype:letype),right,"dptr",GPOINTER);
     else {
         size = AOP_SIZE(right);
         offset = 0 ;
@@ -7678,21 +7671,6 @@ static void genPointerSet (iCode *ic)
     else {
        /* we have to go by the storage class */
        p_type = PTR_TYPE(SPEC_OCLS(etype));
-
-/*     if (SPEC_OCLS(etype)->codesp ) { */
-/*         p_type = CPOINTER ;  */
-/*     } */
-/*     else */
-/*         if (SPEC_OCLS(etype)->fmap && !SPEC_OCLS(etype)->paged) */
-/*             p_type = FPOINTER ; */
-/*         else */
-/*             if (SPEC_OCLS(etype)->fmap && SPEC_OCLS(etype)->paged) */
-/*                 p_type = PPOINTER ; */
-/*             else */
-/*                 if (SPEC_OCLS(etype) == idata ) */
-/*                     p_type = IPOINTER ; */
-/*                 else */
-/*                     p_type = POINTER ; */
     }
 
     /* now that we have the pointer type we assign

diff --git a/src/mcs51/gen.c b/src/mcs51/gen.c
index a960c041a885466b338f4ae27bdc34ed7829b1ed..7f8edba13fe80a0a5e9ea92b84cd2f174d8d51a9 100644 (file)
--- a/src/mcs51/gen.c
+++ b/src/mcs51/gen.c
@@ -2106,17 +2106,6 @@ static void genFunction (iCode *ic)
     if (IS_RENT(sym->etype) || options.stackAuto) {
 
        if (options.useXstack) {
-               /* set up the PAGE for the xternal stack */
-               if (sym->args) {
-                       emitcode("push","dph");
-                       emitcode("push","acc");
-               }
-               emitcode("mov","dph,__page_no__");
-               emitcode("movx","a,@dptr");
-               if (sym->args) {
-                       emitcode("pop","acc");
-                       emitcode("pop","dph");
-               }               
            emitcode("mov","r0,%s",spname);
            emitcode("mov","a,_bp");
            emitcode("movx","@r0,a");
@@ -5871,9 +5860,10 @@ static void genUnpackBits (operand *result, char *rname, int ptype)
     int rlen = 0 ;
     link *etype;
     int offset = 0 ;
+    int rsize ;
 
     etype = getSpec(operandType(result));
-
+    rsize = getSize(operandType(result));
     /* read the first byte  */
     switch (ptype) {
 
@@ -5900,6 +5890,8 @@ static void genUnpackBits (operand *result, char *rname, int ptype)
        break;
     }
 
+    rlen = SPEC_BLEN(etype) ;
+    
     /* if we have bitdisplacement then it fits   */
     /* into this byte completely or if length is */
     /* less than a byte                          */
@@ -5911,12 +5903,11 @@ static void genUnpackBits (operand *result, char *rname, int ptype)
 
         emitcode("anl","a,#0x%02x",
                  ((unsigned char) -1)>>(8 - SPEC_BLEN(etype)));
-        aopPut(AOP(result),"a",offset);
-        return ;
+        aopPut(AOP(result),"a",offset++);
+        goto finish;
     }
 
     /* bit field did not fit in a byte  */
-    rlen = SPEC_BLEN(etype) - 8;
     aopPut(AOP(result),"a",offset++);
 
     while (1)  {
@@ -5952,7 +5943,7 @@ static void genUnpackBits (operand *result, char *rname, int ptype)
 
        rlen -= 8;            
        /* if we are done */
-       if ( rlen <= 0 )
+       if ( rlen < 8 )
            break ;
        
        aopPut(AOP(result),"a",offset++);
@@ -5960,10 +5951,16 @@ static void genUnpackBits (operand *result, char *rname, int ptype)
     }
     
     if (rlen) {
-       emitcode("anl","a,#0x%02x",((unsigned char)-1)>>(-rlen));
-       aopPut(AOP(result),"a",offset);        
+           //  emitcode("anl","a,#0x%02x",((unsigned char)-1)>>(rlen));
+       AccLsh(8-rlen);
+       aopPut(AOP(result),"a",offset++);
     }
     
+ finish:
+    if (offset < rsize) {
+           rsize -= offset;
+           while (rsize--) aopPut(AOP(result),zero,offset++);
+    }
     return ;
 }
 
@@ -6472,7 +6469,7 @@ static void genPackBits (link    *etype ,
         l = aopGet(AOP(right),offset++,FALSE,TRUE);
 
         rLen -= 8 ;
-        if (rLen <= 0 )
+        if (rLen < 8 )
             break ;
 
         switch (p_type) {
@@ -6521,7 +6518,7 @@ static void genPackBits (link    *etype ,
                 break;
         }
 
-        emitcode ("anl","a,#0x%02x",((unsigned char)-1 << -rLen) );
+        emitcode ("anl","a,#0x%02x",(((unsigned char)-1 << rLen) & 0xff) );
         emitcode ("orl","a,b");
     }
 
@@ -6580,18 +6577,19 @@ static void genNearPointerSet (operand *right,
     asmop *aop = NULL;
     regs *preg = NULL ;
     char *rname , *l;
-    link *retype;
+    link *retype, *letype;
     link *ptype = operandType(result);
     
     retype= getSpec(operandType(right));
-
+    letype= getSpec(ptype);
     aopOp(result,ic,FALSE);
     
     /* if the result is rematerializable &
        in data space & not a bit variable */
     if (AOP_TYPE(result) == AOP_IMMD &&
        DCL_TYPE(ptype) == POINTER   &&
-       !IS_BITVAR(retype)) {
+       !IS_BITVAR(retype) &&
+       !IS_BITVAR(letype)) {
        genDataPointerSet (right,result,ic);
        return;
     }
@@ -6613,8 +6611,8 @@ static void genNearPointerSet (operand *right,
     aopOp (right,ic,FALSE);
 
     /* if bitfield then unpack the bits */
-    if (IS_BITVAR(retype)) 
-        genPackBits (retype,right,rname,POINTER);
+    if (IS_BITVAR(retype) || IS_BITVAR(letype)) 
+        genPackBits ((IS_BITVAR(retype) ? retype : letype),right,rname,POINTER);
     else {
         /* we have can just get the values */
         int size = AOP_SIZE(right);
@@ -6669,9 +6667,10 @@ static void genPagedPointerSet (operand *right,
     asmop *aop = NULL;
     regs *preg = NULL ;
     char *rname , *l;
-    link *retype;
+    link *retype, *letype;
        
     retype= getSpec(operandType(right));
+    letype= getSpec(operandType(result));
     
     aopOp(result,ic,FALSE);
     
@@ -6692,8 +6691,8 @@ static void genPagedPointerSet (operand *right,
     aopOp (right,ic,FALSE);
 
     /* if bitfield then unpack the bits */
-    if (IS_BITVAR(retype)) 
-       genPackBits (retype,right,rname,PPOINTER);
+    if (IS_BITVAR(retype) || IS_BITVAR(letype)) 
+       genPackBits ((IS_BITVAR(retype) ? retype : letype),right,rname,PPOINTER);
     else {
        /* we have can just get the values */
        int size = AOP_SIZE(right);
@@ -6746,7 +6745,7 @@ static void genFarPointerSet (operand *right,
 {
     int size, offset ;
     link *retype = getSpec(operandType(right));
-
+    link *letype = getSpec(operandType(result));
     aopOp(result,ic,FALSE);
 
     /* if the operand is already in dptr 
@@ -6769,8 +6768,8 @@ static void genFarPointerSet (operand *right,
     aopOp(right,ic,FALSE);
 
     /* if bit then unpack */
-    if (IS_BITVAR(retype)) 
-        genPackBits(retype,right,"dptr",FPOINTER);
+    if (IS_BITVAR(retype) || IS_BITVAR(letype)) 
+        genPackBits((IS_BITVAR(retype) ? retype : letype),right,"dptr",FPOINTER);
     else {
         size = AOP_SIZE(right);
         offset = 0 ;
@@ -6795,6 +6794,7 @@ static void genGenPointerSet (operand *right,
 {
     int size, offset ;
     link *retype = getSpec(operandType(right));
+    link *letype = getSpec(operandType(result));
 
     aopOp(result,ic,FALSE);
 
@@ -6825,8 +6825,8 @@ static void genGenPointerSet (operand *right,
     aopOp(right,ic,FALSE);
 
     /* if bit then unpack */
-    if (IS_BITVAR(retype)) 
-        genPackBits(retype,right,"dptr",GPOINTER);
+    if (IS_BITVAR(retype) || IS_BITVAR(letype)) 
+        genPackBits((IS_BITVAR(retype) ? retype : letype),right,"dptr",GPOINTER);
     else {
         size = AOP_SIZE(right);
         offset = 0 ;
@@ -6866,21 +6866,6 @@ static void genPointerSet (iCode *ic)
     else {
        /* we have to go by the storage class */
        p_type = PTR_TYPE(SPEC_OCLS(etype));
-
-/*     if (SPEC_OCLS(etype)->codesp ) { */
-/*         p_type = CPOINTER ;  */
-/*     } */
-/*     else */
-/*         if (SPEC_OCLS(etype)->fmap && !SPEC_OCLS(etype)->paged) */
-/*             p_type = FPOINTER ; */
-/*         else */
-/*             if (SPEC_OCLS(etype)->fmap && SPEC_OCLS(etype)->paged) */
-/*                 p_type = PPOINTER ; */
-/*             else */
-/*                 if (SPEC_OCLS(etype) == idata ) */
-/*                     p_type = IPOINTER ; */
-/*                 else */
-/*                     p_type = POINTER ; */
     }
 
     /* now that we have the pointer type we assign

diff --git a/src/mcs51/ralloc.c b/src/mcs51/ralloc.c
index 1648fdd5ca76d01677be44b77933d9ecb662165d..415d930d5a3570a85a7e196b8e0b4199eeaa321f 100644 (file)
--- a/src/mcs51/ralloc.c
+++ b/src/mcs51/ralloc.c
@@ -1460,11 +1460,13 @@ static iCode *farSpacePackable (iCode *ic)
 /*-----------------------------------------------------------------*/
 static int packRegsForAssign (iCode *ic,eBBlock *ebp)
 {
-    iCode *dic, *sic;
-    
+       iCode *dic, *sic;
+       link *etype = operandType(IC_RIGHT(ic));
+       
     if (!IS_ITEMP(IC_RIGHT(ic))       ||       
        OP_SYMBOL(IC_RIGHT(ic))->isind ||
-       OP_LIVETO(IC_RIGHT(ic)) > ic->seq) {
+       OP_LIVETO(IC_RIGHT(ic)) > ic->seq ||
+       IS_BITFIELD(etype)) {
        return 0;
     }
        
@@ -1531,7 +1533,12 @@ static int packRegsForAssign (iCode *ic,eBBlock *ebp)
     
     if (!dic)
        return 0 ; /* did not find */
-           
+       
+    /* if assignment then check that right is not a bit */
+    if (ASSIGNMENT(dic) && !POINTER_SET(dic)) {
+           link *etype = operandType(IC_RIGHT(dic));
+           if (IS_BITFIELD(etype)) return 0;
+    }
     /* if the result is on stack or iaccess then it must be
        the same atleast one of the operands */
     if (OP_SYMBOL(IC_RESULT(ic))->onStack  || 
@@ -1548,7 +1555,7 @@ static int packRegsForAssign (iCode *ic,eBBlock *ebp)
              (IC_RIGHT(dic) &&
               IC_RESULT(ic)->key == IC_RIGHT(dic)->key)))
            return 0;                
-    }
+    }    
 pack:
     /* found the definition */
     /* replace the result with the result of */