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

Portability changes for gcc-6 suggested by Clifford.

This commit is contained in:
Alan Mishchenko 2017-12-02 19:44:08 -08:00
parent c681506b48
commit 3cc4080c55
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -654,6 +654,10 @@ static inline int Gia_ManAppendCi( Gia_Man_t * p )
Vec_IntPush( p->vCis, Gia_ObjId(p, pObj) );
return Gia_ObjId( p, pObj ) << 1;
}
extern void Gia_ManQuantSetSuppAnd( Gia_Man_t * p, Gia_Obj_t * pObj );
extern void Gia_ManBuiltInSimPerform( Gia_Man_t * p, int iObj );
static inline int Gia_ManAppendAnd( Gia_Man_t * p, int iLit0, int iLit1 )
{
Gia_Obj_t * pObj = Gia_ManAppendObj( p );
@ -688,15 +692,9 @@ static inline int Gia_ManAppendAnd( Gia_Man_t * p, int iLit0, int iLit1 )
pObj->fPhase = (Gia_ObjPhase(pFan0) ^ Gia_ObjFaninC0(pObj)) & (Gia_ObjPhase(pFan1) ^ Gia_ObjFaninC1(pObj));
}
if ( p->fBuiltInSim )
{
extern void Gia_ManBuiltInSimPerform( Gia_Man_t * p, int iObj );
Gia_ManBuiltInSimPerform( p, Gia_ObjId( p, pObj ) );
}
if ( p->vSuppWords )
{
extern void Gia_ManQuantSetSuppAnd( Gia_Man_t * p, Gia_Obj_t * pObj );
Gia_ManQuantSetSuppAnd( p, pObj );
}
return Gia_ObjId( p, pObj ) << 1;
}
static inline int Gia_ManAppendXorReal( Gia_Man_t * p, int iLit0, int iLit1 )

7
src/base/main/mainInit.c
View File

@ -61,8 +61,13 @@ extern void Abc2_Init( Abc_Frame_t * pAbc );
extern void Abc2_End ( Abc_Frame_t * pAbc );
extern void Abc85_Init( Abc_Frame_t * pAbc );
extern void Abc85_End( Abc_Frame_t * pAbc );
extern void Glucose_Init( Abc_Frame_t * pAbc );
#ifdef _WIN32
extern void Glucose_Init( Abc_Frame_t *pAbc );
extern void Glucose_End( Abc_Frame_t * pAbc );
#else
extern void "C" Glucose_Init( Abc_Frame_t *pAbc );
extern void "C" Glucose_End( Abc_Frame_t * pAbc );
#endif
static Abc_FrameInitializer_t* s_InitializerStart = NULL;
static Abc_FrameInitializer_t* s_InitializerEnd = NULL;

9
src/sat/glucose/AbcGlucoseCmd.cpp
View File

@ -26,8 +26,13 @@
ABC_NAMESPACE_HEADER_START
void Glucose_Init(Abc_Frame_t *pAbc);
void Glucose_End( Abc_Frame_t * pAbc );
#ifdef _WIN32
extern void Glucose_Init( Abc_Frame_t *pAbc );
extern void Glucose_End( Abc_Frame_t * pAbc );
#else
extern void "C" Glucose_Init( Abc_Frame_t *pAbc );
extern void "C" Glucose_End( Abc_Frame_t * pAbc );
#endif
ABC_NAMESPACE_HEADER_END