Replaced cast (void **) with (void *) to avoid gcc 3 warning:

* src/SDCCcflow.c
* src/SDCCcse.c
* src/SDCCdflow.c
* src/SDCClabel.c
* src/SDCClrange.c
* src/SDCCmem.c
* src/SDCCopt.c
* src/SDCCpeeph.c
* src/SDCCset.c
* src/avr/ralloc.c
* src/ds390/ralloc.c
* src/izt/ralloc.c
* src/mcs51/ralloc.c
* src/pic/ralloc.c
* src/pic16/ralloc.c
* src/xa51/ralloc.c
* src/z80/ralloc.c
* src/z80/gen.c: removed unused label "release:"

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

diff --git a/ChangeLog b/ChangeLog
index 27337e56fbc55a8047398bc56b4770fec0fb7600..61accb82a155f20d4ae17d333433297ca9ebf97e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2003-10-08 Bernhard Held <bernhard@bernhardheld.de>
+
+       Replaced cast (void **) with (void *) to avoid gcc 3 warning:
+       * src/SDCCcflow.c
+       * src/SDCCcse.c
+       * src/SDCCdflow.c
+       * src/SDCClabel.c
+       * src/SDCClrange.c
+       * src/SDCCmem.c
+       * src/SDCCopt.c
+       * src/SDCCpeeph.c
+       * src/SDCCset.c
+       * src/avr/ralloc.c
+       * src/ds390/ralloc.c
+       * src/izt/ralloc.c
+       * src/mcs51/ralloc.c
+       * src/pic/ralloc.c
+       * src/pic16/ralloc.c
+       * src/xa51/ralloc.c
+       * src/z80/ralloc.c
+       * src/z80/gen.c: removed unused label "release:"
+
 2003-10-06  Borut Razem <borut.razem@siol.net>
 
        * src/SDCC.lex: removed definition of unused variables

diff --git a/src/SDCCcflow.c b/src/SDCCcflow.c
index e3befba85b65249664df21bdf03121b9aa48e650..0b307797ef5ac2cfa3da2c8547aff70af1917a66 100644 (file)
--- a/src/SDCCcflow.c
+++ b/src/SDCCcflow.c
@@ -281,7 +281,7 @@ immedDom (eBBlock ** ebbs, eBBlock * ebp)
     if (loop->dfnum > idom->dfnum)
       idom = loop;
 
-  setToNull ((void **) &iset);
+  setToNull ((void *) &iset);
   return idom;
 
 }
@@ -396,10 +396,10 @@ computeControlFlow (eBBlock ** ebbs, int count, int reSort)
 
   for (i = 0; i < count; i++)
     {
-      setToNull ((void **) &ebbs[i]->predList);
-      setToNull ((void **) &ebbs[i]->domVect);
-      setToNull ((void **) &ebbs[i]->succList);
-      setToNull ((void **) &ebbs[i]->succVect);
+      setToNull ((void *) &ebbs[i]->predList);
+      setToNull ((void *) &ebbs[i]->domVect);
+      setToNull ((void *) &ebbs[i]->succList);
+      setToNull ((void *) &ebbs[i]->succVect);
       ebbs[i]->visited = 0;
       ebbs[i]->dfnum = 0;
     }
@@ -408,7 +408,7 @@ computeControlFlow (eBBlock ** ebbs, int count, int reSort)
     /* sort it back by block number */
     qsort (ebbs, saveCount, sizeof (eBBlock *), bbNumCompare);
 
-  setToNull ((void **) &graphEdges);
+  setToNull ((void *) &graphEdges);
   /* this will put in the  */
   /* successor information for each blk */
   eBBSuccessors (ebbs, count);

diff --git a/src/SDCCcse.c b/src/SDCCcse.c
index 08da1d922ede503658e56857ebe574d05ffc7af6..350e6bb92abe46548b6510e023843eeb539734ff 100644 (file)
--- a/src/SDCCcse.c
+++ b/src/SDCCcse.c
@@ -1633,12 +1633,12 @@ cseBBlock (eBBlock * ebb, int computeOnly,
   cseSet = setFromSet (ebb->inExprs);
 
   /* these will be computed by this routine */
-  setToNull ((void **) &ebb->outDefs);
-  setToNull ((void **) &ebb->defSet);
-  setToNull ((void **) &ebb->usesDefs);
-  setToNull ((void **) &ebb->ptrsSet);
-  setToNull ((void **) &ebb->addrOf);
-  setToNull ((void **) &ebb->ldefs);
+  setToNull ((void *) &ebb->outDefs);
+  setToNull ((void *) &ebb->defSet);
+  setToNull ((void *) &ebb->usesDefs);
+  setToNull ((void *) &ebb->ptrsSet);
+  setToNull ((void *) &ebb->addrOf);
+  setToNull ((void *) &ebb->ldefs);
 
   ebb->outDefs = bitVectCopy (ebb->inDefs);
   bitVectDefault = iCodeKey;
@@ -2018,7 +2018,7 @@ cseBBlock (eBBlock * ebb, int computeOnly,
        }
     }
 
-  setToNull ((void **) &ebb->outExprs);
+  setToNull ((void *) &ebb->outExprs);
   ebb->outExprs = cseSet;
   ebb->outDefs = bitVectUnion (ebb->outDefs, ebb->defSet);
   ebb->ptrsSet = bitVectUnion (ebb->ptrsSet, ebb->inPtrsSet);

diff --git a/src/SDCCdflow.c b/src/SDCCdflow.c
index b76055e500ebb5c6fcc100f358b8d173a17f5436..3b3f8dd1438428bd3ac86d6fb5604938f4356be4 100644 (file)
--- a/src/SDCCdflow.c
+++ b/src/SDCCdflow.c
@@ -68,11 +68,11 @@ DEFSETFUNC (ifKilledInBlock)
                   cdp->diCode->key);
   if (bitVectBitsInCommon (outs, OP_DEFS (cdp->sym)))
     {
-      setToNull ((void **) &outs);
+      setToNull ((void *) &outs);
       return 1;
     }
 
-  setToNull ((void **) &outs);
+  setToNull ((void *) &outs);
 
   /* if the operands of this one was changed in the block */
   /* then delete it */
@@ -190,7 +190,7 @@ computeDataFlow (eBBlock ** ebbs, int count)
            oldOutExprs = setFromSet (ebbs[i]->outExprs);
          else
            oldOutDefs = bitVectCopy (ebbs[i]->outDefs);
-         setToNull ((void **) &ebbs[i]->inDefs);
+         setToNull ((void *) &ebbs[i]->inDefs);
 
          /* indefitions are easy just merge them by union */
          /* these are the definitions that can possibly   */
@@ -218,13 +218,13 @@ computeDataFlow (eBBlock ** ebbs, int count)
 
          /* figure out the incoming expressions */
          /* this is a little more complex       */
-         setToNull ((void **) &ebbs[i]->inExprs);
+         setToNull ((void *) &ebbs[i]->inExprs);
          if (optimize.global_cse)
            {
              firstTime = 1;
              applyToSet (pred, mergeInExprs, ebbs[i], &firstTime);
            }
-         setToNull ((void **) &pred);
+         setToNull ((void *) &pred);
 
          /* do cse with computeOnly flag set to TRUE */
          /* this by far the quickest way of computing */

diff --git a/src/SDCClabel.c b/src/SDCClabel.c
index 0b6f7c0ea1b1f56ad8585e1820c10869579f178c..04ce55681ec77c2e601c4fd080186f97a2534650 100644 (file)
--- a/src/SDCClabel.c
+++ b/src/SDCClabel.c
@@ -35,8 +35,8 @@ buildLabelRefTable (iCode * ic)
 {
   iCode *lic;
 
-  setToNull ((void **) &labelRef);
-  setToNull ((void **) &labelDef);
+  setToNull ((void *) &labelRef);
+  setToNull ((void *) &labelDef);
   labelRef = newHashTable (labelKey + 1);
   labelDef = newHashTable (labelKey + 1);
 

diff --git a/src/SDCClrange.c b/src/SDCClrange.c
index 26e4e97c72d76c3c8e2bdf21122832c3eee1b59d..6744ebf97b5e64f690540f9ee25e8e33ccf66d63 100644 (file)
--- a/src/SDCClrange.c
+++ b/src/SDCClrange.c
@@ -742,9 +742,9 @@ computeLiveRanges (eBBlock ** ebbs, int count)
      in terms of this sequence additionally the
      routine will also create a hashtable of instructions */
   iCodeSeq = 0;
-  setToNull ((void **) &iCodehTab);
+  setToNull ((void *) &iCodehTab);
   iCodehTab = newHashTable (iCodeKey);
-  setToNull ((void **) &iCodeSeqhTab);
+  setToNull ((void *) &iCodeSeqhTab);
   iCodeSeqhTab = newHashTable (iCodeKey);
   sequenceiCode (ebbs, count);
 
@@ -756,7 +756,7 @@ computeLiveRanges (eBBlock ** ebbs, int count)
 
   /* call routine to mark the from & to live ranges for
      variables used */
-  setToNull ((void **) &liveRanges);
+  setToNull ((void *) &liveRanges);
   for (i = 0; i < count; i++)
     markLiveRanges (ebbs[i], ebbs, count);
 

diff --git a/src/SDCCmem.c b/src/SDCCmem.c
index 4c62eb07069b1456a912a6b10206cb719f75b84e..5fe82651fe47e1de45281948dfc7140f71fca936 100644 (file)
--- a/src/SDCCmem.c
+++ b/src/SDCCmem.c
@@ -766,7 +766,7 @@ overlay2data ()
       allocIntoSeg (sym);
     }
 
-  setToNull ((void **) &overlay->syms);
+  setToNull ((void *) &overlay->syms);
 
 }
 
@@ -787,7 +787,7 @@ overlay2Set ()
       addSet (&oset, sym);
     }
 
-  setToNull ((void **) &overlay->syms);
+  setToNull ((void *) &overlay->syms);
   addSet (&ovrSetSets, oset);
 
 }

diff --git a/src/SDCCopt.c b/src/SDCCopt.c
index 345f8484bbe3afd793d5d4a7c325a0f6ceb128e6..116c5f0fada20a2a572c5980f0a760a2ba7755e5 100644 (file)
--- a/src/SDCCopt.c
+++ b/src/SDCCopt.c
@@ -978,7 +978,7 @@ eBBlockFromiCode (iCode * ic)
   port->assignRegisters (ebbs, count);
 
   /* throw away blocks */
-  setToNull ((void **) &graphEdges);
+  setToNull ((void *) &graphEdges);
   ebbs = NULL;
   
   return NULL;

diff --git a/src/SDCCpeeph.c b/src/SDCCpeeph.c
index 79cbd12fb94b1b46dee541f88d7482a33b5c7e23..2c493e2528aaabffc331b7da307ded3e7ae01cb4 100644 (file)
--- a/src/SDCCpeeph.c
+++ b/src/SDCCpeeph.c
@@ -1368,7 +1368,7 @@ matchRule (lineNode * pl,
   lineNode *spl;               /* source pl */
   lineNode *rpl;               /* rule peep line */
 
-/*     setToNull((void **) &pr->vars);    */
+/*     setToNull((void *) &pr->vars);    */
 /*     pr->vars = newHashTable(100); */
 
   /* for all the lines defined in the rule */
@@ -2012,7 +2012,7 @@ initPeepHole ()
   if (options.peep_file)
     {
       readRules (s = readFileIntoBuffer (options.peep_file));
-      setToNull ((void **) &s);
+      setToNull ((void *) &s);
     }
 
 

diff --git a/src/SDCCset.c b/src/SDCCset.c
index 8bc2e4685d636bf0851d7071a6f54597c12b653d..2f3ce9bb8f1ae82e1278f2c659e27a128b58dbac 100644 (file)
--- a/src/SDCCset.c
+++ b/src/SDCCset.c
@@ -311,14 +311,14 @@ unionSets (set * list1, set * list2, int throw)
   switch (throw)
     {
     case THROW_SRC:
-      setToNull ((void **) &list2);
+      setToNull ((void *) &list2);
       break;
     case THROW_DEST:
-      setToNull ((void **) &list1);
+      setToNull ((void *) &list1);
       break;
     case THROW_BOTH:
-      setToNull ((void **) &list1);
-      setToNull ((void **) &list2);
+      setToNull ((void *) &list1);
+      setToNull ((void *) &list2);
     }
 
   return un;
@@ -346,14 +346,14 @@ unionSetsWith (set * list1, set * list2, int (*cFunc) (), int throw)
   switch (throw)
     {
     case THROW_SRC:
-      setToNull ((void **) &list2);
+      setToNull ((void *) &list2);
       break;
     case THROW_DEST:
-      setToNull ((void **) &list1);
+      setToNull ((void *) &list1);
       break;
     case THROW_BOTH:
-      setToNull ((void **) &list1);
-      setToNull ((void **) &list2);
+      setToNull ((void *) &list1);
+      setToNull ((void *) &list2);
     }
 
   return un;
@@ -376,14 +376,14 @@ intersectSets (set * list1, set * list2, int throw)
   switch (throw)
     {
     case THROW_SRC:
-      setToNull ((void **) &list2);
+      setToNull ((void *) &list2);
       break;
     case THROW_DEST:
-      setToNull ((void **) &list1);
+      setToNull ((void *) &list1);
       break;
     case THROW_BOTH:
-      setToNull ((void **) &list1);
-      setToNull ((void **) &list2);
+      setToNull ((void *) &list1);
+      setToNull ((void *) &list2);
     }
 
   return in;
@@ -408,14 +408,14 @@ intersectSetsWith (set * list1, set * list2,
   switch (throw)
     {
     case THROW_SRC:
-      setToNull ((void **) &list2);
+      setToNull ((void *) &list2);
       break;
     case THROW_DEST:
-      setToNull ((void **) &list1);
+      setToNull ((void *) &list1);
       break;
     case THROW_BOTH:
-      setToNull ((void **) &list1);
-      setToNull ((void **) &list2);
+      setToNull ((void *) &list1);
+      setToNull ((void *) &list2);
     }
 
   return in;
@@ -495,14 +495,14 @@ subtractFromSet (set * left, set * right, int throw)
   switch (throw)
     {
     case THROW_SRC:
-      setToNull ((void **) &right);
+      setToNull ((void *) &right);
       break;
     case THROW_DEST:
-      setToNull ((void **) &left);
+      setToNull ((void *) &left);
       break;
     case THROW_BOTH:
-      setToNull ((void **) &left);
-      setToNull ((void **) &right);
+      setToNull ((void *) &left);
+      setToNull ((void *) &right);
       break;
     }
 

diff --git a/src/avr/ralloc.c b/src/avr/ralloc.c
index 074e374daa202de7a65c4fd2edffa59d2a88edd0..134286c46a39b27590d36b7aa72751069844fc67 100644 (file)
--- a/src/avr/ralloc.c
+++ b/src/avr/ralloc.c
@@ -692,7 +692,7 @@ leastUsedLR (set * sset)
 
        }
 
-       setToNull ((void **) &sset);
+       setToNull ((void *) &sset);
        sym->blockSpil = 0;
        return sym;
 }
@@ -2276,8 +2276,8 @@ avr_assignRegisters (eBBlock ** ebbs, int count)
        /* free up any _G.stackSpil locations allocated */
        applyToSet (_G.stackSpil, deallocStackSpil);
        _G.slocNum = 0;
-       setToNull ((void **) &_G.stackSpil);
-       setToNull ((void **) &_G.spiltSet);
+       setToNull ((void *) &_G.stackSpil);
+       setToNull ((void *) &_G.spiltSet);
        /* mark all registers as free */
 
        return;

diff --git a/src/ds390/ralloc.c b/src/ds390/ralloc.c
index 982021d8d1c1c7b5dd0dbae8c7144e491a09bd0c..9cbdf64cc8e8ea9f272226fe2dc56e67758bf947 100644 (file)
--- a/src/ds390/ralloc.c
+++ b/src/ds390/ralloc.c
@@ -362,7 +362,7 @@ leastUsedLR (set * sset)
 
     }
 
-  setToNull ((void **) &sset);
+  setToNull ((void *) &sset);
   sym->blockSpil = 0;
   return sym;
 }
@@ -3080,8 +3080,8 @@ ds390_assignRegisters (eBBlock ** ebbs, int count)
   /* free up any _G.stackSpil locations allocated */
   applyToSet (_G.stackSpil, deallocStackSpil);
   _G.slocNum = 0;
-  setToNull ((void **) &_G.stackSpil);
-  setToNull ((void **) &_G.spiltSet);
+  setToNull ((void *) &_G.stackSpil);
+  setToNull ((void *) &_G.spiltSet);
   /* mark all registers as free */
   ds390_nRegs = 8;
   freeAllRegs ();

diff --git a/src/izt/ralloc.c b/src/izt/ralloc.c
index 48a3a6a0c1ee9d7a554841f28a389481ec02ce9a..99ce0a9e4b5896437c0125cf8a0f14cb53255ca8 100644 (file)
--- a/src/izt/ralloc.c
+++ b/src/izt/ralloc.c
@@ -549,7 +549,7 @@ _leastUsedLR (set * sset)
       walk = setNextItem (sset);
     }
 
-  setToNull ((void **) &sset);
+  setToNull ((void *) &sset);
   sym->blockSpil = 0;
 
   return sym;
@@ -915,8 +915,8 @@ izt_assignRegisters (eBBlock ** ebbs, int count)
   applyToSet (_G.spill.set, _deallocStackSpil);
 
   _G.spill.loc = 0;
-  setToNull ((void **) &_G.spill.set);
-  setToNull ((void **) &_G.spill.vect);
+  setToNull ((void *) &_G.spill.set);
+  setToNull ((void *) &_G.spill.vect);
 
   // And free all registers.
   _freeAllRegs ();

diff --git a/src/mcs51/ralloc.c b/src/mcs51/ralloc.c
index c71bdf8e39b0c43e682f81c3526aea1372c30489..11ddf3745f2fcc3744116e8819c41b919a72be77 100644 (file)
--- a/src/mcs51/ralloc.c
+++ b/src/mcs51/ralloc.c
@@ -350,7 +350,7 @@ leastUsedLR (set * sset)
 
     }
 
-  setToNull ((void **) &sset);
+  setToNull ((void *) &sset);
   sym->blockSpil = 0;
   return sym;
 }
@@ -2939,8 +2939,8 @@ mcs51_assignRegisters (eBBlock ** ebbs, int count)
   /* free up any _G.stackSpil locations allocated */
   applyToSet (_G.stackSpil, deallocStackSpil);
   _G.slocNum = 0;
-  setToNull ((void **) &_G.stackSpil);
-  setToNull ((void **) &_G.spiltSet);
+  setToNull ((void *) &_G.stackSpil);
+  setToNull ((void *) &_G.spiltSet);
   /* mark all registers as free */
   freeAllRegs ();
 

diff --git a/src/pic/ralloc.c b/src/pic/ralloc.c
index 6f6ea8e8801f5fa0c0f720c940bdb34f16d57794..3fa1870eb889d97873f083831c9f68be08947c57 100644 (file)
--- a/src/pic/ralloc.c
+++ b/src/pic/ralloc.c
@@ -1300,7 +1300,7 @@ leastUsedLR (set * sset)
 
     }
 
-  setToNull ((void **) &sset);
+  setToNull ((void *) &sset);
   sym->blockSpil = 0;
   return sym;
 }
@@ -3895,8 +3895,8 @@ pic14_assignRegisters (eBBlock ** ebbs, int count)
   /* free up any _G.stackSpil locations allocated */
   applyToSet (_G.stackSpil, deallocStackSpil);
   _G.slocNum = 0;
-  setToNull ((void **) &_G.stackSpil);
-  setToNull ((void **) &_G.spiltSet);
+  setToNull ((void *) &_G.stackSpil);
+  setToNull ((void *) &_G.spiltSet);
   /* mark all registers as free */
   //pic14_freeAllRegs ();
 

diff --git a/src/pic16/ralloc.c b/src/pic16/ralloc.c
index e5cfcb359e99639f9b5cd31f6e7e0f4ec1526c6f..c2de61d9c01a42fa2a5e799a8b8ecd4c7b25920d 100644 (file)
--- a/src/pic16/ralloc.c
+++ b/src/pic16/ralloc.c
@@ -1304,7 +1304,7 @@ leastUsedLR (set * sset)
 
     }
 
-  setToNull ((void **) &sset);
+  setToNull ((void *) &sset);
   sym->blockSpil = 0;
   return sym;
 }
@@ -3889,8 +3889,8 @@ pic16_assignRegisters (eBBlock ** ebbs, int count)
   /* free up any _G.stackSpil locations allocated */
   applyToSet (_G.stackSpil, deallocStackSpil);
   _G.slocNum = 0;
-  setToNull ((void **) &_G.stackSpil);
-  setToNull ((void **) &_G.spiltSet);
+  setToNull ((void *) &_G.stackSpil);
+  setToNull ((void *) &_G.spiltSet);
   /* mark all registers as free */
   //pic16_freeAllRegs ();
 

diff --git a/src/xa51/ralloc.c b/src/xa51/ralloc.c
index 552fdb0cc2530589b3e201ce27002d786c8f1a57..aace857961508192c0856842be04dd77724ab0f2 100755 (executable)
--- a/src/xa51/ralloc.c
+++ b/src/xa51/ralloc.c
@@ -473,7 +473,7 @@ leastUsedLR (set * sset)
       
     }
   
-  setToNull ((void **) &sset);
+  setToNull ((void *) &sset);
   sym->blockSpil = 0;
   return sym;
 }
@@ -2099,8 +2099,8 @@ xa51_assignRegisters (eBBlock ** ebbs, int count)
   /* free up any _G.stackSpil locations allocated */
   applyToSet (_G.stackSpil, deallocStackSpil);
   _G.slocNum = 0;
-  setToNull ((void **) &_G.stackSpil);
-  setToNull ((void **) &_G.spiltSet);
+  setToNull ((void *) &_G.stackSpil);
+  setToNull ((void *) &_G.spiltSet);
   /* mark all registers as free */
   freeAllRegs ();
   

diff --git a/src/z80/gen.c b/src/z80/gen.c
index 263944333bdaaa71498bfe706485ceb4ab20ba9c..f9a678e917ea0af0ebe5140c5af892288252701e 100644 (file)
--- a/src/z80/gen.c
+++ b/src/z80/gen.c
@@ -7132,7 +7132,6 @@ genDummyRead (iCode * ic)
       offset++;
     }
 
-release:
   freeAsmop (right, NULL, ic);
 }
 

diff --git a/src/z80/ralloc.c b/src/z80/ralloc.c
index 9eaebde377de754f1941dd4f87da46ccdd7b6e82..8becb698dd8cf7044e39df9538a7343c9a17f1f9 100644 (file)
--- a/src/z80/ralloc.c
+++ b/src/z80/ralloc.c
@@ -356,7 +356,7 @@ leastUsedLR (set * sset)
 
     }
 
-  setToNull ((void **) &sset);
+  setToNull ((void *) &sset);
   sym->blockSpil = 0;
   return sym;
 }
@@ -3063,8 +3063,8 @@ z80_assignRegisters (eBBlock ** ebbs, int count)
   /* free up any stackSpil locations allocated */
   applyToSet (_G.stackSpil, deallocStackSpil);
   _G.slocNum = 0;
-  setToNull ((void **) &_G.stackSpil);
-  setToNull ((void **) &_G.spiltSet);
+  setToNull ((void *) &_G.stackSpil);
+  setToNull ((void *) &_G.spiltSet);
   /* mark all registers as free */
   freeAllRegs ();