From 3048be2cdf00fb22da26c46fd3c49749c122f6ae Mon Sep 17 00:00:00 2001 From: Alan Mishchenko Date: Fri, 28 Feb 2014 21:19:54 -0800 Subject: Changes to LUT mappers. --- src/map/if/ifDsd.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/map/if/ifDsd.c') diff --git a/src/map/if/ifDsd.c b/src/map/if/ifDsd.c index a059b668..64e07cf8 100644 --- a/src/map/if/ifDsd.c +++ b/src/map/if/ifDsd.c @@ -342,8 +342,7 @@ void If_DsdManPrintOne( FILE * pFile, If_DsdMan_t * p, int iObjId, unsigned char void If_DsdManPrint( If_DsdMan_t * p, char * pFileName, int fVerbose ) { If_DsdObj_t * pObj; - int DsdMax = 0, CountUsed = 0, CountNonDsdStr = 0; - int i, clk = Abc_Clock(); + int i, DsdMax = 0, CountUsed = 0, CountNonDsdStr = 0; FILE * pFile; pFile = pFileName ? fopen( pFileName, "wb" ) : stdout; if ( pFileName && pFile == NULL ) @@ -367,10 +366,8 @@ void If_DsdManPrint( If_DsdMan_t * p, char * pFileName, int fVerbose ) fprintf( pFile, "Memory used for objects = %8.2f MB.\n", 1.0*Mem_FlexReadMemUsage(p->pMem)/(1<<20) ); fprintf( pFile, "Memory used for hash table = %8.2f MB.\n", 1.0*sizeof(int)*p->nBins/(1<<20) ); fprintf( pFile, "Memory used for array = %8.2f MB.\n", 1.0*sizeof(void *)*Vec_PtrCap(p->vObjs)/(1<<20) ); -// Abc_PrintTime( 1, "Time", Abc_Clock() - clk ); // If_DsdManHashProfile( p ); // If_DsdManDump( p ); -// return; if ( !fVerbose ) return; If_DsdVecForEachObj( p->vObjs, pObj, i ) @@ -628,7 +625,7 @@ If_DsdMan_t * If_DsdManLoad( char * pFileName ) pObj = (If_DsdObj_t *)Mem_FlexEntryFetch( p->pMem, sizeof(word) * Num ); fread( pObj, sizeof(word)*Num, 1, pFile ); Vec_PtrWriteEntry( p->vObjs, i, pObj ); - pSpot = If_DsdObjHashLookup( p, pObj->Type, pObj->pFans, pObj->nFans, If_DsdObjTruthId(p, pObj) ); + pSpot = If_DsdObjHashLookup( p, pObj->Type, (int *)pObj->pFans, pObj->nFans, If_DsdObjTruthId(p, pObj) ); assert( *pSpot == 0 ); *pSpot = pObj->Id; } @@ -856,7 +853,7 @@ int If_DsdManComputeFirstArray( If_DsdMan_t * p, int * pLits, int nLits, int * p } int If_DsdManComputeFirst( If_DsdMan_t * p, If_DsdObj_t * pObj, int * pFirsts ) { - return If_DsdManComputeFirstArray( p, pObj->pFans, pObj->nFans, pFirsts ); + return If_DsdManComputeFirstArray( p, (int *)pObj->pFans, pObj->nFans, pFirsts ); } int If_DsdManOperation( If_DsdMan_t * p, int Type, int * pLits, int nLits, unsigned char * pPerm, word * pTruth ) { -- cgit v1.2.3