From 820a147ef1e8ff307c3d4e675001372e8f636404 Mon Sep 17 00:00:00 2001 From: Alan Mishchenko Date: Mon, 1 Aug 2011 12:35:34 +0700 Subject: Removed useless typecasts related to changes in Vec_VecEntry(). --- src/opt/lpk/lpkCore.c | 2 +- src/opt/lpk/lpkCut.c | 2 +- src/opt/res/resCore.c | 4 ++-- src/opt/rwr/rwrEva.c | 8 ++++---- src/opt/sim/simSymSat.c | 2 +- src/opt/sim/simSymSim.c | 2 +- src/opt/sim/simUtils.c | 6 +++--- 7 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src/opt') diff --git a/src/opt/lpk/lpkCore.c b/src/opt/lpk/lpkCore.c index a7485397..a4c9471d 100644 --- a/src/opt/lpk/lpkCore.c +++ b/src/opt/lpk/lpkCore.c @@ -98,7 +98,7 @@ int Lpk_NodeHasChanged( Lpk_Man_t * p, int iNode ) Vec_Ptr_t * vNodes; Abc_Obj_t * pTemp; int i; - vNodes = (Vec_Ptr_t *)Vec_VecEntry( p->vVisited, iNode ); + vNodes = Vec_VecEntry( p->vVisited, iNode ); if ( Vec_PtrSize(vNodes) == 0 ) return 1; Vec_PtrForEachEntry( Abc_Obj_t *, vNodes, pTemp, i ) diff --git a/src/opt/lpk/lpkCut.c b/src/opt/lpk/lpkCut.c index ac0a3516..a07372e6 100644 --- a/src/opt/lpk/lpkCut.c +++ b/src/opt/lpk/lpkCut.c @@ -233,7 +233,7 @@ unsigned * Lpk_CutTruth( Lpk_Man_t * p, Lpk_Cut_t * pCut, int fInv ) void Lpk_NodeRecordImpact( Lpk_Man_t * p ) { Lpk_Cut_t * pCut; - Vec_Ptr_t * vNodes = (Vec_Ptr_t *)Vec_VecEntry( p->vVisited, p->pObj->Id ); + Vec_Ptr_t * vNodes = Vec_VecEntry( p->vVisited, p->pObj->Id ); Abc_Obj_t * pNode; int i, k; // collect the nodes that impact the given node diff --git a/src/opt/res/resCore.c b/src/opt/res/resCore.c index c27b3874..eecdd481 100644 --- a/src/opt/res/resCore.c +++ b/src/opt/res/resCore.c @@ -320,7 +320,7 @@ p->timeSim += clock() - clk; p->nConstsUsed++; pFunc = p->pSim->fConst1? Hop_ManConst1((Hop_Man_t *)pNtk->pManFunc) : Hop_ManConst0((Hop_Man_t *)pNtk->pManFunc); - vFanins = (Vec_Ptr_t *)Vec_VecEntry( p->vResubsW, 0 ); + vFanins = Vec_VecEntry( p->vResubsW, 0 ); Vec_PtrClear( vFanins ); Res_UpdateNetwork( pObj, vFanins, pFunc, p->vLevels ); continue; @@ -389,7 +389,7 @@ p->timeInt += clock() - clk; // update the network clk = clock(); - Res_UpdateNetwork( pObj, (Vec_Ptr_t *)Vec_VecEntry(p->vResubsW, k), pFunc, p->vLevels ); + Res_UpdateNetwork( pObj, Vec_VecEntry(p->vResubsW, k), pFunc, p->vLevels ); p->timeUpd += clock() - clk; break; } diff --git a/src/opt/rwr/rwrEva.c b/src/opt/rwr/rwrEva.c index 4dc6c082..5d826da9 100644 --- a/src/opt/rwr/rwrEva.c +++ b/src/opt/rwr/rwrEva.c @@ -263,7 +263,7 @@ Dec_Graph_t * Rwr_CutEvaluate( Rwr_Man_t * p, Abc_Obj_t * pRoot, Cut_Cut_t * pCu float CostBest;//, CostCur; // find the matching class of subgraphs uTruth = 0xFFFF & *Cut_CutReadTruth(pCut); - vSubgraphs = (Vec_Ptr_t *)Vec_VecEntry( p->vClasses, p->pMap[uTruth] ); + vSubgraphs = Vec_VecEntry( p->vClasses, p->pMap[uTruth] ); p->nSubgraphs += vSubgraphs->nSize; // determine the best subgraph GainBest = -1; @@ -509,7 +509,7 @@ void Rwr_ScoresClean( Rwr_Man_t * p ) int i, k; for ( i = 0; i < p->vClasses->nSize; i++ ) { - vSubgraphs = (Vec_Ptr_t *)Vec_VecEntry( p->vClasses, i ); + vSubgraphs = Vec_VecEntry( p->vClasses, i ); Vec_PtrForEachEntry( Rwr_Node_t *, vSubgraphs, pNode, k ) pNode->nScore = pNode->nGain = pNode->nAdded = 0; } @@ -562,7 +562,7 @@ void Rwr_ScoresReport( Rwr_Man_t * p ) { Perm[i] = i; Gains[i] = 0; - vSubgraphs = (Vec_Ptr_t *)Vec_VecEntry( p->vClasses, i ); + vSubgraphs = Vec_VecEntry( p->vClasses, i ); Vec_PtrForEachEntry( Rwr_Node_t *, vSubgraphs, pNode, k ) Gains[i] += pNode->nGain; } @@ -575,7 +575,7 @@ void Rwr_ScoresReport( Rwr_Man_t * p ) iNew = Perm[i]; if ( Gains[iNew] == 0 ) break; - vSubgraphs = (Vec_Ptr_t *)Vec_VecEntry( p->vClasses, iNew ); + vSubgraphs = Vec_VecEntry( p->vClasses, iNew ); printf( "CLASS %3d: Subgr = %3d. Total gain = %6d. ", iNew, Vec_PtrSize(vSubgraphs), Gains[iNew] ); uTruth = (unsigned)p->pMapInv[iNew]; Extra_PrintBinary( stdout, &uTruth, 16 ); diff --git a/src/opt/sim/simSymSat.c b/src/opt/sim/simSymSat.c index bdc8fbee..dcdff135 100644 --- a/src/opt/sim/simSymSat.c +++ b/src/opt/sim/simSymSat.c @@ -63,7 +63,7 @@ int Sim_SymmsGetPatternUsingSat( Sym_Man_t * p, unsigned * pPattern ) pMatNonSym = (Extra_BitMat_t *)Vec_PtrEntry( p->vMatrNonSymms, out ); // go through the remaining variable pairs - vSupport = (Vec_Int_t *)Vec_VecEntry( p->vSupports, out ); + vSupport = Vec_VecEntryInt( p->vSupports, out ); Vec_IntForEachEntry( vSupport, v, Index1 ) Vec_IntForEachEntryStart( vSupport, u, Index2, Index1+1 ) { diff --git a/src/opt/sim/simSymSim.c b/src/opt/sim/simSymSim.c index af942a19..e1676117 100644 --- a/src/opt/sim/simSymSim.c +++ b/src/opt/sim/simSymSim.c @@ -137,7 +137,7 @@ void Sim_SymmsDeriveInfo( Sym_Man_t * p, unsigned * pPat, Abc_Obj_t * pNode, Vec int i, w, Index; // get the matrix, the support, and the simulation info pMat = (Extra_BitMat_t *)Vec_PtrEntry( vMatrsNonSym, Output ); - vSupport = (Vec_Int_t *)Vec_VecEntry( p->vSupports, Output ); + vSupport = Vec_VecEntryInt( p->vSupports, Output ); pSupport = (unsigned *)Vec_PtrEntry( p->vSuppFun, Output ); pSimInfo = (unsigned *)Vec_PtrEntry( p->vSim, pNode->Id ); // generate vectors A1 and A2 diff --git a/src/opt/sim/simUtils.c b/src/opt/sim/simUtils.c index aa3fc8af..64814c0e 100644 --- a/src/opt/sim/simUtils.c +++ b/src/opt/sim/simUtils.c @@ -639,7 +639,7 @@ clk = clock(); for ( i = 0; i < p->nOutputs; i++ ) { printf( "Output %2d :", i ); - Sim_UtilCountPairsOnePrint( (Extra_BitMat_t *)Vec_PtrEntry(p->vMatrSymms, i), (Vec_Int_t *)Vec_VecEntry(p->vSupports, i) ); + Sim_UtilCountPairsOnePrint( (Extra_BitMat_t *)Vec_PtrEntry(p->vMatrSymms, i), Vec_VecEntryInt(p->vSupports, i) ); printf( "\n" ); } p->timeCount += clock() - clk; @@ -674,8 +674,8 @@ clk = clock(); p->nPairsNonSymm += nPairsNonSym; continue; } - nPairsSym = Sim_UtilCountPairsOne( (Extra_BitMat_t *)Vec_PtrEntry(p->vMatrSymms, i), (Vec_Int_t *)Vec_VecEntry(p->vSupports, i) ); - nPairsNonSym = Sim_UtilCountPairsOne( (Extra_BitMat_t *)Vec_PtrEntry(p->vMatrNonSymms,i), (Vec_Int_t *)Vec_VecEntry(p->vSupports, i) ); + nPairsSym = Sim_UtilCountPairsOne( (Extra_BitMat_t *)Vec_PtrEntry(p->vMatrSymms, i), Vec_VecEntryInt(p->vSupports, i) ); + nPairsNonSym = Sim_UtilCountPairsOne( (Extra_BitMat_t *)Vec_PtrEntry(p->vMatrNonSymms,i), Vec_VecEntryInt(p->vSupports, i) ); assert( nPairsTotal >= nPairsSym + nPairsNonSym ); Vec_IntWriteEntry( p->vPairsSym, i, nPairsSym ); Vec_IntWriteEntry( p->vPairsNonSym, i, nPairsNonSym ); -- cgit v1.2.3