Commit abdf3971 by Alan Mishchenko

Several corner-case bugs in %read, &cec, and st.

parent 1343b8a8
......@@ -3860,9 +3860,18 @@ Gia_Man_t * Gia_ManDemiterToDual( Gia_Man_t * p )
pObj->Value = Gia_ManAppendCi( pNew );
Gia_ManForEachObjVec( vNodes, p, pObj, i )
pObj->Value = Gia_ManAppendAnd( pNew, Gia_ObjFanin0Copy(pObj), Gia_ObjFanin1Copy(pObj) );
pObj = Gia_ManCo(p, 0);
if ( Gia_ObjFanin0(pObj) == Gia_ManConst0(p) )
{
Gia_ManAppendCo( pNew, 0 );
Gia_ManAppendCo( pNew, Gia_ObjFaninC0(pObj) );
}
else
{
Gia_ManSetPhase( p );
Gia_ManForEachObjVec( vOrder, p, pObj, i )
Gia_ManAppendCo( pNew, Abc_LitNotCond(pObj->Value, pObj->fPhase) );
}
Vec_IntFree( vNodes );
Vec_IntFree( vOrder );
return pNew;
......
......@@ -810,7 +810,7 @@ int Abc_NtkSopToAig( Abc_Ntk_t * pNtk )
{
Abc_Obj_t * pNode;
Hop_Man_t * pMan;
int i;
int i, Max;
assert( Abc_NtkHasSop(pNtk) );
......@@ -819,7 +819,8 @@ int Abc_NtkSopToAig( Abc_Ntk_t * pNtk )
// start the functionality manager
pMan = Hop_ManStart();
Hop_IthVar( pMan, Abc_NtkGetFaninMax(pNtk)-1 );
Max = Abc_NtkGetFaninMax(pNtk);
if ( Max ) Hop_IthVar( pMan, Max-1 );
// convert each node from SOP to BDD
Abc_NtkForEachNode( pNtk, pNode, i )
......
......@@ -1265,10 +1265,10 @@ Wlc_Ntk_t * Wlc_ReadVer( char * pFileName )
// derive topological order
pNtk = Wlc_NtkDupDfs( p->pNtk );
Wlc_NtkTransferNames( pNtk, p->pNtk );
pNtk->pSpec = Abc_UtilStrsav( pFileName );
finish:
Wlc_PrsPrintErrorMessage( p );
Wlc_PrsStop( p );
pNtk->pSpec = Abc_UtilStrsav( pFileName );
return pNtk;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment