Fixed up s51 autodetect
[fw/sdcc] / src / SDCCast.c
index 000088b1322df60a3e3aa0b015ffc07e83af7ff2..05db77f88062641f72ebedacfe9bbcdbb688d2cd 100644 (file)
@@ -574,6 +574,46 @@ funcOfType (char *name, sym_link * type, sym_link * argType,
 
 }
 
+/*-----------------------------------------------------------------*/
+/* funcOfTypeVarg :- function of type with name and argtype        */
+/*-----------------------------------------------------------------*/
+symbol *
+funcOfTypeVarg (char *name, char * rtype, int nArgs , char **atypes)
+{
+  
+    symbol *sym;
+    int i ;
+    /* create the symbol */
+    sym = newSymbol (name, 0);
+    
+    /* setup return value */
+    sym->type = newLink ();
+    DCL_TYPE (sym->type) = FUNCTION;
+    sym->type->next = typeFromStr(rtype);
+    sym->etype = getSpec (sym->type);
+    
+    /* if arguments required */
+    if (nArgs) {
+       value *args;
+       args = FUNC_ARGS(sym->type) = newValue ();
+       
+       for ( i = 0 ; i < nArgs ; i++ ) {
+           args->type = typeFromStr(atypes[i]);
+           args->etype = getSpec (args->type);
+           SPEC_EXTR(args->etype)=1;
+           if ((i + 1) == nArgs) break;
+           args = args->next = newValue ();
+       }
+    }
+    
+    /* save it */
+    addSymChain (sym);
+    sym->cdef = 1;
+    allocVariables (sym);
+    return sym;
+
+}
+
 /*-----------------------------------------------------------------*/
 /* reverseParms - will reverse a parameter tree                    */
 /*-----------------------------------------------------------------*/
@@ -1935,7 +1975,9 @@ decorateType (ast * tree)
     ast *dtl, *dtr;
 
     dtl = decorateType (tree->left);
-    dtr = decorateType (tree->right);
+    /* delay right side for '?' operator since conditional macro expansions might
+       rely on this */
+    dtr = (tree->opval.op == '?' ? tree->right : decorateType (tree->right));
 
     /* this is to take care of situations
        when the tree gets rewritten */
@@ -2150,8 +2192,10 @@ decorateType (ast * tree)
        DCL_TYPE (p) = IPOINTER;
       else if (SPEC_SCLS (tree->left->etype) == S_EEPROM)
        DCL_TYPE (p) = EEPPOINTER;
+      else if (SPEC_OCLS(tree->left->etype))
+         DCL_TYPE (p) = PTR_TYPE(SPEC_OCLS(tree->left->etype));
       else
-       DCL_TYPE (p) = POINTER;
+         DCL_TYPE (p) = POINTER;
 
       if (IS_AST_SYM_VALUE (tree->left))
        {
@@ -2843,6 +2887,79 @@ decorateType (ast * tree)
                               tree->opval.val->type);
       return tree;
 
+      /*------------------------------------------------------------------*/
+      /*----------------------------*/
+      /*             typeof         */
+      /*----------------------------*/
+    case TYPEOF:
+       /* return typeof enum value */
+       tree->type = EX_VALUE;
+       {
+           int typeofv = 0;
+           if (IS_SPEC(tree->right->ftype)) {
+               switch (SPEC_NOUN(tree->right->ftype)) {
+               case V_INT:
+                   if (SPEC_LONG(tree->right->ftype)) typeofv = TYPEOF_LONG;
+                   else typeofv = TYPEOF_INT;
+                   break;
+               case V_FLOAT:
+                   typeofv = TYPEOF_FLOAT;
+                   break;
+               case V_CHAR:
+                   typeofv = TYPEOF_CHAR;
+                   break;
+               case V_VOID:
+                   typeofv = TYPEOF_VOID;
+                   break;
+               case V_STRUCT:
+                   typeofv = TYPEOF_STRUCT;
+                   break;
+               case V_BIT:
+                   typeofv = TYPEOF_BIT;
+                   break;
+               case V_SBIT:
+                   typeofv = TYPEOF_SBIT;
+                   break;
+               default:
+                   break;
+               }
+           } else {
+               switch (DCL_TYPE(tree->right->ftype)) {
+               case POINTER:
+                   typeofv = TYPEOF_POINTER;
+                   break;
+               case FPOINTER:
+                   typeofv = TYPEOF_FPOINTER;
+                   break;
+               case CPOINTER:
+                   typeofv = TYPEOF_CPOINTER;
+                   break;
+               case GPOINTER:
+                   typeofv = TYPEOF_GPOINTER;
+                   break;
+               case PPOINTER:
+                   typeofv = TYPEOF_PPOINTER;
+                   break;
+               case IPOINTER:
+                   typeofv = TYPEOF_IPOINTER;
+                   break;
+               case ARRAY:
+                   typeofv = TYPEOF_ARRAY;
+                   break;
+               case FUNCTION:
+                   typeofv = TYPEOF_FUNCTION;
+                   break;
+               default:
+                   break;
+               }
+           }
+           sprintf (buffer, "%d", typeofv);
+           tree->opval.val = constVal (buffer);
+           tree->right = tree->left = NULL;
+           TETYPE (tree) = getSpec (TTYPE (tree) =
+                                    tree->opval.val->type);
+       }
+       return tree;
       /*------------------------------------------------------------------*/
       /*----------------------------*/
       /* conditional operator  '?'  */
@@ -2852,13 +2969,14 @@ decorateType (ast * tree)
       assert(IS_COLON_OP(tree->right));
       /* if already known then replace the tree : optimizer will do it
         but faster to do it here */
-      if (IS_LITERAL (LTYPE(tree))) {
+      if (IS_LITERAL (LTYPE(tree))) {    
          if ( ((int) floatFromVal (valFromType (LETYPE (tree)))) != 0) {
-             return tree->right->left ;
+             return decorateType(tree->right->left) ;
          } else {
-             return tree->right->right ;
+             return decorateType(tree->right->right) ;
          }
       } else {
+         tree->right = decorateType(tree->right);
          TTYPE (tree) = RTYPE(tree);
          TETYPE (tree) = getSpec (TTYPE (tree));
       }
@@ -3080,7 +3198,8 @@ decorateType (ast * tree)
        goto errorTreeReturn;
       }
 
-      if (options.stackAuto || IFFUNC_ISREENT (LTYPE (tree)))
+      if ((options.stackAuto || IFFUNC_ISREENT (LTYPE (tree))) && 
+         !IFFUNC_ISBUILTIN(LTYPE(tree)))
        {
          //FUNC_ARGS(tree->left->ftype) = 
          //reverseVal (FUNC_ARGS(tree->left->ftype));
@@ -3944,6 +4063,63 @@ optimizeCompare (ast * root)
   vright = (root->right->type == EX_VALUE ?
            root->right->opval.val : NULL);
 
+  //#define EXPERIMENTAL
+#ifdef EXPERIMENTAL
+  /* if left is unsigned and right is literal */
+  if (vleft && vright && 
+      IS_UNSIGNED(vleft->etype) &&
+      IS_LITERAL(vright->etype)) {
+    double dval=floatFromVal(vright);
+    int op=root->opval.op;
+
+    fprintf (stderr,"op: '");
+    switch (op) {
+    case LE_OP: fprintf (stderr, "<= '"); break;
+    case EQ_OP: fprintf (stderr, "== '"); break;
+    case GE_OP: fprintf (stderr, ">= '"); break;
+    default: fprintf (stderr, "%c '", op); break;
+    }
+    fprintf (stderr, "%f\n", dval);
+
+    switch (op)
+      {
+      case EQ_OP:
+      case LE_OP:
+      case '<':
+       if (dval<0 || (op=='<' && dval==0)) {
+         // unsigned is never < 0
+         werror (W_IF_NEVER_TRUE);
+         optExpr = newAst_VALUE (constVal("0"));
+         return decorateType (optExpr);
+       }
+       if (dval==0) {
+         if (op==LE_OP) {
+           // change this into a cheaper EQ_OP
+           fprintf (stderr, "warning *** changed '<=' to '==' because of unsigned\n");
+           root->opval.op=EQ_OP;
+           return root;
+         }
+       }
+       break;
+      case GE_OP:
+      case '>':
+       if (dval>0 || (op==GE_OP && dval==0)) {
+         // unsigned is never < 0
+         werror (W_IF_ALWAYS_TRUE);
+         optExpr = newAst_VALUE (constVal("1"));
+         return decorateType (optExpr);
+       }
+       if (dval==0) {
+         if (op=='>') {
+           // change this into a cheaper reversed EQ_OP
+           fprintf (stderr, "warning *** changed '>' to '!=' because of unsigned\n");
+           root->opval.op=EQ_OP;
+         }
+       }
+      }
+  }
+#endif
+
   /* if left is a BITVAR in BITSPACE */
   /* and right is a LITERAL then opt- */
   /* imize else do nothing       */
@@ -4279,7 +4455,7 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                INDENT(indent,outfile);
                fprintf(outfile,"{\n");
                while (decls) {
-                       INDENT(indent+4,outfile);
+                       INDENT(indent+2,outfile);
                        fprintf(outfile,"DECLARE SYMBOL (%s=%p) type (",
                                decls->name, decls);
                        printTypeChain(decls->type,outfile);
@@ -4287,7 +4463,7 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                        
                        decls = decls->next;                    
                }
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->right,outfile,indent+2);
                INDENT(indent,outfile);
                fprintf(outfile,"}\n");
                return;
@@ -4354,8 +4530,8 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                fprintf(outfile,"ARRAY_OP (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
+               ast_print(tree->right,outfile,indent+2);
                return;
 
                /*------------------------------------------------------------------*/
@@ -4366,8 +4542,8 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                fprintf(outfile,"STRUCT_ACCESS (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
+               ast_print(tree->right,outfile,indent+2);
                return ;
 
                /*------------------------------------------------------------------*/
@@ -4378,8 +4554,8 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                fprintf(outfile,"PTR_ACCESS (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
+               ast_print(tree->right,outfile,indent+2);
                return ;
 
                /*------------------------------------------------------------------*/
@@ -4390,14 +4566,14 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                fprintf(outfile,"INC_OP (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
                return ;
 
        case DEC_OP:
                fprintf(outfile,"DEC_OP (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
                return ;
 
                /*------------------------------------------------------------------*/
@@ -4409,14 +4585,14 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                        fprintf(outfile,"& (%p) type (",tree);
                        printTypeChain(tree->ftype,outfile);
                        fprintf(outfile,")\n");
-                       ast_print(tree->left,outfile,indent+4);
-                       ast_print(tree->right,outfile,indent+4);
+                       ast_print(tree->left,outfile,indent+2);
+                       ast_print(tree->right,outfile,indent+2);
                } else {
                        fprintf(outfile,"ADDRESS_OF (%p) type (",tree);
                        printTypeChain(tree->ftype,outfile);
                        fprintf(outfile,")\n");
-                       ast_print(tree->left,outfile,indent+4);
-                       ast_print(tree->right,outfile,indent+4);
+                       ast_print(tree->left,outfile,indent+2);
+                       ast_print(tree->right,outfile,indent+2);
                }
                return ;
                /*----------------------------*/
@@ -4426,8 +4602,8 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                fprintf(outfile,"OR (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
+               ast_print(tree->right,outfile,indent+2);
                return ;
                /*------------------------------------------------------------------*/
                /*----------------------------*/
@@ -4437,8 +4613,8 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                fprintf(outfile,"XOR (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
+               ast_print(tree->right,outfile,indent+2);
                return ;
                
                /*------------------------------------------------------------------*/
@@ -4449,8 +4625,8 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                fprintf(outfile,"DIV (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
+               ast_print(tree->right,outfile,indent+2);
                return ;
                /*------------------------------------------------------------------*/
                /*----------------------------*/
@@ -4460,8 +4636,8 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                fprintf(outfile,"MOD (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
+               ast_print(tree->right,outfile,indent+2);
                return ;
 
                /*------------------------------------------------------------------*/
@@ -4473,7 +4649,7 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                        fprintf(outfile,"DEREF (%p) type (",tree);
                        printTypeChain(tree->ftype,outfile);
                        fprintf(outfile,")\n");
-                       ast_print(tree->left,outfile,indent+4);
+                       ast_print(tree->left,outfile,indent+2);
                        return ;
                }                       
                /*------------------------------------------------------------------*/
@@ -4483,8 +4659,8 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                fprintf(outfile,"MULT (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
+               ast_print(tree->right,outfile,indent+2);
                return ;
 
 
@@ -4498,7 +4674,7 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                        fprintf(outfile,"UPLUS (%p) type (",tree);
                        printTypeChain(tree->ftype,outfile);
                        fprintf(outfile,")\n");
-                       ast_print(tree->left,outfile,indent+4);
+                       ast_print(tree->left,outfile,indent+2);
                } else {
                        /*------------------------------------------------------------------*/
                        /*----------------------------*/
@@ -4507,8 +4683,8 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                        fprintf(outfile,"ADD (%p) type (",tree);
                        printTypeChain(tree->ftype,outfile);
                        fprintf(outfile,")\n");
-                       ast_print(tree->left,outfile,indent+4);
-                       ast_print(tree->right,outfile,indent+4);
+                       ast_print(tree->left,outfile,indent+2);
+                       ast_print(tree->right,outfile,indent+2);
                }
                return;
                /*------------------------------------------------------------------*/
@@ -4520,7 +4696,7 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                        fprintf(outfile,"UMINUS (%p) type (",tree);
                        printTypeChain(tree->ftype,outfile);
                        fprintf(outfile,")\n");
-                       ast_print(tree->left,outfile,indent+4);
+                       ast_print(tree->left,outfile,indent+2);
                } else {
                        /*------------------------------------------------------------------*/
                        /*----------------------------*/
@@ -4529,8 +4705,8 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                        fprintf(outfile,"SUB (%p) type (",tree);
                        printTypeChain(tree->ftype,outfile);
                        fprintf(outfile,")\n");
-                       ast_print(tree->left,outfile,indent+4);
-                       ast_print(tree->right,outfile,indent+4);
+                       ast_print(tree->left,outfile,indent+2);
+                       ast_print(tree->right,outfile,indent+2);
                }
                return;
                /*------------------------------------------------------------------*/
@@ -4541,7 +4717,7 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                fprintf(outfile,"COMPL (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
                return ;
                /*------------------------------------------------------------------*/
                /*----------------------------*/
@@ -4551,7 +4727,7 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                fprintf(outfile,"NOT (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
                return ;
                /*------------------------------------------------------------------*/
                /*----------------------------*/
@@ -4561,34 +4737,34 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                fprintf(outfile,"RRC (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
                return ;
 
        case RLC:
                fprintf(outfile,"RLC (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
                return ;
        case GETHBIT:
                fprintf(outfile,"GETHBIT (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
                return ;
        case LEFT_OP:
                fprintf(outfile,"LEFT_SHIFT (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
+               ast_print(tree->right,outfile,indent+2);
                return ;
        case RIGHT_OP:
                fprintf(outfile,"RIGHT_SHIFT (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
+               ast_print(tree->right,outfile,indent+2);
                return ;
                /*------------------------------------------------------------------*/
                /*----------------------------*/
@@ -4600,22 +4776,22 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                fprintf(outfile,") to type (");
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->right,outfile,indent+2);
                return ;
                
        case AND_OP:
                fprintf(outfile,"ANDAND (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
+               ast_print(tree->right,outfile,indent+2);
                return ;
        case OR_OP:
                fprintf(outfile,"OROR (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
+               ast_print(tree->right,outfile,indent+2);
                return ;
                
                /*------------------------------------------------------------------*/
@@ -4626,43 +4802,43 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                fprintf(outfile,"GT(>) (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
+               ast_print(tree->right,outfile,indent+2);
                return ;
        case '<':
                fprintf(outfile,"LT(<) (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
+               ast_print(tree->right,outfile,indent+2);
                return ;
        case LE_OP:
                fprintf(outfile,"LE(<=) (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
+               ast_print(tree->right,outfile,indent+2);
                return ;
        case GE_OP:
                fprintf(outfile,"GE(>=) (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
+               ast_print(tree->right,outfile,indent+2);
                return ;
        case EQ_OP:
                fprintf(outfile,"EQ(==) (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
+               ast_print(tree->right,outfile,indent+2);
                return ;
        case NE_OP:
                fprintf(outfile,"NE(!=) (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
+               ast_print(tree->right,outfile,indent+2);
                /*------------------------------------------------------------------*/
                /*----------------------------*/
                /*             sizeof         */
@@ -4679,16 +4855,16 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                fprintf(outfile,"QUEST(?) (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
+               ast_print(tree->right,outfile,indent+2);
                return;
 
        case ':':
                fprintf(outfile,"COLON(:) (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
+               ast_print(tree->right,outfile,indent+2);
                return ;
                
                /*------------------------------------------------------------------*/
@@ -4699,50 +4875,50 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                fprintf(outfile,"MULASS(*=) (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
+               ast_print(tree->right,outfile,indent+2);
                return;
        case DIV_ASSIGN:
                fprintf(outfile,"DIVASS(/=) (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
+               ast_print(tree->right,outfile,indent+2);
                return;
        case AND_ASSIGN:
                fprintf(outfile,"ANDASS(&=) (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
+               ast_print(tree->right,outfile,indent+2);
                return;
        case OR_ASSIGN:
                fprintf(outfile,"ORASS(*=) (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
+               ast_print(tree->right,outfile,indent+2);
                return;
        case XOR_ASSIGN:
                fprintf(outfile,"XORASS(*=) (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
+               ast_print(tree->right,outfile,indent+2);
                return;
        case RIGHT_ASSIGN:
                fprintf(outfile,"RSHFTASS(>>=) (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
+               ast_print(tree->right,outfile,indent+2);
                return;
        case LEFT_ASSIGN:
                fprintf(outfile,"LSHFTASS(*=) (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
+               ast_print(tree->right,outfile,indent+2);
                return;
                /*------------------------------------------------------------------*/
                /*----------------------------*/
@@ -4752,8 +4928,8 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                fprintf(outfile,"SUBASS(-=) (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
+               ast_print(tree->right,outfile,indent+2);
                return;
                /*------------------------------------------------------------------*/
                /*----------------------------*/
@@ -4763,8 +4939,8 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                fprintf(outfile,"ADDASS(+=) (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
+               ast_print(tree->right,outfile,indent+2);
                return;
                /*------------------------------------------------------------------*/
                /*----------------------------*/
@@ -4774,8 +4950,8 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                fprintf(outfile,"ASSIGN(=) (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
+               ast_print(tree->right,outfile,indent+2);
                return;     
                /*------------------------------------------------------------------*/
                /*----------------------------*/
@@ -4785,8 +4961,8 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                fprintf(outfile,"COMMA(,) (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
+               ast_print(tree->right,outfile,indent+2);
                return;
                /*------------------------------------------------------------------*/
                /*----------------------------*/
@@ -4797,14 +4973,14 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                fprintf(outfile,"CALL (%p) type (",tree);
                printTypeChain(tree->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->left,outfile,indent+4);
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
+               ast_print(tree->right,outfile,indent+2);
                return;
        case PARAM:
                fprintf(outfile,"PARMS\n");
-               ast_print(tree->left,outfile,indent+4);
-               if (tree->right && !IS_AST_PARAM(tree->right)) {
-                       ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
+               if (tree->right /*&& !IS_AST_PARAM(tree->right)*/) {
+                       ast_print(tree->right,outfile,indent+2);
                }
                return ;
                /*------------------------------------------------------------------*/
@@ -4815,15 +4991,15 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                fprintf(outfile,"RETURN (%p) type (",tree);
                printTypeChain(tree->right->ftype,outfile);
                fprintf(outfile,")\n");
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->right,outfile,indent+2);
                return ;
                /*------------------------------------------------------------------*/
                /*----------------------------*/
                /*     label statement        */
                /*----------------------------*/
        case LABEL :
-               fprintf(outfile,"LABEL (%p)",tree);
-               ast_print(tree->left,outfile,indent+4);
+               fprintf(outfile,"LABEL (%p)\n",tree);
+               ast_print(tree->left,outfile,indent+2);
                ast_print(tree->right,outfile,indent);
                return;
                /*------------------------------------------------------------------*/
@@ -4836,7 +5012,7 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                        fprintf(outfile,"SWITCH (%p) ",tree);
                        ast_print(tree->left,outfile,0);
                        for (val = tree->values.switchVals.swVals; val ; val = val->next) {
-                               INDENT(indent+4,outfile);
+                               INDENT(indent+2,outfile);
                                fprintf(outfile,"CASE 0x%x GOTO _case_%d_%d\n",
                                        (int) floatFromVal(val),
                                        tree->values.switchVals.swNum,
@@ -4851,7 +5027,7 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                /*----------------------------*/
        case IFX:
                fprintf(outfile,"IF (%p) \n",tree);
-               ast_print(tree->left,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
                if (tree->trueLabel) {
                        INDENT(indent,outfile);
                        fprintf(outfile,"NE(!=) 0 goto %s\n",tree->trueLabel->name);
@@ -4860,7 +5036,7 @@ void ast_print (ast * tree, FILE *outfile, int indent)
                        INDENT(indent,outfile);
                        fprintf(outfile,"EQ(==) 0 goto %s\n",tree->falseLabel->name);
                }
-               ast_print(tree->right,outfile,indent+4);
+               ast_print(tree->right,outfile,indent+2);
                return ;
                /*------------------------------------------------------------------*/
                /*----------------------------*/
@@ -4869,22 +5045,22 @@ void ast_print (ast * tree, FILE *outfile, int indent)
        case FOR:
                fprintf(outfile,"FOR (%p) \n",tree);
                if (AST_FOR( tree, initExpr)) {
-                       INDENT(indent+4,outfile);
+                       INDENT(indent+2,outfile);
                        fprintf(outfile,"INIT EXPR ");
-                       ast_print(AST_FOR(tree, initExpr),outfile,indent+4);
+                       ast_print(AST_FOR(tree, initExpr),outfile,indent+2);
                }
                if (AST_FOR( tree, condExpr)) {
-                       INDENT(indent+4,outfile);
+                       INDENT(indent+2,outfile);
                        fprintf(outfile,"COND EXPR ");
-                       ast_print(AST_FOR(tree, condExpr),outfile,indent+4);
+                       ast_print(AST_FOR(tree, condExpr),outfile,indent+2);
                }
                if (AST_FOR( tree, loopExpr)) {
-                       INDENT(indent+4,outfile);
+                       INDENT(indent+2,outfile);
                        fprintf(outfile,"LOOP EXPR ");
-                       ast_print(AST_FOR(tree, loopExpr),outfile,indent+4);
+                       ast_print(AST_FOR(tree, loopExpr),outfile,indent+2);
                }
                fprintf(outfile,"FOR LOOP BODY \n");
-               ast_print(tree->left,outfile,indent+4);
+               ast_print(tree->left,outfile,indent+2);
                return ;
        default:
            return ;