summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlan Mishchenko <alanmi@berkeley.edu>2013-10-03 00:14:13 -0700
committerAlan Mishchenko <alanmi@berkeley.edu>2013-10-03 00:14:13 -0700
commitb1b85e0e6ae41fac9daaa83e9037b2eff7436737 (patch)
treee4d7d346c029a2a6198f4bd772945d928c2535d2 /src
parent4aac586cae0e87c07e04c268735031de21ac7fc1 (diff)
downloadabc-b1b85e0e6ae41fac9daaa83e9037b2eff7436737.tar.gz
abc-b1b85e0e6ae41fac9daaa83e9037b2eff7436737.tar.bz2
abc-b1b85e0e6ae41fac9daaa83e9037b2eff7436737.zip
Integrating synthesis into the new BMC engine.
Diffstat (limited to 'src')
-rw-r--r--src/aig/gia/giaBalance.c12
-rw-r--r--src/aig/gia/giaMuxes.c2
2 files changed, 7 insertions, 7 deletions
diff --git a/src/aig/gia/giaBalance.c b/src/aig/gia/giaBalance.c
index 7d27cd00..80888d29 100644
--- a/src/aig/gia/giaBalance.c
+++ b/src/aig/gia/giaBalance.c
@@ -129,9 +129,9 @@ void Gia_ManSuperCollectXor_rec( Gia_Man_t * p, Gia_Obj_t * pObj )
{
assert( !Gia_IsComplement(pObj) );
if ( !Gia_ObjIsXor(pObj) ||
- Gia_ObjRefNum(p, pObj) > 1 ||
-// Gia_ObjRefNum(p, pObj) > 2 ||
-// (Gia_ObjRefNum(p, pObj) == 2 && (Gia_ObjRefNum(p, Gia_ObjFanin0(pObj)) == 1 || Gia_ObjRefNum(p, Gia_ObjFanin1(pObj)) == 1)) ||
+// Gia_ObjRefNum(p, pObj) > 1 ||
+ Gia_ObjRefNum(p, pObj) > 2 ||
+ (Gia_ObjRefNum(p, pObj) == 2 && (Gia_ObjRefNum(p, Gia_ObjFanin0(pObj)) == 1 || Gia_ObjRefNum(p, Gia_ObjFanin1(pObj)) == 1)) ||
Vec_IntSize(p->vSuper) > 100 )
{
Vec_IntPush( p->vSuper, Gia_ObjToLit(p, pObj) );
@@ -145,9 +145,9 @@ void Gia_ManSuperCollectAnd_rec( Gia_Man_t * p, Gia_Obj_t * pObj )
{
if ( Gia_IsComplement(pObj) ||
!Gia_ObjIsAndReal(p, pObj) ||
- Gia_ObjRefNum(p, pObj) > 1 ||
-// Gia_ObjRefNum(p, pObj) > 2 ||
-// (Gia_ObjRefNum(p, pObj) == 2 && (Gia_ObjRefNum(p, Gia_ObjFanin0(pObj)) == 1 || Gia_ObjRefNum(p, Gia_ObjFanin1(pObj)) == 1)) ||
+// Gia_ObjRefNum(p, pObj) > 1 ||
+ Gia_ObjRefNum(p, pObj) > 2 ||
+ (Gia_ObjRefNum(p, pObj) == 2 && (Gia_ObjRefNum(p, Gia_ObjFanin0(pObj)) == 1 || Gia_ObjRefNum(p, Gia_ObjFanin1(pObj)) == 1)) ||
Vec_IntSize(p->vSuper) > 100 )
{
Vec_IntPush( p->vSuper, Gia_ObjToLit(p, pObj) );
diff --git a/src/aig/gia/giaMuxes.c b/src/aig/gia/giaMuxes.c
index a4764e65..827bdf9a 100644
--- a/src/aig/gia/giaMuxes.c
+++ b/src/aig/gia/giaMuxes.c
@@ -63,7 +63,7 @@ Gia_Man_t * Gia_ManDupMuxes( Gia_Man_t * p )
Gia_ManHashStart( pNew );
Gia_ManForEachAnd( p, pObj, i )
{
- if ( !Gia_ObjIsMuxType(pObj) || (Gia_ObjRefNum(p, Gia_ObjFanin0(pObj)) > 1 && Gia_ObjRefNum(p, Gia_ObjFanin1(pObj)) > 1) )
+ if ( !Gia_ObjIsMuxType(pObj) || (Gia_ObjRefNum(p, Gia_ObjFanin0(pObj)) > 1 || Gia_ObjRefNum(p, Gia_ObjFanin1(pObj)) > 1) )
pObj->Value = Gia_ManHashAnd( pNew, Gia_ObjFanin0Copy(pObj), Gia_ObjFanin1Copy(pObj) );
else if ( Gia_ObjRecognizeExor(pObj, &pFan0, &pFan1) )
pObj->Value = Gia_ManHashXorReal( pNew, Gia_ObjLitCopy(p, Gia_ObjToLit(p, pFan0)), Gia_ObjLitCopy(p, Gia_ObjToLit(p, pFan1)) );