luke
/
abc
mirror of https://github.com/YosysHQ/abc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing C++ compilation issues.

This commit is contained in:
Alan Mishchenko 2013-01-08 13:56:20 +08:00
parent f26e760e9d
commit a625caa17d
7 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/aig/gia/gia.h
View File

@ -1028,8 +1028,6 @@ extern void Tas_ManSatPrintStats( Tas_Man_t * p );
extern int Tas_ManSolve( Tas_Man_t * p, Gia_Obj_t * pObj, Gia_Obj_t * pObj2 ); extern int Tas_ManSolve( Tas_Man_t * p, Gia_Obj_t * pObj, Gia_Obj_t * pObj2 );
extern int Tas_ManSolveArray( Tas_Man_t * p, Vec_Ptr_t * vObjs ); extern int Tas_ManSolveArray( Tas_Man_t * p, Vec_Ptr_t * vObjs );
extern int Gia_ManToBridgeAbsNetlist( FILE * pFile, Gia_Man_t * p );
ABC_NAMESPACE_HEADER_END ABC_NAMESPACE_HEADER_END

4
src/base/abci/abc.c
View File

@ -11678,8 +11678,8 @@ usage:
***********************************************************************/ ***********************************************************************/
int Abc_CommandSendAig( Abc_Frame_t * pAbc, int argc, char ** argv ) int Abc_CommandSendAig( Abc_Frame_t * pAbc, int argc, char ** argv )
{ {
const int BRIDGE_NETLIST = 106; // const int BRIDGE_NETLIST = 106;
const int BRIDGE_ABS_NETLIST = 107; // const int BRIDGE_ABS_NETLIST = 107;
int c, fAndSpace = 1, fAbsNetlist = 0; int c, fAndSpace = 1, fAbsNetlist = 0;
Extra_UtilGetoptReset(); Extra_UtilGetoptReset();

4
src/misc/util/abc_global.h
View File

@ -268,10 +268,14 @@ enum Abc_VerbLevel
ABC_VERBOSE = 2 ABC_VERBOSE = 2
}; };
#define BRIDGE_NETLIST 106
#define BRIDGE_ABS_NETLIST 107
// string printing // string printing
extern char * vnsprintf(const char* format, va_list args); extern char * vnsprintf(const char* format, va_list args);
extern char * nsprintf(const char* format, ...); extern char * nsprintf(const char* format, ...);
extern int Gia_ManToBridgeText( FILE * pFile, int Size, unsigned char * pBuffer ); extern int Gia_ManToBridgeText( FILE * pFile, int Size, unsigned char * pBuffer );
extern int Gia_ManToBridgeAbsNetlist( FILE * pFile, void * p, int pkg_type );
// misc printing procedures // misc printing procedures
static inline void Abc_Print( int level, const char * format, ... ) static inline void Abc_Print( int level, const char * format, ... )

8
src/misc/util/utilBridge.c
View File

@ -33,8 +33,8 @@ ABC_NAMESPACE_IMPL_START
#define BRIDGE_TEXT_MESSAGE 999996 #define BRIDGE_TEXT_MESSAGE 999996
#define BRIDGE_RESULTS 101 #define BRIDGE_RESULTS 101
#define BRIDGE_NETLIST 106 //#define BRIDGE_NETLIST 106
#define BRIDGE_ABS_NETLIST 107 //#define BRIDGE_ABS_NETLIST 107
#define BRIDGE_BAD_ABS 105 #define BRIDGE_BAD_ABS 105
#define BRIDGE_VALUE_X 0 #define BRIDGE_VALUE_X 0
@ -146,10 +146,10 @@ int Gia_ManToBridgeText( FILE * pFile, int Size, unsigned char * pBuffer )
Gia_CreateHeader( pFile, BRIDGE_TEXT_MESSAGE, Size, pBuffer ); Gia_CreateHeader( pFile, BRIDGE_TEXT_MESSAGE, Size, pBuffer );
return 1; return 1;
} }
int Gia_ManToBridgeAbsNetlist( FILE * pFile, Gia_Man_t * p, int pkg_type ) int Gia_ManToBridgeAbsNetlist( FILE * pFile, void * p, int pkg_type )
{ {
Vec_Str_t * vBuffer; Vec_Str_t * vBuffer;
vBuffer = Gia_ManToBridgeVec( p ); vBuffer = Gia_ManToBridgeVec( (Gia_Man_t *)p );
Gia_CreateHeader( pFile, pkg_type, Vec_StrSize(vBuffer), (unsigned char *)Vec_StrArray(vBuffer) ); Gia_CreateHeader( pFile, pkg_type, Vec_StrSize(vBuffer), (unsigned char *)Vec_StrArray(vBuffer) );
Vec_StrFree( vBuffer ); Vec_StrFree( vBuffer );
return 1; return 1;

2
src/proof/abs/absGla.c
View File

@ -1495,7 +1495,7 @@ void Gia_Ga2SendAbsracted( Ga2_Man_t * p, int fVerbose )
Vec_IntFreeP( &vGateClasses ); Vec_IntFreeP( &vGateClasses );
Gia_ManCleanValue( p->pGia ); Gia_ManCleanValue( p->pGia );
// send it out // send it out
Gia_ManToBridgeAbsNetlist( stdout, pAbs ); Gia_ManToBridgeAbsNetlist( stdout, pAbs, BRIDGE_ABS_NETLIST );
Gia_ManStop( pAbs ); Gia_ManStop( pAbs );
} }
void Gia_Ga2SendCancel( Ga2_Man_t * p, int fVerbose ) void Gia_Ga2SendCancel( Ga2_Man_t * p, int fVerbose )

2
src/proof/abs/absGlaOld.c
View File

@ -1583,7 +1583,7 @@ void Gia_GlaSendAbsracted( Gla_Man_t * p, int fVerbose )
pAbs = Gia_ManDupAbsGates( p->pGia0, vGateClasses ); pAbs = Gia_ManDupAbsGates( p->pGia0, vGateClasses );
Vec_IntFreeP( &vGateClasses ); Vec_IntFreeP( &vGateClasses );
// send it out // send it out
Gia_ManToBridgeAbsNetlist( stdout, pAbs ); Gia_ManToBridgeAbsNetlist( stdout, pAbs, BRIDGE_ABS_NETLIST );
Gia_ManStop( pAbs ); Gia_ManStop( pAbs );
} }
void Gia_GlaSendCancel( Gla_Man_t * p, int fVerbose ) void Gia_GlaSendCancel( Gla_Man_t * p, int fVerbose )

2
src/proof/abs/absVta.c
View File

@ -1398,7 +1398,7 @@ void Gia_VtaSendAbsracted( Vta_Man_t * p, int fVerbose )
pAbs = Gia_ManDupAbsGates( p->pGia, p->pGia->vGateClasses ); pAbs = Gia_ManDupAbsGates( p->pGia, p->pGia->vGateClasses );
Vec_IntFreeP( &p->pGia->vGateClasses ); Vec_IntFreeP( &p->pGia->vGateClasses );
// send it out // send it out
Gia_ManToBridgeAbsNetlist( stdout, pAbs ); Gia_ManToBridgeAbsNetlist( stdout, pAbs, BRIDGE_ABS_NETLIST );
Gia_ManStop( pAbs ); Gia_ManStop( pAbs );
} }
void Gia_VtaSendCancel( Vta_Man_t * p, int fVerbose ) void Gia_VtaSendCancel( Vta_Man_t * p, int fVerbose )