Commit 726a1d72 by Alan Mishchenko

Improvements to the new technology mapper.

parent 56e784a2
...@@ -375,7 +375,7 @@ int Jf_CutRef_rec( Jf_Man_t * p, int * pCut, int fEdge, int Limit ) ...@@ -375,7 +375,7 @@ int Jf_CutRef_rec( Jf_Man_t * p, int * pCut, int fEdge, int Limit )
for ( i = 1; i <= pCut[0]; i++ ) for ( i = 1; i <= pCut[0]; i++ )
if ( Gia_ObjRefIncId( p->pGia, pCut[i] ) == 0 ) if ( Gia_ObjRefIncId( p->pGia, pCut[i] ) == 0 )
Count += Jf_CutRef_rec( p, Jf_ObjCutBest(p, pCut[i]), fEdge, Limit - 1 ); Count += Jf_CutRef_rec( p, Jf_ObjCutBest(p, pCut[i]), fEdge, Limit - 1 );
return Count + (fEdge ? pCut[0] : 1); return Count + (fEdge ? (1 << 16) + pCut[0] : 1);
} }
int Jf_CutDeref_rec( Jf_Man_t * p, int * pCut, int fEdge, int Limit ) int Jf_CutDeref_rec( Jf_Man_t * p, int * pCut, int fEdge, int Limit )
{ {
...@@ -385,7 +385,7 @@ int Jf_CutDeref_rec( Jf_Man_t * p, int * pCut, int fEdge, int Limit ) ...@@ -385,7 +385,7 @@ int Jf_CutDeref_rec( Jf_Man_t * p, int * pCut, int fEdge, int Limit )
for ( i = 1; i <= pCut[0]; i++ ) for ( i = 1; i <= pCut[0]; i++ )
if ( Gia_ObjRefDecId( p->pGia, pCut[i] ) == 0 ) if ( Gia_ObjRefDecId( p->pGia, pCut[i] ) == 0 )
Count += Jf_CutDeref_rec( p, Jf_ObjCutBest(p, pCut[i]), fEdge, Limit - 1 ); Count += Jf_CutDeref_rec( p, Jf_ObjCutBest(p, pCut[i]), fEdge, Limit - 1 );
return Count + (fEdge ? pCut[0] : 1); return Count + (fEdge ? (1 << 16) + pCut[0] : 1);
} }
static inline int Jf_CutElaOld( Jf_Man_t * p, int * pCut, int fEdge ) static inline int Jf_CutElaOld( Jf_Man_t * p, int * pCut, int fEdge )
{ {
...@@ -405,7 +405,7 @@ int Jf_CutRef2_rec( Jf_Man_t * p, int * pCut, int fEdge, int Limit ) ...@@ -405,7 +405,7 @@ int Jf_CutRef2_rec( Jf_Man_t * p, int * pCut, int fEdge, int Limit )
if ( Gia_ObjRefIncId( p->pGia, pCut[i] ) == 0 ) if ( Gia_ObjRefIncId( p->pGia, pCut[i] ) == 0 )
Count += Jf_CutRef2_rec( p, Jf_ObjCutBest(p, pCut[i]), fEdge, Limit - 1 ); Count += Jf_CutRef2_rec( p, Jf_ObjCutBest(p, pCut[i]), fEdge, Limit - 1 );
} }
return Count + (fEdge ? pCut[0] : 1); return Count + (fEdge ? (1 << 16) + pCut[0] : 1);
} }
static inline int Jf_CutEla( Jf_Man_t * p, int * pCut, int fEdge ) static inline int Jf_CutEla( Jf_Man_t * p, int * pCut, int fEdge )
{ {
......
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