diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2006-12-16 08:01:00 -0800 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2006-12-16 08:01:00 -0800 |
| commit | be6a484a997a8477d4c3b03c17f798c1b0061bf1 (patch) | |
| tree | 5c2e6dfa747144ba11dbdc8298ad08b19d5e49d1 /src/base/abc | |
| parent | ae037e45038cca6f0b86abea50692399a03b01be (diff) | |
| download | abc-be6a484a997a8477d4c3b03c17f798c1b0061bf1.tar.gz abc-be6a484a997a8477d4c3b03c17f798c1b0061bf1.tar.bz2 abc-be6a484a997a8477d4c3b03c17f798c1b0061bf1.zip | |
Version abc61216
Diffstat (limited to 'src/base/abc')
| -rw-r--r-- | src/base/abc/abcCheck.c | 11 | ||||
| -rw-r--r-- | src/base/abc/abcNames.c | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/base/abc/abcCheck.c b/src/base/abc/abcCheck.c index 7ade6740..bd11afb9 100644 --- a/src/base/abc/abcCheck.c +++ b/src/base/abc/abcCheck.c @@ -422,6 +422,10 @@ bool Abc_NtkCheckObj( Abc_Ntk_t * pNtk, Abc_Obj_t * pObj ) fprintf( stdout, "NetworkCheck: Object \"%s\" has incorrect ID.\n", Abc_ObjName(pObj) ); return 0; } + + if ( !Abc_FrameIsFlagEnabled("checkfio") ) + return Value; + // go through the fanins of the object and make sure fanins have this object as a fanout Abc_ObjForEachFanin( pObj, pFanin, i ) { @@ -443,9 +447,6 @@ bool Abc_NtkCheckObj( Abc_Ntk_t * pNtk, Abc_Obj_t * pObj ) } } - if ( !Abc_FrameIsFlagEnabled("checkfio") ) - return Value; - // make sure fanins are not duplicated for ( i = 0; i < pObj->vFanins.nSize; i++ ) for ( k = i + 1; k < pObj->vFanins.nSize; k++ ) @@ -706,10 +707,10 @@ bool Abc_NtkCompareBoxes( Abc_Ntk_t * pNtk1, Abc_Ntk_t * pNtk2, int fComb ) // for each PI of pNet1 find corresponding PI of pNet2 and reorder them Abc_NtkForEachBox( pNtk1, pObj1, i ) { - if ( strcmp( Abc_ObjName(pObj1), Abc_ObjName(Abc_NtkBox(pNtk2,i)) ) != 0 ) + if ( strcmp( Abc_ObjName(Abc_ObjFanout0(pObj1)), Abc_ObjName(Abc_ObjFanout0(Abc_NtkBox(pNtk2,i))) ) != 0 ) { printf( "Box #%d is different in network 1 ( \"%s\") and in network 2 (\"%s\").\n", - i, Abc_ObjName(pObj1), Abc_ObjName(Abc_NtkBox(pNtk2,i)) ); + i, Abc_ObjName(Abc_ObjFanout0(pObj1)), Abc_ObjName(Abc_ObjFanout0(Abc_NtkBox(pNtk2,i))) ); return 0; } } diff --git a/src/base/abc/abcNames.c b/src/base/abc/abcNames.c index 274cf243..2029994c 100644 --- a/src/base/abc/abcNames.c +++ b/src/base/abc/abcNames.c @@ -320,7 +320,7 @@ void Abc_NtkOrderObjsByName( Abc_Ntk_t * pNtk, int fComb ) Abc_NtkForEachPo( pNtk, pObj, i ) pObj->pCopy = (Abc_Obj_t *)Abc_ObjName(pObj); Abc_NtkForEachBox( pNtk, pObj, i ) - pObj->pCopy = (Abc_Obj_t *)Abc_ObjName(pObj); + pObj->pCopy = (Abc_Obj_t *)Abc_ObjName(Abc_ObjFanout0(pObj)); // order objects alphabetically qsort( (void *)Vec_PtrArray(pNtk->vPis), Vec_PtrSize(pNtk->vPis), sizeof(Abc_Obj_t *), (int (*)(const void *, const void *)) Abc_NodeCompareNames ); |