summaryrefslogtreecommitdiffstats
path: root/src/base
diff options
context:
space:
mode:
authorAlan Mishchenko <alanmi@berkeley.edu>2015-10-23 15:14:31 -0700
committerAlan Mishchenko <alanmi@berkeley.edu>2015-10-23 15:14:31 -0700
commit3712dd30d0e6152e627b487f7f4f5e4e6f6c5afd (patch)
tree156cf8801b8e1f6d46d180428dcf926316bdb0db /src/base
parent0f64f3b7abbc2c0e3ea94c27cface77254127234 (diff)
downloadabc-3712dd30d0e6152e627b487f7f4f5e4e6f6c5afd.tar.gz
abc-3712dd30d0e6152e627b487f7f4f5e4e6f6c5afd.tar.bz2
abc-3712dd30d0e6152e627b487f7f4f5e4e6f6c5afd.zip
Changes for delay-oriented computation.
Diffstat (limited to 'src/base')
-rw-r--r--src/base/abc/abc.h4
-rw-r--r--src/base/abci/abcDar.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/base/abc/abc.h b/src/base/abc/abc.h
index c4a61be6..450aaafe 100644
--- a/src/base/abc/abc.h
+++ b/src/base/abc/abc.h
@@ -526,6 +526,10 @@ static inline void Abc_ObjSetMvVar( Abc_Obj_t * pObj, void * pV) { Vec_At
for ( i = 0; (i < Abc_ObjFaninNum(pObj)) && (((pFanin) = Abc_ObjFanin(pObj, i)), 1); i++ )
#define Abc_ObjForEachFanout( pObj, pFanout, i ) \
for ( i = 0; (i < Abc_ObjFanoutNum(pObj)) && (((pFanout) = Abc_ObjFanout(pObj, i)), 1); i++ )
+#define Abc_ObjForEachFaninId( pObj, iFanin, i ) \
+ for ( i = 0; (i < Abc_ObjFaninNum(pObj)) && (((iFanin) = Abc_ObjFaninId(pObj, i)), 1); i++ )
+#define Abc_ObjForEachFanoutId( pObj, iFanout, i ) \
+ for ( i = 0; (i < Abc_ObjFanoutNum(pObj)) && (((iFanout) = Abc_ObjFanoutId(pObj, i)), 1); i++ )
// cubes and literals
#define Abc_CubeForEachVar( pCube, Value, i ) \
for ( i = 0; (pCube[i] != ' ') && (Value = pCube[i]); i++ )
diff --git a/src/base/abci/abcDar.c b/src/base/abci/abcDar.c
index 8c1928bb..9f672485 100644
--- a/src/base/abci/abcDar.c
+++ b/src/base/abci/abcDar.c
@@ -880,7 +880,7 @@ Abc_Ntk_t * Abc_NtkFromCellMappedGia( Gia_Man_t * p )
Abc_Obj_t * pObjNew, * pObjNewLi, * pObjNewLo;
Gia_Obj_t * pObj, * pObjLi, * pObjLo;
int i, k, iLit, iFanLit, nCells, fNeedConst[2] = {0};
- Mio_Cell_t * pCells = Mio_CollectRootsNewDefault( 6, &nCells, 0 );
+ Mio_Cell2_t * pCells = Mio_CollectRootsNewDefault2( 6, &nCells, 0 );
assert( Gia_ManHasCellMapping(p) );
// start network
pNtkNew = Abc_NtkAlloc( ABC_NTK_LOGIC, ABC_FUNC_MAP, 1 );