From f026e6533987a1628be38cfe828f167d4aaff760 Mon Sep 17 00:00:00 2001 From: Alan Mishchenko Date: Sun, 3 May 2020 19:09:02 -0700 Subject: Compiler warnings and errors. --- src/aig/gia/gia.h | 3 +++ src/aig/gia/giaResub.c | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src/aig') diff --git a/src/aig/gia/gia.h b/src/aig/gia/gia.h index 45291702..4e10cbe6 100644 --- a/src/aig/gia/gia.h +++ b/src/aig/gia/gia.h @@ -1557,6 +1557,9 @@ extern void Gia_ManIncrSimStart( Gia_Man_t * p, int nWords, int n extern void Gia_ManIncrSimSet( Gia_Man_t * p, Vec_Int_t * vObjLits ); extern int Gia_ManIncrSimCheckOver( Gia_Man_t * p, int iLit0, int iLit1 ); extern int Gia_ManIncrSimCheckEqual( Gia_Man_t * p, int iLit0, int iLit1 ); +/*=== giaSimBase.c ============================================================*/ +extern Vec_Wrd_t * Gia_ManSimPatRead( char * pFileName, int * pnWords ); +extern void Gia_ManSimPatWrite( char * pFileName, Vec_Wrd_t * vSimsIn, int nWords ); /*=== giaSpeedup.c ============================================================*/ extern float Gia_ManDelayTraceLut( Gia_Man_t * p ); extern float Gia_ManDelayTraceLutPrint( Gia_Man_t * p, int fVerbose ); diff --git a/src/aig/gia/giaResub.c b/src/aig/gia/giaResub.c index 9de0ffb8..092603ed 100644 --- a/src/aig/gia/giaResub.c +++ b/src/aig/gia/giaResub.c @@ -942,7 +942,6 @@ Gia_Man_t * Gia_ManResub2( Gia_Man_t * pGia, int nNodes, int nSupp, int nDivs, i } Gia_Man_t * Gia_ManResub1( char * pFileName, int nNodes, int nSupp, int nDivs, int fVerbose, int fVeryVerbose ) { - extern Vec_Wrd_t * Gia_ManSimPatRead( char * pFileName, int * pnWords ); int iTopLit, nWords = 0; Gia_Man_t * pMan = NULL; Vec_Wrd_t * vSims = Gia_ManSimPatRead( pFileName, &nWords ); @@ -952,8 +951,8 @@ Gia_Man_t * Gia_ManResub1( char * pFileName, int nNodes, int nSupp, int nDivs, i if ( p == NULL ) return NULL; assert( Vec_PtrSize(vDivs) < (1<<15) ); - printf( "OFF = %5d (%6.2f %%) ", Abc_TtCountOnesVec(Vec_PtrEntry(vDivs, 0), nWords), 100.0*Abc_TtCountOnesVec(Vec_PtrEntry(vDivs, 0), nWords)/(64*nWords) ); - printf( "ON = %5d (%6.2f %%)\n", Abc_TtCountOnesVec(Vec_PtrEntry(vDivs, 1), nWords), 100.0*Abc_TtCountOnesVec(Vec_PtrEntry(vDivs, 1), nWords)/(64*nWords) ); + printf( "OFF = %5d (%6.2f %%) ", Abc_TtCountOnesVec((word *)Vec_PtrEntry(vDivs, 0), nWords), 100.0*Abc_TtCountOnesVec((word *)Vec_PtrEntry(vDivs, 0), nWords)/(64*nWords) ); + printf( "ON = %5d (%6.2f %%)\n", Abc_TtCountOnesVec((word *)Vec_PtrEntry(vDivs, 1), nWords), 100.0*Abc_TtCountOnesVec((word *)Vec_PtrEntry(vDivs, 1), nWords)/(64*nWords) ); if ( Vec_PtrSize(vDivs) > 4000 ) { printf( "Reducing all divs from %d to 4000.\n", Vec_PtrSize(vDivs) ); -- cgit v1.2.3