diff options
Diffstat (limited to 'src/map/mapper')
-rw-r--r-- | src/map/mapper/mapper.c | 15 | ||||
-rw-r--r-- | src/map/mapper/mapper.h | 21 | ||||
-rw-r--r-- | src/map/mapper/mapperCanon.c | 5 | ||||
-rw-r--r-- | src/map/mapper/mapperCore.c | 5 | ||||
-rw-r--r-- | src/map/mapper/mapperCreate.c | 11 | ||||
-rw-r--r-- | src/map/mapper/mapperCut.c | 5 | ||||
-rw-r--r-- | src/map/mapper/mapperCutUtils.c | 5 | ||||
-rw-r--r-- | src/map/mapper/mapperFanout.c | 5 | ||||
-rw-r--r-- | src/map/mapper/mapperGENERIC.c | 5 | ||||
-rw-r--r-- | src/map/mapper/mapperInt.h | 18 | ||||
-rw-r--r-- | src/map/mapper/mapperLib.c | 7 | ||||
-rw-r--r-- | src/map/mapper/mapperMatch.c | 5 | ||||
-rw-r--r-- | src/map/mapper/mapperRefs.c | 5 | ||||
-rw-r--r-- | src/map/mapper/mapperSuper.c | 5 | ||||
-rw-r--r-- | src/map/mapper/mapperSwitch.c | 5 | ||||
-rw-r--r-- | src/map/mapper/mapperTable.c | 5 | ||||
-rw-r--r-- | src/map/mapper/mapperTime.c | 7 | ||||
-rw-r--r-- | src/map/mapper/mapperTree.c | 7 | ||||
-rw-r--r-- | src/map/mapper/mapperTree_old.c | 7 | ||||
-rw-r--r-- | src/map/mapper/mapperTruth.c | 5 | ||||
-rw-r--r-- | src/map/mapper/mapperUtils.c | 5 | ||||
-rw-r--r-- | src/map/mapper/mapperVec.c | 5 |
22 files changed, 138 insertions, 25 deletions
diff --git a/src/map/mapper/mapper.c b/src/map/mapper/mapper.c index 37052100..f13a7641 100644 --- a/src/map/mapper/mapper.c +++ b/src/map/mapper/mapper.c @@ -21,6 +21,9 @@ #include "mio.h" #include "mapperInt.h" +ABC_NAMESPACE_IMPL_START + + //////////////////////////////////////////////////////////////////////// /// DECLARATIONS /// //////////////////////////////////////////////////////////////////////// @@ -58,10 +61,10 @@ void Map_Init( Abc_Frame_t * pAbc ) SeeAlso [] ***********************************************************************/ -void Map_End() +void Map_End( Abc_Frame_t * pAbc ) { // Map_SuperLibFree( s_pSuperLib ); - Map_SuperLibFree( Abc_FrameReadLibSuper() ); + Map_SuperLibFree( (Map_SuperLib_t *)Abc_FrameReadLibSuper() ); } @@ -149,13 +152,13 @@ int Map_CommandReadLibrary( Abc_Frame_t * pAbc, int argc, char **argv ) // replace the current library // Map_SuperLibFree( s_pSuperLib ); // s_pSuperLib = pLib; - Map_SuperLibFree( Abc_FrameReadLibSuper() ); + Map_SuperLibFree( (Map_SuperLib_t *)Abc_FrameReadLibSuper() ); Abc_FrameSetLibSuper( pLib ); // replace the current genlib library // if ( s_pLib ) Mio_LibraryDelete( s_pLib ); // s_pLib = s_pSuperLib->pGenlib; - Mio_LibraryDelete( Abc_FrameReadLibGen() ); - Abc_FrameSetLibGen( pLib->pGenlib ); + Mio_LibraryDelete( (Mio_Library_t *)Abc_FrameReadLibGen() ); + Abc_FrameSetLibGen( (Mio_Library_t *)pLib->pGenlib ); return 0; usage: @@ -174,3 +177,5 @@ usage: //////////////////////////////////////////////////////////////////////// +ABC_NAMESPACE_IMPL_END + diff --git a/src/map/mapper/mapper.h b/src/map/mapper/mapper.h index ac31feac..aaad08ee 100644 --- a/src/map/mapper/mapper.h +++ b/src/map/mapper/mapper.h @@ -19,6 +19,7 @@ #ifndef __MAPPER_H__ #define __MAPPER_H__ + //////////////////////////////////////////////////////////////////////// /// INCLUDES /// //////////////////////////////////////////////////////////////////////// @@ -27,9 +28,10 @@ /// PARAMETERS /// //////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -extern "C" { -#endif + + +ABC_NAMESPACE_HEADER_START + //////////////////////////////////////////////////////////////////////// /// STRUCTURE DEFINITIONS /// @@ -84,7 +86,7 @@ extern Map_Node_t ** Map_ManReadOutputs( Map_Man_t * p ); extern Map_Node_t * Map_ManReadConst1 ( Map_Man_t * p ); extern Map_Time_t * Map_ManReadInputArrivals( Map_Man_t * p ); extern Mio_Library_t * Map_ManReadGenLib ( Map_Man_t * p ); -extern bool Map_ManReadVerbose( Map_Man_t * p ); +extern int Map_ManReadVerbose( Map_Man_t * p ); extern float Map_ManReadAreaFinal( Map_Man_t * p ); extern float Map_ManReadRequiredGlo( Map_Man_t * p ); extern void Map_ManSetTimeToMap( Map_Man_t * p, int Time ); @@ -95,7 +97,7 @@ extern void Map_ManSetOutputNames( Map_Man_t * p, char ** ppNames ); extern void Map_ManSetAreaRecovery( Map_Man_t * p, int fAreaRecovery ); extern void Map_ManSetDelayTarget( Map_Man_t * p, float DelayTarget ); extern void Map_ManSetInputArrivals( Map_Man_t * p, Map_Time_t * pArrivals ); -extern void Map_ManSetObeyFanoutLimits( Map_Man_t * p, bool fObeyFanoutLimits ); +extern void Map_ManSetObeyFanoutLimits( Map_Man_t * p, int fObeyFanoutLimits ); extern void Map_ManSetNumIterations( Map_Man_t * p, int nNumIterations ); extern int Map_ManReadPass( Map_Man_t * p ); extern void Map_ManSetPass( Map_Man_t * p, int nPass ); @@ -167,6 +169,7 @@ extern void Map_CutCreateFromNode( Map_Man_t * p, Map_Super_t * pSupe extern int Map_Mapping( Map_Man_t * p ); /*=== mapperLib.c =============================================================*/ extern int Map_SuperLibDeriveFromGenlib( Mio_Library_t * pLib ); +extern void Map_SuperLibFree( Map_SuperLib_t * p ); /*=== mapperMntk.c =============================================================*/ //extern Mntk_Man_t * Map_ConvertMappingToMntk( Map_Man_t * pMan ); /*=== mapperSuper.c =============================================================*/ @@ -183,9 +186,11 @@ extern void Map_ManCleanData( Map_Man_t * p ); extern void Map_MappingSetupTruthTables( unsigned uTruths[][2] ); extern void Map_MappingSetupTruthTablesLarge( unsigned uTruths[][32] ); -#ifdef __cplusplus -} -#endif + + +ABC_NAMESPACE_HEADER_END + + #endif diff --git a/src/map/mapper/mapperCanon.c b/src/map/mapper/mapperCanon.c index 4f93ad3b..e9445a4f 100644 --- a/src/map/mapper/mapperCanon.c +++ b/src/map/mapper/mapperCanon.c @@ -18,6 +18,9 @@ #include "mapperInt.h" +ABC_NAMESPACE_IMPL_START + + //////////////////////////////////////////////////////////////////////// /// DECLARATIONS /// //////////////////////////////////////////////////////////////////////// @@ -270,3 +273,5 @@ int Map_CanonComputeFast( Map_Man_t * p, int nVarsMax, int nVarsReal, unsigned u //////////////////////////////////////////////////////////////////////// +ABC_NAMESPACE_IMPL_END + diff --git a/src/map/mapper/mapperCore.c b/src/map/mapper/mapperCore.c index fc0d9609..85530a1e 100644 --- a/src/map/mapper/mapperCore.c +++ b/src/map/mapper/mapperCore.c @@ -19,6 +19,9 @@ #include "mapperInt.h" //#include "resm.h" +ABC_NAMESPACE_IMPL_START + + //////////////////////////////////////////////////////////////////////// /// DECLARATIONS /// //////////////////////////////////////////////////////////////////////// @@ -226,3 +229,5 @@ ABC_PRT( "Time", clock() - clk ); Map_MappingPrintOutputArrivals( p ); return 1; } +ABC_NAMESPACE_IMPL_END + diff --git a/src/map/mapper/mapperCreate.c b/src/map/mapper/mapperCreate.c index ee2b089c..af1a858f 100644 --- a/src/map/mapper/mapperCreate.c +++ b/src/map/mapper/mapperCreate.c @@ -18,6 +18,9 @@ #include "mapperInt.h" +ABC_NAMESPACE_IMPL_START + + //////////////////////////////////////////////////////////////////////// /// DECLARATIONS /// //////////////////////////////////////////////////////////////////////// @@ -51,7 +54,7 @@ Map_Node_t ** Map_ManReadOutputs( Map_Man_t * p ) { return Map_Node_t * Map_ManReadConst1 ( Map_Man_t * p ) { return p->pConst1; } Map_Time_t * Map_ManReadInputArrivals( Map_Man_t * p ) { return p->pInputArrivals;} Mio_Library_t * Map_ManReadGenLib ( Map_Man_t * p ) { return p->pSuperLib->pGenlib; } -bool Map_ManReadVerbose( Map_Man_t * p ) { return p->fVerbose; } +int Map_ManReadVerbose( Map_Man_t * p ) { return p->fVerbose; } float Map_ManReadAreaFinal( Map_Man_t * p ) { return p->AreaFinal; } float Map_ManReadRequiredGlo( Map_Man_t * p ) { return p->fRequiredGlo; } void Map_ManSetTimeToMap( Map_Man_t * p, int Time ) { p->timeToMap = Time; } @@ -62,7 +65,7 @@ void Map_ManSetOutputNames( Map_Man_t * p, char ** ppNames ) { p->ppO void Map_ManSetAreaRecovery( Map_Man_t * p, int fAreaRecovery ) { p->fAreaRecovery = fAreaRecovery;} void Map_ManSetDelayTarget( Map_Man_t * p, float DelayTarget ) { p->DelayTarget = DelayTarget;} void Map_ManSetInputArrivals( Map_Man_t * p, Map_Time_t * pArrivals ) { p->pInputArrivals = pArrivals;} -void Map_ManSetObeyFanoutLimits( Map_Man_t * p, bool fObeyFanoutLimits ) { p->fObeyFanoutLimits = fObeyFanoutLimits; } +void Map_ManSetObeyFanoutLimits( Map_Man_t * p, int fObeyFanoutLimits ) { p->fObeyFanoutLimits = fObeyFanoutLimits; } void Map_ManSetNumIterations( Map_Man_t * p, int nIterations ) { p->nIterations = nIterations; } int Map_ManReadFanoutViolations( Map_Man_t * p ) { return p->nFanoutViolations; } void Map_ManSetFanoutViolations( Map_Man_t * p, int nVio ) { p->nFanoutViolations = nVio; } @@ -192,7 +195,7 @@ Map_Man_t * Map_ManCreate( int nInputs, int nOutputs, int fVerbose ) // start the manager p = ABC_ALLOC( Map_Man_t, 1 ); memset( p, 0, sizeof(Map_Man_t) ); - p->pSuperLib = Abc_FrameReadLibSuper(); + p->pSuperLib = (Map_SuperLib_t *)Abc_FrameReadLibSuper(); p->nVarsMax = p->pSuperLib->nVarsMax; p->fVerbose = fVerbose; p->fEpsilon = (float)0.001; @@ -598,3 +601,5 @@ void Map_NodeSetChoice( Map_Man_t * pMan, Map_Node_t * pNodeOld, Map_Node_t * pN /// END OF FILE /// //////////////////////////////////////////////////////////////////////// +ABC_NAMESPACE_IMPL_END + diff --git a/src/map/mapper/mapperCut.c b/src/map/mapper/mapperCut.c index 19878d5b..e0afa792 100644 --- a/src/map/mapper/mapperCut.c +++ b/src/map/mapper/mapperCut.c @@ -18,6 +18,9 @@ #include "mapperInt.h" +ABC_NAMESPACE_IMPL_START + + //////////////////////////////////////////////////////////////////////// /// DECLARATIONS /// //////////////////////////////////////////////////////////////////////// @@ -1166,3 +1169,5 @@ unsigned Map_CutComputeTruth( Map_Man_t * p, Map_Cut_t * pCut, Map_Cut_t * pTemp /// END OF FILE /// //////////////////////////////////////////////////////////////////////// +ABC_NAMESPACE_IMPL_END + diff --git a/src/map/mapper/mapperCutUtils.c b/src/map/mapper/mapperCutUtils.c index 42bdd103..aa307368 100644 --- a/src/map/mapper/mapperCutUtils.c +++ b/src/map/mapper/mapperCutUtils.c @@ -18,6 +18,9 @@ #include "mapperInt.h" +ABC_NAMESPACE_IMPL_START + + //////////////////////////////////////////////////////////////////////// /// DECLARATIONS /// //////////////////////////////////////////////////////////////////////// @@ -272,3 +275,5 @@ void Map_CutInsertFanouts( Map_Node_t * pNode, Map_Cut_t * pCut, int fPhase ) //////////////////////////////////////////////////////////////////////// +ABC_NAMESPACE_IMPL_END + diff --git a/src/map/mapper/mapperFanout.c b/src/map/mapper/mapperFanout.c index 63cdbd2a..f835abe4 100644 --- a/src/map/mapper/mapperFanout.c +++ b/src/map/mapper/mapperFanout.c @@ -18,6 +18,9 @@ #include "mapperInt.h" +ABC_NAMESPACE_IMPL_START + + #ifdef MAP_ALLOCATE_FANOUT //////////////////////////////////////////////////////////////////////// @@ -139,3 +142,5 @@ int Map_NodeGetFanoutNum( Map_Node_t * pNode ) #endif +ABC_NAMESPACE_IMPL_END + diff --git a/src/map/mapper/mapperGENERIC.c b/src/map/mapper/mapperGENERIC.c index 823eb4f2..ff71d3e1 100644 --- a/src/map/mapper/mapperGENERIC.c +++ b/src/map/mapper/mapperGENERIC.c @@ -18,6 +18,9 @@ #include "mapperInt.h" +ABC_NAMESPACE_IMPL_START + + //////////////////////////////////////////////////////////////////////// /// DECLARATIONS /// //////////////////////////////////////////////////////////////////////// @@ -44,3 +47,5 @@ //////////////////////////////////////////////////////////////////////// +ABC_NAMESPACE_IMPL_END + diff --git a/src/map/mapper/mapperInt.h b/src/map/mapper/mapperInt.h index 7f4c93dc..ac8110fc 100644 --- a/src/map/mapper/mapperInt.h +++ b/src/map/mapper/mapperInt.h @@ -19,6 +19,7 @@ #ifndef __MAPPER_INT_H__ #define __MAPPER_INT_H__ + //////////////////////////////////////////////////////////////////////// /// INCLUDES /// //////////////////////////////////////////////////////////////////////// @@ -27,10 +28,13 @@ #include <stdlib.h> #include <string.h> #include <float.h> -#include "cuddInt.h" #include "main.h" #include "mio.h" #include "mapper.h" +#include "cuddInt.h" + +ABC_NAMESPACE_HEADER_START + //////////////////////////////////////////////////////////////////////// /// PARAMETERS /// @@ -113,10 +117,10 @@ struct Map_ManStruct_t_ float AreaBase; // the area after delay-oriented mapping float AreaFinal; // the area after delay-oriented mapping int nIterations; // How many matching passes to do - bool fObeyFanoutLimits;// Should mapper try to obey fanout limits or not + int fObeyFanoutLimits;// Should mapper try to obey fanout limits or not float DelayTarget; // the required times set by the user int nTravIds; // the traversal counter - bool fSwitching; // Should mapper try to obey fanout limits or not + int fSwitching; // Should mapper try to obey fanout limits or not // the supergate library Map_SuperLib_t * pSuperLib; // the current supergate library @@ -169,7 +173,7 @@ struct Map_SuperLibStruct_t_ int nSupersAll; // the total number of supergates int nSupersReal; // the total number of supergates int nLines; // the total number of lines in the supergate file - bool fVerbose; // the verbosity flag + int fVerbose; // the verbosity flag // hash tables Map_Super_t ** ppSupers; // the array of supergates @@ -373,7 +377,7 @@ extern void Map_NodeAddFaninFanout( Map_Node_t * pFanin, Map_Node_t extern void Map_NodeRemoveFaninFanout( Map_Node_t * pFanin, Map_Node_t * pFanoutToRemove ); extern int Map_NodeGetFanoutNum( Map_Node_t * pNode ); /*=== mapperLib.c ============================================================*/ -extern Map_SuperLib_t * Map_SuperLibCreate( char * pFileName, char * pExcludeFile, bool fAlgorithm, bool fVerbose ); +extern Map_SuperLib_t * Map_SuperLibCreate( char * pFileName, char * pExcludeFile, int fAlgorithm, int fVerbose ); extern void Map_SuperLibFree( Map_SuperLib_t * p ); /*=== mapperMatch.c ===============================================================*/ extern int Map_MappingMatches( Map_Man_t * p ); @@ -469,6 +473,10 @@ extern void Map_NodeVecWriteEntry( Map_NodeVec_t * p, int i, Map_No extern Map_Node_t * Map_NodeVecReadEntry( Map_NodeVec_t * p, int i ); extern void Map_NodeVecSortByLevel( Map_NodeVec_t * p ); + + +ABC_NAMESPACE_HEADER_END + #endif //////////////////////////////////////////////////////////////////////// diff --git a/src/map/mapper/mapperLib.c b/src/map/mapper/mapperLib.c index cc64d8b8..9cc8747d 100644 --- a/src/map/mapper/mapperLib.c +++ b/src/map/mapper/mapperLib.c @@ -23,6 +23,9 @@ #include "mapperInt.h" +ABC_NAMESPACE_IMPL_START + + //////////////////////////////////////////////////////////////////////// /// DECLARATIONS /// //////////////////////////////////////////////////////////////////////// @@ -50,7 +53,7 @@ SeeAlso [] ***********************************************************************/ -Map_SuperLib_t * Map_SuperLibCreate( char * pFileName, char * pExcludeFile, bool fAlgorithm, bool fVerbose ) +Map_SuperLib_t * Map_SuperLibCreate( char * pFileName, char * pExcludeFile, int fAlgorithm, int fVerbose ) { Map_SuperLib_t * p; int clk; @@ -251,3 +254,5 @@ int Map_SuperLibDeriveFromGenlib( Mio_Library_t * pLib ) //////////////////////////////////////////////////////////////////////// +ABC_NAMESPACE_IMPL_END + diff --git a/src/map/mapper/mapperMatch.c b/src/map/mapper/mapperMatch.c index 32af030a..5fce3dc0 100644 --- a/src/map/mapper/mapperMatch.c +++ b/src/map/mapper/mapperMatch.c @@ -18,6 +18,9 @@ #include "mapperInt.h" +ABC_NAMESPACE_IMPL_START + + /* A potential improvement: When an internal node is not used in the mapping, its required times @@ -595,3 +598,5 @@ void Map_NodeTransferArrivalTimes( Map_Man_t * p, Map_Node_t * pNode ) //////////////////////////////////////////////////////////////////////// /// END OF FILE /// //////////////////////////////////////////////////////////////////////// +ABC_NAMESPACE_IMPL_END + diff --git a/src/map/mapper/mapperRefs.c b/src/map/mapper/mapperRefs.c index 852e759f..9b0be068 100644 --- a/src/map/mapper/mapperRefs.c +++ b/src/map/mapper/mapperRefs.c @@ -18,6 +18,9 @@ #include "mapperInt.h" +ABC_NAMESPACE_IMPL_START + + //////////////////////////////////////////////////////////////////////// /// DECLARATIONS /// //////////////////////////////////////////////////////////////////////// @@ -555,3 +558,5 @@ float Map_MappingGetArea( Map_Man_t * pMan, Map_NodeVec_t * vMapping ) //////////////////////////////////////////////////////////////////////// +ABC_NAMESPACE_IMPL_END + diff --git a/src/map/mapper/mapperSuper.c b/src/map/mapper/mapperSuper.c index 92f73ecb..3be70541 100644 --- a/src/map/mapper/mapperSuper.c +++ b/src/map/mapper/mapperSuper.c @@ -18,6 +18,9 @@ #include "mapperInt.h" +ABC_NAMESPACE_IMPL_START + + //////////////////////////////////////////////////////////////////////// /// DECLARATIONS /// //////////////////////////////////////////////////////////////////////// @@ -448,3 +451,5 @@ void Map_LibraryPrintClasses( Map_SuperLib_t * p ) //////////////////////////////////////////////////////////////////////// +ABC_NAMESPACE_IMPL_END + diff --git a/src/map/mapper/mapperSwitch.c b/src/map/mapper/mapperSwitch.c index 9dd6e42b..11e99d24 100644 --- a/src/map/mapper/mapperSwitch.c +++ b/src/map/mapper/mapperSwitch.c @@ -18,6 +18,9 @@ #include "mapperInt.h" +ABC_NAMESPACE_IMPL_START + + //////////////////////////////////////////////////////////////////////// /// DECLARATIONS /// //////////////////////////////////////////////////////////////////////// @@ -221,3 +224,5 @@ float Map_MappingGetSwitching( Map_Man_t * pMan, Map_NodeVec_t * vMapping ) //////////////////////////////////////////////////////////////////////// +ABC_NAMESPACE_IMPL_END + diff --git a/src/map/mapper/mapperTable.c b/src/map/mapper/mapperTable.c index a0805991..2120b5ce 100644 --- a/src/map/mapper/mapperTable.c +++ b/src/map/mapper/mapperTable.c @@ -18,6 +18,9 @@ #include "mapperInt.h" +ABC_NAMESPACE_IMPL_START + + //////////////////////////////////////////////////////////////////////// /// DECLARATIONS /// //////////////////////////////////////////////////////////////////////// @@ -400,3 +403,5 @@ void Map_SuperTableSortSupergatesByDelay( Map_HashTable_t * p, int nSupersMax ) //////////////////////////////////////////////////////////////////////// +ABC_NAMESPACE_IMPL_END + diff --git a/src/map/mapper/mapperTime.c b/src/map/mapper/mapperTime.c index 309863fd..d12b607a 100644 --- a/src/map/mapper/mapperTime.c +++ b/src/map/mapper/mapperTime.c @@ -18,6 +18,9 @@ #include "mapperInt.h" +ABC_NAMESPACE_IMPL_START + + //////////////////////////////////////////////////////////////////////// /// DECLARATIONS /// //////////////////////////////////////////////////////////////////////// @@ -96,7 +99,7 @@ float Map_TimeCutComputeArrival( Map_Node_t * pNode, Map_Cut_t * pCut, int fPhas unsigned uPhaseTot = pM->uPhaseBest; Map_Time_t * ptArrRes = &pM->tArrive; Map_Time_t * ptArrIn; - bool fPinPhase; + int fPinPhase; float tDelay; int i; @@ -508,3 +511,5 @@ float Map_MatchComputeReqTimes( Map_Cut_t * pCut, int fPhase, Map_Time_t * ptArr //////////////////////////////////////////////////////////////////////// +ABC_NAMESPACE_IMPL_END + diff --git a/src/map/mapper/mapperTree.c b/src/map/mapper/mapperTree.c index 4cabf86c..f6a0d2d3 100644 --- a/src/map/mapper/mapperTree.c +++ b/src/map/mapper/mapperTree.c @@ -22,6 +22,9 @@ #include "mapperInt.h" +ABC_NAMESPACE_IMPL_START + + //////////////////////////////////////////////////////////////////////// /// DECLARATIONS /// //////////////////////////////////////////////////////////////////////// @@ -560,7 +563,7 @@ void Map_LibraryAddFaninDelays( Map_SuperLib_t * pLib, Map_Super_t * pGate, Map_ { Mio_PinPhase_t PinPhase; float tDelayBlockRise, tDelayBlockFall, tDelayPin; - bool fMaxDelay = 0; + int fMaxDelay = 0; int i; // use this node to enable max-delay model @@ -823,3 +826,5 @@ void Map_LibraryPrintTree( Map_SuperLib_t * pLib ) //////////////////////////////////////////////////////////////////////// +ABC_NAMESPACE_IMPL_END + diff --git a/src/map/mapper/mapperTree_old.c b/src/map/mapper/mapperTree_old.c index 041ba2a0..d0acff12 100644 --- a/src/map/mapper/mapperTree_old.c +++ b/src/map/mapper/mapperTree_old.c @@ -22,6 +22,9 @@ #include "mapperInt.h" +ABC_NAMESPACE_IMPL_START + + //////////////////////////////////////////////////////////////////////// /// DECLARATIONS /// //////////////////////////////////////////////////////////////////////// @@ -558,7 +561,7 @@ void Map_LibraryAddFaninDelays( Map_SuperLib_t * pLib, Map_Super_t * pGate, Map_ { Mio_PinPhase_t PinPhase; float tDelayBlockRise, tDelayBlockFall, tDelayPin; - bool fMaxDelay = 0; + int fMaxDelay = 0; int i; // use this node to enable max-delay model @@ -821,3 +824,5 @@ void Map_LibraryPrintTree( Map_SuperLib_t * pLib ) //////////////////////////////////////////////////////////////////////// +ABC_NAMESPACE_IMPL_END + diff --git a/src/map/mapper/mapperTruth.c b/src/map/mapper/mapperTruth.c index dcc8c1d3..377df9b4 100644 --- a/src/map/mapper/mapperTruth.c +++ b/src/map/mapper/mapperTruth.c @@ -18,6 +18,9 @@ #include "mapperInt.h" +ABC_NAMESPACE_IMPL_START + + //////////////////////////////////////////////////////////////////////// /// DECLARATIONS /// //////////////////////////////////////////////////////////////////////// @@ -308,3 +311,5 @@ void Map_CutsCollect_rec( Map_Cut_t * pCut, Map_NodeVec_t * vVisited ) //////////////////////////////////////////////////////////////////////// +ABC_NAMESPACE_IMPL_END + diff --git a/src/map/mapper/mapperUtils.c b/src/map/mapper/mapperUtils.c index b1f425a3..26033fdb 100644 --- a/src/map/mapper/mapperUtils.c +++ b/src/map/mapper/mapperUtils.c @@ -18,6 +18,9 @@ #include "mapperInt.h" +ABC_NAMESPACE_IMPL_START + + //////////////////////////////////////////////////////////////////////// /// DECLARATIONS /// //////////////////////////////////////////////////////////////////////// @@ -1151,3 +1154,5 @@ int Map_MappingCountUsedNodes( Map_Man_t * pMan, int fChoices ) //////////////////////////////////////////////////////////////////////// +ABC_NAMESPACE_IMPL_END + diff --git a/src/map/mapper/mapperVec.c b/src/map/mapper/mapperVec.c index f675e0c5..dd87e752 100644 --- a/src/map/mapper/mapperVec.c +++ b/src/map/mapper/mapperVec.c @@ -18,6 +18,9 @@ #include "mapperInt.h" +ABC_NAMESPACE_IMPL_START + + //////////////////////////////////////////////////////////////////////// /// DECLARATIONS /// //////////////////////////////////////////////////////////////////////// @@ -316,3 +319,5 @@ int Map_NodeVecCompareLevels( Map_Node_t ** pp1, Map_Node_t ** pp2 ) /// END OF FILE /// //////////////////////////////////////////////////////////////////////// +ABC_NAMESPACE_IMPL_END + |