From: bernhardheld <bernhardheld@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Wed, 8 Oct 2003 09:04:48 +0000 (+0000)
Subject: Replaced cast (void **) with (void *) to avoid gcc 3 warning:
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=352fa0f35ea5438842550a8b438c303a2cd8f5b1;p=fw%2Fsdcc

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 27337e56..61accb82 100644
--- 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 e3befba8..0b307797 100644
--- 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 08da1d92..350e6bb9 100644
--- 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 b76055e5..3b3f8dd1 100644
--- 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 0b6f7c0e..04ce5568 100644
--- 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 26e4e97c..6744ebf9 100644
--- 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 4c62eb07..5fe82651 100644
--- 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 345f8484..116c5f0f 100644
--- 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 79cbd12f..2c493e25 100644
--- 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 8bc2e468..2f3ce9bb 100644
--- 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 074e374d..134286c4 100644
--- 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 982021d8..9cbdf64c 100644
--- 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 48a3a6a0..99ce0a9e 100644
--- 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 c71bdf8e..11ddf374 100644
--- 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 6f6ea8e8..3fa1870e 100644
--- 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 e5cfcb35..c2de61d9 100644
--- 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 552fdb0c..aace8579 100755
--- 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 26394433..f9a678e9 100644
--- 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 9eaebde3..8becb698 100644
--- 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 ();