* src/SDCCsymt.h: removed RESULT_CHECK

* src/SDCCast.c,
* src/SDCCglue.c,
* src/SDCCval.c,
* src/pic/glue.c,
* src/pic16/glue.c: replaced RESULT_CHECK with RESULT_TYPE_NONE

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@3497 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/ChangeLog b/ChangeLog
index 5a2c761f91c90d31c3c13085132e2f88edb14c8b..ec46032ec7f1a00cd0ca880e63ca833e80159451 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-09-15 Bernhard Held <bernhard AT bernhardheld.de>
+
+       * src/SDCCsymt.h: removed RESULT_CHECK
+       * src/SDCCast.c,
+       * src/SDCCglue.c,
+       * src/SDCCval.c,
+       * src/pic/glue.c,
+       * src/pic16/glue.c: replaced RESULT_CHECK with RESULT_TYPE_NONE
+
 2004-09-15 Vangelis Rokas <vrokas AT otenet.gr>
 
        * src/SDCCicode.c (piCode): applied patch from Raphael Neider,

diff --git a/src/SDCCast.c b/src/SDCCast.c
index d0898d7e57991ae917bec7466355cc07a7ea8f4c..2ba8dd0e7bf929b6c13f4e86b699aedbd824457e 100644 (file)
--- a/src/SDCCast.c
+++ b/src/SDCCast.c
@@ -834,8 +834,8 @@ createIvalType (ast * sym, sym_link * type, initList * ilist)
   if (ilist->type == INIT_DEEP)
     ilist = ilist->init.deep;
 
-  iExpr = decorateType (resolveSymbols (list2expr (ilist)), RESULT_CHECK);
-  return decorateType (newNode ('=', sym, iExpr), RESULT_CHECK);
+  iExpr = decorateType (resolveSymbols (list2expr (ilist)), RESULT_TYPE_NONE);
+  return decorateType (newNode ('=', sym, iExpr), RESULT_TYPE_NONE);
 }
 
 /*-----------------------------------------------------------------*/
@@ -865,8 +865,8 @@ createIvalStruct (ast * sym, sym_link * type, initList * ilist)
         break;
       sflds->implicit = 1;
       lAst = newNode (PTR_OP, newNode ('&', sym, NULL), newAst_VALUE (symbolVal (sflds)));
-      lAst = decorateType (resolveSymbols (lAst), RESULT_CHECK);
-      rast = decorateType (resolveSymbols (createIval (lAst, sflds->type, iloop, rast)), RESULT_CHECK);
+      lAst = decorateType (resolveSymbols (lAst), RESULT_TYPE_NONE);
+      rast = decorateType (resolveSymbols (createIval (lAst, sflds->type, iloop, rast)), RESULT_TYPE_NONE);
     }
 
   if (iloop) {
@@ -896,9 +896,9 @@ createIvalArray (ast * sym, sym_link * type, initList * ilist)
   if (IS_CHAR (type->next))
     if ((rast = createIvalCharPtr (sym,
                                    type,
-                        decorateType (resolveSymbols (list2expr (ilist)), RESULT_CHECK))))
+                        decorateType (resolveSymbols (list2expr (ilist)), RESULT_TYPE_NONE))))
 
-      return decorateType (resolveSymbols (rast), RESULT_CHECK);
+      return decorateType (resolveSymbols (rast), RESULT_TYPE_NONE);
 
     /* not the special case             */
     if (ilist->type != INIT_DEEP)
@@ -914,7 +914,7 @@ createIvalArray (ast * sym, sym_link * type, initList * ilist)
     {
         ast *aSym;
 
-        aSym = decorateType (resolveSymbols(sym), RESULT_CHECK);
+        aSym = decorateType (resolveSymbols(sym), RESULT_TYPE_NONE);
         
         rast = newNode(ARRAYINIT, aSym, NULL);
         rast->values.constlist = literalL;
@@ -943,7 +943,7 @@ createIvalArray (ast * sym, sym_link * type, initList * ilist)
             ast *aSym;
             
             aSym = newNode ('[', sym, newAst_VALUE (valueFromLit ((float) (size++))));
-            aSym = decorateType (resolveSymbols (aSym), RESULT_CHECK);
+            aSym = decorateType (resolveSymbols (aSym), RESULT_TYPE_NONE);
             rast = createIval (aSym, type->next, iloop, rast);
             iloop = (iloop ? iloop->next : NULL);
             if (!iloop)
@@ -973,7 +973,7 @@ createIvalArray (ast * sym, sym_link * type, initList * ilist)
         DCL_ELEM (type) = size;
     }
 
-    return decorateType (resolveSymbols (rast), RESULT_CHECK);
+    return decorateType (resolveSymbols (rast), RESULT_TYPE_NONE);
 }
 
 
@@ -1027,7 +1027,7 @@ createIvalCharPtr (ast * sym, sym_link * type, ast * iexpr)
       // now WE don't need iexpr's symbol anymore
       freeStringSymbol(AST_SYMBOL(iexpr));
 
-      return decorateType (resolveSymbols (rast), RESULT_CHECK);
+      return decorateType (resolveSymbols (rast), RESULT_TYPE_NONE);
     }
 
   return NULL;
@@ -1046,7 +1046,7 @@ createIvalPtr (ast * sym, sym_link * type, initList * ilist)
   if (ilist->type == INIT_DEEP)
     ilist = ilist->init.deep;
 
-  iexpr = decorateType (resolveSymbols (list2expr (ilist)), RESULT_CHECK);
+  iexpr = decorateType (resolveSymbols (list2expr (ilist)), RESULT_TYPE_NONE);
 
   /* if character pointer */
   if (IS_CHAR (type->next))
@@ -1084,9 +1084,9 @@ createIval (ast * sym, sym_link * type, initList * ilist, ast * wid)
     rast = createIvalType (sym, type, ilist);
 
   if (wid)
-    return decorateType (resolveSymbols (newNode (NULLOP, wid, rast)), RESULT_CHECK);
+    return decorateType (resolveSymbols (newNode (NULLOP, wid, rast)), RESULT_TYPE_NONE);
   else
-    return decorateType (resolveSymbols (rast), RESULT_CHECK);
+    return decorateType (resolveSymbols (rast), RESULT_TYPE_NONE);
 }
 
 /*-----------------------------------------------------------------*/
@@ -1302,7 +1302,7 @@ bool constExprTree (ast *cexpr) {
     return TRUE;
   }
 
-  cexpr = decorateType (resolveSymbols (cexpr), RESULT_CHECK);
+  cexpr = decorateType (resolveSymbols (cexpr), RESULT_TYPE_NONE);
 
   switch (cexpr->type) 
     {
@@ -1366,7 +1366,7 @@ bool constExprTree (ast *cexpr) {
 value *
 constExprValue (ast * cexpr, int check)
 {
-  cexpr = decorateType (resolveSymbols (cexpr), RESULT_CHECK);
+  cexpr = decorateType (resolveSymbols (cexpr), RESULT_TYPE_NONE);
 
   /* if this is not a constant then */
   if (!IS_LITERAL (cexpr->ftype))
@@ -1961,7 +1961,7 @@ reverseLoop (ast * loop, symbol * sym, ast * init, ast * end)
                                                   rloop))));
 
   rloop->lineno=init->lineno;
-  return decorateType (rloop, RESULT_CHECK);
+  return decorateType (rloop, RESULT_TYPE_NONE);
 
 }
 
@@ -2563,7 +2563,7 @@ decorateType (ast * tree, RESULT_TYPE resultType)
             ast *otree = optimizeGetHbit (tree);
 
             if (otree != tree)
-              return decorateType (otree, RESULT_CHECK);
+              return decorateType (otree, RESULT_TYPE_NONE);
           }
 
           /* if left is a literal exchange left & right */
@@ -2693,11 +2693,11 @@ decorateType (ast * tree, RESULT_TYPE resultType)
       {
         ast *wtree = optimizeRRCRLC (tree);
         if (wtree != tree)
-          return decorateType (wtree, RESULT_CHECK);
+          return decorateType (wtree, RESULT_TYPE_NONE);
         
         wtree = optimizeSWAP (tree);
         if (wtree != tree)
-          return decorateType (wtree, RESULT_CHECK);
+          return decorateType (wtree, RESULT_TYPE_NONE);
       }
 
       /* if left is a literal exchange left & right */
@@ -2850,7 +2850,7 @@ decorateType (ast * tree, RESULT_TYPE resultType)
               else
                 {
                   /* litTree->left is literal: no gcse possible.
-                     We can't call decorateType(parent, RESULT_CHECK), because
+                     We can't call decorateType(parent, RESULT_TYPE_NONE), because
                      this would cause an infinit loop. */
                   parent->decorated = 1;
                   decorateType (litTree, resultType);
@@ -3757,7 +3757,7 @@ decorateType (ast * tree, RESULT_TYPE resultType)
                                      tree->right); /* val 0 */
               tree->right->lineno = tree->lineno;
               tree->right->left->lineno = tree->lineno;
-              decorateType (tree->right, RESULT_CHECK);
+              decorateType (tree->right, RESULT_TYPE_NONE);
             }
         }
       /* if they are both literal then */
@@ -4044,7 +4044,7 @@ decorateType (ast * tree, RESULT_TYPE resultType)
           goto errorTreeReturn;
         }
 
-      tree->right = decorateType (newNode ('+', copyAst (tree->left), tree->right), RESULT_CHECK);
+      tree->right = decorateType (newNode ('+', copyAst (tree->left), tree->right), RESULT_TYPE_NONE);
       tree->opval.op = '=';
 
       return tree;
@@ -4182,7 +4182,7 @@ decorateType (ast * tree, RESULT_TYPE resultType)
             decorateType (newNode (CAST,
                           newAst_LINK (copyLinkChain (currFunc->type->next)),
                                         tree->right),
-                          RESULT_CHECK);
+                          RESULT_TYPE_NONE);
         }
 
       RRVAL (tree) = 1;
@@ -4231,9 +4231,9 @@ decorateType (ast * tree, RESULT_TYPE resultType)
       /*----------------------------*/
     case FOR:
 
-      decorateType (resolveSymbols (AST_FOR (tree, initExpr)), RESULT_CHECK);
-      decorateType (resolveSymbols (AST_FOR (tree, condExpr)), RESULT_CHECK);
-      decorateType (resolveSymbols (AST_FOR (tree, loopExpr)), RESULT_CHECK);
+      decorateType (resolveSymbols (AST_FOR (tree, initExpr)), RESULT_TYPE_NONE);
+      decorateType (resolveSymbols (AST_FOR (tree, condExpr)), RESULT_TYPE_NONE);
+      decorateType (resolveSymbols (AST_FOR (tree, loopExpr)), RESULT_TYPE_NONE);
 
       /* if the for loop is reversible then
          reverse it otherwise do what we normally
@@ -4252,7 +4252,7 @@ decorateType (ast * tree, RESULT_TYPE resultType)
                                           AST_FOR (tree, initExpr),
                                           AST_FOR (tree, condExpr),
                                           AST_FOR (tree, loopExpr),
-                                          tree->left), RESULT_CHECK);
+                                          tree->left), RESULT_TYPE_NONE);
       }
     case PARAM:
       werror (E_INTERNAL_ERROR, __FILE__, __LINE__,
@@ -4477,7 +4477,7 @@ createCase (ast * swStat, ast * caseVal, ast * stmnt)
       return NULL;
     }
 
-  caseVal = decorateType (resolveSymbols (caseVal), RESULT_CHECK);
+  caseVal = decorateType (resolveSymbols (caseVal), RESULT_TYPE_NONE);
   /* if not a constant then error  */
   if (!IS_LITERAL (caseVal->ftype))
     {
@@ -4835,7 +4835,7 @@ optimizeGetHbit (ast * tree)
       && !port->hasExtBitOp(GETHBIT, getSize (TTYPE (tree->left->left))))
     return tree;
 
-  return decorateType (newNode (GETHBIT, tree->left->left, NULL), RESULT_CHECK);
+  return decorateType (newNode (GETHBIT, tree->left->left, NULL), RESULT_TYPE_NONE);
 
 }
 
@@ -5102,7 +5102,7 @@ optimizeCompare (ast * root)
           break;
         }
 
-      return decorateType (optExpr, RESULT_CHECK);
+      return decorateType (optExpr, RESULT_TYPE_NONE);
     }
 
   vleft = (root->left->type == EX_VALUE ?
@@ -5176,7 +5176,7 @@ optimizeCompare (ast * root)
               break;
             }
         }
-      return decorateType (resolveSymbols (optExpr), RESULT_CHECK);
+      return decorateType (resolveSymbols (optExpr), RESULT_TYPE_NONE);
     }                           /* end-of-if of BITVAR */
 
 noOptimize:
@@ -5354,7 +5354,7 @@ createFunction (symbol * name, ast * body)
     {
       GcurMemmap = statsg;
       codeOutFile = statsg->oFile;
-      eBBlockFromiCode (iCodeFromAst (decorateType (resolveSymbols (staticAutos), RESULT_CHECK)));
+      eBBlockFromiCode (iCodeFromAst (decorateType (resolveSymbols (staticAutos), RESULT_TYPE_NONE)));
       staticAutos = NULL;
     }
 

diff --git a/src/SDCCglue.c b/src/SDCCglue.c
index 1c463a294e25e1eea047a5f106164b86de3afa1c..8f5510b4bfe26d29868611e27949fdbce487f174 100644 (file)
--- a/src/SDCCglue.c
+++ b/src/SDCCglue.c
@@ -321,7 +321,7 @@ emitRegularMap (memmap * map, bool addPublics, bool arFlag)
                       sym->name);
             }
             ival = newNode ('=', newAst_VALUE (symbolVal (sym)),
-                            decorateType (resolveSymbols (list2expr (sym->ival)), RESULT_CHECK));
+                            decorateType (resolveSymbols (list2expr (sym->ival)), RESULT_TYPE_NONE));
           }
           codeOutFile = statsg->oFile;
 

diff --git a/src/SDCCsymt.h b/src/SDCCsymt.h
index 68992145a7fe1c95eaaa00055ffa9f3fc7e8c3a2..5ed6048e84072d2a21ad2bda70f72b31612a76d7 100644 (file)
--- a/src/SDCCsymt.h
+++ b/src/SDCCsymt.h
@@ -511,7 +511,6 @@ extern sym_link *floatType;
 typedef enum
 {
   RESULT_TYPE_NONE = 0,        /* operands will be promoted to int */
-  RESULT_CHECK = 0, /* TODO: replace all occurences with the appropriate type and remove me */
   RESULT_TYPE_BIT,
   RESULT_TYPE_CHAR,
   RESULT_TYPE_INT,

diff --git a/src/SDCCval.c b/src/SDCCval.c
index 69aab095c2031230256e3436672010820f19a5aa..f1ec65ce60bf2ff311e9bbc9d9db0ba2c4ea3242 100644 (file)
--- a/src/SDCCval.c
+++ b/src/SDCCval.c
@@ -120,7 +120,7 @@ convertIListToConstList(initList *src, literalList **lList)
            return FALSE;
        }
 
-       if (!IS_AST_LIT_VALUE(decorateType(resolveSymbols(iLoop->init.node), RESULT_CHECK)))
+       if (!IS_AST_LIT_VALUE(decorateType(resolveSymbols(iLoop->init.node), RESULT_TYPE_NONE)))
        {
            return FALSE;
        }

diff --git a/src/pic/glue.c b/src/pic/glue.c
index 3e7faa184e1d3fb98b9d03538bf8c7769e541a0b..4a36acd75834d28388a3e3d7b134116e0b01174e 100644 (file)
--- a/src/pic/glue.c
+++ b/src/pic/glue.c
@@ -212,7 +212,7 @@ pic14emitRegularMap (memmap * map, bool addPublics, bool arFlag)
                                ival = initAggregates (sym, sym->ival, NULL);
                        else
                                ival = newNode ('=', newAst_VALUE(symbolVal (sym)),
-                               decorateType (resolveSymbols (list2expr (sym->ival)), RESULT_CHECK));
+                               decorateType (resolveSymbols (list2expr (sym->ival)), RESULT_TYPE_NONE));
                        codeOutFile = statsg->oFile;
                        GcurMemmap = statsg;
                        eBBlockFromiCode (iCodeFromAst (ival));

diff --git a/src/pic16/glue.c b/src/pic16/glue.c
index d4f90371f07c1a79c65e491814602a7da2a390bc..93d4faf982947acb9663368983b9a55defa570d5 100644 (file)
--- a/src/pic16/glue.c
+++ b/src/pic16/glue.c
@@ -375,7 +375,7 @@ pic16emitRegularMap (memmap * map, bool addPublics, bool arFlag)
                                        addSet(&rel_idataSymSet, copySymbol(sym));
 
 //                                     ival = newNode ('=', newAst_VALUE(symbolVal (sym)),
-//                                             decorateType (resolveSymbols (list2expr (sym->ival)), RESULT_CHECK));
+//                                             decorateType (resolveSymbols (list2expr (sym->ival)), RESULT_TYPE_NONE));
                        }
 
                        if(ival) {