Renamed Aig_ObjPioNum to be Aig_ObjCioId.

8 files changed, 37 insertions, 37 deletions

diff --git a/src/aig/aig/aig.h b/src/aig/aig/aig.h
index 4c437b8c..3c390a37 100644
--- a/src/aig/aig/aig.h
+++ b/src/aig/aig/aig.h
@@ -71,7 +71,7 @@ struct Aig_Obj_t_  // 9 words
 {
     union {                         
         Aig_Obj_t *  pNext;          // strashing table
-        int          PioNum;         // the number of PI/PO
+        int          CioId;          // 0-based number of CI/CO
     };
     Aig_Obj_t *      pFanin0;        // fanin
     Aig_Obj_t *      pFanin1;        // fanin
@@ -268,7 +268,6 @@ static inline Aig_Obj_t *  Aig_ManLi( Aig_Man_t * p, int i )      { return (Aig_
 static inline Aig_Obj_t *  Aig_ManObj( Aig_Man_t * p, int i )     { return p->vObjs ? (Aig_Obj_t *)Vec_PtrEntry(p->vObjs, i) : NULL;  }
 
 static inline Aig_Type_t   Aig_ObjType( Aig_Obj_t * pObj )        { return (Aig_Type_t)pObj->Type;       }
-static inline int          Aig_ObjId( Aig_Obj_t * pObj )          { return pObj->Id;                     }
 static inline int          Aig_ObjIsNone( Aig_Obj_t * pObj )      { return pObj->Type == AIG_OBJ_NONE;   }
 static inline int          Aig_ObjIsConst1( Aig_Obj_t * pObj )    { assert(!Aig_IsComplement(pObj)); return pObj->Type == AIG_OBJ_CONST1; }
 static inline int          Aig_ObjIsCi( Aig_Obj_t * pObj )        { return pObj->Type == AIG_OBJ_CI;     }
@@ -281,6 +280,8 @@ static inline int          Aig_ObjIsTerm( Aig_Obj_t * pObj )      { return pObj-
 static inline int          Aig_ObjIsHash( Aig_Obj_t * pObj )      { return pObj->Type == AIG_OBJ_AND || pObj->Type == AIG_OBJ_EXOR;                                 }
 static inline int          Aig_ObjIsChoice( Aig_Man_t * p, Aig_Obj_t * pObj )    { return p->pEquivs && p->pEquivs[pObj->Id] && pObj->nRefs > 0;                    }
 static inline int          Aig_ObjIsCand( Aig_Obj_t * pObj )      { return pObj->Type == AIG_OBJ_CI || pObj->Type == AIG_OBJ_AND || pObj->Type == AIG_OBJ_EXOR;     }
+static inline int          Aig_ObjCioId( Aig_Obj_t * pObj )       { assert( !Aig_ObjIsNode(pObj) ); return pObj->CioId;                                            }
+static inline int          Aig_ObjId( Aig_Obj_t * pObj )          { return pObj->Id;                     }
 
 static inline int          Aig_ObjIsMarkA( Aig_Obj_t * pObj )     { return pObj->fMarkA;  }
 static inline void         Aig_ObjSetMarkA( Aig_Obj_t * pObj )    { pObj->fMarkA = 1;     }
@@ -327,7 +328,6 @@ static inline void         Aig_ObjSetEquiv( Aig_Man_t * p, Aig_Obj_t * pObj, Aig
 static inline Aig_Obj_t *  Aig_ObjRepr( Aig_Man_t * p, Aig_Obj_t * pObj )     { return p->pReprs? p->pReprs[pObj->Id] : NULL;             } 
 static inline void         Aig_ObjSetRepr( Aig_Man_t * p, Aig_Obj_t * pObj, Aig_Obj_t * pRepr )     { assert(p->pReprs); p->pReprs[pObj->Id] = pRepr;                                } 
 static inline Aig_Obj_t *  Aig_ObjHaig( Aig_Obj_t * pObj )        { assert( Aig_Regular(pObj)->pHaig ); return Aig_NotCond( Aig_Regular(pObj)->pHaig, Aig_IsComplement(pObj) );      } 
-static inline int          Aig_ObjPioNum( Aig_Obj_t * pObj )      { assert( !Aig_ObjIsNode(pObj) ); return (int)(ABC_PTRINT_T)pObj->pNext;                                          }
 static inline int          Aig_ObjWhatFanin( Aig_Obj_t * pObj, Aig_Obj_t * pFanin )    
 { 
     if ( Aig_ObjFanin0(pObj) == pFanin ) return 0; 
@@ -658,8 +658,8 @@ extern void            Aig_ManPrintVerbose( Aig_Man_t * p, int fHaig );
 extern void            Aig_ManDump( Aig_Man_t * p );
 extern void            Aig_ManDumpBlif( Aig_Man_t * p, char * pFileName, Vec_Ptr_t * vPiNames, Vec_Ptr_t * vPoNames );
 extern void            Aig_ManDumpVerilog( Aig_Man_t * p, char * pFileName );
-extern void            Aig_ManSetPioNumbers( Aig_Man_t * p );
-extern void            Aig_ManCleanPioNumbers( Aig_Man_t * p );
+extern void            Aig_ManSetCioIds( Aig_Man_t * p );
+extern void            Aig_ManCleanCioIds( Aig_Man_t * p );
 extern int             Aig_ManChoiceNum( Aig_Man_t * p );
 extern char *          Aig_FileNameGenericAppend( char * pBase, char * pSuffix );
 extern unsigned        Aig_ManRandom( int fReset );
diff --git a/src/aig/aig/aigDfs.c b/src/aig/aig/aigDfs.c
index 20830acb..ace723a2 100644
--- a/src/aig/aig/aigDfs.c
+++ b/src/aig/aig/aigDfs.c
@@ -47,7 +47,7 @@ int Aig_ManVerifyTopoOrder( Aig_Man_t * p )
 {
     Aig_Obj_t * pObj, * pNext;
     int i, k, iBox, iTerm1, nTerms;
-    Aig_ManSetPioNumbers( p );
+    Aig_ManSetCioIds( p );
     Aig_ManIncrementTravId( p );
     Aig_ManForEachObj( p, pObj, i )
     {
@@ -79,7 +79,7 @@ int Aig_ManVerifyTopoOrder( Aig_Man_t * p )
         {
             if ( p->pManTime )
             {
-                iBox = Tim_ManBoxForCi( (Tim_Man_t *)p->pManTime, Aig_ObjPioNum(pObj) );
+                iBox = Tim_ManBoxForCi( (Tim_Man_t *)p->pManTime, Aig_ObjCioId(pObj) );
                 if ( iBox >= 0 ) // this is not a true PI
                 {
                     iTerm1 = Tim_ManBoxInputFirst( (Tim_Man_t *)p->pManTime, iBox );
@@ -87,7 +87,7 @@ int Aig_ManVerifyTopoOrder( Aig_Man_t * p )
                     for ( k = 0; k < nTerms; k++ )
                     {
                         pNext = Aig_ManCo( p, iTerm1 + k );
-                        assert( Tim_ManBoxForCo( (Tim_Man_t *)p->pManTime, Aig_ObjPioNum(pNext) ) == iBox ); 
+                        assert( Tim_ManBoxForCo( (Tim_Man_t *)p->pManTime, Aig_ObjCioId(pNext) ) == iBox ); 
                         if ( !Aig_ObjIsTravIdCurrent(p,pNext) )
                         {
                             printf( "Box %d has input %d that is not in a topological order.\n", iBox, pNext->Id );
@@ -101,7 +101,7 @@ int Aig_ManVerifyTopoOrder( Aig_Man_t * p )
             assert( 0 );
         Aig_ObjSetTravIdCurrent( p, pObj );
     }
-    Aig_ManCleanPioNumbers( p );
+    Aig_ManCleanCioIds( p );
     return 1;
 }
 
@@ -505,7 +505,7 @@ void Aig_ManChoiceLevel_rec( Aig_Man_t * p, Aig_Obj_t * pObj )
     {
         if ( p->pManTime )
         {
-            iBox = Tim_ManBoxForCi( (Tim_Man_t *)p->pManTime, Aig_ObjPioNum(pObj) );
+            iBox = Tim_ManBoxForCi( (Tim_Man_t *)p->pManTime, Aig_ObjCioId(pObj) );
             if ( iBox >= 0 ) // this is not a true PI
             {
                 iTerm1 = Tim_ManBoxInputFirst( (Tim_Man_t *)p->pManTime, iBox );
@@ -572,7 +572,7 @@ int Aig_ManChoiceLevel( Aig_Man_t * p )
     int i, LevelMax = 0;
     Aig_ManForEachObj( p, pObj, i )
         Aig_ObjSetLevel( pObj, 0 );
-    Aig_ManSetPioNumbers( p );
+    Aig_ManSetCioIds( p );
     Aig_ManIncrementTravId( p );
     Aig_ManForEachCo( p, pObj, i )
     {
@@ -587,7 +587,7 @@ int Aig_ManChoiceLevel( Aig_Man_t * p )
         if ( LevelMax < Aig_ObjLevel(pObj) )
             LevelMax = Aig_ObjLevel(pObj);
     }
-    Aig_ManCleanPioNumbers( p );
+    Aig_ManCleanCioIds( p );
 //    Aig_ManForEachNode( p, pObj, i )
 //        assert( Aig_ObjLevel(pObj) > 0 );
     return LevelMax;
diff --git a/src/aig/aig/aigDup.c b/src/aig/aig/aigDup.c
index 9b993c86..97d99128 100644
--- a/src/aig/aig/aigDup.c
+++ b/src/aig/aig/aigDup.c
@@ -679,16 +679,16 @@ Vec_Ptr_t * Aig_ManOrderPios( Aig_Man_t * p, Aig_Man_t * pOrder )
     int i;
     assert( Aig_ManCiNum(p) == Aig_ManCiNum(pOrder) );
     assert( Aig_ManCoNum(p) == Aig_ManCoNum(pOrder) );
-    Aig_ManSetPioNumbers( pOrder );
+    Aig_ManSetCioIds( pOrder );
     vPios = Vec_PtrAlloc( Aig_ManCiNum(p) + Aig_ManCoNum(p) );
     Aig_ManForEachObj( pOrder, pObj, i )
     {
         if ( Aig_ObjIsCi(pObj) )
-            Vec_PtrPush( vPios, Aig_ManCi(p, Aig_ObjPioNum(pObj)) );
+            Vec_PtrPush( vPios, Aig_ManCi(p, Aig_ObjCioId(pObj)) );
         else if ( Aig_ObjIsCo(pObj) )
-            Vec_PtrPush( vPios, Aig_ManCo(p, Aig_ObjPioNum(pObj)) );
+            Vec_PtrPush( vPios, Aig_ManCo(p, Aig_ObjCioId(pObj)) );
     }
-    Aig_ManCleanPioNumbers( pOrder );
+    Aig_ManCleanCioIds( pOrder );
     return vPios;
 }
 
diff --git a/src/aig/aig/aigJust.c b/src/aig/aig/aigJust.c
index a6df4a1b..2c524c85 100644
--- a/src/aig/aig/aigJust.c
+++ b/src/aig/aig/aigJust.c
@@ -114,7 +114,7 @@ int Aig_NtkFindSatAssign_rec( Aig_Man_t * pAig, Aig_Obj_t * pNode, int Value, Ve
 //        if ( Aig_ObjId(pNode) % 1000 == 0 )
 //            Value ^= 1;
         if ( vSuppLits )
-            Vec_IntPush( vSuppLits, Abc_Var2Lit( Aig_ObjPioNum(pNode), !Value ) );
+            Vec_IntPush( vSuppLits, Abc_Var2Lit( Aig_ObjCioId(pNode), !Value ) );
         return 1;
     }
     assert( Aig_ObjIsNode(pNode) );
diff --git a/src/aig/aig/aigMan.c b/src/aig/aig/aigMan.c
index ed8cf8e9..a7bd17da 100644
--- a/src/aig/aig/aigMan.c
+++ b/src/aig/aig/aigMan.c
@@ -455,7 +455,7 @@ void Aig_ManSetRegNum( Aig_Man_t * p, int nRegs )
     p->nRegs = nRegs;
     p->nTruePis = Aig_ManCiNum(p) - nRegs;
     p->nTruePos = Aig_ManCoNum(p) - nRegs;
-    Aig_ManSetPioNumbers( p );
+    Aig_ManSetCioIds( p );
 }
 
 /**Function*************************************************************
diff --git a/src/aig/aig/aigPart.c b/src/aig/aig/aigPart.c
index 587596b5..56d2fd3f 100644
--- a/src/aig/aig/aigPart.c
+++ b/src/aig/aig/aigPart.c
@@ -1133,7 +1133,7 @@ void Aig_ManSupportNodes_rec( Aig_Man_t * p, Aig_Obj_t * pObj, Vec_Int_t * vSupp
     Aig_ObjSetTravIdCurrent(p, pObj);
     if ( Aig_ObjIsCi(pObj) )
     {
-        Vec_IntPush( vSupport, Aig_ObjPioNum(pObj) );
+        Vec_IntPush( vSupport, Aig_ObjCioId(pObj) );
         return;
     }
     Aig_ManSupportNodes_rec( p, Aig_ObjFanin0(pObj), vSupport );
@@ -1156,7 +1156,7 @@ Vec_Ptr_t * Aig_ManSupportNodes( Aig_Man_t * p, Vec_Ptr_t * vParts )
     Vec_Ptr_t * vPartSupps;
     Vec_Int_t * vPart, * vSupport;
     int i, k, iOut;
-    Aig_ManSetPioNumbers( p );
+    Aig_ManSetCioIds( p );
     vPartSupps = Vec_PtrAlloc( Vec_PtrSize(vParts) );
     Vec_PtrForEachEntry( Vec_Int_t *, vParts, vPart, i )
     {
@@ -1168,7 +1168,7 @@ Vec_Ptr_t * Aig_ManSupportNodes( Aig_Man_t * p, Vec_Ptr_t * vParts )
 //        Vec_IntSort( vSupport, 0 );
         Vec_PtrPush( vPartSupps, vSupport );
     }
-    Aig_ManCleanPioNumbers( p );
+    Aig_ManCleanCioIds( p );
     return vPartSupps;
 }
 
@@ -1392,7 +1392,7 @@ Aig_Man_t * Aig_ManFraigPartitioned( Aig_Man_t * pAig, int nPartSize, int nConfM
     Aig_ManReprStart( pAig, Aig_ManObjNumMax(pAig) );
 
     // set the PI numbers
-    Aig_ManSetPioNumbers( pAig );
+    Aig_ManSetCioIds( pAig );
 
     // create the total fraiged AIG
     Vec_PtrForEachEntry( Vec_Int_t *, vParts, vPart, i )
@@ -1425,7 +1425,7 @@ Aig_Man_t * Aig_ManFraigPartitioned( Aig_Man_t * pAig, int nPartSize, int nConfM
     Vec_VecFree( (Vec_Vec_t *)vParts );
 
     // clear the PI numbers
-    Aig_ManCleanPioNumbers( pAig );
+    Aig_ManCleanCioIds( pAig );
 
     // derive the result of choicing
     return Aig_ManDupRepr( pAig, 0 );
diff --git a/src/aig/aig/aigScl.c b/src/aig/aig/aigScl.c
index 26de9244..5dc79d7f 100644
--- a/src/aig/aig/aigScl.c
+++ b/src/aig/aig/aigScl.c
@@ -77,15 +77,15 @@ Aig_Man_t * Aig_ManRemap( Aig_Man_t * p, Vec_Ptr_t * vMap )
         pObj->pData = Aig_NotCond( (Aig_Obj_t *)Aig_Regular(pObjMapped)->pData, Aig_IsComplement(pObjMapped) );
         if ( pNew->vFlopReprs && i >= nTruePis && pObj != pObjMapped )
         {
-            Vec_IntPush( pNew->vFlopReprs, Aig_ObjPioNum(pObj) );
+            Vec_IntPush( pNew->vFlopReprs, Aig_ObjCioId(pObj) );
             if ( Aig_ObjIsConst1( Aig_Regular(pObjMapped) ) )
                 Vec_IntPush( pNew->vFlopReprs, -1 );
             else
             {
                 assert( !Aig_IsComplement(pObjMapped) );
                 assert( Aig_ObjIsCi(pObjMapped) );
-                assert( Aig_ObjPioNum(pObj) != Aig_ObjPioNum(pObjMapped) );
-                Vec_IntPush( pNew->vFlopReprs, Aig_ObjPioNum(pObjMapped) );
+                assert( Aig_ObjCioId(pObj) != Aig_ObjCioId(pObjMapped) );
+                Vec_IntPush( pNew->vFlopReprs, Aig_ObjCioId(pObjMapped) );
             }
         }
     }
@@ -236,7 +236,7 @@ int Aig_ManSeqCleanup( Aig_Man_t * p )
     Vec_PtrFree( vNodes );
     p->nTruePis = Aig_ManCiNum(p) - Aig_ManRegNum(p); 
     p->nTruePos = Aig_ManCoNum(p) - Aig_ManRegNum(p); 
-    Aig_ManSetPioNumbers( p );
+    Aig_ManSetCioIds( p );
     // remove dangling nodes
     return Aig_ManCleanup( p );
 }
diff --git a/src/aig/aig/aigUtil.c b/src/aig/aig/aigUtil.c
index c247208f..0cf12370 100644
--- a/src/aig/aig/aigUtil.c
+++ b/src/aig/aig/aigUtil.c
@@ -799,16 +799,16 @@ void Aig_ManDumpBlif( Aig_Man_t * p, char * pFileName, Vec_Ptr_t * vPiNames, Vec
     // write nodes
     if ( pConst1 )
         fprintf( pFile, ".names n%0*d\n 1\n", nDigits, pConst1->iData );
-    Aig_ManSetPioNumbers( p );
+    Aig_ManSetCioIds( p );
     Vec_PtrForEachEntry( Aig_Obj_t *, vNodes, pObj, i )
     {
         fprintf( pFile, ".names" );
         if ( vPiNames && Aig_ObjIsCi(Aig_ObjFanin0(pObj)) )
-            fprintf( pFile, " %s", (char*)Vec_PtrEntry(vPiNames, Aig_ObjPioNum(Aig_ObjFanin0(pObj))) );
+            fprintf( pFile, " %s", (char*)Vec_PtrEntry(vPiNames, Aig_ObjCioId(Aig_ObjFanin0(pObj))) );
         else
             fprintf( pFile, " n%0*d", nDigits, Aig_ObjFanin0(pObj)->iData );
         if ( vPiNames && Aig_ObjIsCi(Aig_ObjFanin1(pObj)) )
-            fprintf( pFile, " %s", (char*)Vec_PtrEntry(vPiNames, Aig_ObjPioNum(Aig_ObjFanin1(pObj))) );
+            fprintf( pFile, " %s", (char*)Vec_PtrEntry(vPiNames, Aig_ObjCioId(Aig_ObjFanin1(pObj))) );
         else
             fprintf( pFile, " n%0*d", nDigits, Aig_ObjFanin1(pObj)->iData );
         fprintf( pFile, " n%0*d\n", nDigits, pObj->iData );
@@ -819,16 +819,16 @@ void Aig_ManDumpBlif( Aig_Man_t * p, char * pFileName, Vec_Ptr_t * vPiNames, Vec
     {
         fprintf( pFile, ".names" );
         if ( vPiNames && Aig_ObjIsCi(Aig_ObjFanin0(pObj)) )
-            fprintf( pFile, " %s", (char*)Vec_PtrEntry(vPiNames, Aig_ObjPioNum(Aig_ObjFanin0(pObj))) );
+            fprintf( pFile, " %s", (char*)Vec_PtrEntry(vPiNames, Aig_ObjCioId(Aig_ObjFanin0(pObj))) );
         else
             fprintf( pFile, " n%0*d", nDigits, Aig_ObjFanin0(pObj)->iData );
         if ( vPoNames )
-            fprintf( pFile, " %s\n", (char*)Vec_PtrEntry(vPoNames, Aig_ObjPioNum(pObj)) );
+            fprintf( pFile, " %s\n", (char*)Vec_PtrEntry(vPoNames, Aig_ObjCioId(pObj)) );
         else
             fprintf( pFile, " n%0*d\n", nDigits, pObj->iData );
         fprintf( pFile, "%d 1\n", !Aig_ObjFaninC0(pObj) );
     }
-    Aig_ManCleanPioNumbers( p );
+    Aig_ManCleanCioIds( p );
     fprintf( pFile, ".end\n\n" );
     fclose( pFile );
     Vec_PtrFree( vNodes );
@@ -962,14 +962,14 @@ void Aig_ManDumpVerilog( Aig_Man_t * p, char * pFileName )
   SeeAlso     []
 
 ***********************************************************************/
-void Aig_ManSetPioNumbers( Aig_Man_t * p )
+void Aig_ManSetCioIds( Aig_Man_t * p )
 {
     Aig_Obj_t * pObj;
     int i;
     Aig_ManForEachCi( p, pObj, i )
-        pObj->PioNum = i;
+        pObj->CioId = i;
     Aig_ManForEachCo( p, pObj, i )
-        pObj->PioNum = i;
+        pObj->CioId = i;
 }
 
 /**Function*************************************************************
@@ -983,7 +983,7 @@ void Aig_ManSetPioNumbers( Aig_Man_t * p )
   SeeAlso     []
 
 ***********************************************************************/
-void Aig_ManCleanPioNumbers( Aig_Man_t * p )
+void Aig_ManCleanCioIds( Aig_Man_t * p )
 {
     Aig_Obj_t * pObj;
     int i;