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

* distrib/alliance.spec.in : 

- Mise a jour du numero de release. Utilisation de %{_tmppath}.

 * vst2xnf/src/vst2xnf.c,
   x2y/src/x2y.c :
   - Bug : les chaines de caracteres ne peuvent plus etre ouvertes et
       fermees sur des lignes differentes (probleme avec gcc 3.3.x).
       Mais on peut toujours en mettre sur des lignes consecutives qui
       seront fusionnees par le compilateur.

 * ocp/src/common/PCommon.h,
   ocp/src/placer/PPlacement.h :
   - Compatibilite avec gcc 3.3.x : assert est maintenant definit dans
      <assert.h>. On l'inclus si la version de GCC est superieure ou
      egale a 3.3 .
This commit is contained in:
Jean-Paul Chaput 2003-11-15 21:26:19 +00:00
parent f2ab614f51
commit 4e3b1e230d
5 changed files with 47 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
alliance/src/distrib/alliance.spec.in
View File

@ -1,21 +1,20 @@
%define name alliance %define name alliance
%define ver @VERSION@ %define ver @VERSION@
%define release 20021016 %define release 20031115
%define tag alpha.1
%define prefix @prefix@ %define prefix @prefix@
Name: %{name} Name: %{name}
Summary: Alliance VLSI CAD Sytem Summary: Alliance VLSI CAD Sytem
Version: %{ver} Version: %{ver}
Release: %{release}.%{tag} Release: %{release}
Copyright: GPL Copyright: GPL
Group: Applications/VLSI Group: Applications/VLSI
Source: %{name}-%{ver}.tar.gz Source: %{name}-%{ver}.tar.gz
URL: http://www-asim.lip6.fr/alliance/ URL: http://www-asim.lip6.fr/alliance/
Packager: Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr> Packager: Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
BuildRoot: /var/tmp/root-%{name} BuildRoot: %{_tmppath}/root-%{name}
@ -147,6 +146,8 @@ Sources of the Alliance VLSI CAD System, as you might guess...
%{prefix}/etc/*.par %{prefix}/etc/*.par
%{prefix}/etc/*.scapin %{prefix}/etc/*.scapin
%{prefix}/etc/*.conf %{prefix}/etc/*.conf
%{prefix}/etc/*.mac
%{prefix}/etc/*.lef
%{prefix}/cells/* %{prefix}/cells/*
%{prefix}/bin/* %{prefix}/bin/*
%{prefix}/lib/* %{prefix}/lib/*
@ -165,6 +166,16 @@ Sources of the Alliance VLSI CAD System, as you might guess...
%changelog %changelog
* Sat Nov 15 2003 Jean-Paul.Chaput <Jean-Paul.Chaput@lip6.fr>
- assert is now in assert.h, patch mut.h to include it if
GCC_VERSION >= 3003 (gcc >= 3.3.x).
* Sat Oct 18 2003 Jean-Paul.Chaput <Jean-Paul.Chaput@lip6.fr>
- Synched with 2003/10/18 version.
- Missing depcomp : added "--add-missing --copy" to the individual
packages in autostuff, so the first who needs depcomp will add
it at top level.
* Sun Oct 13 2002 Jean-Paul.Chaput <Jean-Paul.Chaput@lip6.fr> * Sun Oct 13 2002 Jean-Paul.Chaput <Jean-Paul.Chaput@lip6.fr>
- autoconf m4 macros moved back in the Alliance source tree to avoid - autoconf m4 macros moved back in the Alliance source tree to avoid
re-declaration on our development computers (on which the macros re-declaration on our development computers (on which the macros

5
alliance/src/ocp/src/common/PCommon.h
View File

@ -1,9 +1,14 @@
#ifndef __PCOMMON_H #ifndef __PCOMMON_H
#define __PCOMMON_H #define __PCOMMON_H
#include <ansidecl.h>
#if defined(GCC_VERSION) && (GCC_VERSION >= 3003)
#include <assert.h>
#endif
#include <iostream> #include <iostream>
#include "mut.h" #include "mut.h"
#include "mlo.h" #include "mlo.h"
#include "mph.h" #include "mph.h"
using namespace std; using namespace std;
const double SquareShape(const double margin, const double sumwidth, const double SquareShape(const double margin, const double sumwidth,

4
alliance/src/ocp/src/placer/PPlacement.h
View File

@ -12,6 +12,10 @@ using namespace __gnu_cxx; // GCC 3.1 and later
#endif #endif
#endif #endif
#endif #endif
#include <ansidecl.h>
#if defined(GCC_VERSION) && (GCC_VERSION >= 3003)
#include <assert.h>
#endif
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>

16
alliance/src/vst2xnf/src/vst2xnf.c
View File

@ -86,8 +86,8 @@ locon_list *plc;
fprintf(stderr,"**liste des connecteurs externes\n"); fprintf(stderr,"**liste des connecteurs externes\n");
plc = ptfig->LOCON ; plc = ptfig->LOCON ;
while(plc) { while(plc) {
fprintf(stderr,"connecteur : %s ,sig index : %d ,type : %c, fprintf(stderr,"connecteur : %s ,sig index : %d ,type : %c,"
direction : %c \n",plc->NAME,plc->SIG->INDEX,plc->TYPE, "direction : %c \n",plc->NAME,plc->SIG->INDEX,plc->TYPE,
plc->DIRECTION); plc->DIRECTION);
plc = plc->NEXT; plc = plc->NEXT;
} }
@ -122,8 +122,8 @@ locon_list *pc;
fprintf(stderr,"modele : %s ,instance : %s \n",pi->FIGNAME,pi->INSNAME); fprintf(stderr,"modele : %s ,instance : %s \n",pi->FIGNAME,pi->INSNAME);
pc = pi->LOCON; pc = pi->LOCON;
while(pc) { while(pc) {
fprintf(stderr,"connecteur : %s ,index : %d ,type : %c, fprintf(stderr,"connecteur : %s ,index : %d ,type : %c,"
dir : %c \n",pc->NAME,pc->SIG->INDEX,pc->TYPE,pc->DIRECTION); "dir : %c \n",pc->NAME,pc->SIG->INDEX,pc->TYPE,pc->DIRECTION);
pc = pc->NEXT; pc = pc->NEXT;
} }
pi = pi->NEXT; pi = pi->NEXT;
@ -178,8 +178,8 @@ int prim_add_inv(char *name)
else if ( ! strcmp(name,"i2") ) { pin=2 ; } else if ( ! strcmp(name,"i2") ) { pin=2 ; }
else if ( ! strcmp(name,"i3") ) { pin=3 ; } else if ( ! strcmp(name,"i3") ) { pin=3 ; }
else if ( ! strcmp(name,"i4") ) { pin=4 ; } else if ( ! strcmp(name,"i4") ) { pin=4 ; }
else { fprintf(stderr,"FORMAT_ERROR: pin name *%s* not in set o,i0,i1, else { fprintf(stderr,"FORMAT_ERROR: pin name *%s* not in set o,i0,i1,"
i2,i3,i4 \n",name) ; } "i2,i3,i4 \n",name) ; }
if ( pin >= diff ) { return 1 ; } if ( pin >= diff ) { return 1 ; }
else { return 0 ; } else { return 0 ; }
} }
@ -194,8 +194,8 @@ static char *prim_map_pin_name(char *name,char *buffer)
else if ( ! strcmp(buffer,"i2") ) { return "3" ; } else if ( ! strcmp(buffer,"i2") ) { return "3" ; }
else if ( ! strcmp(buffer,"i3") ) { return "4" ; } else if ( ! strcmp(buffer,"i3") ) { return "4" ; }
else if ( ! strcmp(buffer,"i4") ) { return "5" ; } else if ( ! strcmp(buffer,"i4") ) { return "5" ; }
else { fprintf(stderr,"FORMAT_ERROR: pin name *%s* not in set o,i0,i1, else { fprintf(stderr,"FORMAT_ERROR: pin name *%s* not in set o,i0,i1,"
i2,i3,i4 \n",buffer) ; "i2,i3,i4 \n",buffer) ;
return buffer ;} return buffer ;}
} }
/*-------------------------------------------------------------*/ /*-------------------------------------------------------------*/

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

@ -21,7 +21,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#ident "$Id: x2y.c,v 1.3 2003/05/20 13:28:39 czo Exp $" #ident "$Id: x2y.c,v 1.4 2003/11/15 21:26:19 jpc Exp $"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "mut.h" #include "mut.h"
@ -63,20 +63,20 @@ int main( argc, argv )
if ( argc != 5 ) if ( argc != 5 )
{ {
fprintf( stdout, " fprintf( stdout,
Syntax: x2y in_format out_format in_file out_file "Syntax: x2y in_format out_format in_file out_file"
Where format is one of "Where format is one of"
al ALLIANCE netlist " al ALLIANCE netlist"
ap ALLIANCE layout " ap ALLIANCE layout"
cct HILO netlist " cct HILO netlist"
cp VTI layout " cp VTI layout"
edi EDIF netlist or layout " edi EDIF netlist or layout"
fne VTI extracted netlist " fne VTI extracted netlist"
hns VTI netlist " hns VTI netlist"
spi, sp, cir SPICE netlist " spi, sp, cir SPICE netlist"
vlg VERILOG netlist " vlg VERILOG netlist"
vst VHDL netlist " vst VHDL netlist"
" ); );
return( 1 ); return( 1 );
} }