From f026e6533987a1628be38cfe828f167d4aaff760 Mon Sep 17 00:00:00 2001
From: Alan Mishchenko <alanmi@berkeley.edu>
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 ++---
 src/base/abci/abc.c      | 6 ++----
 src/base/abci/abcNtbdd.c | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

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) );
diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c
index 70ef45ca..9107af22 100644
--- a/src/base/abci/abc.c
+++ b/src/base/abci/abc.c
@@ -32841,7 +32841,6 @@ usage:
 ***********************************************************************/
 int Abc_CommandAbc9ReadSim( Abc_Frame_t * pAbc, int argc, char ** argv )
 {
-    extern Vec_Wrd_t * Gia_ManSimPatRead( char * pFileName );
     int c, fOutputs = 0, nWords = 4, fVerbose = 0;
     char ** pArgvNew;
     int nArgcNew;
@@ -32893,7 +32892,7 @@ int Abc_CommandAbc9ReadSim( Abc_Frame_t * pAbc, int argc, char ** argv )
     if ( fOutputs )
     {
         Vec_WrdFreeP( &pAbc->pGia->vSimsPo );
-        pAbc->pGia->vSimsPo = Gia_ManSimPatRead( pArgvNew[0] );
+        pAbc->pGia->vSimsPo = Gia_ManSimPatRead( pArgvNew[0], NULL );
         if ( Vec_WrdSize(pAbc->pGia->vSimsPo) % Gia_ManCoNum(pAbc->pGia) != 0 )
         {
             Vec_WrdFreeP( &pAbc->pGia->vSimsPo );
@@ -32907,7 +32906,7 @@ int Abc_CommandAbc9ReadSim( Abc_Frame_t * pAbc, int argc, char ** argv )
     else
     {
         Vec_WrdFreeP( &pAbc->pGia->vSimsPi );
-        pAbc->pGia->vSimsPi = Gia_ManSimPatRead( pArgvNew[0] );
+        pAbc->pGia->vSimsPi = Gia_ManSimPatRead( pArgvNew[0], NULL );
         if ( Vec_WrdSize(pAbc->pGia->vSimsPi) % Gia_ManCiNum(pAbc->pGia) != 0 )
         {
             Vec_WrdFreeP( &pAbc->pGia->vSimsPi );
@@ -32944,7 +32943,6 @@ usage:
 ***********************************************************************/
 int Abc_CommandAbc9WriteSim( Abc_Frame_t * pAbc, int argc, char ** argv )
 {
-    extern void Gia_ManSimPatWrite( char * pFileName, Vec_Wrd_t * vSimsIn, int nWords );
     int c, fOutputs = 0, fVerbose = 0;
     char ** pArgvNew;
     int nArgcNew;
diff --git a/src/base/abci/abcNtbdd.c b/src/base/abci/abcNtbdd.c
index d3a19d83..aa35aa6a 100644
--- a/src/base/abci/abcNtbdd.c
+++ b/src/base/abci/abcNtbdd.c
@@ -286,7 +286,7 @@ int Abc_NtkBddToMuxesPerformGlo( Abc_Ntk_t * pNtk, Abc_Ntk_t * pNtkNew, int Limi
     // complement the global functions
     Abc_NtkForEachCo( pNtk, pObj, i )
     {
-        DdNode * bFunc = Abc_ObjGlobalBdd(pObj);
+        DdNode * bFunc = (DdNode *)Abc_ObjGlobalBdd(pObj);
         pObjNew = Abc_NodeBddToMuxes_rec( dd, Cudd_Regular(bFunc), pNtkNew, tBdd2Node );
         if ( Cudd_IsComplement(bFunc) )
             pObjNew = Abc_NtkCreateNodeInv( pNtkNew, pObjNew );
-- 
cgit v1.2.3