fixed

[fw/sdcc] / src / SDCCglue.c

diff --git a/src/SDCCglue.c b/src/SDCCglue.c
index 1cb787fc7ed1136b9d8642212e8c2a22a1b8fec2..b0860486c8d8e86acd7dc3695fc7e30f0dca7672 100644 (file)
--- a/src/SDCCglue.c
+++ b/src/SDCCglue.c
@@ -317,7 +317,7 @@ emitRegularMap (memmap * map, bool addPublics, bool arFlag)
 /* initPointer - pointer initialization code massaging             */
 /*-----------------------------------------------------------------*/
 value *
-initPointer (initList * ilist)
+initPointer (initList * ilist, sym_link *toType)
 {
        value *val;
        ast *expr = list2expr (ilist);
@@ -329,6 +329,29 @@ initPointer (initList * ilist)
        if ((val = constExprValue (expr, FALSE)))
                return val;
        
+       /* ( ptr + constant ) */
+       if (IS_AST_OP (expr) &&
+           (expr->opval.op == '+' || expr->opval.op == '-') &&
+           IS_AST_SYM_VALUE (expr->left) &&
+           (IS_ARRAY(expr->left->ftype) || IS_PTR(expr->left->ftype)) &&
+           compareType(toType, expr->left->ftype) &&
+           IS_AST_LIT_VALUE (expr->right)) {
+         return valForCastAggr (expr->left, expr->left->ftype,
+                                     expr->right,
+                                     expr->opval.op);
+       }
+       
+       /* (char *)&a */
+       if (IS_AST_OP(expr) && expr->opval.op==CAST &&
+           IS_AST_OP(expr->right) && expr->right->opval.op=='&') {
+         if (compareType(toType, expr->left->ftype)!=1) {
+           werror (W_INIT_WRONG);
+           printFromToType(expr->left->ftype, toType);
+         }
+         // skip the cast ???
+         expr=expr->right;
+       }
+
        /* no then we have to do these cludgy checks */
        /* pointers can be initialized with address of
           a variable or address of an array element */
@@ -390,7 +413,6 @@ initPointer (initList * ilist)
                                       expr->right, expr->opval.op);
 
        }
-       
        /* case 4. (char *)(array type) */
        if (IS_CAST_OP(expr) && IS_AST_SYM_VALUE (expr->right) &&
            IS_ARRAY(expr->right->ftype)) {
@@ -416,7 +438,7 @@ initPointer (initList * ilist)
                return val;
        }
  wrong:
-       werror (W_INIT_WRONG);
+       werror (E_INCOMPAT_PTYPES);
        return NULL;
 
 }
@@ -482,12 +504,8 @@ pointerTypeToGPByte (const int p_type, const char *iname, const char *oname)
     case POINTER:
       return 0;
     case GPOINTER:
-      /* hack - if we get a generic pointer, we just assume
-       * it's an FPOINTER (i.e. in XDATA space).
-       */
       werror (E_CANNOT_USE_GENERIC_POINTER, iname, oname);
       exit (1);
-      // fall through
     case FPOINTER:
       return 1;
     case CPOINTER:
@@ -726,7 +744,7 @@ printIvalArray (symbol * sym, sym_link * type, initList * ilist,
   /* by a string                      */
   if (IS_CHAR (type->next)) {
     if (!IS_LITERAL(list2val(ilist)->etype)) {
-      werror (W_INIT_WRONG);
+      werror (E_CONST_EXPECTED);
       return;
     }
     if (printIvalChar (type,
@@ -785,6 +803,11 @@ printIvalFuncPtr (sym_link * type, initList * ilist, FILE * oFile)
 
   val = list2val (ilist);
 
+  if (!val) {
+    // an error has been thrown allready
+    val=constVal("0");
+  }
+
   if (IS_LITERAL(val->etype)) {
     if (compareType(type,val->etype)==0) {
       werror (E_INCOMPAT_TYPES);
@@ -945,7 +968,7 @@ printIvalPtr (symbol * sym, sym_link * type, initList * ilist, FILE * oFile)
       return;
     }
 
-  if (!(val = initPointer (ilist)))
+  if (!(val = initPointer (ilist, type)))
     return;
 
   /* if character pointer */
@@ -954,8 +977,10 @@ printIvalPtr (symbol * sym, sym_link * type, initList * ilist, FILE * oFile)
       return;
 
   /* check the type      */
-  if (compareType (type, val->type) == 0)
+  if (compareType (type, val->type) == 0) {
     werror (W_INIT_WRONG);
+    printFromToType (val->type, type);
+  }
 
   /* if val is literal */
   if (IS_LITERAL (val->etype))
@@ -1011,6 +1036,9 @@ printIval (symbol * sym, sym_link * type, initList * ilist, FILE * oFile)
   if (!ilist)
     return;
 
+  /* update line number for error msgs */
+  lineno=sym->lineDef;
+
   /* if structure then    */
   if (IS_STRUCT (type))
     {