summaryrefslogtreecommitdiffstats
path: root/src/map/mapper
diff options
context:
space:
mode:
authorAlan Mishchenko <alanmi@berkeley.edu>2012-09-19 18:42:00 -0700
committerAlan Mishchenko <alanmi@berkeley.edu>2012-09-19 18:42:00 -0700
commit5dc50744f0604173293be81f013834db59ea0142 (patch)
treed2112feb4147cad872959173ecc897b616e3067b /src/map/mapper
parent480ca14c75e9f8c54ca9b55c39162324aaa1e288 (diff)
downloadabc-5dc50744f0604173293be81f013834db59ea0142.tar.gz
abc-5dc50744f0604173293be81f013834db59ea0142.tar.bz2
abc-5dc50744f0604173293be81f013834db59ea0142.zip
Extending Liberty parser to handle multi-output cells.
Diffstat (limited to 'src/map/mapper')
-rw-r--r--src/map/mapper/mapperTree.c4
-rw-r--r--src/map/mapper/mapperTree_old.c4
-rw-r--r--src/map/mapper/mapperUtils.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/map/mapper/mapperTree.c b/src/map/mapper/mapperTree.c
index 36ad4920..b41dfe54 100644
--- a/src/map/mapper/mapperTree.c
+++ b/src/map/mapper/mapperTree.c
@@ -309,7 +309,7 @@ Map_Super_t * Map_LibraryReadGateTree( Map_SuperLib_t * pLib, char * pBuffer, in
return NULL;
}
// set the max number of fanouts
- pGate->nFanLimit = s_MapFanoutLimits[ Mio_GateReadInputs(pGate->pRoot) ];
+ pGate->nFanLimit = s_MapFanoutLimits[ Mio_GateReadPinNum(pGate->pRoot) ];
// read the pin-to-pin delay
for ( i = 0; ( pTemp = strtok( NULL, " \n\0" ) ); i++ )
@@ -336,7 +336,7 @@ Map_Super_t * Map_LibraryReadGateTree( Map_SuperLib_t * pLib, char * pBuffer, in
pGate->pFanins[i] = pLib->ppSupers[Num];
}
pGate->nFanins = i;
- if ( pGate->nFanins != (unsigned)Mio_GateReadInputs(pGate->pRoot) )
+ if ( pGate->nFanins != (unsigned)Mio_GateReadPinNum(pGate->pRoot) )
{
printf( "The number of fanins of a root gate is wrong.\n" );
return NULL;
diff --git a/src/map/mapper/mapperTree_old.c b/src/map/mapper/mapperTree_old.c
index eafba376..5b491e82 100644
--- a/src/map/mapper/mapperTree_old.c
+++ b/src/map/mapper/mapperTree_old.c
@@ -306,7 +306,7 @@ Map_Super_t * Map_LibraryReadGateTree( Map_SuperLib_t * pLib, char * pBuffer, in
return NULL;
}
// set the max number of fanouts
- pGate->nFanLimit = s_MapFanoutLimits[ Mio_GateReadInputs(pGate->pRoot) ];
+ pGate->nFanLimit = s_MapFanoutLimits[ Mio_GateReadPinNum(pGate->pRoot) ];
// read the pin-to-pin delay
for ( i = 0; ( pTemp = strtok( NULL, " \n\0" ) ); i++ )
@@ -333,7 +333,7 @@ Map_Super_t * Map_LibraryReadGateTree( Map_SuperLib_t * pLib, char * pBuffer, in
pGate->pFanins[i] = pLib->ppSupers[Num];
}
pGate->nFanins = i;
- if ( pGate->nFanins != (unsigned)Mio_GateReadInputs(pGate->pRoot) )
+ if ( pGate->nFanins != (unsigned)Mio_GateReadPinNum(pGate->pRoot) )
{
printf( "The number of fanins of a root gate is wrong.\n" );
return NULL;
diff --git a/src/map/mapper/mapperUtils.c b/src/map/mapper/mapperUtils.c
index 26033fdb..e49c4dd4 100644
--- a/src/map/mapper/mapperUtils.c
+++ b/src/map/mapper/mapperUtils.c
@@ -799,7 +799,7 @@ st_table * Map_CreateTableGate2Super( Map_Man_t * pMan )
if ( pSuper->nGates == 1 )
{
// skip different versions of the same root gate
- nInputs = Mio_GateReadInputs(pSuper->pRoot);
+ nInputs = Mio_GateReadPinNum(pSuper->pRoot);
for ( v = 0; v < nInputs; v++ )
if ( pSuper->pFanins[v]->Num != nInputs - 1 - v )
break;