X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCCsymt.c;h=eba05f5a30e72bd66415023b7f2aead7706c8a08;hb=6de2afd5e99e3c470349c6c342e5c3cc2a569832;hp=0c0c00cc0f9d6c2c1642378cfbc798df56e63814;hpb=a8b6b80ff9fcad4aba5bb339e95db62f75f9eb61;p=fw%2Fsdcc

diff --git a/src/SDCCsymt.c b/src/SDCCsymt.c
index 0c0c00cc..eba05f5a 100644
--- a/src/SDCCsymt.c
+++ b/src/SDCCsymt.c
@@ -1280,12 +1280,24 @@ compStructSize (int su, structdef * sdef)
                     bitOffset += loop->bitVar;
                 } 
                 else {
-                    /* does not fit; need to realign first */
-                    sum++;
-                    loop->offset = (su == UNION ? sum = 0 : sum);
-                    bitOffset = 0;
-                    SPEC_BSTR (loop->etype) = bitOffset;
-                    bitOffset += loop->bitVar;
+					if( TARGET_IS_PIC16 && getenv("PIC16_PACKED_BITFIELDS") ) {
+						/* if PIC16 && enviroment variable is set, then
+						 * tightly pack bitfields, this means that when a
+						 * bitfield goes beyond byte alignment, do not
+						 * automatically start allocatint from next byte,
+						 * but also use the available bits first */
+						fprintf(stderr, ": packing bitfields in structures\n");
+						SPEC_BSTR (loop->etype) = bitOffset;
+						bitOffset += loop->bitVar;
+						loop->offset = (su == UNION ? sum = 0 : sum);
+					} else {
+						/* does not fit; need to realign first */
+	                    sum++;
+    	                loop->offset = (su == UNION ? sum = 0 : sum);
+        	            bitOffset = 0;
+            	        SPEC_BSTR (loop->etype) = bitOffset;
+                	    bitOffset += loop->bitVar;
+                	}
                 }
                 while (bitOffset>8) {
                     bitOffset -= 8;
@@ -1416,8 +1428,7 @@ checkSClass (symbol * sym, int isProto)
     fprintf (stderr, "checkSClass: %s \n", sym->name);
   }
   
-  /* type is literal can happen for enums change
-     to auto */
+  /* type is literal can happen for enums change to auto */
   if (SPEC_SCLS (sym->etype) == S_LITERAL && !SPEC_ENUM (sym->etype))
     SPEC_SCLS (sym->etype) = S_AUTO;
   
@@ -1576,6 +1587,7 @@ checkSClass (symbol * sym, int isProto)
         //!sym->level &&
         port->mem.code_ro &&
         !IS_EXTERN (sym->etype) &&
+        !SPEC_ABSA (sym->etype) &&
         !funcInChain (sym->type))
       werror (E_CODE_NO_INIT, sym->name);
   }
@@ -1954,12 +1966,12 @@ computeType (sym_link * type1, sym_link * type2,
       && (   (SPEC_USIGN (etype1)
               /* if this operand is promoted to a larger type,
                  then it will be promoted to a signed type */
-              && !(getSize (etype1) < getSize (reType))
+              && !(bitsForType (etype1) < bitsForType (reType))
               /* char require special handling */
               && !IS_CHAR (etype1))
           || /* same for 2nd operand */  
              (SPEC_USIGN (etype2)
-              && !(getSize (etype2) < getSize (reType))
+              && !(bitsForType (etype2) < bitsForType (reType))
               && !IS_CHAR (etype2))
           || /* if both are 'unsigned char' and not promoted
                 let the result be unsigned too */
@@ -3114,7 +3126,7 @@ printTypeChainRaw (sym_link * start, FILE * of)
 /* powof2 - returns power of two for the number if number is pow 2 */
 /*-----------------------------------------------------------------*/
 int
-powof2 (TYPE_UDWORD num)
+powof2 (TYPE_TARGET_ULONG num)
 {
   int nshifts = 0;
   int n1s = 0;
@@ -3445,17 +3457,50 @@ initCSupport ()
         {
           for (muldivmod = 1; muldivmod < 3; muldivmod++)
             {
-              /* div and mod */
-              SNPRINTF (buffer, sizeof(buffer),
-                        "_%s%s%s",
-                       smuldivmod[muldivmod],
-                       ssu[su],
-                       sbwd[bwd]);
-              __muldiv[muldivmod][bwd][su] = funcOfType (_mangleFunctionName(buffer), __multypes[bwd][su], __multypes[bwd][su], 2, options.intlong_rent);
-              FUNC_NONBANKED (__muldiv[muldivmod][bwd][su]->type) = 1;
+              /* div and mod : s8_t x s8_t -> s8_t should be s8_t x s8_t -> s16_t, see below */
+	      if (!TARGET_IS_PIC16 || muldivmod != 1 || bwd != 0 || su != 0)
+	      {
+		SNPRINTF (buffer, sizeof(buffer),
+		    "_%s%s%s",
+		    smuldivmod[muldivmod],
+		    ssu[su],
+		    sbwd[bwd]);
+		__muldiv[muldivmod][bwd][su] = funcOfType (
+		    _mangleFunctionName(buffer),
+		    __multypes[bwd][su],
+		    __multypes[bwd][su],
+		    2,
+		    options.intlong_rent);
+		FUNC_NONBANKED (__muldiv[muldivmod][bwd][su]->type) = 1;
+	      }
             }
         }
     }
+
+  if (TARGET_IS_PIC16)
+  {
+    /* PIC16 port wants __divschar/__modschar to return an int, so that both
+     * 100 / -4 = -25 and -128 / -1 = 128 can be handled correctly
+     * (first one would have to be sign extended, second one must not be).
+     * Similarly, modschar should be handled, but the iCode introduces cast
+     * here and forces '% : s8 x s8 -> s8' ... */
+    su = 0; bwd = 0;
+    for (muldivmod = 1; muldivmod < 2; muldivmod++) {
+      SNPRINTF (buffer, sizeof(buffer),
+	  "_%s%s%s",
+	  smuldivmod[muldivmod],
+	  ssu[su],
+	  sbwd[bwd]);
+      __muldiv[muldivmod][bwd][su] = funcOfType (
+	  _mangleFunctionName(buffer),
+	  __multypes[1][su],
+	  __multypes[bwd][su],
+	  2,
+	  options.intlong_rent);
+      FUNC_NONBANKED (__muldiv[muldivmod][bwd][su]->type) = 1;
+    }
+  }
+
   /* mul only */
   muldivmod = 0;
   /* byte */
@@ -3540,7 +3585,7 @@ sym_link *validateLink(sym_link         *l,
             " expected %s, got %s\n",
             macro, args, file, line, 
             DECLSPEC2TXT(select), l ? DECLSPEC2TXT(l->class) : "null-link");
-    exit(-1);
+    exit(EXIT_FAILURE);
     return l; // never reached, makes compiler happy.
 }