- added newline in the .def file to keep MSC compiler satisfied

[fw/sdcc] / src / SDCCglue.c

diff --git a/src/SDCCglue.c b/src/SDCCglue.c
index e8922ec841debb17375afbee0f9e0123c1fdff7f..590320ca0684bebc60635cac9402b98185abe740 100644 (file)
--- a/src/SDCCglue.c
+++ b/src/SDCCglue.c
@@ -329,6 +329,18 @@ initPointer (initList * ilist, sym_link *toType)
        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=='&') {
@@ -401,7 +413,6 @@ initPointer (initList * ilist, sym_link *toType)
                                       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)) {
@@ -427,7 +438,7 @@ initPointer (initList * ilist, sym_link *toType)
                return val;
        }
  wrong:
-       werror (W_INIT_WRONG);
+       werror (E_INCOMPAT_PTYPES);
        return NULL;
 
 }
@@ -491,20 +502,18 @@ pointerTypeToGPByte (const int p_type, const char *iname, const char *oname)
     {
     case IPOINTER:
     case POINTER:
-      return 0;
+      return GPTYPE_NEAR;
     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);
+       werror (E_CANNOT_USE_GENERIC_POINTER, 
+               iname ? iname : "<null>", 
+               oname ? oname : "<null>");
       exit (1);
-      // fall through
     case FPOINTER:
-      return 1;
+      return GPTYPE_FAR;
     case CPOINTER:
-      return 2;
+      return GPTYPE_CODE;
     case PPOINTER:
-      return 3;
+      return GPTYPE_XSTACK;
     default:
       fprintf (stderr, "*** internal error: unknown pointer type %d in GPByte.\n",
               p_type);
@@ -737,7 +746,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,
@@ -796,6 +805,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);
@@ -965,8 +979,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))
@@ -982,9 +998,9 @@ printIvalPtr (symbol * sym, sym_link * type, initList * ilist, FILE * oFile)
          else
            tfprintf (oFile, "\t.byte %s,%s\n", aopLiteral (val, 0), aopLiteral (val, 1));
          break;
-       case 3:
-         fprintf (oFile, "\t.byte %s,%s,#0x02\n",
-                  aopLiteral (val, 0), aopLiteral (val, 1));
+       case 3: // how about '390??
+         fprintf (oFile, "\t.byte %s,%s,#0x%d\n",
+                  aopLiteral (val, 0), aopLiteral (val, 1), GPTYPE_CODE);
        }
       return;
     }
@@ -1022,6 +1038,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))
     {
@@ -1663,7 +1682,6 @@ rm_tmpfiles (void)
 char *
 tempfilename (void)
 {
-#if !defined(_MSC_VER)
   const char *tmpdir = NULL;
   if (getenv ("TMP"))
     tmpdir = getenv ("TMP");
@@ -1679,7 +1697,6 @@ tempfilename (void)
           return name;
         }
     }
-#endif
   return tmpnam (NULL);
 }
 
@@ -1690,7 +1707,6 @@ tempfilename (void)
 FILE *
 tempfile (void)
 {
-#if !defined(_MSC_VER)
   const char *tmpdir = NULL;
   if (getenv ("TMP"))
     tmpdir = getenv ("TMP");
@@ -1712,7 +1728,5 @@ tempfile (void)
        }
       return NULL;
     }
-#endif
   return tmpfile ();
 }
-