more function pointer parameter issues

[fw/sdcc] / src / SDCCast.c

diff --git a/src/SDCCast.c b/src/SDCCast.c
index 0277d7ff20e9b64e0546af0a0dacefff012123f8..189216815a0652776a06e48bf869ceb537abd859 100644 (file)
--- a/src/SDCCast.c
+++ b/src/SDCCast.c
@@ -605,7 +605,7 @@ processParms (ast * func,
              value *defParm,
              ast * actParm,
              int *parmNumber, // unused, although updated
-             bool rightmost) // double checked?
+             bool rightmost)
 {
   /* if none of them exist */
   if (!defParm && !actParm)
@@ -697,7 +697,7 @@ processParms (ast * func,
       if (newType)
        {
          /* cast required; change this op to a cast. */
-         ast *parmCopy = resolveSymbols (copyAst (actParm));
+         ast *parmCopy = decorateType(resolveSymbols (copyAst (actParm)));
 
          actParm->type = EX_OP;
          actParm->opval.op = CAST;
@@ -751,7 +751,7 @@ processParms (ast * func,
   /* if the parameter is castable then add the cast */
   if (compareType (defParm->type, actParm->ftype) < 0)
     {
-      ast *pTree = resolveSymbols (copyAst (actParm));
+      ast *pTree = decorateType(resolveSymbols (copyAst (actParm)));
 
       /* now change the current one to a cast */
       actParm->type = EX_OP;
@@ -3093,13 +3093,14 @@ decorateType (ast * tree)
 
       if (processParms (tree->left,
                        FUNC_ARGS(tree->left->ftype),
-                       tree->right, &parmNumber, TRUE))
+                       tree->right, &parmNumber, TRUE)) {
        goto errorTreeReturn;
+      }
 
       if (options.stackAuto || IFFUNC_ISREENT (LTYPE (tree)))
        {
-         //IFFUNC_ARGS(tree->left->ftype) = 
-         //reverseVal (IFFUNC_ARGS(tree->left->ftype));
+         //FUNC_ARGS(tree->left->ftype) = 
+         //reverseVal (FUNC_ARGS(tree->left->ftype));
          reverseParms (tree->right);
        }
 
@@ -4100,6 +4101,9 @@ createFunction (symbol * name, ast * body)
   sym_link *fetype;
   iCode *piCode = NULL;
 
+  if (getenv("SDCC_DEBUG_FUNCTION_POINTERS"))
+    fprintf (stderr, "SDCCast.c:createFunction(%s)\n", name->name);
+
   /* if check function return 0 then some problem */
   if (checkFunction (name, NULL) == 0)
     return NULL;
@@ -4130,7 +4134,10 @@ createFunction (symbol * name, ast * body)
     }
   name->lastLine = yylineno;
   currFunc = name;
-  processFuncArgs (currFunc, 0);
+
+#if 0 // jwk: this is now done in addDecl()
+  processFuncArgs (currFunc);
+#endif
 
   /* set the stack pointer */
   /* PENDING: check this for the mcs51 */
@@ -4171,7 +4178,7 @@ createFunction (symbol * name, ast * body)
   body = resolveSymbols (body);        /* resolve the symbols */
   body = decorateType (body);  /* propagateType & do semantic checks */
 
-  ex = newAst_VALUE (symbolVal (name));                /* create name       */
+  ex = newAst_VALUE (symbolVal (name));        /* create name */
   ex = newNode (FUNCTION, ex, body);
   ex->values.args = FUNC_ARGS(name->type);
   ex->decorated=1;
@@ -4275,9 +4282,9 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                  if (arg) {
                    fprintf (outfile, ", ");
                  }
-                 printTypeChain (args->type, outfile);
+                 printTypeChain (args ? args->type : NULL, outfile);
                  arg++;
-                 args=args->next;
+                 args= args ? args->next : NULL;
                } while (args);
                fprintf(outfile,")\n");
                ast_print(tree->left,outfile,indent);
@@ -4811,10 +4818,9 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                ast_print(tree->right,outfile,indent+4);
                return;
        case PARAM:
-               fprintf(outfile,"PARM ");
+               fprintf(outfile,"PARMS\n");
                ast_print(tree->left,outfile,indent+4);
                if (tree->right && !IS_AST_PARAM(tree->right)) {
-                       fprintf(outfile,"PARM ");
                        ast_print(tree->right,outfile,indent+4);
                }
                return ;