summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/aig/cnf/cnfFast.c4
-rw-r--r--src/aig/saig/saigGlaCba.c2
-rw-r--r--src/base/abci/abc.c2
-rw-r--r--src/base/io/io.c2
-rw-r--r--src/base/io/ioWriteBlif.c5
-rw-r--r--src/map/if/if.h4
-rw-r--r--src/map/if/ifDec16.c7
7 files changed, 15 insertions, 11 deletions
diff --git a/src/aig/cnf/cnfFast.c b/src/aig/cnf/cnfFast.c
index fcec8ba3..afa05a05 100644
--- a/src/aig/cnf/cnfFast.c
+++ b/src/aig/cnf/cnfFast.c
@@ -259,7 +259,7 @@ void Cnf_ComputeClauses( Aig_Man_t * p, Aig_Obj_t * pRoot,
if ( (Cube & 3) == 0 )
continue;
assert( (Cube & 3) != 3 );
- Vec_IntPush( vClauses, Cnf_ObjGetLit(vMap, Vec_PtrEntry(vLeaves,k), (Cube&3)!=1) );
+ Vec_IntPush( vClauses, Cnf_ObjGetLit(vMap, (Aig_Obj_t *)Vec_PtrEntry(vLeaves,k), (Cube&3)!=1) );
}
}
@@ -276,7 +276,7 @@ void Cnf_ComputeClauses( Aig_Man_t * p, Aig_Obj_t * pRoot,
if ( (Cube & 3) == 0 )
continue;
assert( (Cube & 3) != 3 );
- Vec_IntPush( vClauses, Cnf_ObjGetLit(vMap, Vec_PtrEntry(vLeaves,k), (Cube&3)!=1) );
+ Vec_IntPush( vClauses, Cnf_ObjGetLit(vMap, (Aig_Obj_t *)Vec_PtrEntry(vLeaves,k), (Cube&3)!=1) );
}
}
}
diff --git a/src/aig/saig/saigGlaCba.c b/src/aig/saig/saigGlaCba.c
index ae439631..5c7c76cf 100644
--- a/src/aig/saig/saigGlaCba.c
+++ b/src/aig/saig/saigGlaCba.c
@@ -394,7 +394,7 @@ int Aig_Gla1ObjAddToSolver( Aig_Gla1Man_t * p, Aig_Obj_t * pObj, int k )
Aig_ObjFaninC0(pObj), Aig_ObjFaninC1(pObj) );
// derive clauses
assert( pObj->fMarkA );
- vClauses = Vec_PtrEntry( p->vObj2Cnf, Aig_ObjId(pObj) );
+ vClauses = (Vec_Int_t *)Vec_PtrEntry( p->vObj2Cnf, Aig_ObjId(pObj) );
if ( vClauses == NULL )
{
Vec_PtrWriteEntry( p->vObj2Cnf, Aig_ObjId(pObj), (vClauses = Vec_IntAlloc(16)) );
diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c
index d9c0974b..02694856 100644
--- a/src/base/abci/abc.c
+++ b/src/base/abci/abc.c
@@ -13154,7 +13154,7 @@ int Abc_CommandIf( Abc_Frame_t * pAbc, int argc, char ** argv )
}
pPars->pLutStruct = argv[globalUtilOptind];
globalUtilOptind++;
- if ( !strlen(pPars->pLutStruct) == 2 && !strlen(pPars->pLutStruct) == 3 )
+ if ( strlen(pPars->pLutStruct) != 2 && strlen(pPars->pLutStruct) != 3 )
{
Abc_Print( -1, "Command line switch \"-S\" should be followed by a 2- or 3-char string (e.g. \"44\" or \"555\").\n" );
goto usage;
diff --git a/src/base/io/io.c b/src/base/io/io.c
index 60085168..d205d4cf 100644
--- a/src/base/io/io.c
+++ b/src/base/io/io.c
@@ -1597,7 +1597,7 @@ int IoCommandWriteBlif( Abc_Frame_t * pAbc, int argc, char **argv )
}
pLutStruct = argv[globalUtilOptind];
globalUtilOptind++;
- if ( !strlen(pLutStruct) == 2 && !strlen(pLutStruct) == 3 )
+ if ( strlen(pLutStruct) != 2 && strlen(pLutStruct) != 3 )
{
Abc_Print( -1, "Command line switch \"-S\" should be followed by a 2- or 3-char string (e.g. \"44\" or \"555\").\n" );
goto usage;
diff --git a/src/base/io/ioWriteBlif.c b/src/base/io/ioWriteBlif.c
index 5370cd85..bb148bab 100644
--- a/src/base/io/ioWriteBlif.c
+++ b/src/base/io/ioWriteBlif.c
@@ -22,6 +22,7 @@
#include "main.h"
#include "mio.h"
#include "kit.h"
+#include "if.h"
ABC_NAMESPACE_IMPL_START
@@ -882,10 +883,6 @@ void Io_NtkWriteNodeIntStruct( FILE * pFile, Abc_Obj_t * pNode, Vec_Int_t * vCov
else
{
extern int If_CluMinimumBase( word * t, int * pSupp, int nVarsAll, int * pnVars );
- extern int If_CluCheckExt( void * p, word * pTruth, int nVars, int nLutLeaf, int nLutRoot,
- char * pLut0, char * pLut1, word * pFunc0, word * pFunc1 );
- extern int If_CluCheckExt3( void * p, word * pTruth, int nVars, int nLutLeaf, int nLutLeaf2, int nLutRoot,
- char * pLut0, char * pLut1, char * pLut2, word * pFunc0, word * pFunc1, word * pFunc2 );
static word TruthStore[16][1<<10] = {{0}}, * pTruths[16];
word pCube[1<<10], pRes[1<<10], Func0, Func1, Func2;
diff --git a/src/map/if/if.h b/src/map/if/if.h
index 54bc9206..47a5498c 100644
--- a/src/map/if/if.h
+++ b/src/map/if/if.h
@@ -426,6 +426,10 @@ extern int If_CutPerformCheck08( If_Man_t * p, unsigned * pTruth, in
extern int If_CutPerformCheck10( If_Man_t * p, unsigned * pTruth, int nVars, int nLeaves, char * pStr );
extern int If_CutPerformCheck16( If_Man_t * p, unsigned * pTruth, int nVars, int nLeaves, char * pStr );
extern float If_CutDelayLutStruct( If_Man_t * p, If_Cut_t * pCut, char * pStr, float WireDelay );
+extern int If_CluCheckExt( void * p, word * pTruth, int nVars, int nLutLeaf, int nLutRoot,
+ char * pLut0, char * pLut1, word * pFunc0, word * pFunc1 );
+extern int If_CluCheckExt3( void * p, word * pTruth, int nVars, int nLutLeaf, int nLutLeaf2, int nLutRoot,
+ char * pLut0, char * pLut1, char * pLut2, word * pFunc0, word * pFunc1, word * pFunc2 );
/*=== ifLib.c =============================================================*/
extern If_Lib_t * If_LutLibRead( char * FileName );
extern If_Lib_t * If_LutLibDup( If_Lib_t * p );
diff --git a/src/map/if/ifDec16.c b/src/map/if/ifDec16.c
index cf9a80e0..606fb912 100644
--- a/src/map/if/ifDec16.c
+++ b/src/map/if/ifDec16.c
@@ -19,6 +19,7 @@
***********************************************************************/
#include "if.h"
+#include "kit.h"
ABC_NAMESPACE_IMPL_START
@@ -1780,9 +1781,10 @@ If_Grp_t If_CluCheck3( If_Man_t * p, word * pTruth0, int nVars, int nLutLeaf, in
}
// returns the best group found
-int If_CluCheckExt( If_Man_t * p, word * pTruth, int nVars, int nLutLeaf, int nLutRoot,
+int If_CluCheckExt( void * pMan, word * pTruth, int nVars, int nLutLeaf, int nLutRoot,
char * pLut0, char * pLut1, word * pFunc0, word * pFunc1 )
{
+ If_Man_t * p = (If_Man_t *)pMan;
If_Grp_t G, R;
G = If_CluCheck( p, pTruth, nVars, 0, nLutLeaf, nLutRoot, &R, pFunc0, pFunc1, NULL, 0 );
memcpy( pLut0, &R, sizeof(If_Grp_t) );
@@ -1792,9 +1794,10 @@ int If_CluCheckExt( If_Man_t * p, word * pTruth, int nVars, int nLutLeaf, int nL
}
// returns the best group found
-int If_CluCheckExt3( If_Man_t * p, word * pTruth, int nVars, int nLutLeaf, int nLutLeaf2, int nLutRoot,
+int If_CluCheckExt3( void * pMan, word * pTruth, int nVars, int nLutLeaf, int nLutLeaf2, int nLutRoot,
char * pLut0, char * pLut1, char * pLut2, word * pFunc0, word * pFunc1, word * pFunc2 )
{
+ If_Man_t * p = (If_Man_t *)pMan;
If_Grp_t G, G2, R;
G = If_CluCheck3( p, pTruth, nVars, nLutLeaf, nLutLeaf2, nLutRoot, &R, &G2, pFunc0, pFunc1, pFunc2 );
memcpy( pLut0, &R, sizeof(If_Grp_t) );
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 08:03:45 +0000