Renaming If_Lut_t into If_LibLut_t.

3 files changed, 46 insertions, 46 deletions

diff --git a/src/map/if/if.h b/src/map/if/if.h
index a2d047af..bdc505be 100644
--- a/src/map/if/if.h
+++ b/src/map/if/if.h
@@ -71,16 +71,17 @@ typedef enum {
 
 typedef struct If_Man_t_     If_Man_t;
 typedef struct If_Par_t_     If_Par_t;
-typedef struct If_Lib_t_     If_Lib_t;
 typedef struct If_Obj_t_     If_Obj_t;
 typedef struct If_Cut_t_     If_Cut_t;
 typedef struct If_Set_t_     If_Set_t;
+typedef struct If_LibLut_t_  If_LibLut_t;
+typedef struct If_LibBox_t_  If_LibBox_t;
 
 typedef struct Ifif_Par_t_   Ifif_Par_t;
 struct Ifif_Par_t_
 {
     int                nLutSize;      // the LUT size
-    If_Lib_t *         pLutLib;       // the LUT library
+    If_LibLut_t *      pLutLib;       // the LUT library
     float              pLutDelays[IF_MAX_LUTSIZE];  // pin-to-pin delays of the max LUT
     float              DelayWire;     // wire delay
     int                nDegree;       // structure degree 
@@ -138,7 +139,7 @@ struct If_Par_t_
     int                nLatchesCoBox; // the number of white box inputs among the COs
     int                fLiftLeaves;   // shift the leaves for seq mapping
     int                fUseCoAttrs;   // use CO attributes
-    If_Lib_t *         pLutLib;       // the LUT library
+    If_LibLut_t *      pLutLib;       // the LUT library
     float *            pTimesArr;     // arrival times
     float *            pTimesReq;     // required times
     int (* pFuncCost)  (If_Cut_t *);  // procedure to compute the user's cost of a cut
@@ -148,7 +149,7 @@ struct If_Par_t_
 };
 
 // the LUT library
-struct If_Lib_t_
+struct If_LibLut_t_
 {
     char *             pName;         // the name of the LUT library
     int                LutMax;        // the maximum LUT size 
@@ -323,7 +324,6 @@ struct If_Box_t_
     int *              pDelays;
 };
 
-typedef struct If_LibBox_t_ If_LibBox_t;
 struct If_LibBox_t_
 {
     Vec_Ptr_t *        vBoxes;
@@ -388,7 +388,7 @@ static inline int        If_CutTruthWords( int nVarsMax )                    { r
 static inline int        If_CutPermWords( int nVarsMax )                     { return nVarsMax / sizeof(int) + ((nVarsMax % sizeof(int)) > 0); }
 
 static inline float      If_CutLutArea( If_Man_t * p, If_Cut_t * pCut )      { return pCut->fUser? (float)pCut->Cost : (p->pPars->pLutLib? p->pPars->pLutLib->pLutAreas[pCut->nLeaves] : (float)1.0); }
-static inline float      If_CutLutDelay( If_Lib_t * p, int Size, int iPin )  { return p ? (p->fVarPinDelays ? p->pLutDelays[Size][iPin] : p->pLutDelays[Size][0]) : 1.0;                              }
+static inline float      If_CutLutDelay( If_LibLut_t * p, int Size, int iPin )  { return p ? (p->fVarPinDelays ? p->pLutDelays[Size][iPin] : p->pLutDelays[Size][0]) : 1.0;                              }
 
 static inline word       If_AndToWrd( If_And_t m )                           { union { If_And_t x; word y; } v; v.x = m; return v.y;  }
 static inline If_And_t   If_WrdToAnd( word m )                               { union { If_And_t x; word y; } v; v.y = m; return v.x;  }
@@ -492,15 +492,15 @@ extern int             If_CluCheckExt( void * p, word * pTruth, int nVars, int n
 extern int             If_CluCheckExt3( void * p, word * pTruth, int nVars, int nLutLeaf, int nLutLeaf2, int nLutRoot, 
                            char * pLut0, char * pLut1, char * pLut2, word * pFunc0, word * pFunc1, word * pFunc2 );
 /*=== ifLib.c =============================================================*/
-extern If_Lib_t *      If_LutLibRead( char * FileName );
-extern If_Lib_t *      If_LutLibDup( If_Lib_t * p );
-extern void            If_LutLibFree( If_Lib_t * pLutLib );
-extern void            If_LutLibPrint( If_Lib_t * pLutLib );
-extern int             If_LutLibDelaysAreDiscrete( If_Lib_t * pLutLib );
-extern int             If_LutLibDelaysAreDifferent( If_Lib_t * pLutLib );
-extern If_Lib_t *      If_LutLibSetSimple( int nLutSize );
-extern float           If_LutLibFastestPinDelay( If_Lib_t * p );
-extern float           If_LutLibSlowestPinDelay( If_Lib_t * p );
+extern If_LibLut_t *   If_LibLutRead( char * FileName );
+extern If_LibLut_t *   If_LibLutDup( If_LibLut_t * p );
+extern void            If_LibLutFree( If_LibLut_t * pLutLib );
+extern void            If_LibLutPrint( If_LibLut_t * pLutLib );
+extern int             If_LibLutDelaysAreDiscrete( If_LibLut_t * pLutLib );
+extern int             If_LibLutDelaysAreDifferent( If_LibLut_t * pLutLib );
+extern If_LibLut_t *   If_LibLutSetSimple( int nLutSize );
+extern float           If_LibLutFastestPinDelay( If_LibLut_t * p );
+extern float           If_LibLutSlowestPinDelay( If_LibLut_t * p );
 /*=== ifLibBox.c =============================================================*/
 extern If_LibBox_t *   If_LibBoxStart();
 extern void            If_LibBoxFree( If_LibBox_t * p );
diff --git a/src/map/if/ifCom.c b/src/map/if/ifCom.c
index a6af038f..b14d857e 100644
--- a/src/map/if/ifCom.c
+++ b/src/map/if/ifCom.c
@@ -51,8 +51,8 @@ static int If_CommandPrintBox( Abc_Frame_t * pAbc, int argc, char **argv );
 void If_Init( Abc_Frame_t * pAbc )
 {
     // set the default library
-    If_Lib_t s_LutLib = { "lutlib", 4, 0, {0,1,1,1,1}, {{0},{1},{1},{1},{1}} };
-    Abc_FrameSetLibLut( If_LutLibDup(&s_LutLib) );
+    If_LibLut_t s_LutLib = { "lutlib", 4, 0, {0,1,1,1,1}, {{0},{1},{1},{1},{1}} };
+    Abc_FrameSetLibLut( If_LibLutDup(&s_LutLib) );
 
     Cmd_CommandAdd( pAbc, "FPGA mapping", "read_lut",   If_CommandReadLut,   0 ); 
     Cmd_CommandAdd( pAbc, "FPGA mapping", "print_lut",  If_CommandPrintLut,  0 ); 
@@ -74,7 +74,7 @@ void If_Init( Abc_Frame_t * pAbc )
 ***********************************************************************/
 void If_End( Abc_Frame_t * pAbc )
 {
-    If_LutLibFree( (If_Lib_t *)   Abc_FrameReadLibLut() );
+    If_LibLutFree( (If_LibLut_t *)   Abc_FrameReadLibLut() );
     If_LibBoxFree( (If_LibBox_t *)Abc_FrameReadLibBox() );
 }
 
@@ -93,7 +93,7 @@ int If_CommandReadLut( Abc_Frame_t * pAbc, int argc, char **argv )
 {
     FILE * pFile;
     FILE * pOut, * pErr;
-    If_Lib_t * pLib;
+    If_LibLut_t * pLib;
     Abc_Ntk_t * pNet;
     char * FileName;
     int fVerbose;
@@ -137,14 +137,14 @@ int If_CommandReadLut( Abc_Frame_t * pAbc, int argc, char **argv )
     fclose( pFile );
 
     // set the new network
-    pLib = If_LutLibRead( FileName );
+    pLib = If_LibLutRead( FileName );
     if ( pLib == NULL )
     {
         fprintf( pErr, "Reading LUT library has failed.\n" );
         goto usage;
     }
     // replace the current library
-    If_LutLibFree( (If_Lib_t *)Abc_FrameReadLibLut() );
+    If_LibLutFree( (If_LibLut_t *)Abc_FrameReadLibLut() );
     Abc_FrameSetLibLut( pLib );
     return 0;
 
@@ -212,7 +212,7 @@ int If_CommandPrintLut( Abc_Frame_t * pAbc, int argc, char **argv )
         goto usage;
 
     // set the new network
-    If_LutLibPrint( (If_Lib_t *)Abc_FrameReadLibLut() );
+    If_LibLutPrint( (If_LibLut_t *)Abc_FrameReadLibLut() );
     return 0;
 
 usage:
diff --git a/src/map/if/ifLibLut.c b/src/map/if/ifLibLut.c
index b1e6c680..26fa137b 100644
--- a/src/map/if/ifLibLut.c
+++ b/src/map/if/ifLibLut.c
@@ -44,10 +44,10 @@ static inline char * If_UtilStrsav( char *s ) {  return !s ? s : strcpy(ABC_ALLO
   SeeAlso     []
 
 ***********************************************************************/
-If_Lib_t * If_LutLibRead( char * FileName )
+If_LibLut_t * If_LibLutRead( char * FileName )
 {
     char pBuffer[1000], * pToken;
-    If_Lib_t * p;
+    If_LibLut_t * p;
     FILE * pFile;
     int i, k;
 
@@ -58,8 +58,8 @@ If_Lib_t * If_LutLibRead( char * FileName )
         return NULL;
     }
 
-    p = ABC_ALLOC( If_Lib_t, 1 );
-    memset( p, 0, sizeof(If_Lib_t) );
+    p = ABC_ALLOC( If_LibLut_t, 1 );
+    memset( p, 0, sizeof(If_LibLut_t) );
     p->pName = If_UtilStrsav( FileName );
 
     i = 1;
@@ -150,10 +150,10 @@ If_Lib_t * If_LutLibRead( char * FileName )
   SeeAlso     []
 
 ***********************************************************************/
-If_Lib_t * If_LutLibDup( If_Lib_t * p )
+If_LibLut_t * If_LibLutDup( If_LibLut_t * p )
 {
-    If_Lib_t * pNew;
-    pNew = ABC_ALLOC( If_Lib_t, 1 );
+    If_LibLut_t * pNew;
+    pNew = ABC_ALLOC( If_LibLut_t, 1 );
     *pNew = *p;
     pNew->pName = If_UtilStrsav( pNew->pName );
     return pNew;
@@ -170,7 +170,7 @@ If_Lib_t * If_LutLibDup( If_Lib_t * p )
   SeeAlso     []
 
 ***********************************************************************/
-void If_LutLibFree( If_Lib_t * pLutLib )
+void If_LibLutFree( If_LibLut_t * pLutLib )
 {
     if ( pLutLib == NULL )
         return;
@@ -190,7 +190,7 @@ void If_LutLibFree( If_Lib_t * pLutLib )
   SeeAlso     []
 
 ***********************************************************************/
-void If_LutLibPrint( If_Lib_t * pLutLib )
+void If_LibLutPrint( If_LibLut_t * pLutLib )
 {
     int i, k;
     Abc_Print( 1, "# The area/delay of k-variable LUTs:\n" );
@@ -221,7 +221,7 @@ void If_LutLibPrint( If_Lib_t * pLutLib )
   SeeAlso     []
 
 ***********************************************************************/
-int If_LutLibDelaysAreDiscrete( If_Lib_t * pLutLib )
+int If_LibLutDelaysAreDiscrete( If_LibLut_t * pLutLib )
 {
     float Delay;
     int i;
@@ -245,7 +245,7 @@ int If_LutLibDelaysAreDiscrete( If_Lib_t * pLutLib )
   SeeAlso     []
 
 ***********************************************************************/
-int If_LutLibDelaysAreDifferent( If_Lib_t * pLutLib )
+int If_LibLutDelaysAreDifferent( If_LibLut_t * pLutLib )
 {
     int i, k;
     float Delay = pLutLib->pLutDelays[1][0];
@@ -276,17 +276,17 @@ int If_LutLibDelaysAreDifferent( If_Lib_t * pLutLib )
   SeeAlso     []
 
 ***********************************************************************/
-If_Lib_t * If_LutLibSetSimple( int nLutSize )
+If_LibLut_t * If_LibLutSetSimple( int nLutSize )
 {
-    If_Lib_t s_LutLib10= { "lutlib",10, 0, {0,1,1,1,1,1,1,1,1,1,1}, {{0},{1},{1},{1},{1},{1},{1},{1},{1},{1},{1}} };
-    If_Lib_t s_LutLib9 = { "lutlib", 9, 0, {0,1,1,1,1,1,1,1,1,1}, {{0},{1},{1},{1},{1},{1},{1},{1},{1},{1}} };
-    If_Lib_t s_LutLib8 = { "lutlib", 8, 0, {0,1,1,1,1,1,1,1,1}, {{0},{1},{1},{1},{1},{1},{1},{1},{1}} };
-    If_Lib_t s_LutLib7 = { "lutlib", 7, 0, {0,1,1,1,1,1,1,1}, {{0},{1},{1},{1},{1},{1},{1},{1}} };
-    If_Lib_t s_LutLib6 = { "lutlib", 6, 0, {0,1,1,1,1,1,1}, {{0},{1},{1},{1},{1},{1},{1}} };
-    If_Lib_t s_LutLib5 = { "lutlib", 5, 0, {0,1,1,1,1,1}, {{0},{1},{1},{1},{1},{1}} };
-    If_Lib_t s_LutLib4 = { "lutlib", 4, 0, {0,1,1,1,1}, {{0},{1},{1},{1},{1}} };
-    If_Lib_t s_LutLib3 = { "lutlib", 3, 0, {0,1,1,1}, {{0},{1},{1},{1}} };
-    If_Lib_t * pLutLib;
+    If_LibLut_t s_LutLib10= { "lutlib",10, 0, {0,1,1,1,1,1,1,1,1,1,1}, {{0},{1},{1},{1},{1},{1},{1},{1},{1},{1},{1}} };
+    If_LibLut_t s_LutLib9 = { "lutlib", 9, 0, {0,1,1,1,1,1,1,1,1,1}, {{0},{1},{1},{1},{1},{1},{1},{1},{1},{1}} };
+    If_LibLut_t s_LutLib8 = { "lutlib", 8, 0, {0,1,1,1,1,1,1,1,1}, {{0},{1},{1},{1},{1},{1},{1},{1},{1}} };
+    If_LibLut_t s_LutLib7 = { "lutlib", 7, 0, {0,1,1,1,1,1,1,1}, {{0},{1},{1},{1},{1},{1},{1},{1}} };
+    If_LibLut_t s_LutLib6 = { "lutlib", 6, 0, {0,1,1,1,1,1,1}, {{0},{1},{1},{1},{1},{1},{1}} };
+    If_LibLut_t s_LutLib5 = { "lutlib", 5, 0, {0,1,1,1,1,1}, {{0},{1},{1},{1},{1},{1}} };
+    If_LibLut_t s_LutLib4 = { "lutlib", 4, 0, {0,1,1,1,1}, {{0},{1},{1},{1},{1}} };
+    If_LibLut_t s_LutLib3 = { "lutlib", 3, 0, {0,1,1,1}, {{0},{1},{1},{1}} };
+    If_LibLut_t * pLutLib;
     assert( nLutSize >= 3 && nLutSize <= 10 );
     switch ( nLutSize )
     {
@@ -302,7 +302,7 @@ If_Lib_t * If_LutLibSetSimple( int nLutSize )
     }
     if ( pLutLib == NULL )
         return NULL;
-    return If_LutLibDup(pLutLib);
+    return If_LibLutDup(pLutLib);
 }
 
 /**Function*************************************************************
@@ -316,7 +316,7 @@ If_Lib_t * If_LutLibSetSimple( int nLutSize )
   SeeAlso     []
 
 ***********************************************************************/
-float If_LutLibFastestPinDelay( If_Lib_t * p )
+float If_LibLutFastestPinDelay( If_LibLut_t * p )
 {
     return !p? 1.0 : p->pLutDelays[p->LutMax][0];
 }
@@ -332,7 +332,7 @@ float If_LutLibFastestPinDelay( If_Lib_t * p )
   SeeAlso     []
 
 ***********************************************************************/
-float If_LutLibSlowestPinDelay( If_Lib_t * p )
+float If_LibLutSlowestPinDelay( If_LibLut_t * p )
 {
     return !p? 1.0 : (p->fVarPinDelays? p->pLutDelays[p->LutMax][p->LutMax-1]: p->pLutDelays[p->LutMax][0]);
 }