mirror of https://github.com/YosysHQ/abc.git
Fixing some update gcc.
This commit is contained in:
parent
0ca7e355f4
commit
ee1bd8f0be
|
|
@ -725,7 +725,7 @@ void Aig_ManPrintVerbose( Aig_Man_t * p, int fHaig )
|
||||||
void Aig_ManDump( Aig_Man_t * p )
|
void Aig_ManDump( Aig_Man_t * p )
|
||||||
{
|
{
|
||||||
static int Counter = 0;
|
static int Counter = 0;
|
||||||
char FileName[20];
|
char FileName[200];
|
||||||
// dump the logic into a file
|
// dump the logic into a file
|
||||||
sprintf( FileName, "aigbug\\%03d.blif", ++Counter );
|
sprintf( FileName, "aigbug\\%03d.blif", ++Counter );
|
||||||
Aig_ManDumpBlif( p, FileName, NULL, NULL );
|
Aig_ManDumpBlif( p, FileName, NULL, NULL );
|
||||||
|
|
|
||||||
|
|
@ -76,7 +76,7 @@ static inline int Agi_ObjIsRo( Agi_Man_t * p, int i ) { ret
|
||||||
static inline int Agi_ObjIsPo( Agi_Man_t * p, int i ) { return (p->pObjs[i] & AGI_PI) == AGI_PO; }
|
static inline int Agi_ObjIsPo( Agi_Man_t * p, int i ) { return (p->pObjs[i] & AGI_PI) == AGI_PO; }
|
||||||
static inline int Agi_ObjIsRi( Agi_Man_t * p, int i ) { return (p->pObjs[i] & AGI_PI) == AGI_RI; }
|
static inline int Agi_ObjIsRi( Agi_Man_t * p, int i ) { return (p->pObjs[i] & AGI_PI) == AGI_RI; }
|
||||||
static inline int Agi_ObjIsCi( Agi_Man_t * p, int i ) { return (p->pObjs[i] & AGI_RO) == AGI_RO; }
|
static inline int Agi_ObjIsCi( Agi_Man_t * p, int i ) { return (p->pObjs[i] & AGI_RO) == AGI_RO; }
|
||||||
static inline int Agi_ObjIsCo( Agi_Man_t * p, int i ) { return (p->pObjs[i] & AGI_RO) == AGI_PO; }
|
static inline int Agi_ObjIsCo( Agi_Man_t * p, int i ) { return (p->pObjs[i] & AGI_PO) == AGI_PO; }
|
||||||
static inline int Agi_ObjIsNode( Agi_Man_t * p, int i ) { return p->pObjs[i] < AGI_C0; }
|
static inline int Agi_ObjIsNode( Agi_Man_t * p, int i ) { return p->pObjs[i] < AGI_C0; }
|
||||||
static inline int Agi_ObjIsBuf( Agi_Man_t * p, int i ) { return Agi_ObjLit0(p, i) == Agi_ObjLit1(p, i); }
|
static inline int Agi_ObjIsBuf( Agi_Man_t * p, int i ) { return Agi_ObjLit0(p, i) == Agi_ObjLit1(p, i); }
|
||||||
static inline int Agi_ObjIsAnd( Agi_Man_t * p, int i ) { return Agi_ObjIsNode(p, i) && Agi_ObjLit0(p, i) < Agi_ObjLit1(p, i); }
|
static inline int Agi_ObjIsAnd( Agi_Man_t * p, int i ) { return Agi_ObjIsNode(p, i) && Agi_ObjLit0(p, i) < Agi_ObjLit1(p, i); }
|
||||||
|
|
|
||||||
|
|
@ -609,7 +609,7 @@ void Gia_ManPerformFlow( int fIsMapped, int nAnds, int nLevels, int nLutSize, in
|
||||||
***********************************************************************/
|
***********************************************************************/
|
||||||
void Gia_ManPerformFlow2( int fIsMapped, int nAnds, int nLevels, int nLutSize, int nCutNum, int fBalance, int fMinAve, int fUseMfs, int fVerbose )
|
void Gia_ManPerformFlow2( int fIsMapped, int nAnds, int nLevels, int nLutSize, int nCutNum, int fBalance, int fMinAve, int fUseMfs, int fVerbose )
|
||||||
{
|
{
|
||||||
char Comm1[100], Comm2[100], Comm3[100], Comm4[100];
|
char Comm1[1000], Comm2[1000], Comm3[1000], Comm4[1000];
|
||||||
sprintf( Comm1, "&synch2 -K %d -C 500; &if -m%s -K %d -C %d; %s &save", nLutSize, fMinAve?"t":"", nLutSize, nCutNum, fUseMfs ? "&put; mfs2 -W 4 -M 500 -C 7000; &get -m;":"" );
|
sprintf( Comm1, "&synch2 -K %d -C 500; &if -m%s -K %d -C %d; %s &save", nLutSize, fMinAve?"t":"", nLutSize, nCutNum, fUseMfs ? "&put; mfs2 -W 4 -M 500 -C 7000; &get -m;":"" );
|
||||||
sprintf( Comm2, "&dch -C 500; &if -m%s -K %d -C %d; %s &save", fMinAve?"t":"", nLutSize, nCutNum+4, fUseMfs ? "&put; mfs2 -W 4 -M 500 -C 7000; &get -m;":"" );
|
sprintf( Comm2, "&dch -C 500; &if -m%s -K %d -C %d; %s &save", fMinAve?"t":"", nLutSize, nCutNum+4, fUseMfs ? "&put; mfs2 -W 4 -M 500 -C 7000; &get -m;":"" );
|
||||||
sprintf( Comm3, "&synch2 -K %d -C 500; &lf -m%s -E 5 -K %d -C %d; %s &save", nLutSize, fMinAve?"t":"", nLutSize, nCutNum, fUseMfs ? "&put; mfs2 -W 4 -M 500 -C 7000; &get -m;":"" );
|
sprintf( Comm3, "&synch2 -K %d -C 500; &lf -m%s -E 5 -K %d -C %d; %s &save", nLutSize, fMinAve?"t":"", nLutSize, nCutNum, fUseMfs ? "&put; mfs2 -W 4 -M 500 -C 7000; &get -m;":"" );
|
||||||
|
|
|
||||||
|
|
@ -388,7 +388,7 @@ static inline Ses_Store_t * Ses_StoreAlloc( int nBTLimit, int fMakeAIG, int fVer
|
||||||
pStore->fMakeAIG = fMakeAIG;
|
pStore->fMakeAIG = fMakeAIG;
|
||||||
pStore->fVerbose = fVerbose;
|
pStore->fVerbose = fVerbose;
|
||||||
pStore->nBTLimit = nBTLimit;
|
pStore->nBTLimit = nBTLimit;
|
||||||
memset( pStore->pEntries, 0, SES_STORE_TABLE_SIZE );
|
memset( pStore->pEntries, 0, sizeof(char)*SES_STORE_TABLE_SIZE );
|
||||||
|
|
||||||
pStore->pSat = sat_solver_new();
|
pStore->pSat = sat_solver_new();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1086,7 +1086,7 @@ int Ver_ParseInitial( Ver_Man_t * pMan, Abc_Ntk_t * pNtk )
|
||||||
***********************************************************************/
|
***********************************************************************/
|
||||||
int Ver_ParseAssign( Ver_Man_t * pMan, Abc_Ntk_t * pNtk )
|
int Ver_ParseAssign( Ver_Man_t * pMan, Abc_Ntk_t * pNtk )
|
||||||
{
|
{
|
||||||
char Buffer[1000], Buffer2[1000];
|
char Buffer[1000], Buffer2[2000];
|
||||||
Ver_Stream_t * p = pMan->pReader;
|
Ver_Stream_t * p = pMan->pReader;
|
||||||
Abc_Obj_t * pNode, * pNet;
|
Abc_Obj_t * pNode, * pNet;
|
||||||
char * pWord, * pName, * pEquation;
|
char * pWord, * pName, * pEquation;
|
||||||
|
|
|
||||||
|
|
@ -746,7 +746,7 @@ int Smt_PrsBuildNode( Wlc_Ntk_t * pNtk, Smt_Prs_t * p, int iNode, int RangeOut,
|
||||||
}
|
}
|
||||||
else if ( Type == WLC_OBJ_ROTATE_R || Type == WLC_OBJ_ROTATE_L )
|
else if ( Type == WLC_OBJ_ROTATE_R || Type == WLC_OBJ_ROTATE_L )
|
||||||
{
|
{
|
||||||
char Buffer[10];
|
char Buffer[100];
|
||||||
assert( Value1 >= 0 );
|
assert( Value1 >= 0 );
|
||||||
sprintf( Buffer, "%d", Value1 );
|
sprintf( Buffer, "%d", Value1 );
|
||||||
NameId = Smt_PrsBuildConstant( pNtk, Buffer, -1, NULL );
|
NameId = Smt_PrsBuildConstant( pNtk, Buffer, -1, NULL );
|
||||||
|
|
|
||||||
|
|
@ -258,7 +258,7 @@ int Abc_CascadeExperiment( char * pFileGeneric, DdManager * dd, DdNode ** pOutpu
|
||||||
// verify the results
|
// verify the results
|
||||||
if ( fCheck )
|
if ( fCheck )
|
||||||
{
|
{
|
||||||
char Command[200];
|
char Command[300];
|
||||||
sprintf( Command, "cec %s %s", FileNameIni, FileNameFin );
|
sprintf( Command, "cec %s %s", FileNameIni, FileNameFin );
|
||||||
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), Command );
|
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), Command );
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -264,7 +264,7 @@ If_DsdObj_t * If_DsdObjAlloc( If_DsdMan_t * p, int Type, int nFans )
|
||||||
If_DsdMan_t * If_DsdManAlloc( int nVars, int LutSize )
|
If_DsdMan_t * If_DsdManAlloc( int nVars, int LutSize )
|
||||||
{
|
{
|
||||||
If_DsdMan_t * p; int v;
|
If_DsdMan_t * p; int v;
|
||||||
char pFileName[10];
|
char pFileName[100];
|
||||||
assert( nVars <= DAU_MAX_VAR );
|
assert( nVars <= DAU_MAX_VAR );
|
||||||
sprintf( pFileName, "%02d.dsd", nVars );
|
sprintf( pFileName, "%02d.dsd", nVars );
|
||||||
p = ABC_CALLOC( If_DsdMan_t, 1 );
|
p = ABC_CALLOC( If_DsdMan_t, 1 );
|
||||||
|
|
|
||||||
|
|
@ -589,7 +589,7 @@ char * Dau_DsdMerge( char * pDsd0i, int * pPerm0, char * pDsd1i, int * pPerm1, i
|
||||||
int fVerbose = 0;
|
int fVerbose = 0;
|
||||||
int fCheck = 0;
|
int fCheck = 0;
|
||||||
static int Counter = 0;
|
static int Counter = 0;
|
||||||
static char pRes[DAU_MAX_STR];
|
static char pRes[2*DAU_MAX_STR+10];
|
||||||
char pDsd0[DAU_MAX_STR];
|
char pDsd0[DAU_MAX_STR];
|
||||||
char pDsd1[DAU_MAX_STR];
|
char pDsd1[DAU_MAX_STR];
|
||||||
int pMatches0[DAU_MAX_STR];
|
int pMatches0[DAU_MAX_STR];
|
||||||
|
|
|
||||||
|
|
@ -115,7 +115,7 @@ void Dau_TruthEnum(int nVars)
|
||||||
{
|
{
|
||||||
FILE * pFile;
|
FILE * pFile;
|
||||||
int RetValue;
|
int RetValue;
|
||||||
char pFileName[20];
|
char pFileName[200];
|
||||||
sprintf( pFileName, "tableW%d.data", nSizeLog );
|
sprintf( pFileName, "tableW%d.data", nSizeLog );
|
||||||
pFile = fopen( pFileName, "wb" );
|
pFile = fopen( pFileName, "wb" );
|
||||||
RetValue = fwrite( pTable, 8, nSizeW, pFile );
|
RetValue = fwrite( pTable, 8, nSizeW, pFile );
|
||||||
|
|
@ -180,7 +180,7 @@ void Dau_NetworkEnum(int nVars)
|
||||||
int UseTwo = 0;
|
int UseTwo = 0;
|
||||||
int nSizeLog = (1<<nVars) -2;
|
int nSizeLog = (1<<nVars) -2;
|
||||||
int nSizeW = 1 << nSizeLog;
|
int nSizeW = 1 << nSizeLog;
|
||||||
char pFileName[20];
|
char pFileName[200];
|
||||||
unsigned * pTable;
|
unsigned * pTable;
|
||||||
Vec_Wec_t * vNpns = Vec_WecStart( 32 );
|
Vec_Wec_t * vNpns = Vec_WecStart( 32 );
|
||||||
Vec_Wec_t * vNpns_ = Vec_WecStart( 32 );
|
Vec_Wec_t * vNpns_ = Vec_WecStart( 32 );
|
||||||
|
|
|
||||||
|
|
@ -348,7 +348,7 @@ unsigned * Dtt_ManLoadClasses( int nVars, int * pnClasses )
|
||||||
unsigned * pTable = NULL;
|
unsigned * pTable = NULL;
|
||||||
int nSizeLog = (1<<nVars) -2;
|
int nSizeLog = (1<<nVars) -2;
|
||||||
int nSizeW = 1 << nSizeLog;
|
int nSizeW = 1 << nSizeLog;
|
||||||
char pFileName[20];
|
char pFileName[200];
|
||||||
sprintf( pFileName, "tableW%d.data", nSizeLog );
|
sprintf( pFileName, "tableW%d.data", nSizeLog );
|
||||||
pTable = Dau_ReadFile2( pFileName, nSizeW );
|
pTable = Dau_ReadFile2( pFileName, nSizeW );
|
||||||
if (pTable == NULL)
|
if (pTable == NULL)
|
||||||
|
|
|
||||||
|
|
@ -670,7 +670,7 @@ Vec_Str_t * Pdr_InvPrintStr( Vec_Int_t * vInv, Vec_Int_t * vCounts )
|
||||||
Vec_Int_t * vMap = Pdr_InvMap( vCounts );
|
Vec_Int_t * vMap = Pdr_InvMap( vCounts );
|
||||||
int nVars = Vec_IntSize(vCounts) - Vec_IntCountZero(vCounts);
|
int nVars = Vec_IntSize(vCounts) - Vec_IntCountZero(vCounts);
|
||||||
int i, k, * pCube, * pList = Vec_IntArray(vInv);
|
int i, k, * pCube, * pList = Vec_IntArray(vInv);
|
||||||
char * pBuffer = ABC_ALLOC( char, nVars );
|
char * pBuffer = ABC_ALLOC( char, (size_t)(unsigned)nVars );
|
||||||
for ( i = 0; i < nVars; i++ )
|
for ( i = 0; i < nVars; i++ )
|
||||||
pBuffer[i] = '-';
|
pBuffer[i] = '-';
|
||||||
Pdr_ForEachCube( pList, pCube, i )
|
Pdr_ForEachCube( pList, pCube, i )
|
||||||
|
|
|
||||||
|
|
@ -577,7 +577,7 @@ static inline int Exa_ManEval( Exa_Man_t * p )
|
||||||
void Exa_ManDumpBlif( Exa_Man_t * p, int fCompl )
|
void Exa_ManDumpBlif( Exa_Man_t * p, int fCompl )
|
||||||
{
|
{
|
||||||
char Buffer[1000];
|
char Buffer[1000];
|
||||||
char FileName[1000];
|
char FileName[1100];
|
||||||
FILE * pFile;
|
FILE * pFile;
|
||||||
int i, k, iVar;
|
int i, k, iVar;
|
||||||
if ( fCompl )
|
if ( fCompl )
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue