Extending Liberty parser to handle multi-output cells.

4 files changed, 88 insertions, 3 deletions

diff --git a/src/map/mio/mio.h b/src/map/mio/mio.h
index 3aff8790..55612e32 100644
--- a/src/map/mio/mio.h
+++ b/src/map/mio/mio.h
@@ -111,7 +111,7 @@ extern Mio_Pin_t *       Mio_GateReadPins          ( Mio_Gate_t * pGate );
 extern Mio_Library_t *   Mio_GateReadLib           ( Mio_Gate_t * pGate );      
 extern Mio_Gate_t *      Mio_GateReadNext          ( Mio_Gate_t * pGate );      
 extern Mio_Gate_t *      Mio_GateReadTwin          ( Mio_Gate_t * pGate );      
-extern int               Mio_GateReadInputs        ( Mio_Gate_t * pGate );      
+extern int               Mio_GateReadPinNum        ( Mio_Gate_t * pGate );      
 extern double            Mio_GateReadDelayMax      ( Mio_Gate_t * pGate );      
 extern char *            Mio_GateReadSop           ( Mio_Gate_t * pGate );      
 extern word              Mio_GateReadTruth         ( Mio_Gate_t * pGate );
@@ -135,6 +135,7 @@ extern int               Mio_LibraryReadExclude( char * ExcludeFile, st_table *
 extern int               Mio_LibraryParseFormulas( Mio_Library_t * pLib );
 /*=== mioParse.c =============================================================*/
 extern Vec_Int_t *       Mio_ParseFormula( char * pFormInit, char ** ppVarNames, int nVars );
+extern int               Mio_ParseCheckFormula( Mio_Gate_t * pGate, char * pForm );
 /*=== mioSop.c =============================================================*/
 extern char *            Mio_LibDeriveSop( int nVars, Vec_Int_t * vExpr, Vec_Str_t * vStr );
 /*=== mioUtils.c =============================================================*/
diff --git a/src/map/mio/mioApi.c b/src/map/mio/mioApi.c
index 2fe23c2c..31d803ab 100644
--- a/src/map/mio/mioApi.c
+++ b/src/map/mio/mioApi.c
@@ -148,7 +148,7 @@ Mio_Pin_t *       Mio_GateReadPins    ( Mio_Gate_t * pGate )            { return
 Mio_Library_t *   Mio_GateReadLib     ( Mio_Gate_t * pGate )            { return pGate->pLib;      }
 Mio_Gate_t *      Mio_GateReadNext    ( Mio_Gate_t * pGate )            { return pGate->pNext;     }
 Mio_Gate_t *      Mio_GateReadTwin    ( Mio_Gate_t * pGate )            { return pGate->pTwin;     }
-int               Mio_GateReadInputs  ( Mio_Gate_t * pGate )            { return pGate->nInputs;   }
+int               Mio_GateReadPinNum  ( Mio_Gate_t * pGate )            { return pGate->nInputs;   }
 double            Mio_GateReadDelayMax( Mio_Gate_t * pGate )            { return pGate->dDelayMax; }
 char *            Mio_GateReadSop     ( Mio_Gate_t * pGate )            { return pGate->pSop;      }
 word              Mio_GateReadTruth   ( Mio_Gate_t * pGate )            { return pGate->nInputs <= 6 ? pGate->uTruth : 0;   }
diff --git a/src/map/mio/mioParse.c b/src/map/mio/mioParse.c
index c68b7dea..a3dfa435 100644
--- a/src/map/mio/mioParse.c
+++ b/src/map/mio/mioParse.c
@@ -382,6 +382,83 @@ Vec_Int_t * Mio_ParseFormula( char * pFormInit, char ** ppVarNames, int nVars )
     return NULL;
 }
 
+/**Function*************************************************************
+
+  Synopsis    [Checks if the gate's formula essentially depends on all variables.]
+
+  Description []
+               
+  SideEffects []
+
+  SeeAlso     []
+
+***********************************************************************/
+int Mio_ParseCheckName( Mio_Gate_t * pGate, char ** ppStr )
+{
+    Mio_Pin_t * pPin;
+    int i;
+    for ( pPin = Mio_GateReadPins(pGate), i = 0; pPin; pPin = Mio_PinReadNext(pPin), i++ )
+        if ( !strncmp( *ppStr, Mio_PinReadName(pPin), strlen(Mio_PinReadName(pPin)) ) )
+        {
+            *ppStr += strlen(Mio_PinReadName(pPin)) - 1;
+            return i;
+        }
+    return -1;
+}
+int Mio_ParseCheckFormula( Mio_Gate_t * pGate, char * pForm )
+{
+    Mio_Pin_t * pPin;
+    char * pStr;
+    int i, iPin, fVisit[32] = {0};
+    if ( Mio_GateReadPins(pGate) == NULL )
+        return 1;
+/*
+    // find the equality sign
+    pForm = strstr( pForm, "=" );
+    if ( pForm == NULL )
+    {
+        printf( "Skipping gate \"%s\" because formula \"%s\" has not equality sign (=).\n", pGate->pName, pForm );
+        return 0;
+    }
+*/
+printf( "Checking gate %s\n", pGate->pName );
+
+    for ( pStr = pForm + 1; *pStr; pStr++ )
+    {
+        if ( *pStr == ' ' ||
+             *pStr == MIO_EQN_SYM_OPEN ||   
+             *pStr == MIO_EQN_SYM_CLOSE ||  
+             *pStr == MIO_EQN_SYM_CONST0 || 
+             *pStr == MIO_EQN_SYM_CONST1 || 
+             *pStr == MIO_EQN_SYM_NEG ||    
+             *pStr == MIO_EQN_SYM_NEGAFT || 
+             *pStr == MIO_EQN_SYM_AND ||    
+             *pStr == MIO_EQN_SYM_AND2 ||   
+             *pStr == MIO_EQN_SYM_XOR ||    
+             *pStr == MIO_EQN_SYM_OR ||     
+             *pStr == MIO_EQN_SYM_OR2 
+           )
+           continue;
+        // return the number of the pin which has this name
+        iPin = Mio_ParseCheckName( pGate, &pStr );
+        if ( iPin == -1 )
+        {
+            printf( "Skipping gate \"%s\" because substring \"%s\" does not match with a pin name.\n", pGate->pName, *pStr );
+            return 0;
+        }
+        assert( iPin < 32 );
+        fVisit[iPin] = 1;
+    }
+    // check that all pins are used
+    for ( pPin = Mio_GateReadPins(pGate), i = 0; pPin; pPin = Mio_PinReadNext(pPin), i++ )
+        if ( fVisit[i] == 0 )
+        {
+            printf( "Skipping gate \"%s\" because pin \"%s\" does not appear in the formula \"%s\".\n", pGate->pName, Mio_PinReadName(pPin), pForm );
+            return 0;
+        }
+    return 1;
+}
+
 ////////////////////////////////////////////////////////////////////////
 ///                       END OF FILE                                ///
 ////////////////////////////////////////////////////////////////////////
diff --git a/src/map/mio/mioRead.c b/src/map/mio/mioRead.c
index 53ea7d2d..2d1a747f 100644
--- a/src/map/mio/mioRead.c
+++ b/src/map/mio/mioRead.c
@@ -209,7 +209,14 @@ int Mio_LibraryReadInternal( Mio_Library_t * pLib, char * pBuffer, int fExtended
         pGate = Mio_LibraryReadGate( &pToken, fExtendedFormat );
         if ( pGate == NULL )
             return 1;
-        
+/*
+        // skip the gate if its formula has problems
+        if ( !Mio_ParseCheckFormula(pGate, pGate->pForm) )
+        {
+            Mio_GateDelete( pGate );
+            continue;
+        }
+*/        
         // set the library
         pGate->pLib = pLib;