luke/abc
1
0
Fork 0
mirror of https://github.com/YosysHQ/abc.git synced 2026-09-08 03:46:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Extending Liberty parser to handle multi-output cells.

Browse Source
This commit is contained in:
Alan Mishchenko
2012-09-19 18:42:00 -07:00
parent 480ca14c75
commit 5dc50744f0
12 changed files with 106 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/base/abci/abcAttach.c
+1 -1
View File
@@ -88,7 +88,7 @@ int Abc_NtkAttach( Abc_Ntk_t * pNtk )
for ( i = 1; i < nGates; i++ )
puTruthGates[i] = puTruthGates[i-1] + 2;
for ( i = 0; i < nGates; i++ )
Mio_DeriveTruthTable( ppGates[i], uTruths, Mio_GateReadInputs(ppGates[i]), 6, puTruthGates[i] );
Mio_DeriveTruthTable( ppGates[i], uTruths, Mio_GateReadPinNum(ppGates[i]), 6, puTruthGates[i] );
// assign the gates to pNode->pCopy
Abc_NtkCleanCopy( pNtk );
src/base/abci/abcPrint.c
+1 -1
View File
@@ -1049,7 +1049,7 @@ void Abc_NtkPrintGates( Abc_Ntk_t * pNtk, int fUseLibrary )
Area = Counter * Mio_GateReadArea( ppGates[i] );
printf( "%-*s Fanin = %2d Instance = %8d Area = %10.2f %6.2f %%\n",
nGateNameLen, Mio_GateReadName( ppGates[i] ),
Mio_GateReadInputs( ppGates[i] ),
Mio_GateReadPinNum( ppGates[i] ),
Counter, Area, 100.0 * Area / AreaTotal );
}
printf( "%-*s Instance = %8d Area = %10.2f %6.2f %%\n",
src/base/io/ioReadBlif.c
+6 -6
View File
@@ -533,12 +533,12 @@ int Io_ReadBlifReorderFormalNames( Vec_Ptr_t * vTokens, Mio_Gate_t * pGate, Mio_
nSize = Vec_PtrSize(vTokens);
if ( pTwin == NULL )
{
if ( nSize - 3 != Mio_GateReadInputs(pGate) )
if ( nSize - 3 != Mio_GateReadPinNum(pGate) )
return 0;
}
else
{
if ( nSize - 3 != Mio_GateReadInputs(pGate) && nSize - 4 != Mio_GateReadInputs(pGate) )
if ( nSize - 3 != Mio_GateReadPinNum(pGate) && nSize - 4 != Mio_GateReadPinNum(pGate) )
return 0;
}
// check if the names are in order
@@ -553,7 +553,7 @@ int Io_ReadBlifReorderFormalNames( Vec_Ptr_t * vTokens, Mio_Gate_t * pGate, Mio_
}
if ( pTwin == NULL )
{
if ( i == Mio_GateReadInputs(pGate) )
if ( i == Mio_GateReadPinNum(pGate) )
return 1;
// reorder the pins
for ( pGatePin = Mio_GateReadPins(pGate), i = 0; pGatePin; pGatePin = Mio_PinReadNext(pGatePin), i++ )
@@ -589,10 +589,10 @@ int Io_ReadBlifReorderFormalNames( Vec_Ptr_t * vTokens, Mio_Gate_t * pGate, Mio_
}
else
{
if ( i != Mio_GateReadInputs(pGate) ) // expect the correct order of input pins in the network with twin gates
if ( i != Mio_GateReadPinNum(pGate) ) // expect the correct order of input pins in the network with twin gates
return 0;
// check the last two entries
if ( nSize - 3 == Mio_GateReadInputs(pGate) ) // only one output is available
if ( nSize - 3 == Mio_GateReadPinNum(pGate) ) // only one output is available
{
pNamePin = Mio_GateReadOutName(pGate);
Length = strlen(pNamePin);
@@ -614,7 +614,7 @@ int Io_ReadBlifReorderFormalNames( Vec_Ptr_t * vTokens, Mio_Gate_t * pGate, Mio_
}
return 0;
}
if ( nSize - 4 == Mio_GateReadInputs(pGate) ) // two outputs are available
if ( nSize - 4 == Mio_GateReadPinNum(pGate) ) // two outputs are available
{
pNamePin = Mio_GateReadOutName(pGate);
Length = strlen(pNamePin);
src/base/ver/verCore.c
+1 -1
View File
@@ -1527,7 +1527,7 @@ int Ver_ParseGate( Ver_Man_t * pMan, Abc_Ntk_t * pNtk, Mio_Gate_t * pGate )
Ver_Stream_t * p = pMan->pReader;
Abc_Obj_t * pNetActual, * pNode, * pNode2 = NULL;
char * pWord, Symbol;
int Input, i, nFanins = Mio_GateReadInputs(pGate);
int Input, i, nFanins = Mio_GateReadPinNum(pGate);
// convert from the blackbox into the network with local functions representated by gates
if ( 1 != pMan->fMapped )