riscv
/
alliance
mirror of https://gitlab.lip6.fr/vlsi-eda/alliance.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Better interface for x2y to YoSys (courtesy of N. Shimizu) 

* New: In x2y.c, added ability to extract specifically one figure.
    Add vdd/vss terminals for compliance with Alliance.
This commit is contained in:
Jean-Paul Chaput 2016-07-19 17:27:28 +02:00
parent d8c05cd022
commit e2db4908a9
2 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,6 +2,7 @@ cvsCommit.txt
gitCommit.txt gitCommit.txt
patchs/ patchs/
Linux.*/ Linux.*/
Linux.el7_64
Darwin/ Darwin/
Solaris/ Solaris/
Makefile.in Makefile.in

45
alliance/src/x2y/src/x2y.c
View File

@ -45,15 +45,32 @@ vst VHDL netlist
*/ */
void addloinscon(struct loins *ptfig, const char *cname, losig_list *ptsig, char dir) {
locon_list *ptcon;
ptcon = (locon_list *)mbkalloc(sizeof(locon_list));
ptcon->NAME = cname;
ptcon->TYPE = 'E';
ptcon->SIG = ptsig;
ptcon->ROOT = (void *)ptfig;
ptcon->DIRECTION = dir;
ptcon->USER = NULL;
ptcon->NEXT = ptfig->LOCON;
ptcon->PNODE = NULL;
ptfig->LOCON = ptcon;
}
int main( argc, argv ) int main( argc, argv )
int argc; int argc;
char **argv; char **argv;
{ {
lofig_list *LogicalFigure; lofig_list *LogicalFigure;
struct loins *ptfig;
losig_list *sigvss, *sigvdd;
phfig_list *PhysicalFigure; phfig_list *PhysicalFigure;
char *InputName; char *InputName;
char *OutputName; char *OutputName;
char *FigureName;
char *InputFormat; char *InputFormat;
char *OutputFormat; char *OutputFormat;
int MbkIn; int MbkIn;
@ -63,10 +80,10 @@ int main( argc, argv )
alliancebanner ("x2y", "1.4", "MBK Format Translator", "1990", ALLIANCE_VERSION); alliancebanner ("x2y", "1.4", "MBK Format Translator", "1990", ALLIANCE_VERSION);
if ( argc != 5 ) if ( argc != 5 && argc != 6 && argc != 7)
{ {
fprintf( stdout, fprintf( stdout,
"Syntax: x2y in_format out_format in_file out_file\n" "Syntax: x2y in_format out_format in_file out_file [[fig_name] addpcon]\n"
"Where format is one of:\n" "Where format is one of:\n"
" al ALLIANCE netlist\n" " al ALLIANCE netlist\n"
" ap ALLIANCE layout\n" " ap ALLIANCE layout\n"
@ -86,6 +103,8 @@ int main( argc, argv )
OutputFormat = namealloc( argv[ 2 ] ); OutputFormat = namealloc( argv[ 2 ] );
InputName = namealloc( argv[ 3 ] ); InputName = namealloc( argv[ 3 ] );
OutputName = namealloc( argv[ 4 ] ); OutputName = namealloc( argv[ 4 ] );
if(argc>=6)
FigureName = namealloc( argv[ 5 ] );
if ( ( !strcmp( InputFormat, "al" ) ) || if ( ( !strcmp( InputFormat, "al" ) ) ||
( !strcmp( InputFormat, "vst" ) ) || ( !strcmp( InputFormat, "vst" ) ) ||
@ -146,8 +165,28 @@ int main( argc, argv )
fprintf( stdout, "\t--> Conversion of %s(%s) to %s(%s)\n", fprintf( stdout, "\t--> Conversion of %s(%s) to %s(%s)\n",
InputName, InputFormat, OutputName, OutputFormat ); InputName, InputFormat, OutputName, OutputFormat );
if ( MbkIn == 1 ) LogicalFigure = getlofig( InputName, 'A' ); if ( MbkIn == 1 ) {
LogicalFigure = getlofig( InputName, 'A' );
if(argc>=6)
LogicalFigure = getlofig( FigureName, 'A' );
}
else PhysicalFigure = getphfig( InputName, 'A' ); else PhysicalFigure = getphfig( InputName, 'A' );
if(argc == 7 && !strcmp(argv[6],"addpcon")) {
struct locon *LOCON;
sigvss=NULL;
sigvdd=NULL;
for (LOCON = LogicalFigure->LOCON; LOCON; LOCON = LOCON->NEXT) {
if(!strcmp(LOCON->NAME,"vss")) sigvss=LOCON->SIG;
if(!strcmp(LOCON->NAME,"vdd")) sigvdd=LOCON->SIG;
}
for (ptfig = LogicalFigure->LOINS; ptfig; ptfig = ptfig->NEXT) {
for (LOCON=ptfig->LOCON; LOCON && strcmp(LOCON->NAME,"vss"); LOCON = LOCON->NEXT) ;
if(!LOCON) {
addloinscon( ptfig, namealloc( "vdd" ), sigvdd, 'X' );
addloinscon( ptfig, namealloc( "vss" ), sigvss, 'X' );
}
}
}
if ( MbkOut == 1 ) if ( MbkOut == 1 )
{ {