From 1b519c1142e6fbdc95e68820b2f631184a104013 Mon Sep 17 00:00:00 2001 From: Christophe Alexandre Date: Wed, 29 Mar 2006 17:11:09 +0000 Subject: [PATCH] * gcc4 compatible : no cast like (Foo*)bar=foo; use bar=(Bar*)foo; * ALLIANCE_CFLAGS not added anymore to CFLAGS or CXXFLAGS by alliance.m4 -> must be added explicitely in each Makefile.am * remove configure.in (generated by autostuff) --- alliance/src/abl/src/abl.h | 3 + alliance/src/abl/src/ablcreate.c | 4 +- alliance/src/abl/src/ablctlnorm.c | 24 +- alliance/src/abl/src/ablctlsimp.c | 44 +- alliance/src/abl/src/abldev.c | 2 +- alliance/src/abl/src/abloptim.c | 4 +- alliance/src/abl/src/ablpolar.c | 4 +- alliance/src/abl/src/ablsimp.c | 20 +- alliance/src/abl/src/ablsubst.c | 2 +- alliance/src/abl/src/ablunflat.c | 2 +- alliance/src/abt/src/bhl_delaux.c | 7 +- alliance/src/alliance.m4 | 4 +- alliance/src/bdd/src/bddcircuit.c | 2 +- alliance/src/bdd/src/bddconvert.c | 2 +- alliance/src/boog/src/Makefile.am | 5 +- alliance/src/boog/src/bog_lib_format.c | 2 +- alliance/src/boog/src/bog_lib_negativ.c | 66 +- alliance/src/boog/src/bog_lib_permute.c | 4 +- alliance/src/boog/src/bog_map_adapt.c | 42 +- alliance/src/boog/src/bog_map_pattern.c | 18 +- alliance/src/boog/src/bog_normalize_ARITY.c | 2 +- alliance/src/boog/src/bog_normalize_ARITY.h | 1 + alliance/src/boog/src/bog_normalize_DAG.c | 8 +- alliance/src/boog/src/bog_normalize_DC.c | 4 +- .../src/boog/src/bog_normalize_nameindex.c | 2 +- .../src/boog/src/bog_normalize_simplify.c | 10 +- alliance/src/boog/src/bog_unflatten_befig.c | 8 +- alliance/src/boom/src/Makefile.am | 5 +- alliance/src/boom/src/boom_abl.c | 4 +- alliance/src/boom/src/boom_aux.c | 4 +- alliance/src/boom/src/boom_auxinit.c | 6 +- alliance/src/boom/src/boom_bdd.c | 2 +- alliance/src/boom/src/boom_dc.c | 2 +- alliance/src/boom/src/boom_post.c | 2 +- alliance/src/configure.in | 1024 ----------------- alliance/src/dreal/src/GRD.h | 4 + alliance/src/dreal/src/GRD_rds.c | 18 +- alliance/src/fvh/src/fvhfbh2fsm.c | 2 +- alliance/src/growstk/src/growstk.c | 3 +- alliance/src/log/src/log_bdd0.c | 3 +- alliance/src/log/src/log_thashbdd.c | 4 +- alliance/src/loon/src/Makefile.am | 5 +- alliance/src/loon/src/lon_lib_format.c | 2 +- alliance/src/loon/src/lon_lib_negativ.c | 60 +- alliance/src/loon/src/lon_main.c | 1 + alliance/src/loon/src/lon_normalize_DAG.c | 32 +- .../src/loon/src/lon_normalize_simplify.c | 8 +- alliance/src/lynx/src/netlist.c | 4 +- alliance/src/mbk/src/rcn_lo.c | 9 +- alliance/src/mbkedif/src/parser_y.y | 1 + alliance/src/mbkedif/src/time.c | 11 + alliance/src/mbkspice/src/spi_parse.c | 22 +- alliance/src/mbkvhdlg/src/gen_generic.c | 3 +- alliance/src/mbkvhdlg/src/mvl_drive.c | 3 +- alliance/src/mbkvhdlg/src/mvl_scomp_y.y | 3 +- alliance/src/mbkvhdlg/src/vel_o.c | 16 +- alliance/src/mbkvti/src/parse_vti_l.c | 15 +- alliance/src/mocha/src/Makefile.am | 5 +- alliance/src/mocha/src/mocha_syf.c | 14 +- alliance/src/mocha/src/mocha_syf.h | 9 +- alliance/src/nero/src/pdv.c | 1 + alliance/src/ocr/src/rout/findNPointsPath.c | 23 +- alliance/src/ocr/src/rout/ocrRouter.c | 180 +-- alliance/src/ocr/src/seg/ocrWPlaneLabeling.c | 21 +- alliance/src/ocr/src/seg/ocrWRoutingUtil.c | 19 +- alliance/src/ocr/src/util/ocrConnectorUtil.c | 14 +- alliance/src/ocr/src/util/ocrDataBaseUtil.c | 17 +- alliance/src/pcbs/src/emulbs/bstools.c | 2 +- alliance/src/pcbs/src/emulbs/hardware_io.c | 8 +- alliance/src/pcbs/src/emulbs/traduction.c | 4 +- alliance/src/s2r/src/postrat.c | 16 +- alliance/src/syf/src/Makefile.am | 5 +- alliance/src/syf/src/syf_comp.c | 2 +- alliance/src/syf/src/syf_synth.c | 14 +- alliance/src/vex/src/vex.h | 1 + alliance/src/vvh/src/vvh_vbh2vpn.c | 6 +- 76 files changed, 509 insertions(+), 1426 deletions(-) delete mode 100644 alliance/src/configure.in diff --git a/alliance/src/abl/src/abl.h b/alliance/src/abl/src/abl.h index 0996349a..6a2191bb 100644 --- a/alliance/src/abl/src/abl.h +++ b/alliance/src/abl/src/abl.h @@ -128,11 +128,14 @@ extern "C" { # define ABL_CDR( E ) ( ( E )->NEXT ) # define ABL_CAR( E ) ( (ablexpr *)( E )->DATA ) +# define ABL_CAR_L( E ) ( ( E )->DATA ) # define ABL_CADR( E ) ( ABL_CAR( ABL_CDR( ( E ) ) ) ) +# define ABL_CADR_L( E ) ( ABL_CAR_L( ABL_CDR( ( E ) ) ) ) # define ABL_CDDR( E ) ( ABL_CDR( ABL_CDR( ( E ) ) ) ) # define ABL_ATOM( E ) ( ( E )->NEXT == (ablexpr *)0 ) # define ABL_ATOM_VALUE( E ) ( (char *)( ( E )->DATA ) ) # define ABL_OPER( E ) ( (long)( ( ABL_CAR( ( E ) ) )->DATA ) ) +# define ABL_OPER_L( E ) ( ( ABL_CAR( ( E ) ) )->DATA ) # define SET_ABL_OPER( E,O ) ( ( ABL_CAR( (E) )->DATA = (void *)(O) ) ) /*------------------------------------------------------\ diff --git a/alliance/src/abl/src/ablcreate.c b/alliance/src/abl/src/ablcreate.c index 0e97d637..df96b120 100644 --- a/alliance/src/abl/src/ablcreate.c +++ b/alliance/src/abl/src/ablcreate.c @@ -198,14 +198,14 @@ ablexpr *createablnotexpr( Expr ) if ( AtomValue == ABL_ATOM_NAME_ONE ) { - ABL_ATOM_VALUE( Expr ) = (void *)ABL_ATOM_NAME_ZERO; + ABL_CAR_L( Expr ) = (void *)ABL_ATOM_NAME_ZERO; return( Expr ); } else if ( AtomValue == ABL_ATOM_NAME_ZERO ) { - ABL_ATOM_VALUE( Expr ) = (void *)ABL_ATOM_NAME_ONE; + ABL_CAR_L( Expr ) = (void *)ABL_ATOM_NAME_ONE; return( Expr ); } diff --git a/alliance/src/abl/src/ablctlnorm.c b/alliance/src/abl/src/ablctlnorm.c index e24dbefd..06774e25 100644 --- a/alliance/src/abl/src/ablctlnorm.c +++ b/alliance/src/abl/src/ablctlnorm.c @@ -109,8 +109,8 @@ static ablexpr *local_normablctl( Expr ) { NormExpr = local_normablctl( ABL_CADR( Expr ) ); if ( NormExpr != ABL_CADR( Expr ) ) - ABL_CADR( Expr ) = NormExpr; - ABL_CADR( Expr ) = createablnotexpr( ABL_CADR( Expr ) ); + ABL_CADR_L( Expr ) = NormExpr; + ABL_CADR_L( Expr ) = createablnotexpr( ABL_CADR( Expr ) ); SET_ABL_OPER( Expr, ABL_EX ); NormExpr = createablnotexpr( Expr ); return( NormExpr ); @@ -123,7 +123,7 @@ static ablexpr *local_normablctl( Expr ) { NormExpr = local_normablctl( ABL_CADR( Expr ) ); if ( NormExpr != ABL_CADR( Expr ) ) - ABL_CADR( Expr ) = NormExpr; + ABL_CADR_L( Expr ) = NormExpr; ExprTemp = createablatom( ABL_ATOM_NAME_ONE ); NormExpr = createablbinexpr( ABL_EU, ExprTemp, @@ -141,8 +141,8 @@ static ablexpr *local_normablctl( Expr ) { NormExpr = local_normablctl( ABL_CADR( Expr ) ); if ( NormExpr != ABL_CADR( Expr ) ) - ABL_CADR( Expr ) = NormExpr; - ABL_CADR( Expr ) = createablnotexpr( ABL_CADR( Expr ) ); + ABL_CADR_L( Expr ) = NormExpr; + ABL_CADR_L( Expr ) = createablnotexpr( ABL_CADR( Expr ) ); SET_ABL_OPER( Expr, ABL_EG ); NormExpr = createablnotexpr( Expr ); return( NormExpr ); @@ -155,8 +155,8 @@ static ablexpr *local_normablctl( Expr ) { NormExpr = local_normablctl( ABL_CADR( Expr ) ); if ( NormExpr != ABL_CADR( Expr ) ) - ABL_CADR( Expr ) = NormExpr; - ABL_CADR( Expr ) = createablnotexpr( ABL_CADR( Expr ) ); + ABL_CADR_L( Expr ) = NormExpr; + ABL_CADR_L( Expr ) = createablnotexpr( ABL_CADR( Expr ) ); SET_ABL_OPER( Expr, ABL_EF ); NormExpr = createablnotexpr( Expr ); NormExpr = local_normablctl( NormExpr ); @@ -170,13 +170,13 @@ static ablexpr *local_normablctl( Expr ) { NormExpr = local_normablctl( ABL_CADR( Expr ) ); if ( NormExpr != ABL_CADR( Expr ) ) - ABL_CADR( Expr ) = NormExpr; + ABL_CADR_L( Expr ) = NormExpr; NormExpr = local_normablctl( ABL_CAR( ABL_CDDR( Expr ) ) ); if ( NormExpr != ABL_CAR( ABL_CDDR( Expr ) ) ) - ABL_CAR( ABL_CDDR( Expr ) ) = NormExpr; + ABL_CAR_L( ABL_CDDR( Expr ) ) = NormExpr; - ABL_CADR( Expr ) = createablnotexpr( ABL_CADR( Expr ) ); - ABL_CAR( ABL_CDDR( Expr ) ) = createablnotexpr( ABL_CAR( ABL_CDDR( Expr ) ) ); + ABL_CADR_L( Expr ) = createablnotexpr( ABL_CADR( Expr ) ); + ABL_CAR_L( ABL_CDDR( Expr ) ) = createablnotexpr( ABL_CAR( ABL_CDDR( Expr ) ) ); ExprG1 = dupablexpr( ABL_CAR( ABL_CDDR( Expr ) ) ); ExprG2 = dupablexpr( ABL_CAR( ABL_CDDR( Expr ) ) ); ExprTemp = createablbinexpr( ABL_AND, @@ -209,7 +209,7 @@ static ablexpr *local_normablctl( Expr ) { NormExpr = local_normablctl( ABL_CAR( ScanExpr ) ); if ( NormExpr != ABL_CAR( ScanExpr ) ) - ABL_CAR( ScanExpr ) = NormExpr; + ABL_CAR_L( ScanExpr ) = NormExpr; NormExpr = Expr; } diff --git a/alliance/src/abl/src/ablctlsimp.c b/alliance/src/abl/src/ablctlsimp.c index a9ff400a..2ee886d7 100644 --- a/alliance/src/abl/src/ablctlsimp.c +++ b/alliance/src/abl/src/ablctlsimp.c @@ -165,7 +165,7 @@ static ablexpr *loc_simpablctl( Expr ) ExprTemp = ABL_CADR( ABL_CADR( Expr ) ); freechain( ABL_CAR( ABL_CADR( Expr ) ) ); freechain( ABL_CADR( Expr ) ); - ABL_CADR( Expr ) = ExprTemp; + ABL_CADR_L( Expr ) = ExprTemp; SimpExpr = Expr; ExprTemp = loc_simpablctl( SimpExpr ); @@ -184,10 +184,10 @@ static ablexpr *loc_simpablctl( Expr ) { ExprTemp = loc_simpablctl( ABL_CADR( Expr ) ); if ( ExprTemp != ABL_CADR( Expr ) ) - ABL_CADR( Expr ) = ExprTemp; + ABL_CADR_L( Expr ) = ExprTemp; ExprTemp = loc_simpablctl( ABL_CAR( ABL_CDDR( Expr ) ) ); if ( ExprTemp != ABL_CAR( ABL_CDDR( Expr ) ) ) - ABL_CAR( ABL_CDDR( Expr ) ) = ExprTemp; + ABL_CAR_L( ABL_CDDR( Expr ) ) = ExprTemp; if ( ABL_OPER( ABL_CAR( ABL_CDDR( Expr ) ) ) == Oper && ABL_CADR( Expr ) != (ablexpr *)0 && @@ -214,10 +214,10 @@ static ablexpr *loc_simpablctl( Expr ) { ExprTemp = loc_simpablctl( ABL_CADR( Expr ) ); if ( ExprTemp != ABL_CADR( Expr ) ) - ABL_CADR( Expr ) = ExprTemp; + ABL_CADR_L( Expr ) = ExprTemp; ExprTemp = loc_simpablctl( ABL_CAR( ABL_CDDR( Expr ) ) ); if ( ExprTemp != ABL_CAR( ABL_CDDR( Expr ) ) ) - ABL_CAR( ABL_CDDR( Expr ) ) = ExprTemp; + ABL_CAR_L( ABL_CDDR( Expr ) ) = ExprTemp; if ( ( Oper == ABL_AND && ABL_OPER( ABL_CADR( Expr ) ) == ABL_AG && @@ -265,16 +265,16 @@ static ablexpr *loc_simpablctl( Expr ) SimpExpr = createablbinexpr( ABL_OR, ABL_CADR( ABL_CADR( ABL_CADR( Expr ) ) ), ABL_CAR( ABL_CDDR( ABL_CAR( ABL_CDDR( ABL_CADR( Expr ) ) ) ) ) ); - ABL_CADR( ABL_CADR( ABL_CADR( Expr ) ) ) = (ablexpr *)0; - ABL_CAR( ABL_CDDR( ABL_CAR( ABL_CDDR( ABL_CADR( Expr ) ) ) ) ) = (ablexpr *)0; + ABL_CADR_L( ABL_CADR( ABL_CADR( Expr ) ) ) = (ablexpr *)0; + ABL_CAR_L( ABL_CDDR( ABL_CAR( ABL_CDDR( ABL_CADR( Expr ) ) ) ) ) = (ablexpr *)0; freeablexpr( Expr ); ExprTemp = loc_simpablctl( ABL_CADR( SimpExpr ) ); if ( ExprTemp != ABL_CADR( SimpExpr ) ) - ABL_CADR( SimpExpr ) = ExprTemp; + ABL_CADR_L( SimpExpr ) = ExprTemp; ExprTemp = loc_simpablctl( ABL_CAR( ABL_CDDR( SimpExpr ) ) ); if ( ExprTemp != ABL_CAR( ABL_CDDR( SimpExpr ) ) ) - ABL_CAR( ABL_CDDR( SimpExpr ) ) = ExprTemp; + ABL_CAR_L( ABL_CDDR( SimpExpr ) ) = ExprTemp; return( SimpExpr ); } @@ -302,16 +302,16 @@ static ablexpr *loc_simpablctl( Expr ) SimpExpr = createablbinexpr( ABL_AND, ABL_CADR( ABL_CAR( ABL_CDDR( ABL_CADR( Expr ) ) ) ), ABL_CAR( ABL_CDDR( ABL_CADR( ABL_CADR( Expr ) ) ) ) ); - ABL_CADR( ABL_CAR( ABL_CDDR( ABL_CADR( Expr ) ) ) ) = (ablexpr *)0; - ABL_CAR( ABL_CDDR( ABL_CADR( ABL_CADR( Expr ) ) ) ) = (ablexpr *)0; + ABL_CADR_L( ABL_CAR( ABL_CDDR( ABL_CADR( Expr ) ) ) ) = (ablexpr *)0; + ABL_CAR_L( ABL_CDDR( ABL_CADR( ABL_CADR( Expr ) ) ) ) = (ablexpr *)0; freeablexpr( Expr ); ExprTemp = loc_simpablctl( ABL_CADR( SimpExpr ) ); if ( ExprTemp != ABL_CADR( SimpExpr ) ) - ABL_CADR( SimpExpr ) = ExprTemp; + ABL_CADR_L( SimpExpr ) = ExprTemp; ExprTemp = loc_simpablctl( ABL_CAR( ABL_CDDR( SimpExpr ) ) ); if ( ExprTemp != ABL_CAR( ABL_CDDR( SimpExpr ) ) ) - ABL_CAR( ABL_CDDR( SimpExpr ) ) = ExprTemp; + ABL_CAR_L( ABL_CDDR( SimpExpr ) ) = ExprTemp; return( SimpExpr ); } @@ -349,13 +349,13 @@ static ablexpr *loc_simpablctl( Expr ) ExprTemp = createablbinexpr( ABL_AU, ABL_CADR( ABL_CADR( Expr ) ), ABL_CADR( ABL_CADR( ABL_CAR( ABL_CDDR( Expr ) ) ) ) ); - ABL_CADR( ABL_CADR( Expr ) ) = (ablexpr *)0; - ABL_CADR( ABL_CADR( ABL_CAR( ABL_CDDR( Expr ) ) ) ) = (ablexpr *)0; + ABL_CADR_L( ABL_CADR( Expr ) ) = (ablexpr *)0; + ABL_CADR_L( ABL_CADR( ABL_CAR( ABL_CDDR( Expr ) ) ) ) = (ablexpr *)0; SimpExpr = createablbinexpr( ABL_EU, ABL_CAR( ABL_CDDR( ABL_CADR( Expr ) ) ), ABL_CADR( ABL_CAR( ABL_CDDR( ABL_CAR( ABL_CDDR( Expr ) ) ) ) ) ); - ABL_CAR( ABL_CDDR( ABL_CADR( Expr ) ) ) = (ablexpr *)0; - ABL_CADR( ABL_CAR( ABL_CDDR( ABL_CAR( ABL_CDDR( Expr ) ) ) ) ) = (ablexpr *)0; + ABL_CAR_L( ABL_CDDR( ABL_CADR( Expr ) ) ) = (ablexpr *)0; + ABL_CADR_L( ABL_CAR( ABL_CDDR( ABL_CAR( ABL_CDDR( Expr ) ) ) ) ) = (ablexpr *)0; SimpExpr = createablbinexpr( ABL_AND, ExprTemp, SimpExpr ); @@ -363,16 +363,16 @@ static ablexpr *loc_simpablctl( Expr ) ExprTemp = loc_simpablctl( ABL_CADR( ABL_CADR( SimpExpr ) ) ); if ( ExprTemp != ABL_CADR( ABL_CADR( SimpExpr ) ) ) - ABL_CADR( ABL_CADR( SimpExpr ) ) = ExprTemp; + ABL_CADR_L( ABL_CADR( SimpExpr ) ) = ExprTemp; ExprTemp = loc_simpablctl( ABL_CAR( ABL_CDDR( ABL_CADR( SimpExpr ) ) ) ); if ( ExprTemp != ABL_CAR( ABL_CDDR( ABL_CADR( SimpExpr ) ) ) ) - ABL_CAR( ABL_CDDR( ABL_CADR( SimpExpr ) ) ) = ExprTemp; + ABL_CAR_L( ABL_CDDR( ABL_CADR( SimpExpr ) ) ) = ExprTemp; ExprTemp = loc_simpablctl( ABL_CADR( ABL_CAR( ABL_CDDR( SimpExpr ) ) ) ); if ( ExprTemp != ABL_CADR( ABL_CAR( ABL_CDDR( SimpExpr ) ) ) ) - ABL_CADR( ABL_CAR( ABL_CDDR( SimpExpr ) ) ) = ExprTemp; + ABL_CADR_L( ABL_CAR( ABL_CDDR( SimpExpr ) ) ) = ExprTemp; ExprTemp = loc_simpablctl( ABL_CAR( ABL_CDDR( ABL_CAR( ABL_CDDR( SimpExpr ) ) ) ) ); if ( ExprTemp != ABL_CAR( ABL_CDDR( ABL_CAR( ABL_CDDR( SimpExpr ) ) ) ) ) - ABL_CAR( ABL_CDDR( ABL_CAR( ABL_CDDR( SimpExpr ) ) ) ) = ExprTemp; + ABL_CAR_L( ABL_CDDR( ABL_CAR( ABL_CDDR( SimpExpr ) ) ) ) = ExprTemp; return( SimpExpr ); } @@ -385,7 +385,7 @@ static ablexpr *loc_simpablctl( Expr ) { SimpExpr = loc_simpablctl( ABL_CAR( ScanExpr ) ); if ( SimpExpr != ABL_CAR( ScanExpr ) ) - ABL_CAR( ScanExpr ) = SimpExpr; + ABL_CAR_L( ScanExpr ) = SimpExpr; SimpExpr = Expr; } diff --git a/alliance/src/abl/src/abldev.c b/alliance/src/abl/src/abldev.c index d4a9bb9a..cf738777 100644 --- a/alliance/src/abl/src/abldev.c +++ b/alliance/src/abl/src/abldev.c @@ -168,7 +168,7 @@ ablexpr *devablxorexpr( Expr ) while ( ( Expr = ABL_CDR( Expr ) ) != (ablexpr *)0 ) { - ABL_CAR( Expr ) = (void *)devablxorexpr( ABL_CAR( Expr ) ); + ABL_CAR_L( Expr ) = (void *)devablxorexpr( ABL_CAR( Expr ) ); } } diff --git a/alliance/src/abl/src/abloptim.c b/alliance/src/abl/src/abloptim.c index fdae45c9..83ec2e66 100644 --- a/alliance/src/abl/src/abloptim.c +++ b/alliance/src/abl/src/abloptim.c @@ -161,14 +161,14 @@ ablexpr *optimablnotexpr( Expr ) if ( AtomValue == ABL_ATOM_NAME_ONE ) { - ABL_ATOM_VALUE( Expr ) = (void *)ABL_ATOM_NAME_ZERO; + ABL_CAR_L( Expr ) = (void *)ABL_ATOM_NAME_ZERO; return( Expr ); } else if ( AtomValue == ABL_ATOM_NAME_ZERO ) { - ABL_ATOM_VALUE( Expr ) = (void *)ABL_ATOM_NAME_ONE; + ABL_CAR_L( Expr ) = (void *)ABL_ATOM_NAME_ONE; return( Expr ); } diff --git a/alliance/src/abl/src/ablpolar.c b/alliance/src/abl/src/ablpolar.c index 85665242..be3724af 100644 --- a/alliance/src/abl/src/ablpolar.c +++ b/alliance/src/abl/src/ablpolar.c @@ -221,7 +221,7 @@ ablexpr *polarablexpr( Expr, Polar ) } else { - ABL_CADR( Expr ) = polarablexpr( ABL_CADR( Expr ), ABL_POLAR_POSITIVE ); + ABL_CADR_L( Expr ) = polarablexpr( ABL_CADR( Expr ), ABL_POLAR_POSITIVE ); if ( Polar == ABL_POLAR_NEGATIVE ) { @@ -244,7 +244,7 @@ ablexpr *polarablexpr( Expr, Polar ) while ( ( ScanExpr = ABL_CDR( ScanExpr ) ) != (ablexpr *)0 ) { - ABL_CAR( ScanExpr ) = polarablexpr( ABL_CAR( ScanExpr ), Polar ); + ABL_CAR_L( ScanExpr ) = polarablexpr( ABL_CAR( ScanExpr ), Polar ); } } diff --git a/alliance/src/abl/src/ablsimp.c b/alliance/src/abl/src/ablsimp.c index da96f8de..d0739a50 100644 --- a/alliance/src/abl/src/ablsimp.c +++ b/alliance/src/abl/src/ablsimp.c @@ -201,7 +201,7 @@ ablexpr *simpdupexpr( Expr ) if ( AblSimplifyTable[ Oper ][ 1 ] != -1 ) { freeablexpr( Expr ); - ABL_ATOM_VALUE( ExprSimp ) = (char *)AblSimplifyTable[ Oper ][ 1 ]; + ABL_CAR_L( ExprSimp ) = (char *)AblSimplifyTable[ Oper ][ 1 ]; if ( Negative == 1 ) { @@ -235,14 +235,14 @@ ablexpr *simpdupexpr( Expr ) if ( ExprQueue == Expr ) { ExprSimp = ABL_CAR( Expr ); - ABL_ATOM_VALUE( ExprSimp ) = (char *)AblSimplifyTable[ Oper ][ 3 ]; + ABL_CAR_L( ExprSimp ) = (char *)AblSimplifyTable[ Oper ][ 3 ]; freechain( Expr ); } else if ( ExprQueue == ABL_CDR( Expr ) ) { ExprSimp = ABL_CADR( Expr ); - ABL_CADR( Expr ) = (void *)0; + ABL_CADR_L( Expr ) = (void *)0; freeablexpr( Expr ); } else @@ -309,7 +309,7 @@ ablexpr *loc_simpablexpr( Expr ) if ( isablunaryoper( Oper ) ) { - ABL_CADR( Expr ) = loc_simpablexpr( ABL_CADR( Expr ) ); + ABL_CADR_L( Expr ) = loc_simpablexpr( ABL_CADR( Expr ) ); return( Expr ); } @@ -340,9 +340,9 @@ ablexpr *loc_simpablexpr( Expr ) { if ( AblSimplifyTable[ Oper ][ 1 ] != -1 ) { - ABL_CAR( ScanExpr ) = (ablexpr *)0; + ABL_CAR_L( ScanExpr ) = (ablexpr *)0; freeablexpr( Expr ); - ABL_ATOM_VALUE( ExprSimp ) = (char *)AblSimplifyTable[ Oper ][ 1 ]; + ABL_CAR_L( ExprSimp ) = (char *)AblSimplifyTable[ Oper ][ 1 ]; if ( Negative == 1 ) { @@ -374,12 +374,12 @@ ablexpr *loc_simpablexpr( Expr ) } else { - ABL_CAR( ScanExpr ) = ExprSimp; + ABL_CAR_L( ScanExpr ) = ExprSimp; } } else { - ABL_CAR( ScanExpr ) = ExprSimp; + ABL_CAR_L( ScanExpr ) = ExprSimp; } PrevExpr = ScanExpr; @@ -387,14 +387,14 @@ ablexpr *loc_simpablexpr( Expr ) if ( PrevExpr == Expr ) { - ABL_ATOM_VALUE( Expr ) = (char *)AblSimplifyTable[ Oper ][ 3 ]; + ABL_CAR_L( Expr ) = (char *)AblSimplifyTable[ Oper ][ 3 ]; ExprSimp = Expr; } else if ( PrevExpr == ABL_CDR( Expr ) ) { ExprSimp = ABL_CADR( Expr ); - ABL_CADR( Expr ) = (void *)0; + ABL_CADR_L( Expr ) = (void *)0; freeablexpr( Expr ); } else diff --git a/alliance/src/abl/src/ablsubst.c b/alliance/src/abl/src/ablsubst.c index 40432f25..f9555844 100644 --- a/alliance/src/abl/src/ablsubst.c +++ b/alliance/src/abl/src/ablsubst.c @@ -105,7 +105,7 @@ static ablexpr *loc_substablexpr( Expr ) while ( ( Expr = ABL_CDR( Expr ) ) ) { - ABL_CAR( Expr ) = loc_substablexpr( ABL_CAR( Expr ) ); + ABL_CAR_L( Expr ) = loc_substablexpr( ABL_CAR( Expr ) ); } return( ExprSubst ); diff --git a/alliance/src/abl/src/ablunflat.c b/alliance/src/abl/src/ablunflat.c index 917b87d5..70d6ce24 100644 --- a/alliance/src/abl/src/ablunflat.c +++ b/alliance/src/abl/src/ablunflat.c @@ -119,7 +119,7 @@ ablexpr *unflatablexpr( Expr ) while ( ( ScanExpr = ABL_CDR( ScanExpr ) ) != (ablexpr *)0 ) { - ABL_CAR( ScanExpr ) = unflatablexpr( ABL_CAR( ScanExpr ) ); + ABL_CAR_L( ScanExpr ) = unflatablexpr( ABL_CAR( ScanExpr ) ); } } diff --git a/alliance/src/abt/src/bhl_delaux.c b/alliance/src/abt/src/bhl_delaux.c index f14b56e2..9c1687bd 100644 --- a/alliance/src/abt/src/bhl_delaux.c +++ b/alliance/src/abt/src/bhl_delaux.c @@ -48,6 +48,7 @@ # include "abt.h" # include +# include # include "bhl_error.h" # include "bhl_delaux.h" @@ -167,7 +168,7 @@ static chain_list *bhl_delauxexpr( Expr ) bhlerror( BHL_OPERATOR_ERROR, Oper ); } - ABL_CAR( Expr ) = bhl_delauxexpr( ABL_CAR( Expr ) ); + ABL_CAR_L( Expr ) = bhl_delauxexpr( ABL_CAR( Expr ) ); return( FirstExpr ); } @@ -209,11 +210,11 @@ static chain_list *bhl_delauxexpr( Expr ) bhlerror( BHL_OPERATOR_ERROR, Oper ); } - ABL_CAR( Expr ) = bhl_delauxexpr( ABL_CAR( Expr ) ); + ABL_CAR_L( Expr ) = bhl_delauxexpr( ABL_CAR( Expr ) ); while ( ( Expr = ABL_CDR( Expr ) ) != (chain_list *)0 ) { - ABL_CAR( Expr ) = bhl_delauxexpr( ABL_CAR( Expr ) ); + ABL_CAR_L( Expr ) = bhl_delauxexpr( ABL_CAR( Expr ) ); } return( FirstExpr ); diff --git a/alliance/src/alliance.m4 b/alliance/src/alliance.m4 index 5388d924..97f09725 100644 --- a/alliance/src/alliance.m4 +++ b/alliance/src/alliance.m4 @@ -50,8 +50,8 @@ dnl ifelse([$2], , :, [$2]) dnl fi -CFLAGS="-I${ALLIANCE_TOP}/include $CFLAGS" -LDFLAGS="-L${ALLIANCE_TOP}/lib $LDFLAGS" +dnl CFLAGS="-I${ALLIANCE_TOP}/include $CFLAGS" +dnl LDFLAGS="-L${ALLIANCE_TOP}/lib $LDFLAGS" AC_ARG_ENABLE(devel, diff --git a/alliance/src/bdd/src/bddcircuit.c b/alliance/src/bdd/src/bddcircuit.c index 9c84728b..e8f820a1 100644 --- a/alliance/src/bdd/src/bddcircuit.c +++ b/alliance/src/bdd/src/bddcircuit.c @@ -811,7 +811,7 @@ void loc_stablebddcircuitabl( Expr ) if ( Name != (char *)0 ) { - ABL_CAR( Expr ) = addchain( (chain_list *)0, (void *)ABL_STABLE ); + ABL_CAR_L( Expr ) = addchain( (chain_list *)0, (void *)ABL_STABLE ); addablhexpr( Expr, createablatom( Name ) ); } } diff --git a/alliance/src/bdd/src/bddconvert.c b/alliance/src/bdd/src/bddconvert.c index 2a088782..6634e761 100644 --- a/alliance/src/bdd/src/bddconvert.c +++ b/alliance/src/bdd/src/bddconvert.c @@ -551,7 +551,7 @@ chain_list *convertbddnodesumabl( BddSystem, NameArray, IndexArray, BddNode ) if ( ABL_CDDR( BddConvertSumProd ) == (chain_list *)0 ) { SumProd = ABL_CADR( BddConvertSumProd ); - ABL_CADR( BddConvertSumProd ) = (chain_list *)0; + ABL_CADR_L( BddConvertSumProd ) = (chain_list *)0; freeablexpr( BddConvertSumProd ); BddConvertSumProd = SumProd; diff --git a/alliance/src/boog/src/Makefile.am b/alliance/src/boog/src/Makefile.am index 49063495..3348236b 100644 --- a/alliance/src/boog/src/Makefile.am +++ b/alliance/src/boog/src/Makefile.am @@ -1,11 +1,12 @@ ## Process this file with automake to produce Makefile.in -AM_CFLAGS = @ALLIANCE_CFLAGS@ -I$(top_srcdir)/abe/src \ +AM_CFLAGS = -I$(top_srcdir)/abe/src \ -I$(top_srcdir)/abl/src \ -I$(top_srcdir)/abv/src \ -I$(top_srcdir)/bdd/src \ -I$(top_srcdir)/aut/src \ --I$(top_srcdir)/mbk/src +-I$(top_srcdir)/mbk/src \ +@ALLIANCE_CFLAGS@ bin_PROGRAMS = boog diff --git a/alliance/src/boog/src/bog_lib_format.c b/alliance/src/boog/src/bog_lib_format.c index 9106a259..1374ab86 100644 --- a/alliance/src/boog/src/bog_lib_format.c +++ b/alliance/src/boog/src/bog_lib_format.c @@ -152,7 +152,7 @@ static chain_list* format_subst_abl( chain_list* abl, beaux_list *BeauxSubst ) } for (chain=ABL_CDR(abl); chain; chain=ABL_CDR(chain)) { - ABL_CAR(chain) = format_subst_abl( ABL_CAR( chain ), BeauxSubst ); + ABL_CAR_L(chain) = format_subst_abl( ABL_CAR( chain ), BeauxSubst ); } return abl; diff --git a/alliance/src/boog/src/bog_lib_negativ.c b/alliance/src/boog/src/bog_lib_negativ.c index e3a6b404..6188d239 100644 --- a/alliance/src/boog/src/bog_lib_negativ.c +++ b/alliance/src/boog/src/bog_lib_negativ.c @@ -47,15 +47,15 @@ extern chain_list* inv_oper(chain_list* abl, int negativ) if (ABL_ATOM(abl)) { if (ABL_ATOM_VALUE(abl)==getablatomzero()) { - if (negativ) ABL_ATOM_VALUE(abl)=getablatomone(); + if (negativ) ABL_CAR_L(abl)=getablatomone(); } else if (ABL_ATOM_VALUE(abl)==getablatomone()) { - if (negativ) ABL_ATOM_VALUE(abl)=getablatomzero(); + if (negativ) ABL_CAR_L(abl)=getablatomzero(); } else { if (negativ) { abl=createablnotexpr(abl); - ABL_ARITY(abl)=1; + ABL_ARITY_L(abl)=1; } } return abl; @@ -63,30 +63,30 @@ extern chain_list* inv_oper(chain_list* abl, int negativ) switch (ABL_OPER(abl)) { case ABL_AND: - if (negativ) ABL_OPER(abl)=ABL_NAND; - else ABL_OPER(abl)=ABL_NOR; + if (negativ) ABL_OPER_L(abl)=ABL_NAND; + else ABL_OPER_L(abl)=ABL_NOR; negativ=!negativ; break; case ABL_NAND: - if (negativ) ABL_OPER(abl)=ABL_NOR; - else ABL_OPER(abl)=ABL_NAND; + if (negativ) ABL_OPER_L(abl)=ABL_NOR; + else ABL_OPER_L(abl)=ABL_NAND; break; case ABL_OR: - if (negativ) ABL_OPER(abl)=ABL_NOR; - else ABL_OPER(abl)=ABL_NAND; + if (negativ) ABL_OPER_L(abl)=ABL_NOR; + else ABL_OPER_L(abl)=ABL_NAND; negativ=!negativ; break; case ABL_NOR: - if (negativ) ABL_OPER(abl)=ABL_NAND; - else ABL_OPER(abl)=ABL_NOR; + if (negativ) ABL_OPER_L(abl)=ABL_NAND; + else ABL_OPER_L(abl)=ABL_NOR; break; case ABL_XOR: - if (negativ) ABL_OPER(abl)=ABL_NXOR; + if (negativ) ABL_OPER_L(abl)=ABL_NXOR; negativ=0; /*nothing to do: same size XOR and NXOR*/ break; case ABL_NXOR: - if (negativ) ABL_OPER(abl)=ABL_XOR; + if (negativ) ABL_OPER_L(abl)=ABL_XOR; negativ=0; /*nothing to do*/ break; @@ -98,7 +98,7 @@ extern chain_list* inv_oper(chain_list* abl, int negativ) case ABL_STABLE: if (negativ) { abl=createablnotexpr(abl); - ABL_ARITY(abl)=1; + ABL_ARITY_L(abl)=1; } return abl; default: @@ -107,7 +107,7 @@ extern chain_list* inv_oper(chain_list* abl, int negativ) } for (chain=ABL_CDR(abl); chain; chain=ABL_CDR(chain)) { - ABL_CAR(chain)=inv_oper(ABL_CAR(chain),negativ); + ABL_CAR_L(chain)=inv_oper(ABL_CAR(chain),negativ); } return abl; @@ -141,7 +141,7 @@ extern chain_list* build_negativ(chain_list* abl) if (ABL_OPER(abl)==ABL_STABLE) return abl; for (chain=ABL_CDR(abl); chain; chain=ABL_CDR(chain)) { - ABL_CAR(chain)=build_negativ(ABL_CAR(chain)); + ABL_CAR_L(chain)=build_negativ(ABL_CAR(chain)); } for (chain=ABL_CDR(abl); chain; chain=ABL_CDR(chain)) { @@ -182,29 +182,29 @@ extern chain_list* build_negativ(chain_list* abl) if (ABL_ATOM(leaf)) { /*constant undifferent*/ if (ABL_ATOM_VALUE(leaf)==getablatomzero()) - ABL_ATOM_VALUE(leaf)=getablatomone(); + ABL_CAR_L(leaf)=getablatomone(); else if (ABL_ATOM_VALUE(leaf)==getablatomone()) - ABL_ATOM_VALUE(leaf)=getablatomzero(); + ABL_CAR_L(leaf)=getablatomzero(); else { - ABL_CAR(chain)=createablnotexpr(ABL_CAR(chain)); - ABL_ARITY(ABL_CAR(chain))=1; + ABL_CAR_L(chain)=createablnotexpr(ABL_CAR(chain)); + ABL_ARITY_L(ABL_CAR(chain))=1; } continue; } else if (ABL_OPER(leaf)==ABL_STABLE) { - ABL_CAR(chain)=createablnotexpr(ABL_CAR(chain)); - ABL_ARITY(ABL_CAR(chain))=1; + ABL_CAR_L(chain)=createablnotexpr(ABL_CAR(chain)); + ABL_ARITY_L(ABL_CAR(chain))=1; continue; } switch (ABL_OPER(leaf)) { - case ABL_AND: ABL_OPER(leaf)=ABL_NAND; break; - case ABL_OR: ABL_OPER(leaf)=ABL_NOR; break; - case ABL_NAND: ABL_OPER(leaf)=ABL_AND; break; - case ABL_NOR: ABL_OPER(leaf)=ABL_OR; break; - case ABL_XOR: ABL_OPER(leaf)=ABL_NXOR; break; - case ABL_NXOR: ABL_OPER(leaf)=ABL_XOR; break; + case ABL_AND: ABL_OPER_L(leaf)=ABL_NAND; break; + case ABL_OR: ABL_OPER_L(leaf)=ABL_NOR; break; + case ABL_NAND: ABL_OPER_L(leaf)=ABL_AND; break; + case ABL_NOR: ABL_OPER_L(leaf)=ABL_OR; break; + case ABL_XOR: ABL_OPER_L(leaf)=ABL_NXOR; break; + case ABL_NXOR: ABL_OPER_L(leaf)=ABL_XOR; break; case ABL_NOT: - ABL_CAR(chain)=ABL_CADR(leaf); + ABL_CAR_L(chain)=ABL_CADR(leaf); freechain(leaf); break; default: @@ -214,10 +214,10 @@ extern chain_list* build_negativ(chain_list* abl) } switch (ABL_OPER(abl)) { - case ABL_AND: ABL_OPER(abl)=ABL_NOR; break; - case ABL_OR: ABL_OPER(abl)=ABL_NAND; break; - case ABL_NAND: ABL_OPER(abl)=ABL_OR; break; - case ABL_NOR: ABL_OPER(abl)=ABL_AND; break; + case ABL_AND: ABL_OPER_L(abl)=ABL_NOR; break; + case ABL_OR: ABL_OPER_L(abl)=ABL_NAND; break; + case ABL_NAND: ABL_OPER_L(abl)=ABL_OR; break; + case ABL_NOR: ABL_OPER_L(abl)=ABL_AND; break; case ABL_NOT: chain=abl; abl=ABL_CADR(abl); diff --git a/alliance/src/boog/src/bog_lib_permute.c b/alliance/src/boog/src/bog_lib_permute.c index 7cc337e3..e2dcb0a9 100644 --- a/alliance/src/boog/src/bog_lib_permute.c +++ b/alliance/src/boog/src/bog_lib_permute.c @@ -27,7 +27,7 @@ * Author : Francois Donnet */ - +#include #include #include #include @@ -248,7 +248,7 @@ static chain_list *permutations_abl(chain_list* abl) /*put the operator*/ for (chain=list_abl; chain; chain=chain->NEXT) { head=createabloper(ABL_OPER(abl)); - ABL_ARITY(head)=ABL_ARITY(abl); + ABL_ARITY_L(head)=ABL_ARITY(abl); ABL_CDR(head)=dupablchain(chain->DATA); chain->DATA=head; } diff --git a/alliance/src/boog/src/bog_map_adapt.c b/alliance/src/boog/src/bog_map_adapt.c index 3f5e4477..b8ad4baf 100644 --- a/alliance/src/boog/src/bog_map_adapt.c +++ b/alliance/src/boog/src/bog_map_adapt.c @@ -52,9 +52,9 @@ extern void swap_pointers(chain_list* abl1, chain_list* abl2) car=ABL_CAR(abl1); cdr=ABL_CDR(abl1); - ABL_CAR(abl1)=ABL_CAR(abl2); + ABL_CAR_L(abl1)=ABL_CAR(abl2); ABL_CDR(abl1)=ABL_CDR(abl2); - ABL_CAR(abl2)=car; + ABL_CAR_L(abl2)=car; ABL_CDR(abl2)=cdr; } @@ -80,12 +80,12 @@ extern void invert_port(port_list* port) if (ABL_ATOM(port->ABL)) { name=getoppositename(ABL_ATOM_VALUE(port->ABL)); - if (is_signal(name)) ABL_ATOM_VALUE(port->ABL)=name; + if (is_signal(name)) ABL_CAR_L(port->ABL)=name; else { /*add a not*/ not=createabloper(ABL_NOT); - ABL_ARITY(not)=1; + ABL_ARITY_L(not)=1; /*swap pointers references*/ swap_pointers(port->ABL,not); ABL_CDR(port->ABL)=addchain(NULL,not); @@ -94,14 +94,14 @@ extern void invert_port(port_list* port) else { switch (ABL_OPER(port->ABL)) { - case ABL_AND: ABL_OPER(port->ABL)=ABL_NAND; break; - case ABL_NAND: ABL_OPER(port->ABL)=ABL_AND; break; - case ABL_OR: ABL_OPER(port->ABL)=ABL_NOR; break; - case ABL_NOR: ABL_OPER(port->ABL)=ABL_OR; break; - case ABL_XOR: ABL_OPER(port->ABL)=ABL_NXOR; break; - case ABL_NXOR: ABL_OPER(port->ABL)=ABL_XOR; break; + case ABL_AND: ABL_OPER_L(port->ABL)=ABL_NAND; break; + case ABL_NAND: ABL_OPER_L(port->ABL)=ABL_AND; break; + case ABL_OR: ABL_OPER_L(port->ABL)=ABL_NOR; break; + case ABL_NOR: ABL_OPER_L(port->ABL)=ABL_OR; break; + case ABL_XOR: ABL_OPER_L(port->ABL)=ABL_NXOR; break; + case ABL_NXOR: ABL_OPER_L(port->ABL)=ABL_XOR; break; case ABL_NOT: /*no need to insert*/ - port->ABL=ABL_CADR(port->ABL); continue; + port->ABL=ABL_CADR_L(port->ABL); continue; default: fprintf(stderr, "invert_port: oper %s forbidden at this level\n", @@ -112,7 +112,7 @@ extern void invert_port(port_list* port) /*insert a NOT to match perfectly with cell*/ not=createabloper(ABL_NOT); - ABL_ARITY(not)=1; + ABL_ARITY_L(not)=1; /*swap pointers references*/ swap_pointers(port->ABL,not); ABL_CDR(port->ABL)=addchain(NULL,not); @@ -160,12 +160,12 @@ static chain_list* loc_adapt_abl(chain_list* expr, float C) /*evaluate with the biggest oper*/ int arity=ABL_ARITY(expr); /*memorize arity*/ /*search the biggest arity which matches expr*/ - for (ABL_ARITY(expr)=ABL_ARITY(expr)-1 ; ABL_ARITY(expr)>0; - ABL_ARITY(expr)--) { + for (ABL_ARITY_L(expr)=ABL_ARITY(expr)-1 ; ABL_ARITY(expr)>0; + ABL_ARITY_L(expr)--) { cell=cell_prepare(expr); if (cell) break; } - ABL_ARITY(expr)=arity; /*put back arity*/ + ABL_ARITY_L(expr)=arity; /*put back arity*/ if (!cell) { fprintf(stderr,"Library Error: No cell could match '"); display_abl(expr); @@ -181,7 +181,7 @@ static chain_list* loc_adapt_abl(chain_list* expr, float C) return expr; } for (abl=ABL_CDR(expr); abl; abl=ABL_CDR(abl)) { - ABL_CAR(abl)=loc_adapt_abl(ABL_CAR(abl),port->C); + ABL_CAR_L(abl)=loc_adapt_abl(ABL_CAR(abl),port->C); } return expr; } @@ -241,12 +241,12 @@ extern chain_list* adapt_abl(chain_list* expr) /*evaluate with the biggest oper*/ arity=ABL_ARITY(expr); /*memorize arity*/ /*search the biggest arity which matches expr*/ - for (ABL_ARITY(expr)=ABL_ARITY(expr)-1 ; ABL_ARITY(expr)>0; - ABL_ARITY(expr)--) { + for (ABL_ARITY_L(expr)=ABL_ARITY(expr)-1 ; ABL_ARITY(expr)>0; + ABL_ARITY_L(expr)--) { cell=cell_prepare(expr); if (cell) break; } - ABL_ARITY(expr)=arity; /*put back arity*/ + ABL_ARITY_L(expr)=arity; /*put back arity*/ if (!cell) { fprintf(stderr,"Library Error: No cell could match '"); display_abl(expr); @@ -261,7 +261,7 @@ extern chain_list* adapt_abl(chain_list* expr) return expr; } for (abl=ABL_CDR(expr); abl; abl=ABL_CDR(abl)) { - ABL_CAR(abl)=loc_adapt_abl(ABL_CAR(abl),port->C); + ABL_CAR_L(abl)=loc_adapt_abl(ABL_CAR(abl),port->C); } return expr; } @@ -315,7 +315,7 @@ extern biabl_list* adapt_bus(biabl_list* biabl) biabl->VALABL=build_negativ(biabl->VALABL); biabl->VALABL=createablnotexpr(biabl->VALABL); /* createablnotexpr() can simplify*/ - if (!ABL_ATOM(biabl->VALABL)) ABL_ARITY(biabl->VALABL)=1; + if (!ABL_ATOM(biabl->VALABL)) ABL_ARITY_L(biabl->VALABL)=1; } cell=cell_prepare_bus(biabl); diff --git a/alliance/src/boog/src/bog_map_pattern.c b/alliance/src/boog/src/bog_map_pattern.c index e04a7782..5f3a5117 100644 --- a/alliance/src/boog/src/bog_map_pattern.c +++ b/alliance/src/boog/src/bog_map_pattern.c @@ -406,7 +406,7 @@ extern cell_list* cell_pattern(chain_list* expr) /*create a temporary NOT to match perfectly with cell*/ not=createabloper(ABL_NOT); ABL_CDR(not)=addchain(NULL,NULL); - ABL_ARITY(not)=1; + ABL_ARITY_L(not)=1; /*take those are biggest*/ for (cell=getcell_logic_lib(); cell; cell=cell->NEXT) { @@ -497,7 +497,7 @@ extern cell_list* cell_pattern(chain_list* expr) exit(1); } if (port->NEGATIV) { - ABL_CADR(not)=port->ABL; + ABL_CADR_L(not)=port->ABL; delay=port->T+find_delay(not, port->C); } else delay=port->T+find_delay(port->ABL, port->C); @@ -566,7 +566,7 @@ extern cell_list* cell_pattern_bus(biabl_list* biabl) /*create a temporary NOT to match perfectly with cell*/ not=createabloper(ABL_NOT); ABL_CDR(not)=addchain(NULL,NULL); - ABL_ARITY(not)=1; + ABL_ARITY_L(not)=1; for (cell=getcell_tristate_lib(); cell; cell=cell->NEXT) { /*prepare for use*/ @@ -642,7 +642,7 @@ extern cell_list* cell_pattern_bus(biabl_list* biabl) exit(1); } if (port->NEGATIV) { - ABL_CADR(not)=port->ABL; + ABL_CADR_L(not)=port->ABL; delay=port->T+find_delay(not, port->C); } else delay=port->T+find_delay(port->ABL, port->C); @@ -713,7 +713,7 @@ extern cell_list* cell_pattern_reg(biabl_list* biabl) /*create a temporary NOT to match perfectly with cell*/ not=createabloper(ABL_NOT); ABL_CDR(not)=addchain(NULL,NULL); - ABL_ARITY(not)=1; + ABL_ARITY_L(not)=1; cell=getcell_register_lib(); @@ -791,7 +791,7 @@ extern cell_list* cell_pattern_reg(biabl_list* biabl) exit(1); } if (port->NEGATIV) { - ABL_CADR(not)=port->ABL; + ABL_CADR_L(not)=port->ABL; delay=port->T+find_delay(not, port->C); } else delay=port->T+find_delay(port->ABL, port->C); @@ -879,12 +879,12 @@ extern chain_list* build_reference(befig_list* befig, port_list* port, port_list } /*refer to new port*/ - ABL_ATOM_VALUE(abl)=(chain_list*)port; + ABL_CAR_L(abl)=(chain_list*)port; return abl; /*head unchanged*/ } for (chain=ABL_CDR(abl); chain; chain=ABL_CDR(chain)) { - ABL_CAR(chain)=build_reference(befig,port,internal_port,ABL_CAR(chain)); + ABL_CAR_L(chain)=build_reference(befig,port,internal_port,ABL_CAR(chain)); } /*mark if STABLE*/ @@ -932,7 +932,7 @@ extern port_list* internal_reference(befig_list* befig, port_list* port, chain_l port_aux->DIRECTION=INOUT; /*refer to new port*/ - ABL_ATOM_VALUE(abl)=(chain_list*)port_aux; + ABL_CAR_L(abl)=(chain_list*)port_aux; return port_aux; } diff --git a/alliance/src/boog/src/bog_normalize_ARITY.c b/alliance/src/boog/src/bog_normalize_ARITY.c index 8d1fe6f1..15ae8898 100644 --- a/alliance/src/boog/src/bog_normalize_ARITY.c +++ b/alliance/src/boog/src/bog_normalize_ARITY.c @@ -54,7 +54,7 @@ extern void put_arity_abl (chain_list* abl) put_arity_abl((chain_list*)ABL_CAR(pattern)); } - ABL_ARITY(abl)=arity; + ABL_ARITY_L(abl)=arity; return ; } diff --git a/alliance/src/boog/src/bog_normalize_ARITY.h b/alliance/src/boog/src/bog_normalize_ARITY.h index 9678505d..ff914ddf 100644 --- a/alliance/src/boog/src/bog_normalize_ARITY.h +++ b/alliance/src/boog/src/bog_normalize_ARITY.h @@ -45,6 +45,7 @@ /*head operator arity*/ /* Warning: simpablexpr() do not work anymore after pulling arity */ #define ABL_ARITY(abl) ((int)ABL_CDR((chain_list*)ABL_CAR(abl))) +#define ABL_ARITY_L(abl) (ABL_CDR((chain_list*)ABL_CAR(abl))) /***************************************************************************/ /* put arity operator in abl->DATA->NEXT field */ diff --git a/alliance/src/boog/src/bog_normalize_DAG.c b/alliance/src/boog/src/bog_normalize_DAG.c index ada5f70a..51526281 100644 --- a/alliance/src/boog/src/bog_normalize_DAG.c +++ b/alliance/src/boog/src/bog_normalize_DAG.c @@ -41,8 +41,8 @@ #include "bog_normalize_DAG.h" -#define USING(node) {(int)node=-mark;} -#define USED(node) {(int)node=(int)((((int)node<0)?0:(int)node)+1);} +#define USING(node) {node=-mark;} +#define USED(node) {node=(int)((((int)node<0)?0:(int)node)+1);} #define IS_USING(node) ((int)node==-mark) #define IS_USED(node) ((int)node!=0) #define IS_UNUSED(node) ((int)node==0) @@ -128,7 +128,7 @@ static chain_list* inter_equi(equi_list *equi, chain_list *abl) head=abl; for (abl=ABL_CDR(head); abl; abl=ABL_CDR(abl)) { - ABL_CAR(abl)=inter_equi(equi,ABL_CAR(abl)); + ABL_CAR_L(abl)=inter_equi(equi,ABL_CAR(abl)); } return head; @@ -159,7 +159,7 @@ static chain_list* replace_equi(chain_list* abl) head=abl; for (abl=ABL_CDR(head); abl; abl=ABL_CDR(abl)) { - ABL_CAR(abl)=replace_equi(ABL_CAR(abl)); + ABL_CAR_L(abl)=replace_equi(ABL_CAR(abl)); } return head; diff --git a/alliance/src/boog/src/bog_normalize_DC.c b/alliance/src/boog/src/bog_normalize_DC.c index de9d214d..c4846aee 100644 --- a/alliance/src/boog/src/bog_normalize_DC.c +++ b/alliance/src/boog/src/bog_normalize_DC.c @@ -49,12 +49,12 @@ static void find_d_z_abl(chain_list* abl, int value) if (ABL_ATOM_VALUE(abl)==getablatomdc()/* = namealloc("'d'")*/) { /*non standard IEEE VHDL*/ /*it means "don't care"*/ /* we can put zero either one, only to simplify*/ - ABL_ATOM_VALUE(abl)=value?getablatomone():getablatomzero(); + ABL_CAR_L(abl)=value?getablatomone():getablatomzero(); } else if (ABL_ATOM_VALUE(abl)==getablatomtristate()/* =namealloc("'z'")*/){ /*no drive on signal*/ /* a pull-up is done for better conductance*/ - ABL_ATOM_VALUE(abl)=getablatomone()/* = namealloc("'1'")*/; + ABL_CAR_L(abl)=getablatomone()/* = namealloc("'1'")*/; } } diff --git a/alliance/src/boog/src/bog_normalize_nameindex.c b/alliance/src/boog/src/bog_normalize_nameindex.c index 201bc5e1..25fb1e50 100644 --- a/alliance/src/boog/src/bog_normalize_nameindex.c +++ b/alliance/src/boog/src/bog_normalize_nameindex.c @@ -53,7 +53,7 @@ static void changename(chain_list* abl) if (ABL_ATOM(abl)) { elem=searchauthelem(HTABLE,ABL_ATOM_VALUE(abl)); if (!elem) return; - ABL_ATOM_VALUE(abl)=(char*) elem->VALUE; + ABL_CAR_L(abl)=(char*) elem->VALUE; return; } diff --git a/alliance/src/boog/src/bog_normalize_simplify.c b/alliance/src/boog/src/bog_normalize_simplify.c index b08a54a3..b6624755 100644 --- a/alliance/src/boog/src/bog_normalize_simplify.c +++ b/alliance/src/boog/src/bog_normalize_simplify.c @@ -28,7 +28,7 @@ */ - +#include #include #include #include @@ -48,7 +48,7 @@ static chain_list* unflatnegexpr(chain_list* abl) if (ABL_ATOM(abl)) return abl; for (chain=ABL_CDR(abl); chain; chain=ABL_CDR(chain)) { - ABL_CAR(chain)=unflatnegexpr(ABL_CAR(chain)); + ABL_CAR_L(chain)=unflatnegexpr(ABL_CAR(chain)); count++; } @@ -57,13 +57,13 @@ static chain_list* unflatnegexpr(chain_list* abl) switch(ABL_OPER(abl)) { case ABL_NAND: - ABL_OPER(abl)=ABL_AND; + ABL_OPER_L(abl)=ABL_AND; return createablnotexpr(abl); case ABL_NOR: - ABL_OPER(abl)=ABL_OR; + ABL_OPER_L(abl)=ABL_OR; return createablnotexpr(abl); case ABL_NXOR: - ABL_OPER(abl)=ABL_XOR; + ABL_OPER_L(abl)=ABL_XOR; return createablnotexpr(abl); default: return abl; } diff --git a/alliance/src/boog/src/bog_unflatten_befig.c b/alliance/src/boog/src/bog_unflatten_befig.c index b6c2cfc4..4251d9d1 100644 --- a/alliance/src/boog/src/bog_unflatten_befig.c +++ b/alliance/src/boog/src/bog_unflatten_befig.c @@ -64,7 +64,7 @@ static chain_list* change_atom(chain_list* abl,int invert) if (ABL_ATOM(abl)) { if (!invert) return abl; - ABL_ATOM_VALUE(abl)=getoppositename(ABL_ATOM_VALUE(abl)); + ABL_CAR_L(abl)=getoppositename(ABL_ATOM_VALUE(abl)); return createablnotexpr(abl); } @@ -74,7 +74,7 @@ static chain_list* change_atom(chain_list* abl,int invert) } for (chain=ABL_CDR(abl); chain; chain=ABL_CDR(chain)) { - ABL_CAR(chain)=change_atom(ABL_CAR(chain),invert); + ABL_CAR_L(chain)=change_atom(ABL_CAR(chain),invert); } return abl; @@ -227,7 +227,7 @@ static void search_name(char* name) /* keep the NOT to use inverter bus */ if (is_tristate_inverter_lib() && !ABL_ATOM(biabl->VALABL) && ABL_OPER(biabl->VALABL)==ABL_NOT) { - ABL_CADR(biabl->VALABL)=unflatten_abl(ABL_CADR(biabl->VALABL)); + ABL_CADR_L(biabl->VALABL)=unflatten_abl(ABL_CADR(biabl->VALABL)); } else biabl->VALABL=unflatten_abl(biabl->VALABL); /*arity solver*/ biabl->CNDABL=unflatten_abl(biabl->CNDABL); /*arity solver*/ @@ -342,7 +342,7 @@ extern void unflatten_befig(befig_list *befig_param) /* keep the NOT to use inverter bus */ if (is_tristate_inverter_lib() && !ABL_ATOM(biabl->VALABL) && ABL_OPER(biabl->VALABL)==ABL_NOT) { - ABL_CADR(biabl->VALABL)=unflatten_abl(ABL_CADR(biabl->VALABL)); + ABL_CADR_L(biabl->VALABL)=unflatten_abl(ABL_CADR(biabl->VALABL)); } else biabl->VALABL=unflatten_abl(biabl->VALABL); /*arity solver*/ biabl->CNDABL=unflatten_abl(biabl->CNDABL); /*arity solver*/ diff --git a/alliance/src/boom/src/Makefile.am b/alliance/src/boom/src/Makefile.am index a65aa491..e6be9bac 100644 --- a/alliance/src/boom/src/Makefile.am +++ b/alliance/src/boom/src/Makefile.am @@ -2,13 +2,14 @@ bin_PROGRAMS = boom -AM_CFLAGS = @ALLIANCE_CFLAGS@ -I$(top_srcdir)/abe/src \ +AM_CFLAGS = -I$(top_srcdir)/abe/src \ -I$(top_srcdir)/abl/src \ -I$(top_srcdir)/abt/src \ -I$(top_srcdir)/abv/src \ -I$(top_srcdir)/aut/src \ -I$(top_srcdir)/bdd/src \ --I$(top_srcdir)/mbk/src +-I$(top_srcdir)/mbk/src \ +@ALLIANCE_CFLAGS@ boom_LDADD = @ALLIANCE_LIBS@ \ -L$(top_srcdir)/abv/src \ diff --git a/alliance/src/boom/src/boom_abl.c b/alliance/src/boom/src/boom_abl.c index e2a6b6df..a2d52c68 100644 --- a/alliance/src/boom/src/boom_abl.c +++ b/alliance/src/boom/src/boom_abl.c @@ -153,7 +153,7 @@ static chain_list *BoomBddIndex2Abl( Index ) if ( Name != (char *)0 ) { - ABL_CAR( Atom ) = addchain( (chain_list *)0, (void *)ABL_STABLE ); + ABL_CAR_L( Atom ) = addchain( (chain_list *)0, (void *)ABL_STABLE ); addablhexpr( Atom, createablatom( Name ) ); } @@ -1550,7 +1550,7 @@ static chain_list *BoomReverseAbl( Expr ) while ( ( ScanExpr = ABL_CDR( ScanExpr ) ) != (chain_list *)0 ) { - ABL_CAR( ScanExpr ) = BoomReverseAbl( ABL_CAR( ScanExpr ) ); + ABL_CAR_L( ScanExpr ) = BoomReverseAbl( ABL_CAR( ScanExpr ) ); } } diff --git a/alliance/src/boom/src/boom_aux.c b/alliance/src/boom/src/boom_aux.c index c627022b..0c830791 100644 --- a/alliance/src/boom/src/boom_aux.c +++ b/alliance/src/boom/src/boom_aux.c @@ -192,7 +192,7 @@ static ablexpr *BoomCreateAuxAbl( Expr ) while ( ( ScanExpr = ABL_CDR( ScanExpr ) ) != (chain_list *)0 ) { - ABL_CAR( ScanExpr ) = BoomCreateAuxAbl( ABL_CAR( ScanExpr ) ); + ABL_CAR_L( ScanExpr ) = BoomCreateAuxAbl( ABL_CAR( ScanExpr ) ); } BddNode = BoomGetBddMarkAbl( Expr ); @@ -417,7 +417,7 @@ static ablexpr *BoomReplaceUselessAuxAbl( Expr ) while ( ( ScanExpr = ABL_CDR( ScanExpr ) ) != (chain_list *)0 ) { - ABL_CAR( ScanExpr ) = BoomReplaceUselessAuxAbl( ABL_CAR( ScanExpr ) ); + ABL_CAR_L( ScanExpr ) = BoomReplaceUselessAuxAbl( ABL_CAR( ScanExpr ) ); } } diff --git a/alliance/src/boom/src/boom_auxinit.c b/alliance/src/boom/src/boom_auxinit.c index f6265a33..4585e6d5 100644 --- a/alliance/src/boom/src/boom_auxinit.c +++ b/alliance/src/boom/src/boom_auxinit.c @@ -200,13 +200,13 @@ static ablexpr *BoomCreateAuxInitComparatorAbl( Expr ) if ( Operand1 == (ablexpr *)0 ) { Operand1 = ABL_CAR( ScanExpr ); - ABL_CAR( ScanExpr ) = (ablexpr *)0; + ABL_CAR_L( ScanExpr ) = (ablexpr *)0; continue; } Operand2 = ABL_CAR( ScanExpr ); - ABL_CAR( ScanExpr ) = (ablexpr *)0; + ABL_CAR_L( ScanExpr ) = (ablexpr *)0; AuxExpr = createablbinexpr( ABL_XOR, Operand1, Operand2 ); AuxName = BoomGetNewAuxInitName(); @@ -238,7 +238,7 @@ static ablexpr *BoomCreateAuxInitComparatorAbl( Expr ) while ( ( ScanExpr = ABL_CDR( ScanExpr ) ) != (ablexpr *)0 ) { - ABL_CAR( ScanExpr ) = BoomCreateAuxInitComparatorAbl( ABL_CAR( ScanExpr ) ); + ABL_CAR_L( ScanExpr ) = BoomCreateAuxInitComparatorAbl( ABL_CAR( ScanExpr ) ); } } diff --git a/alliance/src/boom/src/boom_bdd.c b/alliance/src/boom/src/boom_bdd.c index 2d078ffc..877f734e 100644 --- a/alliance/src/boom/src/boom_bdd.c +++ b/alliance/src/boom/src/boom_bdd.c @@ -1083,7 +1083,7 @@ static void BoomBddReplaceKeepAuxAbl( Expr ) if ( Element != (authelem *)0 ) { - ABL_ATOM_VALUE( Expr ) = (char *)Element->VALUE; + ABL_CAR_L( Expr ) = (char *)Element->VALUE; } } } diff --git a/alliance/src/boom/src/boom_dc.c b/alliance/src/boom/src/boom_dc.c index 2c84fffe..3b38629a 100644 --- a/alliance/src/boom/src/boom_dc.c +++ b/alliance/src/boom/src/boom_dc.c @@ -103,7 +103,7 @@ static void BoomReplaceDontCareAbl( Expr ) if ( ABL_ATOM_VALUE( Expr ) == ABL_ATOM_NAME_DC ) { BoomFoundAblDc = 1; - ABL_ATOM_VALUE( Expr ) = ABL_ATOM_NAME_ZERO; + ABL_CAR_L( Expr ) = ABL_ATOM_NAME_ZERO; } } diff --git a/alliance/src/boom/src/boom_post.c b/alliance/src/boom/src/boom_post.c index 475af48a..f13cbc38 100644 --- a/alliance/src/boom/src/boom_post.c +++ b/alliance/src/boom/src/boom_post.c @@ -106,7 +106,7 @@ static void BoomRenameAuxVectorAbl( Expr ) if ( Element != (authelem *)0 ) { - ABL_ATOM_VALUE( Expr ) = (char *)Element->VALUE; + ABL_CAR_L( Expr ) = (char *)Element->VALUE; } } diff --git a/alliance/src/configure.in b/alliance/src/configure.in deleted file mode 100644 index 77ad4608..00000000 --- a/alliance/src/configure.in +++ /dev/null @@ -1,1024 +0,0 @@ - -AC_INIT(./autostuff) -AM_INIT_AUTOMAKE(alliance, 5.0) - -AM_PROG_LEX -AM_PROG_LIBTOOL -AC_CHECK_HEADERS(fcntl.h malloc.h strings.h sys/time.h unistd.h) -AC_CHECK_HEADERS(strings.h unistd.h) -AC_CHECK_LIB(gen, basename) -AC_CHECK_LIB(iberty, basename) -AC_CHECK_LIB(m, exp) -AC_CHECK_LIB(m, floor) -AC_CHECK_LIB(m, pow) -AC_CHECK_LIB(m, sqrt) -AC_CHECK_PROG(SED, sed, sed) -AC_CHECK_PROGS(SED, gsed sed) -AC_C_CONST -AC_FUNC_VFORK -AC_HEADER_STDC -AC_HEADER_SYS_WAIT -AC_PATH_XTRA -AC_PROG_CC -AC_PROG_CPP -AC_PROG_CXX -AC_PROG_INSTALL -AC_PROG_MAKE_SET -AC_PROG_RANLIB -AC_PROG_YACC -AC_TYPE_SIGNAL -dnl -dnl Check for X stuff -dnl -dnl -dnl Check X options -dnl -if test "$with_x" = no; then -AC_MSG_ERROR([requires the X window system to compile and run. - Please do not use the configure option '--without-x'.]) -fi -if test "$with_motif" = no; then -AC_MSG_ERROR([requires Motif to compile and run. - Please do not use the configure option '--without-motif'.]) -fi -dnl -dnl -dnl Check for X libraries -dnl -if test "$with_x" != no; then -ice_save_LIBS="$LIBS" -ice_save_CFLAGS="$CFLAGS" -ice_save_CXXFLAGS="$CXXFLAGS" -ice_save_CPPFLAGS="$CPPFLAGS" -ice_save_LDFLAGS="$LDFLAGS" - -dnl -dnl - -AC_FIND_MOTIF -AC_FIND_XPM - -dnl -dnl -dnl -LIBS="$LIBS $X_EXTRA_LIBS" -CFLAGS="$CFLAGS $X_CFLAGS" -CPPFLAGS="$CPPFLAGS $X_CFLAGS" -LDFLAGS="$LDFLAGS $X_LIBS" -dnl -dnl Check for X library -dnl -X11_LIBS="" -AC_CHECK_LIB(X11, XOpenDisplay, X11_LIBS="-lX11",,${X_PRE_LIBS} ${X_EXTRA_LIBS}) -if test "$X11_LIBS" = ""; then -dnl Not having X is fatal. Let the user fix this. -AC_MSG_ERROR([The X11 library '-lX11' could not be found. - Please use the configure options '--x-includes=DIR' - and '--x-libraries=DIR' to specify the X location.]) -fi -AC_SUBST(X_LIBS) -AC_SUBST(X11_LIBS) -AC_SUBST(X_PRE_LIBS) -dnl -dnl -dnl Check for -lXintl library. Lutz Kittler says -dnl that DLD-Linux with CDE wants `-lXintl' to refine `Xlcmbcurmax'. -dnl Guenther Roehrich says that -dnl we must check for `_Xlcmbcurmax' instead of `Xlcmbcurmax'. -dnl -AC_CHECK_LIB(Xintl, _Xlcmbcurmax, X11_LIBS="${X11_LIBS} -lXintl",, - ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS}) -dnl -dnl -dnl Check for -lipc library. SCO unix is said to want that. -dnl -AC_CHECK_LIB(ipc, shmap, X11_LIBS="${X11_LIBS} -lipc",, - ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS}) -dnl -dnl -dnl Check for X toolkit libraries -dnl -XT_LIBS="" -AC_CHECK_LIB(Xt, XtToolkitInitialize, XT_LIBS="-lXt",, - ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS}) -if test "$XT_LIBS" = ""; then -dnl Not having Xt is fatal. Let the user fix this. -AC_MSG_ERROR([The X toolkit library '-lXt' could not be found. - Please use the configure options '--x-includes=DIR' - and '--x-libraries=DIR' to specify the X location. - See the files 'config.log' and 'ddd/config.log' - for further diagnostics.]) -fi -AC_SUBST(XT_LIBS) -dnl -dnl -dnl Check for X extension libraries -dnl -dnl -XEXT_LIBS="" -AC_CHECK_LIB(Xext, XShapeQueryVersion, XEXT_LIBS="-lXext",, - ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS}) -AC_SUBST(XEXT_LIBS) -dnl -dnl -dnl -dnl Check for Xpm library and headers -dnl -XPM_LIBS="" -if test "$xpm_includes" != "no" && test "$xpm_libraries" != "no" -then -AC_CHECK_LIB(Xpm, XpmCreatePixmapFromXpmImage, - XPM_LIBS="-lXpm" - AC_DEFINE(HAVE_XPM),,${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS}) -if test "$XPM_LIBS" != ""; then -AC_CHECK_HEADERS(X11/xpm.h xpm.h) -fi -fi -AC_SUBST(XPM_LIBS) - -dnl Check for Motif widget libraries -dnl - -XM_LIBS="" -XP_LIBS="" -if test "$motif_includes" != "no" && test "$motif_libraries" != "no" -then -dnl Motif 2.1 wants `-lXp' (X11R6.3 print server) -AC_CHECK_LIB(Xp, XpSelectInput, - XP_LIBS="-lXp" - AC_DEFINE(HAVE_XP),, - ${XPM_LIBS} ${XEXT_LIBS} ${XT_LIBS} ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS}) -dnl -AC_CHECK_LIB(Xm, XmCreateOptionMenu, - XM_LIBS="-lXm" - AC_DEFINE(HAVE_MOTIF),, - ${XP_LIBS} ${XPM_LIBS} ${XEXT_LIBS} ${XT_LIBS} ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS}) -dnl -AC_CHECK_LIB(Xm, xmUseVersion, - AC_DEFINE(HAVE_XMUSEVERSION),, - ${XP_LIBS} ${XPM_LIBS} ${XEXT_LIBS} ${XT_LIBS} ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS}) -dnl -AC_CHECK_LIB(Xm, XmInstallImage, - AC_DEFINE(HAVE_XMINSTALLIMAGE),, - ${XP_LIBS} ${XPM_LIBS} ${XEXT_LIBS} ${XT_LIBS} ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS}) -dnl -AC_CHECK_LIB(Xm, Xm21InstallImage, - AC_DEFINE(HAVE_XM21INSTALLIMAGE),, - ${XP_LIBS} ${XPM_LIBS} ${XEXT_LIBS} ${XT_LIBS} ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS}) -fi -if test "$XM_LIBS" = ""; then -dnl Without Motif, we won't get far. Let the user fix this. -AC_MSG_ERROR([The Motif library '-lXm' could not be found. - Please use the configure options '--with-motif-includes=DIR' - and '--with-motif-libraries=DIR' to specify the Xm location. - See the files 'config.log' - for further diagnostics.]) -fi - -AC_SUBST(XP_LIBS) -AC_SUBST(XM_LIBS) - -LIBS="$LIBS ${XM_LIBS} ${XP_LIBS} ${XPM_LIBS} ${XEXT_LIBS} ${XT_LIBS} ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS}" - - -LIBS="$ice_save_LIBS" -CFLAGS="$ice_save_CFLAGS" -CXXFLAGS="$ice_save_CXXFLAGS" -CPPFLAGS="$ice_save_CPPFLAGS" -LDFLAGS="$ice_save_LDFLAGS" -fi -AM_ALLIANCE -AM_CONDITIONAL([ALLIANCE_BUILD],[(exit 0)]) - -dnl Infos extracted from mbk/configure.in -MBK_CUR=4 -AC_SUBST(MBK_CUR) -MBK_REV=2 -AC_SUBST(MBK_REV) -MBK_REL=0 -AC_SUBST(MBK_REL) -MBK_DLL_VERSION=${MBK_CUR}:${MBK_REV}:${MBK_REL} -AC_SUBST(MBK_DLL_VERSION) -MBK_VERSION=$MBK_CUR.$MBK_REV -AC_SUBST(MBK_VERSION) - -dnl Infos extracted from mbkal/configure.in -MAL_DLL_VERSION=6:0:0 -AC_SUBST(MAL_DLL_VERSION) - -dnl Infos extracted from mbkap/configure.in -MAP_DLL_VERSION=6:0:0 -AC_SUBST(MAP_DLL_VERSION) - -dnl Infos extracted from mbkedif/configure.in -MEL_DLL_VERSION=4:9:0 -AC_SUBST(MEL_DLL_VERSION) - -dnl Infos extracted from mbkhilo/configure.in -MHL_DLL_VERSION=2:1:0 -AC_SUBST(MHL_DLL_VERSION) - -dnl Infos extracted from mbkmg/configure.in -MMG_DLL_VERSION=1:0:0 -AC_SUBST(MMG_DLL_VERSION) - -dnl Infos extracted from mbkspice/configure.in -MSL_DLL_VERSION=7:0:0 -AC_SUBST(MSL_DLL_VERSION) - -dnl Infos extracted from mbkvhdl/configure.in -MVL_DLL_VERSION=4:1:0 -AC_SUBST(MVL_DLL_VERSION) - -dnl Infos extracted from mbkvrlog/configure.in -MGL_DLL_VERSION=0:8:0 -AC_SUBST(MGL_DLL_VERSION) - -dnl Infos extracted from mbkvti/configure.in -MCP_DLL_VERSION=4:9:0 -AC_SUBST(MCP_DLL_VERSION) -MCL_DLL_VERSION=4:9:0 -AC_SUBST(MCL_DLL_VERSION) - -dnl Infos extracted from mbkvhdlg/configure.in -MVG_DLL_VERSION=4:1:0 -AC_SUBST(MVG_DLL_VERSION) - -dnl Infos extracted from aut/configure.in -AUT_DLL_VERSION=1:3:0 -AC_SUBST(AUT_DLL_VERSION) - -dnl Infos extracted from rds/configure.in -RDS_DLL_VERSION=2:1:0 -AC_SUBST(RDS_DLL_VERSION) -RUT_DLL_VERSION=2:1:0 -AC_SUBST(RUT_DLL_VERSION) -RFM_DLL_VERSION=2:1:0 -AC_SUBST(RFM_DLL_VERSION) -RPR_DLL_VERSION=2:1:0 -AC_SUBST(RPR_DLL_VERSION) -RWI_DLL_VERSION=2:1:0 -AC_SUBST(RWI_DLL_VERSION) -RTL_DLL_VERSION=2:1:0 -AC_SUBST(RTL_DLL_VERSION) - -dnl Infos extracted from rdscif/configure.in -RCF_DLL_VERSION=2:1:0 -AC_SUBST(RCF_DLL_VERSION) - -dnl Infos extracted from rdsgds/configure.in -RGS_DLL_VERSION=2:1:0 -AC_SUBST(RGS_DLL_VERSION) - -dnl Infos extracted from elp/configure.in -ELP_DLL_VERSION=1:5:0 -AC_SUBST(ELP_DLL_VERSION) - -dnl Infos extracted from abl/configure.in -ABL_DLL_VERSION=1:3:0 -AC_SUBST(ABL_DLL_VERSION) - -dnl Infos extracted from bdd/configure.in -BDD_DLL_VERSION=1:5:0 -AC_SUBST(BDD_DLL_VERSION) - -dnl Infos extracted from log/configure.in -LOG_DLL_VERSION=2:1:0 -AC_SUBST(LOG_DLL_VERSION) - -dnl Infos extracted from btr/configure.in -BTR_DLL_VERSION=1:3:0 -AC_SUBST(BTR_DLL_VERSION) - -dnl Infos extracted from vex/configure.in -VEX_DLL_VERSION=1:3:0 -AC_SUBST(VEX_DLL_VERSION) - -dnl Infos extracted from ctl/configure.in -CTL_DLL_VERSION=1:1:0 -AC_SUBST(CTL_DLL_VERSION) - -dnl Infos extracted from ctp/configure.in -CTP_DLL_VERSION=1:1:0 -AC_SUBST(CTP_DLL_VERSION) - -dnl Infos extracted from abe/configure.in -ABE_DLL_VERSION=2:1:0 -AC_SUBST(ABE_DLL_VERSION) - -dnl Infos extracted from abt/configure.in -ABT_DLL_VERSION=2:1:0 -AC_SUBST(ABT_DLL_VERSION) - -dnl Infos extracted from abv/configure.in -ABV_DLL_VERSION=2:1:0 -AC_SUBST(ABV_DLL_VERSION) - -dnl Infos extracted from fsm/configure.in -FSM_DLL_VERSION=1:4:0 -AC_SUBST(FSM_DLL_VERSION) - -dnl Infos extracted from fks/configure.in -FKS_DLL_VERSION=1:4:0 -AC_SUBST(FKS_DLL_VERSION) - -dnl Infos extracted from fvh/configure.in -FVH_DLL_VERSION=1:4:0 -AC_SUBST(FVH_DLL_VERSION) - -dnl Infos extracted from ftl/configure.in -FTL_DLL_VERSION=1:4:0 -AC_SUBST(FTL_DLL_VERSION) - -dnl Infos extracted from rtn/configure.in -RTN_DLL_VERSION=1:1:0 -AC_SUBST(RTN_DLL_VERSION) - -dnl Infos extracted from rtd/configure.in -RTD_DLL_VERSION=1:1:0 -AC_SUBST(RTD_DLL_VERSION) - -dnl Infos extracted from scl/configure.in -SCL_DLL_VERSION=1:5:0 -AC_SUBST(SCL_DLL_VERSION) - -dnl Infos extracted from vbh/configure.in -VBH_DLL_VERSION=1:4:0 -AC_SUBST(VBH_DLL_VERSION) - -dnl Infos extracted from vbl/configure.in -VBL_DLL_VERSION=1:4:0 -AC_SUBST(VBL_DLL_VERSION) - -dnl Infos extracted from vpn/configure.in -VPN_DLL_VERSION=1:5:0 -AC_SUBST(VPN_DLL_VERSION) - -dnl Infos extracted from vpd/configure.in -VPD_DLL_VERSION=1:5:0 -AC_SUBST(VPD_DLL_VERSION) - -dnl Infos extracted from vvh/configure.in -VVH_DLL_VERSION=1:5:0 -AC_SUBST(VVH_DLL_VERSION) - -dnl Infos extracted from vtl/configure.in -VTL_DLL_VERSION=1:5:0 -AC_SUBST(VTL_DLL_VERSION) - -dnl Infos extracted from pat/configure.in -PAT_DLL_VERSION=1:9:0 -AC_SUBST(PAT_DLL_VERSION) - -dnl Infos extracted from ppt/configure.in -PPT_DLL_VERSION=1:9:0 -AC_SUBST(PPT_DLL_VERSION) - -dnl Infos extracted from phl/configure.in -PHL_DLL_VERSION=1:9:0 -AC_SUBST(PHL_DLL_VERSION) - -dnl Infos extracted from gcp/configure.in - -dnl Infos extracted from druc/configure.in -VRD_DLL_VERSION=3:4:0 -AC_SUBST(VRD_DLL_VERSION) - -dnl Infos extracted from beh/configure.in -BEH_DLL_VERSION=1:11:0 -AC_SUBST(BEH_DLL_VERSION) - -dnl Infos extracted from bhl/configure.in -BHL_DLL_VERSION=1:11:0 -AC_SUBST(BHL_DLL_VERSION) - -dnl Infos extracted from bvl/configure.in -BVL_DLL_VERSION=1:14:0 -AC_SUBST(BVL_DLL_VERSION) - -dnl Infos extracted from alcban/configure.in -ALCBANNER_MAJOR_VERSION=1 -AC_SUBST(ALCBANNER_MAJOR_VERSION) -ALCBANNER_MINOR_VERSION=1 -AC_SUBST(ALCBANNER_MINOR_VERSION) -ALCBANNER_VERSION=$ALCBANNER_MAJOR_VERSION.$ALCBANNER_MINOR_VERSION -AC_SUBST(ALCBANNER_VERSION) - -dnl Infos extracted from asimut/configure.in -CST_DLL_VERSION=3:2:0 -AC_SUBST(CST_DLL_VERSION) -SCH_DLL_VERSION=3:2:0 -AC_SUBST(SCH_DLL_VERSION) - -dnl Infos extracted from attila/configure.in -ATTILA_MAJOR_VERSION=0 -AC_SUBST(ATTILA_MAJOR_VERSION) -ATTILA_MINOR_VERSION=1 -AC_SUBST(ATTILA_MINOR_VERSION) -ATTILA_VERSION=$ATTILA_MAJOR_VERSION.$ATTILA_MINOR_VERSION -AC_SUBST(ATTILA_VERSION) - -dnl Infos extracted from b2f/configure.in -B2F_MAJOR_VERSION=1 -AC_SUBST(B2F_MAJOR_VERSION) -B2F_MINOR_VERSION=2 -AC_SUBST(B2F_MINOR_VERSION) -B2F_VERSION=$B2F_MAJOR_VERSION.$B2F_MINOR_VERSION -AC_SUBST(B2F_VERSION) - -dnl Infos extracted from boog/configure.in -BOOG_MAJOR_VERSION=1 -AC_SUBST(BOOG_MAJOR_VERSION) -BOOG_MINOR_VERSION=7 -AC_SUBST(BOOG_MINOR_VERSION) -BOOG_VERSION=$BOOG_MAJOR_VERSION.$BOOG_MINOR_VERSION -AC_SUBST(BOOG_VERSION) - -dnl Infos extracted from boom/configure.in -BOOM_MAJOR_VERSION=1 -AC_SUBST(BOOM_MAJOR_VERSION) -BOOM_MINOR_VERSION=2 -AC_SUBST(BOOM_MINOR_VERSION) -BOOM_VERSION=$BOOM_MAJOR_VERSION.$BOOM_MINOR_VERSION -AC_SUBST(BOOM_VERSION) - -dnl Infos extracted from cells/configure.in - -dnl Infos extracted from distrib/configure.in - -dnl Infos extracted from documentation/configure.in -DOC_MAJOR_VERSION=1 -AC_SUBST(DOC_MAJOR_VERSION) -DOC_MINOR_VERSION=0 -AC_SUBST(DOC_MINOR_VERSION) -DOC_VERSION=$DOC_MAJOR_VERSION.$DOC_MINOR_VERSION -AC_SUBST(DOC_VERSION) - -dnl Infos extracted from dreal/configure.in -DREAL_MAJOR_VERSION=1 -AC_SUBST(DREAL_MAJOR_VERSION) -DREAL_MINOR_VERSION=14 -AC_SUBST(DREAL_MINOR_VERSION) -DREAL_VERSION=$DREAL_MAJOR_VERSION.$DREAL_MINOR_VERSION -AC_SUBST(DREAL_VERSION) - -dnl Infos extracted from exp/configure.in -EXP_MAJOR_VERSION=1 -AC_SUBST(EXP_MAJOR_VERSION) -EXP_MINOR_VERSION=0 -AC_SUBST(EXP_MINOR_VERSION) -EXP_VERSION=$EXP_MAJOR_VERSION.$EXP_MINOR_VERSION -AC_SUBST(EXP_VERSION) - -dnl Infos extracted from flatbeh/configure.in -FLATBEH_MAJOR_VERSION=1 -AC_SUBST(FLATBEH_MAJOR_VERSION) -FLATBEH_MINOR_VERSION=1 -AC_SUBST(FLATBEH_MINOR_VERSION) -FLATBEH_VERSION=$FLATBEH_MAJOR_VERSION.$FLATBEH_MINOR_VERSION -AC_SUBST(FLATBEH_VERSION) - -dnl Infos extracted from flatlo/configure.in - -dnl Infos extracted from flatph/configure.in - -dnl Infos extracted from fmi/configure.in -FMI_MAJOR_VERSION=1 -AC_SUBST(FMI_MAJOR_VERSION) -FMI_MINOR_VERSION=1 -AC_SUBST(FMI_MINOR_VERSION) -FMI_VERSION=$FMI_MAJOR_VERSION.$FMI_MINOR_VERSION -AC_SUBST(FMI_VERSION) - -dnl Infos extracted from fsp/configure.in -FSP_MAJOR_VERSION=1 -AC_SUBST(FSP_MAJOR_VERSION) -FSP_MINOR_VERSION=1 -AC_SUBST(FSP_MINOR_VERSION) -FSP_VERSION=$FSP_MAJOR_VERSION.$FSP_MINOR_VERSION -AC_SUBST(FSP_VERSION) - -dnl Infos extracted from genlib/configure.in -MGN_DLL_VERSION=3:3:0 -AC_SUBST(MGN_DLL_VERSION) - -dnl Infos extracted from genpat/configure.in -PGN_DLL_VERSION=3:3:0 -AC_SUBST(PGN_DLL_VERSION) - -dnl Infos extracted from graal/configure.in -GRAAL_MAJOR_VERSION=1 -AC_SUBST(GRAAL_MAJOR_VERSION) -GRAAL_MINOR_VERSION=27 -AC_SUBST(GRAAL_MINOR_VERSION) -GRAAL_VERSION=$GRAAL_MAJOR_VERSION.$GRAAL_MINOR_VERSION -AC_SUBST(GRAAL_VERSION) - -dnl Infos extracted from growstk/configure.in -GROWSTK_MAJOR_VERSION=1 -AC_SUBST(GROWSTK_MAJOR_VERSION) -GROWSTK_MINOR_VERSION=5 -AC_SUBST(GROWSTK_MINOR_VERSION) -GROWSTK_VERSION=$GROWSTK_MAJOR_VERSION.$GROWSTK_MINOR_VERSION -AC_SUBST(GROWSTK_VERSION) - -dnl Infos extracted from k2f/configure.in -K2F_MAJOR_VERSION=1 -AC_SUBST(K2F_MAJOR_VERSION) -K2F_MINOR_VERSION=1 -AC_SUBST(K2F_MINOR_VERSION) -K2F_VERSION=$K2F_MAJOR_VERSION.$K2F_MINOR_VERSION -AC_SUBST(K2F_VERSION) - -dnl Infos extracted from l2p/configure.in -L2P_MAJOR_VERSION=1 -AC_SUBST(L2P_MAJOR_VERSION) -L2P_MINOR_VERSION=12 -AC_SUBST(L2P_MINOR_VERSION) -L2P_VERSION=$L2P_MAJOR_VERSION.$L2P_MINOR_VERSION -AC_SUBST(L2P_VERSION) - -dnl Infos extracted from loon/configure.in -LOON_MAJOR_VERSION=1 -AC_SUBST(LOON_MAJOR_VERSION) -LOON_MINOR_VERSION=7 -AC_SUBST(LOON_MINOR_VERSION) -LOON_VERSION=$LOON_MAJOR_VERSION.$LOON_MINOR_VERSION -AC_SUBST(LOON_VERSION) - -dnl Infos extracted from lvx/configure.in -LVX_MAJOR_VERSION=1 -AC_SUBST(LVX_MAJOR_VERSION) -LVX_MINOR_VERSION=2 -AC_SUBST(LVX_MINOR_VERSION) -LVX_VERSION=$LVX_MAJOR_VERSION.$LVX_MINOR_VERSION -AC_SUBST(LVX_VERSION) - -dnl Infos extracted from lynx/configure.in -LYNX_MAJOR_VERSION=1 -AC_SUBST(LYNX_MAJOR_VERSION) -LYNX_MINOR_VERSION=21 -AC_SUBST(LYNX_MINOR_VERSION) -LYNX_VERSION=$LYNX_MAJOR_VERSION.$LYNX_MINOR_VERSION -AC_SUBST(LYNX_VERSION) - -dnl Infos extracted from m2e/configure.in -M2E_MAJOR_VERSION=1 -AC_SUBST(M2E_MAJOR_VERSION) -M2E_MINOR_VERSION=0 -AC_SUBST(M2E_MINOR_VERSION) -M2E_VERSION=$M2E_MAJOR_VERSION.$M2E_MINOR_VERSION -AC_SUBST(M2E_VERSION) - -dnl Infos extracted from mips_asm/configure.in -MIPS_ASM_MAJOR_VERSION=1 -AC_SUBST(MIPS_ASM_MAJOR_VERSION) -MIPS_ASM_MINOR_VERSION=0 -AC_SUBST(MIPS_ASM_MINOR_VERSION) -MIPS_ASM_VERSION=$MIPS_ASM_MAJOR_VERSION.$MIPS_ASM_MINOR_VERSION -AC_SUBST(MIPS_ASM_VERSION) - -dnl Infos extracted from mocha/configure.in -MOCHA_MAJOR_VERSION=1 -AC_SUBST(MOCHA_MAJOR_VERSION) -MOCHA_MINOR_VERSION=1 -AC_SUBST(MOCHA_MINOR_VERSION) -MOCHA_VERSION=$MOCHA_MAJOR_VERSION.$MOCHA_MINOR_VERSION -AC_SUBST(MOCHA_VERSION) - -dnl Infos extracted from nero/configure.in -NERO_MAJOR_VERSION=1 -AC_SUBST(NERO_MAJOR_VERSION) -NERO_MINOR_VERSION=0 -AC_SUBST(NERO_MINOR_VERSION) -NERO_VERSION=$NERO_MAJOR_VERSION.$NERO_MINOR_VERSION -AC_SUBST(NERO_VERSION) - -dnl Infos extracted from ocp/configure.in -OCP_MAJOR_VERSION=1 -AC_SUBST(OCP_MAJOR_VERSION) -OCP_MINOR_VERSION=0 -AC_SUBST(OCP_MINOR_VERSION) -OCP_VERSION=$OCP_MAJOR_VERSION.$OCP_MINOR_VERSION -AC_SUBST(OCP_VERSION) - -dnl Infos extracted from ocr/configure.in -OCR_MAJOR_VERSION=1 -AC_SUBST(OCR_MAJOR_VERSION) -OCR_MINOR_VERSION=0 -AC_SUBST(OCR_MINOR_VERSION) -OCR_VERSION=$OCR_MAJOR_VERSION.$OCR_MINOR_VERSION -AC_SUBST(OCR_VERSION) - -dnl Infos extracted from pat2spi/configure.in -PAT2SPI_MAJOR_VERSION=1 -AC_SUBST(PAT2SPI_MAJOR_VERSION) -PAT2SPI_MINOR_VERSION=1 -AC_SUBST(PAT2SPI_MINOR_VERSION) -PAT2SPI_VERSION=$PAT2SPI_MAJOR_VERSION.$PAT2SPI_MINOR_VERSION -AC_SUBST(PAT2SPI_VERSION) - -dnl Infos extracted from pcbs/configure.in -EMULBS_MAJOR_VERSION=3 -AC_SUBST(EMULBS_MAJOR_VERSION) -EMULBS_MINOR_VERSION=2 -AC_SUBST(EMULBS_MINOR_VERSION) -EMULBS_VERSION=$EMULBS_MAJOR_VERSION.$EMULBS_MINOR_VERSION -AC_SUBST(EMULBS_VERSION) -PCBS_MAJOR_VERSION=2 -AC_SUBST(PCBS_MAJOR_VERSION) -PCBS_MINOR_VERSION=1 -AC_SUBST(PCBS_MINOR_VERSION) -PCBS_VERSION=$PCBS_MAJOR_VERSION.$PCBS_MINOR_VERSION -AC_SUBST(PCBS_VERSION) - -dnl Infos extracted from proof/configure.in -PROOF_MAJOR_VERSION=4 -AC_SUBST(PROOF_MAJOR_VERSION) -PROOF_MINOR_VERSION=9 -AC_SUBST(PROOF_MINOR_VERSION) -PROOF_VERSION=$PROOF_MAJOR_VERSION.$PROOF_MINOR_VERSION -AC_SUBST(PROOF_VERSION) - -dnl Infos extracted from ring/configure.in -RING_MAJOR_VERSION=3 -AC_SUBST(RING_MAJOR_VERSION) -RING_MINOR_VERSION=0 -AC_SUBST(RING_MINOR_VERSION) -RING_VERSION=$RING_MAJOR_VERSION.$RING_MINOR_VERSION -AC_SUBST(RING_VERSION) - -dnl Infos extracted from s2r/configure.in -S2R_MAJOR_VERSION=4 -AC_SUBST(S2R_MAJOR_VERSION) -S2R_MINOR_VERSION=4 -AC_SUBST(S2R_MINOR_VERSION) -S2R_VERSION=$S2R_MAJOR_VERSION.$S2R_MINOR_VERSION -AC_SUBST(S2R_VERSION) - -dnl Infos extracted from scapin/configure.in -SCAPIN_MAJOR_VERSION=1 -AC_SUBST(SCAPIN_MAJOR_VERSION) -SCAPIN_MINOR_VERSION=1 -AC_SUBST(SCAPIN_MINOR_VERSION) -SCAPIN_VERSION=$SCAPIN_MAJOR_VERSION.$SCAPIN_MINOR_VERSION -AC_SUBST(SCAPIN_VERSION) - -dnl Infos extracted from sea/configure.in -SEA_MAJOR_VERSION=1 -AC_SUBST(SEA_MAJOR_VERSION) -SEA_MINOR_VERSION=0 -AC_SUBST(SEA_MINOR_VERSION) -SEA_VERSION=$SEA_MAJOR_VERSION.$SEA_MINOR_VERSION -AC_SUBST(SEA_VERSION) - -dnl Infos extracted from syf/configure.in -SYF_MAJOR_VERSION=3 -AC_SUBST(SYF_MAJOR_VERSION) -SYF_MINOR_VERSION=6 -AC_SUBST(SYF_MINOR_VERSION) -SYF_VERSION=$SYF_MAJOR_VERSION.$SYF_MINOR_VERSION -AC_SUBST(SYF_VERSION) - -dnl Infos extracted from vasy/configure.in -VASY_MAJOR_VERSION=1 -AC_SUBST(VASY_MAJOR_VERSION) -VASY_MINOR_VERSION=5 -AC_SUBST(VASY_MINOR_VERSION) -VASY_VERSION=$VASY_MAJOR_VERSION.$VASY_MINOR_VERSION -AC_SUBST(VASY_VERSION) - -dnl Infos extracted from vst2xnf/configure.in -VST2XNF_MAJOR_VERSION=1 -AC_SUBST(VST2XNF_MAJOR_VERSION) -VST2XNF_MINOR_VERSION=0 -AC_SUBST(VST2XNF_MINOR_VERSION) -VST2XNF_VERSION=$VST2XNF_MAJOR_VERSION.$VST2XNF_MINOR_VERSION -AC_SUBST(VST2XNF_VERSION) - -dnl Infos extracted from x2y/configure.in - -dnl Infos extracted from xfsm/configure.in -XFSM_MAJOR_VERSION=1 -AC_SUBST(XFSM_MAJOR_VERSION) -XFSM_MINOR_VERSION=4 -AC_SUBST(XFSM_MINOR_VERSION) -XFSM_VERSION=$XFSM_MAJOR_VERSION.$XFSM_MINOR_VERSION -AC_SUBST(XFSM_VERSION) - -dnl Infos extracted from xpat/configure.in -XPAT_MAJOR_VERSION=1 -AC_SUBST(XPAT_MAJOR_VERSION) -XPAT_MINOR_VERSION=4 -AC_SUBST(XPAT_MINOR_VERSION) -XPAT_VERSION=$XPAT_MAJOR_VERSION.$XPAT_MINOR_VERSION -AC_SUBST(XPAT_VERSION) - -dnl Infos extracted from xsch/configure.in -XSCH_MAJOR_VERSION=1 -AC_SUBST(XSCH_MAJOR_VERSION) -XSCH_MINOR_VERSION=4 -AC_SUBST(XSCH_MINOR_VERSION) -XSCH_VERSION=$XSCH_MAJOR_VERSION.$XSCH_MINOR_VERSION -AC_SUBST(XSCH_VERSION) - -dnl Infos extracted from xvpn/configure.in -XVPN_MAJOR_VERSION=1 -AC_SUBST(XVPN_MAJOR_VERSION) -XVPN_MINOR_VERSION=5 -AC_SUBST(XVPN_MINOR_VERSION) -XVPN_VERSION=$XVPN_MAJOR_VERSION.$XVPN_MINOR_VERSION -AC_SUBST(XVPN_VERSION) - -TOOLSDIRS="mbk mbkal mbkap mbkedif mbkhilo mbkmg mbkspice mbkvhdl mbkvrlog mbkvti mbkvhdlg aut rds rdscif rdsgds elp abl bdd log btr vex ctl ctp abe abt abv fsm fks fvh ftl rtn rtd scl vbh vbl vpn vpd vvh vtl pat ppt phl gcp druc beh bhl bvl alcban asimut attila b2f boog boom cells distrib documentation dreal exp flatbeh flatlo flatph fmi fsp genlib genpat graal growstk k2f l2p loon lvx lynx m2e mips_asm mocha nero ocp ocr pat2spi pcbs proof ring s2r scapin sea syf vasy vst2xnf x2y xfsm xpat xsch xvpn" -AC_SUBST(TOOLSDIRS) - -AC_OUTPUT([ -Makefile -distrib/alliance.spec -distrib/etc/alc_env.sh -distrib/etc/alc_env.csh -mbk/Makefile -mbk/man1/Makefile -mbk/man5/Makefile -mbk/man3/Makefile -mbk/src/Makefile -mbkal/doc/Makefile -mbkal/Makefile -mbkal/src/Makefile -mbkap/Makefile -mbkap/src/Makefile -mbkedif/Makefile -mbkedif/src/Makefile -mbkhilo/Makefile -mbkhilo/src/Makefile -mbkmg/Makefile -mbkmg/src/Makefile -mbkspice/doc/Makefile -mbkspice/Makefile -mbkspice/etc/Makefile -mbkspice/src/Makefile -mbkvhdl/Makefile -mbkvhdl/src/Makefile -mbkvrlog/Makefile -mbkvrlog/src/Makefile -mbkvti/Makefile -mbkvti/src/Makefile -mbkvhdlg/Makefile -mbkvhdlg/src/Makefile -aut/Makefile -aut/man1/Makefile -aut/man3/Makefile -aut/src/Makefile -rds/Makefile -rds/etc/Makefile -rds/man3/Makefile -rds/src/Makefile -rdscif/Makefile -rdscif/src/Makefile -rdsgds/Makefile -rdsgds/src/Makefile -elp/Makefile -elp/etc/Makefile -elp/src/Makefile -abl/Makefile -abl/man1/Makefile -abl/man3/Makefile -abl/src/Makefile -bdd/Makefile -bdd/man1/Makefile -bdd/man3/Makefile -bdd/src/Makefile -log/Makefile -log/man1/Makefile -log/man3/Makefile -log/src/Makefile -btr/Makefile -btr/src/Makefile -vex/Makefile -vex/src/Makefile -ctl/Makefile -ctl/man5/Makefile -ctl/src/Makefile -ctp/Makefile -ctp/src/Makefile -abe/Makefile -abe/src/Makefile -abt/Makefile -abt/src/Makefile -abv/Makefile -abv/src/Makefile -fsm/Makefile -fsm/man1/Makefile -fsm/man5/Makefile -fsm/src/Makefile -fks/Makefile -fks/src/Makefile -fvh/Makefile -fvh/src/Makefile -ftl/Makefile -ftl/src/Makefile -rtn/Makefile -rtn/src/Makefile -rtd/Makefile -rtd/src/Makefile -scl/Makefile -scl/src/Makefile -vbh/Makefile -vbh/src/Makefile -vbl/Makefile -vbl/src/Makefile -vpn/Makefile -vpn/src/Makefile -vpd/Makefile -vpd/src/Makefile -vvh/Makefile -vvh/src/Makefile -vtl/Makefile -vtl/src/Makefile -pat/doc/Makefile -pat/Makefile -pat/src/Makefile -ppt/Makefile -ppt/src/Makefile -phl/Makefile -phl/src/Makefile -gcp/Makefile -gcp/src/Makefile -druc/Makefile -druc/man1/Makefile -druc/src/Makefile -beh/Makefile -beh/man3/Makefile -beh/src/Makefile -bhl/Makefile -bhl/src/Makefile -bvl/Makefile -bvl/src/Makefile -alcban/Makefile -alcban/man1/Makefile -alcban/src/Makefile -asimut/Makefile -asimut/man1/Makefile -asimut/src/Makefile -attila/doc/Makefile -attila/doc/man1/Makefile -attila/doc/attila/Makefile -attila/Makefile -attila/etc/Makefile -attila/src/Makefile -b2f/Makefile -b2f/src/Makefile -boog/doc/Makefile -boog/Makefile -boog/src/Makefile -boom/Makefile -boom/man1/Makefile -boom/src/Makefile -cells/doc/Makefile -cells/Makefile -cells/src/Makefile -cells/src/sxlib/Makefile -cells/src/rf2lib/Makefile -cells/src/ramlib/Makefile -cells/src/romlib/Makefile -cells/src/rflib/Makefile -cells/src/dp_sxlib/Makefile -cells/src/padlib/Makefile -distrib/doc/Makefile -distrib/Makefile -distrib/etc/Makefile -documentation/Makefile -documentation/tutorials/Makefile -dreal/Makefile -dreal/man1/Makefile -dreal/etc/Makefile -dreal/src/Makefile -exp/doc/Makefile -exp/Makefile -exp/src/Makefile -flatbeh/doc/Makefile -flatbeh/Makefile -flatbeh/src/Makefile -flatlo/doc/Makefile -flatlo/Makefile -flatlo/src/Makefile -flatph/doc/Makefile -flatph/Makefile -flatph/src/Makefile -fmi/Makefile -fmi/man1/Makefile -fmi/src/Makefile -fsp/Makefile -fsp/man1/Makefile -fsp/src/Makefile -genlib/doc/Makefile -genlib/doc/genlib/Makefile -genlib/Makefile -genlib/man1/Makefile -genlib/man3/Makefile -genlib/src/Makefile -genpat/doc/Makefile -genpat/doc/man1/Makefile -genpat/doc/man3/Makefile -genpat/Makefile -genpat/src/Makefile -graal/Makefile -graal/man1/Makefile -graal/etc/Makefile -graal/src/Makefile -growstk/Makefile -growstk/src/Makefile -k2f/Makefile -k2f/man1/Makefile -k2f/src/Makefile -l2p/Makefile -l2p/man1/Makefile -l2p/src/Makefile -loon/doc/Makefile -loon/Makefile -loon/src/Makefile -lvx/doc/Makefile -lvx/Makefile -lvx/src/Makefile -lynx/Makefile -lynx/man1/Makefile -lynx/src/Makefile -m2e/doc/Makefile -m2e/doc/man1/Makefile -m2e/Makefile -m2e/src/Makefile -mips_asm/Makefile -mips_asm/src/Makefile -mocha/Makefile -mocha/man1/Makefile -mocha/src/Makefile -nero/doc/Makefile -nero/doc/man1/Makefile -nero/doc/nero/Makefile -nero/Makefile -nero/src/Makefile -ocp/doc/Makefile -ocp/Makefile -ocp/src/Makefile -ocp/src/placer/Makefile -ocp/src/common/Makefile -ocr/doc/Makefile -ocr/Makefile -ocr/src/Makefile -ocr/src/util/Makefile -ocr/src/include/Makefile -ocr/src/rout/Makefile -ocr/src/seg/Makefile -pat2spi/Makefile -pat2spi/man1/Makefile -pat2spi/src/Makefile -pcbs/doc/Makefile -pcbs/Makefile -pcbs/src/Makefile -pcbs/src/emulbs/Makefile -pcbs/src/bvl/Makefile -pcbs/src/pcbs/Makefile -proof/Makefile -proof/man1/Makefile -proof/src/Makefile -ring/doc/Makefile -ring/Makefile -ring/src/Makefile -s2r/doc/Makefile -s2r/Makefile -s2r/src/Makefile -scapin/Makefile -scapin/man1/Makefile -scapin/etc/Makefile -scapin/src/Makefile -sea/Makefile -sea/etc/Makefile -sea/src/Makefile -syf/Makefile -syf/man1/Makefile -syf/src/Makefile -vasy/Makefile -vasy/man1/Makefile -vasy/man5/Makefile -vasy/src/Makefile -vst2xnf/Makefile -vst2xnf/src/Makefile -x2y/doc/Makefile -x2y/Makefile -x2y/src/Makefile -xfsm/Makefile -xfsm/etc/Makefile -xfsm/src/Makefile -xpat/Makefile -xpat/man1/Makefile -xpat/etc/Makefile -xpat/src/Makefile -xsch/Makefile -xsch/man1/Makefile -xsch/etc/Makefile -xsch/src/Makefile -xvpn/Makefile -xvpn/etc/Makefile -xvpn/src/Makefile -]) diff --git a/alliance/src/dreal/src/GRD.h b/alliance/src/dreal/src/GRD.h index 6191c6f3..4a2cb7f6 100644 --- a/alliance/src/dreal/src/GRD.h +++ b/alliance/src/dreal/src/GRD.h @@ -65,6 +65,10 @@ \ ((rdsrec_list **)((R)->USER)) +# define DREAL_PREVIOUS_L( R ) \ + \ + ((R)->USER) + # define DREAL_WINDOW( R ) \ \ (((drealrec *)((char *)(R)+sizeof(rdsrec_list)))->WINDOW ) diff --git a/alliance/src/dreal/src/GRD_rds.c b/alliance/src/dreal/src/GRD_rds.c index af063b9b..e951bc02 100644 --- a/alliance/src/dreal/src/GRD_rds.c +++ b/alliance/src/dreal/src/GRD_rds.c @@ -213,7 +213,7 @@ void DrealAddFigure( Name ) Rectangle != (rdsrec_list *)NULL; Rectangle = Rectangle->NEXT ) { - DREAL_PREVIOUS( Rectangle ) = Previous; + DREAL_PREVIOUS_L( Rectangle ) = Previous; Previous = &Rectangle->NEXT; DrealInsertRectangle( Rectangle ); @@ -230,7 +230,7 @@ void DrealAddFigure( Name ) Rectangle != (rdsrec_list *)NULL; Rectangle = Rectangle->NEXT ) { - DREAL_PREVIOUS( Rectangle ) = (rdsrec_list **)Instance; + DREAL_PREVIOUS_L( Rectangle ) = (rdsrec_list **)Instance; DrealInsertRectangle( Rectangle ); } @@ -266,10 +266,10 @@ rdsrec_list *DrealAddRectangle( Name, Layer, X, Y, Dx, Dy ) if ( ScanRec->NEXT != (rdsrec_list *)0 ) { - DREAL_PREVIOUS( ScanRec->NEXT ) = &ScanRec->NEXT; + DREAL_PREVIOUS_L( ScanRec->NEXT ) = &ScanRec->NEXT; } - DREAL_PREVIOUS( ScanRec ) = &DrealFigureRds->LAYERTAB[ Layer ]; + DREAL_PREVIOUS_L( ScanRec ) = &DrealFigureRds->LAYERTAB[ Layer ]; rdsend(); return( ScanRec ); @@ -305,10 +305,10 @@ rdsrec_list *DrealAddAbox( X, Y, Dx, Dy ) if ( ScanRec->NEXT != (rdsrec_list *)0 ) { - DREAL_PREVIOUS( ScanRec->NEXT ) = &ScanRec->NEXT; + DREAL_PREVIOUS_L( ScanRec->NEXT ) = &ScanRec->NEXT; } - DREAL_PREVIOUS( ScanRec ) = &DrealFigureRds->LAYERTAB[ RDS_ABOX ]; + DREAL_PREVIOUS_L( ScanRec ) = &DrealFigureRds->LAYERTAB[ RDS_ABOX ]; rdsend(); return( ScanRec ); @@ -406,7 +406,7 @@ void DrealDelRectangle( DelRec ) if ( DelRec->NEXT != (rdsrec_list *)0 ) { - DREAL_PREVIOUS( DelRec->NEXT ) = DREAL_PREVIOUS( DelRec ); + DREAL_PREVIOUS_L( DelRec->NEXT ) = DREAL_PREVIOUS( DelRec ); } DrealEraseRectangle( DelRec ); @@ -471,7 +471,7 @@ void DrealFlattenFigure() while ( ScanRec != (rdsrec_list *)NULL ) { - DREAL_PREVIOUS( ScanRec ) = Previous; + DREAL_PREVIOUS_L( ScanRec ) = Previous; Previous = &ScanRec->NEXT; DrealInsertRectangle( ScanRec ); @@ -484,7 +484,7 @@ void DrealFlattenFigure() if ( ScanRec->NEXT != (rdsrec_list *)NULL ) { - DREAL_PREVIOUS( ScanRec->NEXT ) = &ScanRec->NEXT; + DREAL_PREVIOUS_L( ScanRec->NEXT ) = &ScanRec->NEXT; } break; diff --git a/alliance/src/fvh/src/fvhfbh2fsm.c b/alliance/src/fvh/src/fvhfbh2fsm.c index 159a77cb..e59cd037 100644 --- a/alliance/src/fvh/src/fvhfbh2fsm.c +++ b/alliance/src/fvh/src/fvhfbh2fsm.c @@ -1874,7 +1874,7 @@ void FvhFbhPostTreat( FsmFigure ) if ( ABL_CDDR( Equation ) == (ablexpr *)0 ) { StarChain = ABL_CADR( Equation ); - ABL_CADR( Equation ) = (ablexpr *)0; + ABL_CADR_L( Equation ) = (ablexpr *)0; freeablexpr( Equation ); Equation = StarChain; } diff --git a/alliance/src/growstk/src/growstk.c b/alliance/src/growstk/src/growstk.c index a5a7298d..914276d3 100644 --- a/alliance/src/growstk/src/growstk.c +++ b/alliance/src/growstk/src/growstk.c @@ -346,7 +346,8 @@ int main (int ac, char *av[]) } } } - in_touch : +in_touch : + ; // xtof to avoid an error with gcc4 } } } diff --git a/alliance/src/log/src/log_bdd0.c b/alliance/src/log/src/log_bdd0.c index f8263551..cf6fc95a 100644 --- a/alliance/src/log/src/log_bdd0.c +++ b/alliance/src/log/src/log_bdd0.c @@ -30,13 +30,14 @@ -#ident "$Id: log_bdd0.c,v 1.4 2005/04/15 08:38:49 alliance Exp $" +#ident "$Id: log_bdd0.c,v 1.5 2006/03/29 17:10:13 xtof Exp $" /****************************************************************************/ /* Produit : librairie BDD - Gestion de BDD */ /****************************************************************************/ #include +#include #include "mut.h" #include "log.h" diff --git a/alliance/src/log/src/log_thashbdd.c b/alliance/src/log/src/log_thashbdd.c index d80bb1f2..a21f66d6 100644 --- a/alliance/src/log/src/log_thashbdd.c +++ b/alliance/src/log/src/log_thashbdd.c @@ -30,13 +30,13 @@ -#ident "$Id: log_thashbdd.c,v 1.2 2002/09/30 16:20:43 czo Exp $" +#ident "$Id: log_thashbdd.c,v 1.3 2006/03/29 17:10:13 xtof Exp $" /*-------------------------------------------------------------------------- la table de hachage des BDD la version du 10.12.90 -------------------------------------------------------------------------- */ - +#include #include "mut.h" #include "log.h" diff --git a/alliance/src/loon/src/Makefile.am b/alliance/src/loon/src/Makefile.am index b57b4016..c87cd3bf 100644 --- a/alliance/src/loon/src/Makefile.am +++ b/alliance/src/loon/src/Makefile.am @@ -2,12 +2,13 @@ bin_PROGRAMS = loon -AM_CFLAGS = @ALLIANCE_CFLAGS@ -I$(top_srcdir)/abe/src \ +AM_CFLAGS = -I$(top_srcdir)/abe/src \ -I$(top_srcdir)/abl/src \ -I$(top_srcdir)/aut/src \ -I$(top_srcdir)/abv/src \ -I$(top_srcdir)/bdd/src \ --I$(top_srcdir)/mbk/src +-I$(top_srcdir)/mbk/src \ +@ALLIANCE_CFLAGS@ loon_LDADD = @ALLIANCE_LIBS@ \ -L$(top_srcdir)/abe/src \ diff --git a/alliance/src/loon/src/lon_lib_format.c b/alliance/src/loon/src/lon_lib_format.c index cefb7110..14c917d8 100644 --- a/alliance/src/loon/src/lon_lib_format.c +++ b/alliance/src/loon/src/lon_lib_format.c @@ -152,7 +152,7 @@ static chain_list* format_subst_abl( chain_list* abl, beaux_list *BeauxSubst ) } for (chain=ABL_CDR(abl); chain; chain=ABL_CDR(chain)) { - ABL_CAR(chain) = format_subst_abl( ABL_CAR( chain ), BeauxSubst ); + ABL_CAR_L(chain) = format_subst_abl( ABL_CAR( chain ), BeauxSubst ); } return abl; diff --git a/alliance/src/loon/src/lon_lib_negativ.c b/alliance/src/loon/src/lon_lib_negativ.c index 1bbdaa66..e0eec33c 100644 --- a/alliance/src/loon/src/lon_lib_negativ.c +++ b/alliance/src/loon/src/lon_lib_negativ.c @@ -46,10 +46,10 @@ extern chain_list* inv_oper(chain_list* abl, int negativ) if (ABL_ATOM(abl)) { if (ABL_ATOM_VALUE(abl)==getablatomzero()) { - if (negativ) ABL_ATOM_VALUE(abl)=getablatomone(); + if (negativ) ABL_CAR_L(abl)=getablatomone(); } else if (ABL_ATOM_VALUE(abl)==getablatomone()) { - if (negativ) ABL_ATOM_VALUE(abl)=getablatomzero(); + if (negativ) ABL_CAR_L(abl)=getablatomzero(); } else { if (negativ) { @@ -61,30 +61,30 @@ extern chain_list* inv_oper(chain_list* abl, int negativ) switch (ABL_OPER(abl)) { case ABL_AND: - if (negativ) ABL_OPER(abl)=ABL_NAND; - else ABL_OPER(abl)=ABL_NOR; + if (negativ) ABL_OPER_L(abl)=ABL_NAND; + else ABL_OPER_L(abl)=ABL_NOR; negativ=!negativ; break; case ABL_NAND: - if (negativ) ABL_OPER(abl)=ABL_NOR; - else ABL_OPER(abl)=ABL_NAND; + if (negativ) ABL_OPER_L(abl)=ABL_NOR; + else ABL_OPER_L(abl)=ABL_NAND; break; case ABL_OR: - if (negativ) ABL_OPER(abl)=ABL_NOR; - else ABL_OPER(abl)=ABL_NAND; + if (negativ) ABL_OPER_L(abl)=ABL_NOR; + else ABL_OPER_L(abl)=ABL_NAND; negativ=!negativ; break; case ABL_NOR: - if (negativ) ABL_OPER(abl)=ABL_NAND; - else ABL_OPER(abl)=ABL_NOR; + if (negativ) ABL_OPER_L(abl)=ABL_NAND; + else ABL_OPER_L(abl)=ABL_NOR; break; case ABL_XOR: - if (negativ) ABL_OPER(abl)=ABL_NXOR; + if (negativ) ABL_OPER_L(abl)=ABL_NXOR; negativ=0; /*nothing to do: same size XOR and NXOR*/ break; case ABL_NXOR: - if (negativ) ABL_OPER(abl)=ABL_XOR; + if (negativ) ABL_OPER_L(abl)=ABL_XOR; negativ=0; /*nothing to do*/ break; @@ -99,7 +99,7 @@ extern chain_list* inv_oper(chain_list* abl, int negativ) } for (chain=ABL_CDR(abl); chain; chain=ABL_CDR(chain)) { - ABL_CAR(chain)=inv_oper(ABL_CAR(chain),negativ); + ABL_CAR_L(chain)=inv_oper(ABL_CAR(chain),negativ); } return abl; @@ -131,7 +131,7 @@ extern chain_list* build_negativ(chain_list* abl) } for (chain=ABL_CDR(abl); chain; chain=ABL_CDR(chain)) { - ABL_CAR(chain)=build_negativ(ABL_CAR(chain)); + ABL_CAR_L(chain)=build_negativ(ABL_CAR(chain)); } for (chain=ABL_CDR(abl); chain; chain=ABL_CDR(chain)) { @@ -166,23 +166,23 @@ extern chain_list* build_negativ(chain_list* abl) if (ABL_ATOM(leaf)) { /*constant undifferent*/ if (ABL_ATOM_VALUE(leaf)==getablatomzero()) - ABL_ATOM_VALUE(leaf)=getablatomone(); + ABL_CAR_L(leaf)=getablatomone(); else if (ABL_ATOM_VALUE(leaf)==getablatomone()) - ABL_ATOM_VALUE(leaf)=getablatomzero(); + ABL_CAR_L(leaf)=getablatomzero(); else { - ABL_CAR(chain)=createablnotexpr(ABL_CAR(chain)); + ABL_CAR_L(chain)=createablnotexpr(ABL_CAR(chain)); } continue; } switch (ABL_OPER(leaf)) { - case ABL_AND: ABL_OPER(leaf)=ABL_NAND; break; - case ABL_OR: ABL_OPER(leaf)=ABL_NOR; break; - case ABL_NAND: ABL_OPER(leaf)=ABL_AND; break; - case ABL_NOR: ABL_OPER(leaf)=ABL_OR; break; - case ABL_XOR: ABL_OPER(leaf)=ABL_NXOR; break; - case ABL_NXOR: ABL_OPER(leaf)=ABL_XOR; break; + case ABL_AND: ABL_OPER_L(leaf)=ABL_NAND; break; + case ABL_OR: ABL_OPER_L(leaf)=ABL_NOR; break; + case ABL_NAND: ABL_OPER_L(leaf)=ABL_AND; break; + case ABL_NOR: ABL_OPER_L(leaf)=ABL_OR; break; + case ABL_XOR: ABL_OPER_L(leaf)=ABL_NXOR; break; + case ABL_NXOR: ABL_OPER_L(leaf)=ABL_XOR; break; case ABL_NOT: - ABL_CAR(chain)=ABL_CADR(leaf); + ABL_CAR_L(chain)=ABL_CADR(leaf); freechain(leaf); break; default: @@ -192,12 +192,12 @@ extern chain_list* build_negativ(chain_list* abl) } switch (ABL_OPER(abl)) { - case ABL_AND: ABL_OPER(abl)=ABL_NOR; break; - case ABL_OR: ABL_OPER(abl)=ABL_NAND; break; - case ABL_NAND: ABL_OPER(abl)=ABL_OR; break; - case ABL_NOR: ABL_OPER(abl)=ABL_AND; break; - case ABL_XOR: ABL_OPER(abl)=ABL_NXOR; break; - case ABL_NXOR: ABL_OPER(abl)=ABL_XOR; break; + case ABL_AND: ABL_OPER_L(abl)=ABL_NOR; break; + case ABL_OR: ABL_OPER_L(abl)=ABL_NAND; break; + case ABL_NAND: ABL_OPER_L(abl)=ABL_OR; break; + case ABL_NOR: ABL_OPER_L(abl)=ABL_AND; break; + case ABL_XOR: ABL_OPER_L(abl)=ABL_NXOR; break; + case ABL_NXOR: ABL_OPER_L(abl)=ABL_XOR; break; case ABL_NOT: chain=abl; abl=ABL_CADR(abl); diff --git a/alliance/src/loon/src/lon_main.c b/alliance/src/loon/src/lon_main.c index 329d543f..e5172cf7 100644 --- a/alliance/src/loon/src/lon_main.c +++ b/alliance/src/loon/src/lon_main.c @@ -30,6 +30,7 @@ #include #include +#include #include #include #include diff --git a/alliance/src/loon/src/lon_normalize_DAG.c b/alliance/src/loon/src/lon_normalize_DAG.c index 50975d3d..15b2f6d2 100644 --- a/alliance/src/loon/src/lon_normalize_DAG.c +++ b/alliance/src/loon/src/lon_normalize_DAG.c @@ -39,7 +39,9 @@ #define USING(node) {(int)node=-mark;} +#define USING_L(node) {node=-mark;} #define USED(node) {(int)node=(int)((((int)node<0)?0:(int)node)+1);} +#define USED_L(node) {node=(int)((((int)node<0)?0:(int)node)+1);} #define IS_USING(node) ((int)node==-mark) #define IS_USED(node) ((int)node!=0) #define IS_UNUSED(node) ((int)node==0) @@ -123,7 +125,7 @@ static chain_list* inter_equi(equi_list *equi, chain_list *abl) head=abl; for (abl=ABL_CDR(head); abl; abl=ABL_CDR(abl)) { - ABL_CAR(abl)=inter_equi(equi,ABL_CAR(abl)); + ABL_CAR_L(abl)=inter_equi(equi,ABL_CAR(abl)); } return head; @@ -152,7 +154,7 @@ static chain_list* replace_equi(chain_list* abl) head=abl; for (abl=ABL_CDR(head); abl; abl=ABL_CDR(abl)) { - ABL_CAR(abl)=replace_equi(ABL_CAR(abl)); + ABL_CAR_L(abl)=replace_equi(ABL_CAR(abl)); } return head; @@ -353,10 +355,10 @@ static int abl_dispatching(chain_list *abl, int mark) return 0; } if (IS_USED(beaux->NODE)) { - USED(beaux->NODE); + USED_L(beaux->NODE); return 1; } - USING(beaux->NODE); + USING_L(beaux->NODE); if (!abl_dispatching(beaux->ABL, mark)) { if (!CYCLE) return 0; /*for display*/ if (CYCLE==beaux->NAME) { @@ -366,7 +368,7 @@ static int abl_dispatching(chain_list *abl, int mark) else fprintf(stderr,"%s, ",beaux->NAME); return 0; } - USED(beaux->NODE); + USED_L(beaux->NODE); return 1; } } @@ -380,10 +382,10 @@ static int abl_dispatching(chain_list *abl, int mark) return 0; } if (IS_USED(bebux->BINODE)) { - USED(bebux->BINODE); + USED_L(bebux->BINODE); return 1; } - USING(bebux->BINODE); + USING_L(bebux->BINODE); for (biabl=bebux->BIABL; biabl; biabl=biabl->NEXT) { if (!abl_dispatching(biabl->CNDABL, mark) || !abl_dispatching(biabl->VALABL, mark)) { @@ -396,7 +398,7 @@ static int abl_dispatching(chain_list *abl, int mark) return 0; } } - USED(bebux->BINODE); + USED_L(bebux->BINODE); return 1; } } @@ -410,11 +412,11 @@ static int abl_dispatching(chain_list *abl, int mark) return 0; } if (IS_USED(bereg->BINODE)) { - USED(bereg->BINODE); + USED_L(bereg->BINODE); return 1; } /*cycle forbidden on clock*/ - USING(bereg->BINODE); + USING_L(bereg->BINODE); for (biabl=bereg->BIABL; biabl; biabl=biabl->NEXT) { ptype=getptype(biabl->USER,ABL_STABLE); /*search if flip-flop*/ /*cycle not forbidden on value for flip-flop */ @@ -431,7 +433,7 @@ static int abl_dispatching(chain_list *abl, int mark) return 0; } } - USED(bereg->BINODE); + USED_L(bereg->BINODE); /*impossible to look after value now, probably cycled on a signal*/ /*wait the end of recursion*/ return 1; @@ -501,7 +503,7 @@ static int mark_output() /*create new internal signals and mark the path from output to input*/ for (beout=befig->BEOUT; beout; beout=beout->NEXT) { - USING(beout->NODE); + USING_L(beout->NODE); if (!abl_dispatching(beout->ABL, mark)) { if (!CYCLE) return 0; /*for display*/ if (CYCLE==beout->NAME) { @@ -511,11 +513,11 @@ static int mark_output() else fprintf(stderr,"%s, ",beout->NAME); return 0; } - USED(beout->NODE); + USED_L(beout->NODE); } for (bebus=befig->BEBUS; bebus; bebus=bebus->NEXT) { - USING(bebus->BINODE); + USING_L(bebus->BINODE); for (biabl=bebus->BIABL; biabl; biabl=biabl->NEXT) { if (!abl_dispatching(biabl->CNDABL, mark) || !abl_dispatching(biabl->VALABL, mark)) { @@ -528,7 +530,7 @@ static int mark_output() return 0; } } - USED(bebus->BINODE); + USED_L(bebus->BINODE); } return 1; /*ok*/ diff --git a/alliance/src/loon/src/lon_normalize_simplify.c b/alliance/src/loon/src/lon_normalize_simplify.c index f901fafd..5b4f2691 100644 --- a/alliance/src/loon/src/lon_normalize_simplify.c +++ b/alliance/src/loon/src/lon_normalize_simplify.c @@ -48,7 +48,7 @@ static chain_list* unflatnegexpr(chain_list* abl) if (ABL_ATOM(abl)) return abl; for (chain=ABL_CDR(abl); chain; chain=ABL_CDR(chain)) { - ABL_CAR(chain)=unflatnegexpr(ABL_CAR(chain)); + ABL_CAR_L(chain)=unflatnegexpr(ABL_CAR(chain)); count++; } @@ -57,13 +57,13 @@ static chain_list* unflatnegexpr(chain_list* abl) switch(ABL_OPER(abl)) { case ABL_NAND: - ABL_OPER(abl)=ABL_AND; + ABL_OPER_L(abl)=ABL_AND; return createablnotexpr(abl); case ABL_NOR: - ABL_OPER(abl)=ABL_OR; + ABL_OPER_L(abl)=ABL_OR; return createablnotexpr(abl); case ABL_NXOR: - ABL_OPER(abl)=ABL_XOR; + ABL_OPER_L(abl)=ABL_XOR; return createablnotexpr(abl); default: return abl; } diff --git a/alliance/src/lynx/src/netlist.c b/alliance/src/lynx/src/netlist.c index 05c48f0c..d481fcde 100644 --- a/alliance/src/lynx/src/netlist.c +++ b/alliance/src/lynx/src/netlist.c @@ -484,7 +484,7 @@ Cette liste contient la liste des rectangles connecteurs. */ PtypeRec = getptype( LogicalConnector->USER, RDSLOCON1 ); - (chain_list*)( PtypeRec->DATA) = append( (chain_list*)(PtypeRec->DATA), RecConnector ); + PtypeRec->DATA = append( (chain_list*)(PtypeRec->DATA), RecConnector ); RecConnector = NULL; if( Rcnet == 'c' || Rcnet == 'r' ) @@ -493,7 +493,7 @@ Cette liste contient la liste des rectangles connecteurs. */ } PrevFEQUI = getptype( Signal->USER, RCN_FEQUI ); - ((chain_list*)(PrevFEQUI->DATA)) = addchain( ((chain_list*)(PrevFEQUI->DATA)), FirstEqui ); + PrevFEQUI->DATA = addchain( ((chain_list*)(PrevFEQUI->DATA)), FirstEqui ); } else diff --git a/alliance/src/mbk/src/rcn_lo.c b/alliance/src/mbk/src/rcn_lo.c index 10632732..781dc356 100644 --- a/alliance/src/mbk/src/rcn_lo.c +++ b/alliance/src/mbk/src/rcn_lo.c @@ -21,7 +21,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ident "$Id: rcn_lo.c,v 1.3 2003/04/03 14:46:30 xtof Exp $" +#ident "$Id: rcn_lo.c,v 1.4 2006/03/29 17:10:33 xtof Exp $" /******************************************************************************* * rcn : acces functions to logical rc network structures * @@ -1495,11 +1495,11 @@ loctc_list* heaploctc() ptctc=HEAD_CTC_FREE; for(i=1;iSIG1) = ptctc+1; + ptctc->SIG1 = ptctc+1; ptctc->NODE1 = -1000; ptctc++; } - (loctc_list*)(ptctc->SIG1) = NULL; + ptctc->SIG1 = NULL; ptctc->NODE1 = -1000; } @@ -1811,8 +1811,7 @@ losig_list *ptsig; if( RCN_GETFLAG( ptnode->FLAG, RCN_FLAG_LOCON ) ) { ptlocon = getptype(ptnode->USER, RCN_LOCON ); - (chain_list*)(ptlocon->DATA)= - addchain((chain_list*)(ptlocon->DATA),ptcon); + ptlocon->DATA=addchain((chain_list*)(ptlocon->DATA),ptcon); } else { diff --git a/alliance/src/mbkedif/src/parser_y.y b/alliance/src/mbkedif/src/parser_y.y index 66d7bd5b..a31bdbf2 100644 --- a/alliance/src/mbkedif/src/parser_y.y +++ b/alliance/src/mbkedif/src/parser_y.y @@ -12,6 +12,7 @@ #include #include +#include #include /*---------------------------------------------------------\ diff --git a/alliance/src/mbkedif/src/time.c b/alliance/src/mbkedif/src/time.c index d36a3028..f9e48c94 100644 --- a/alliance/src/mbkedif/src/time.c +++ b/alliance/src/mbkedif/src/time.c @@ -24,6 +24,15 @@ /* * gives time the format edif wants * $Log: time.c,v $ + * Revision 1.4 2006/03/29 17:10:36 xtof + * * gcc4 compatible : no cast like (Foo*)bar=foo; use bar=(Bar*)foo; + * + * * ALLIANCE_CFLAGS not added anymore to CFLAGS or CXXFLAGS + * by alliance.m4 -> must be added explicitely in each + * Makefile.am + * + * * remove configure.in (generated by autostuff) + * * Revision 1.3 2002/09/30 16:20:54 czo * support/users * @@ -34,6 +43,8 @@ */ #include +#include +#include #include char *EdifTime() diff --git a/alliance/src/mbkspice/src/spi_parse.c b/alliance/src/mbkspice/src/spi_parse.c index 1dec13f8..c81557f5 100644 --- a/alliance/src/mbkspice/src/spi_parse.c +++ b/alliance/src/mbkspice/src/spi_parse.c @@ -21,7 +21,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ident "$Author: alliance $ $Date: 2005/04/15 08:38:50 $ $Revision: 1.4 $" +#ident "$Author: xtof $ $Date: 2006/03/29 17:10:37 $ $Revision: 1.5 $" /******************************************************************************* * * @@ -173,8 +173,8 @@ char mode; if( SPI_VERBOSE ) { printf( "Parser Spice compile le %s a %s\n", __DATE__, __TIME__ ); - printf( "Revision : %s\n", "$Revision: 1.4 $" ); - printf( "Date : %s\n", "$Date: 2005/04/15 08:38:50 $" ); + printf( "Revision : %s\n", "$Revision: 1.5 $" ); + printf( "Date : %s\n", "$Date: 2006/03/29 17:10:37 $" ); printf( "Separateur : '%c'\n", SPI_SEPAR ); printf( "Nom de noeud : %s\n", SPI_NETNAME ); @@ -1974,11 +1974,9 @@ char mode; ptnodename = getptype( scanlocon->USER, PNODENAME ); if( ptnoeud->NOM ) - ((chain_list*)(ptnodename->DATA)) = - addchain( ((chain_list*)(ptnodename->DATA)), namealloc( ptnoeud->NOM ) ); + ptnodename->DATA = addchain( ((chain_list*)(ptnodename->DATA)), namealloc( ptnoeud->NOM ) ); else - ((chain_list*)(ptnodename->DATA)) = - addchain( ((chain_list*)(ptnodename->DATA)), NULL ); + ptnodename->DATA = addchain( ((chain_list*)(ptnodename->DATA)), NULL ); } } @@ -1991,15 +1989,14 @@ char mode; for( scanlocon = ptfig->LOCON ; scanlocon ; scanlocon = scanlocon->NEXT ) { - (chain_list*)scanlocon->PNODE = reverse( (chain_list*)scanlocon->PNODE ); + scanlocon->PNODE = reverse( (chain_list*)scanlocon->PNODE ); ptnodename = getptype( scanlocon->USER, PNODENAME ); for( sc1 = (chain_list*)( ptnodename->DATA ) ; sc1 ; sc1 = sc1->NEXT ) if( sc1->DATA ) break; if( sc1 ) - ((chain_list*)(ptnodename->DATA)) = - reverse( ((chain_list*)(ptnodename->DATA)) ); + ptnodename->DATA = reverse( ((chain_list*)(ptnodename->DATA)) ); else { freechain( (chain_list*)ptnodename->DATA ); @@ -2007,7 +2004,7 @@ char mode; } } - (chain_list*)ptfig->LOCON = reverse( (chain_list*)ptfig->LOCON ); + ptfig->LOCON = reverse( (chain_list*)ptfig->LOCON ); /* On cree les transistors */ @@ -2194,8 +2191,7 @@ char mode; sc3 = (chain_list*)sc2->DATA; for( ; sc3 ; sc3 = sc3->NEXT ) - ((chain_list*)(ptnodename->DATA)) = addchain( - ((chain_list*)(ptnodename->DATA)), + ptnodename->DATA = addchain(((chain_list*)(ptnodename->DATA)), sc3->DATA ); diff --git a/alliance/src/mbkvhdlg/src/gen_generic.c b/alliance/src/mbkvhdlg/src/gen_generic.c index dd4db290..40bdccb3 100644 --- a/alliance/src/mbkvhdlg/src/gen_generic.c +++ b/alliance/src/mbkvhdlg/src/gen_generic.c @@ -5,8 +5,9 @@ author : D.HOMMAIS content : basic functions for logen structure use */ -#ident "$Id: gen_generic.c,v 1.1 2002/04/26 09:51:07 ludo Exp $" +#ident "$Id: gen_generic.c,v 1.2 2006/03/29 17:10:38 xtof Exp $" #include +#include #include #include "gen_generic.h" diff --git a/alliance/src/mbkvhdlg/src/mvl_drive.c b/alliance/src/mbkvhdlg/src/mvl_drive.c index 88e7a752..98a397f4 100644 --- a/alliance/src/mbkvhdlg/src/mvl_drive.c +++ b/alliance/src/mbkvhdlg/src/mvl_drive.c @@ -7,8 +7,9 @@ /* functions : vhdlsavelofig() */ /* */ /* ###--------------------------------------------------------------### */ -#ident "$Id: mvl_drive.c,v 1.1 2002/04/26 09:51:07 ludo Exp $" +#ident "$Id: mvl_drive.c,v 1.2 2006/03/29 17:10:38 xtof Exp $" #include +#include #include #include #include diff --git a/alliance/src/mbkvhdlg/src/mvl_scomp_y.y b/alliance/src/mbkvhdlg/src/mvl_scomp_y.y index 270c0b87..0db1044f 100644 --- a/alliance/src/mbkvhdlg/src/mvl_scomp_y.y +++ b/alliance/src/mbkvhdlg/src/mvl_scomp_y.y @@ -1143,8 +1143,7 @@ generic_element_association : .generic_choices. generic_expression { - ((logen_list *)MVL_GENLST->DATA) - = duplogen (&MVL_LOGEN, + MVL_GENLST->DATA = duplogen (&MVL_LOGEN, ((logen_list *)MVL_GENLST->DATA), NULL); MVL_LOGEN.TYPE = GENTYPE_EMPTY; } diff --git a/alliance/src/mbkvhdlg/src/vel_o.c b/alliance/src/mbkvhdlg/src/vel_o.c index 31360886..0e1532f0 100644 --- a/alliance/src/mbkvhdlg/src/vel_o.c +++ b/alliance/src/mbkvhdlg/src/vel_o.c @@ -10,8 +10,17 @@ /* ###--------------------------------------------------------------------### */ /* * $Log: vel_o.c,v $ - * Revision 1.1 2002/04/26 09:51:07 ludo - * Initial revision + * Revision 1.2 2006/03/29 17:10:39 xtof + * * gcc4 compatible : no cast like (Foo*)bar=foo; use bar=(Bar*)foo; + * + * * ALLIANCE_CFLAGS not added anymore to CFLAGS or CXXFLAGS + * by alliance.m4 -> must be added explicitely in each + * Makefile.am + * + * * remove configure.in (generated by autostuff) + * + * Revision 1.1.1.1 2002/04/26 09:51:07 ludo + * Mise a plat de mbkvhdlg * * Revision 1.1.1.1 2002/04/11 08:54:53 fred * Importing mbkvhdlg into the new Alliance CVS tree @@ -39,10 +48,11 @@ * */ -#ident "$Id: vel_o.c,v 1.1 2002/04/26 09:51:07 ludo Exp $" +#ident "$Id: vel_o.c,v 1.2 2006/03/29 17:10:39 xtof Exp $" #include +#include #include #include #include diff --git a/alliance/src/mbkvti/src/parse_vti_l.c b/alliance/src/mbkvti/src/parse_vti_l.c index 23d86229..b022ec29 100644 --- a/alliance/src/mbkvti/src/parse_vti_l.c +++ b/alliance/src/mbkvti/src/parse_vti_l.c @@ -41,6 +41,15 @@ * date : 12/06/1998 * * * * $Log: parse_vti_l.c,v $ +* Revision 1.4 2006/03/29 17:10:46 xtof +* * gcc4 compatible : no cast like (Foo*)bar=foo; use bar=(Bar*)foo; +* +* * ALLIANCE_CFLAGS not added anymore to CFLAGS or CXXFLAGS +* by alliance.m4 -> must be added explicitely in each +* Makefile.am +* +* * remove configure.in (generated by autostuff) +* * Revision 1.3 2002/09/30 16:21:00 czo * support/users * @@ -966,7 +975,7 @@ losig_list *sigct1,*sigct2; break; } if( !scan_sigalias ) { - (chain_list*)(scan_head_sigalias->DATA) = addchain( (chain_list*)(scan_head_sigalias->DATA), sig2); + scan_head_sigalias->DATA = addchain( (chain_list*)(scan_head_sigalias->DATA), sig2); } } } @@ -1235,7 +1244,7 @@ int index; scanx->NEXT = headx; scanx->rcn = 0; headx = scanx; - (struct hns_X*)(ptl->DATA) = headx; + ptl->DATA = headx; } return(scanx); @@ -1268,7 +1277,7 @@ loins_list *ptins; scani->ins = ptins; scani->rcn = 0; headi = scani; - (struct hns_I*)(ptl->DATA) = headi; + ptl->DATA = headi; } return(scani); diff --git a/alliance/src/mocha/src/Makefile.am b/alliance/src/mocha/src/Makefile.am index df9e6b4f..5453dd69 100644 --- a/alliance/src/mocha/src/Makefile.am +++ b/alliance/src/mocha/src/Makefile.am @@ -2,7 +2,7 @@ bin_PROGRAMS = moka -AM_CFLAGS = @ALLIANCE_CFLAGS@ -Wall \ +AM_CFLAGS = -Wall \ -I$(top_srcdir)/abe/src \ -I$(top_srcdir)/abl/src \ -I$(top_srcdir)/abv/src \ @@ -15,7 +15,8 @@ AM_CFLAGS = @ALLIANCE_CFLAGS@ -Wall \ -I$(top_srcdir)/ftl/src \ -I$(top_srcdir)/mbk/src \ -I$(top_srcdir)/fvh/src \ --I$(top_srcdir)/vex/src +-I$(top_srcdir)/vex/src \ +@ALLIANCE_CFLAGS@ moka_LDADD = @ALLIANCE_LIBS@ \ -L$(top_srcdir)/abe/src \ diff --git a/alliance/src/mocha/src/mocha_syf.c b/alliance/src/mocha/src/mocha_syf.c index ebcdc8e8..cf7fb0cb 100644 --- a/alliance/src/mocha/src/mocha_syf.c +++ b/alliance/src/mocha/src/mocha_syf.c @@ -639,7 +639,7 @@ static void MochaSyfSynthOut2Abl( FsmFigure ) ** Out(i) = OR Locout(j) -> Out(i) = Locout(j) */ Atom = ABL_CADR( Equation ); - ABL_CADR( Equation ) = (ablexpr *)0; + ABL_CADR_L( Equation ) = (ablexpr *)0; freeablexpr( Equation ); ScanMochaSyfOut->ABL = Atom; } @@ -757,7 +757,7 @@ static void MochaSyfSynthReg2Abl( FsmFigure ) ** Reg(i) = OR E(j) -> Reg(i) = E(j) */ Atom = ABL_CADR( Equation ); - ABL_CADR( Equation ) = (ablexpr *)0; + ABL_CADR_L( Equation ) = (ablexpr *)0; freeablexpr( Equation ); RegArray[ Index ].ABL = Atom; } @@ -813,7 +813,7 @@ static void MochaSyfSynthReg2Abl( FsmFigure ) if ( ABL_CDDR( Equation ) == (ablexpr *)0 ) { Atom = ABL_CADR( Equation ); - ABL_CADR( Equation ) = (ablexpr *)0; + ABL_CADR_L( Equation ) = (ablexpr *)0; freeablexpr( Equation ); RegArray[ Index ].ABL_SET = Atom; } @@ -829,7 +829,7 @@ static void MochaSyfSynthReg2Abl( FsmFigure ) if ( ABL_CDDR( Equation ) == (ablexpr *)0 ) { Atom = ABL_CADR( Equation ); - ABL_CADR( Equation ) = (ablexpr *)0; + ABL_CADR_L( Equation ) = (ablexpr *)0; freeablexpr( Equation ); RegArray[ Index ].ABL_RESET = Atom; } @@ -1579,7 +1579,7 @@ void MochaSyfFreeFsm( FsmFigure ) ScanOut != (fsmout_list *)0; ScanOut = ScanOut->NEXT ) { - MOCHA_SYF_OUT( ScanOut ) = NULL; + MOCHA_SYF_OUT_L( ScanOut ) = NULL; } for ( ScanState = ScanFigure->STATE; @@ -1588,7 +1588,7 @@ void MochaSyfFreeFsm( FsmFigure ) { ScanMochaSyfState = MOCHA_SYF_STATE( ScanState ); autfreeblock( (void *)ScanMochaSyfState ); - MOCHA_SYF_STATE( ScanState ) = NULL; + MOCHA_SYF_STATE_L( ScanState ) = NULL; } autfreeblock( ScanMochaSyfInfo->REG_ARRAY ); @@ -1596,7 +1596,7 @@ void MochaSyfFreeFsm( FsmFigure ) autfreeblock( ScanMochaSyfInfo->CODE_ARRAY ); autfreeblock( ScanMochaSyfInfo ); - MOCHA_SYF_INFO( ScanFigure ) = NULL; + MOCHA_SYF_INFO_L( ScanFigure ) = NULL; if ( IsFsmFigMulti( FsmFigure ) ) { diff --git a/alliance/src/mocha/src/mocha_syf.h b/alliance/src/mocha/src/mocha_syf.h index 7e2c8e05..588ce287 100644 --- a/alliance/src/mocha/src/mocha_syf.h +++ b/alliance/src/mocha/src/mocha_syf.h @@ -52,9 +52,12 @@ | | \------------------------------------------------------------*/ -# define MOCHA_SYF_INFO( Figure ) ( (mochasyfinfo *)( ( Figure )->USER ) ) -# define MOCHA_SYF_STATE( State ) ( (mochasyfstate *)( ( State )->USER ) ) -# define MOCHA_SYF_OUT( Out ) ( (mochasyfout *)( ( Out )->USER ) ) +# define MOCHA_SYF_INFO( Figure ) ( (mochasyfinfo *)( ( Figure )->USER ) ) +# define MOCHA_SYF_INFO_L( Figure ) ( ( Figure )->USER ) +# define MOCHA_SYF_STATE( State ) ( (mochasyfstate *)( ( State )->USER ) ) +# define MOCHA_SYF_STATE_L( State ) ( ( State )->USER ) +# define MOCHA_SYF_OUT( Out ) ( (mochasyfout *)( ( Out )->USER ) ) +# define MOCHA_SYF_OUT_L( Out ) ( ( Out )->USER ) /*------------------------------------------------------------\ | | diff --git a/alliance/src/nero/src/pdv.c b/alliance/src/nero/src/pdv.c index fe58ea7a..3d8df8aa 100644 --- a/alliance/src/nero/src/pdv.c +++ b/alliance/src/nero/src/pdv.c @@ -10,6 +10,7 @@ # include # include # include +# include # define _ALU2_ 0 diff --git a/alliance/src/ocr/src/rout/findNPointsPath.c b/alliance/src/ocr/src/rout/findNPointsPath.c index a6cbd916..59d8023a 100644 --- a/alliance/src/ocr/src/rout/findNPointsPath.c +++ b/alliance/src/ocr/src/rout/findNPointsPath.c @@ -1,8 +1,17 @@ /* ### -------------------------------------------------- ### - $Author: hcl $ - $Date: 2002/06/27 09:09:01 $ + $Author: xtof $ + $Date: 2006/03/29 17:10:51 $ $Log: findNPointsPath.c,v $ + Revision 1.6 2006/03/29 17:10:51 xtof + * gcc4 compatible : no cast like (Foo*)bar=foo; use bar=(Bar*)foo; + + * ALLIANCE_CFLAGS not added anymore to CFLAGS or CXXFLAGS + by alliance.m4 -> must be added explicitely in each + Makefile.am + + * remove configure.in (generated by autostuff) + Revision 1.5 2002/06/27 09:09:01 hcl Code d'erreur si tous les signaux ne sont pas routés. @@ -95,7 +104,7 @@ #include "ocrAstar.h" static char *res_id = - "$Id: findNPointsPath.c,v 1.5 2002/06/27 09:09:01 hcl Exp $"; + "$Id: findNPointsPath.c,v 1.6 2006/03/29 17:10:51 xtof Exp $"; #define MAX_HT 500 @@ -557,7 +566,7 @@ makeExtEquipotentielle(ocrRoutingParameters * i_pParam, l_pVirCon = createVirtualConnector(i, 0, 0, 0, SOUTH); if (isFreePoint(i_pCon, i_pGrid, l_pVirCon)) { - (ocrVirtualConnector *) l_pVirCon->NEXT = l_pVirConList; + l_pVirCon->NEXT = l_pVirConList; l_pVirConList = l_pVirCon; } // FIXME : pas de free ??? @@ -587,7 +596,7 @@ makeExtEquipotentielle(ocrRoutingParameters * i_pParam, 0, 0, NORTH); if (isFreePoint(i_pCon, i_pGrid, l_pVirCon)) { - (ocrVirtualConnector *) l_pVirCon->NEXT = l_pVirConList; + l_pVirCon->NEXT = l_pVirConList; l_pVirConList = l_pVirCon; } } @@ -609,7 +618,7 @@ makeExtEquipotentielle(ocrRoutingParameters * i_pParam, l_pVirCon = createVirtualConnector((i_pGrid->SIZE_H - 1), i, 0, 0, EAST); if (isFreePoint(i_pCon, i_pGrid, l_pVirCon)) { - (ocrVirtualConnector *) l_pVirCon->NEXT = l_pVirConList; + l_pVirCon->NEXT = l_pVirConList; l_pVirConList = l_pVirCon; } } @@ -630,7 +639,7 @@ makeExtEquipotentielle(ocrRoutingParameters * i_pParam, for (i = l_uOffset; i < i_pGrid->SIZE_V - l_uOffset; i += l_uDelta) { l_pVirCon = createVirtualConnector(0, i, 0, 0, WEST); if (isFreePoint(i_pCon, i_pGrid, l_pVirCon)) { - (ocrVirtualConnector *) l_pVirCon->NEXT = l_pVirConList; + l_pVirCon->NEXT = l_pVirConList; l_pVirConList = l_pVirCon; } } diff --git a/alliance/src/ocr/src/rout/ocrRouter.c b/alliance/src/ocr/src/rout/ocrRouter.c index 31c18fac..c94c0af2 100644 --- a/alliance/src/ocr/src/rout/ocrRouter.c +++ b/alliance/src/ocr/src/rout/ocrRouter.c @@ -1,8 +1,17 @@ /* ### -------------------------------------------------- ### - $Author: ludo $ - $Date: 2004/05/23 09:50:42 $ + $Author: xtof $ + $Date: 2006/03/29 17:10:51 $ $Log: ocrRouter.c,v $ + Revision 1.9 2006/03/29 17:10:51 xtof + * gcc4 compatible : no cast like (Foo*)bar=foo; use bar=(Bar*)foo; + + * ALLIANCE_CFLAGS not added anymore to CFLAGS or CXXFLAGS + by alliance.m4 -> must be added explicitely in each + Makefile.am + + * remove configure.in (generated by autostuff) + Revision 1.8 2004/05/23 09:50:42 ludo - Bug fix: Segmentation fault when the input netlist has unconnected signals Those unused nets are now removed from the input lofig after the flatten. @@ -257,6 +266,90 @@ void noCritVC(ocrRoutingDataBase * i_pDataBase) return; } +/* On rippe plus de signaux */ +void +ripUp2(ocrRoutingDataBase * i_pDataBase, + ocrRoutingParameters * i_pParam, ocrSignal * i_pSignal) +{ + ocrConnector *l_pCon; + ocrVirtualConnector *l_pVirCon; + ocrSignal *l_pSignal; + + for (l_pCon = i_pSignal->CON_LIST; l_pCon; l_pCon = l_pCon->NEXT) { + // parcours des connecteurs virtuels + for (l_pVirCon = l_pCon->VIR_CON_LIST; + l_pVirCon; + l_pVirCon = (ocrVirtualConnector *) l_pVirCon->NEXT) { + //printf ("(%ld,%ld,%ld)\n", l_pVirCon->X, l_pVirCon->Y, l_pVirCon->Z); + // altitude du connecteur + if (l_pVirCon->Z == 0) { + // on déroute sur les 2 niveaux au dessus (ALU2 et ALU3) + + // ALU2 + l_pSignal = findSignal(i_pDataBase, + getWSegmentCV(i_pDataBase->GRID, + l_pVirCon)-> + SIGNAL_INDEX); + if (l_pSignal) + if ( (l_pSignal != i_pSignal) && (!(l_pSignal->HARD)) ) { + // ajoute le signal dans la liste à re-router. + i_pDataBase->RIPUP = addchain(i_pDataBase->RIPUP, + (void *) l_pSignal); + + + //fprintf (stdout, "RIPUP : Suppression du signal (ALU2) %ld \n", l_pSignal->INDEX); + deleteEquipotentielle(i_pParam, i_pDataBase->GRID, + l_pSignal); + l_pSignal->SEGMENT = NULL; + l_pSignal->ROUTED = 0; + i_pDataBase->NB_ROUTED--; + unMarkSegmentAsFree(i_pDataBase, l_pSignal, l_pSignal->INDEX); // XXX + } + // ALU3 + l_pSignal = findSignal(i_pDataBase, + getWSegment(i_pDataBase->GRID, + l_pVirCon->X, + l_pVirCon->Y, + l_pVirCon->Z + + 1)->SIGNAL_INDEX); + if (l_pSignal) + if (l_pSignal != i_pSignal) { + // ajoute le signal dans la liste à re-router. + i_pDataBase->RIPUP = addchain(i_pDataBase->RIPUP, + (void *) l_pSignal); + + + //fprintf (stdout, "RIPUP : Suppression du signal (ALU3) %ld \n", l_pSignal->INDEX); + deleteEquipotentielle(i_pParam, i_pDataBase->GRID, + l_pSignal); + l_pSignal->SEGMENT = NULL; + l_pSignal->ROUTED = 0; + i_pDataBase->NB_ROUTED--; + unMarkSegmentAsFree(i_pDataBase, l_pSignal, l_pSignal->INDEX); // XXX + } + + + } else { + // altitude du connecteur > 0 + // premiere version : on ne fait rien. + // + // future version : + // on déroute immédiatement au dessus si possible + // et sur chaque côté en suivant la direction du plan. + } + + } + // supression du signal lui meme + } + //fprintf (stdout, "RIPUP : Suppression du signal %ld \n", i_pSignal->INDEX); + deleteEquipotentielle(i_pParam, i_pDataBase->GRID, i_pSignal); + unMarkSegmentAsFree(i_pDataBase, i_pSignal, i_pSignal->INDEX); // XXX + i_pSignal->SEGMENT = NULL; + i_pSignal->ROUTED = 0; + countFreeVC(i_pDataBase); +} + + /** * route les signaux dans l'ordre : @@ -444,89 +537,6 @@ ripUp(ocrRoutingDataBase * i_pDataBase, } -/* On rippe plus de signaux */ -void -ripUp2(ocrRoutingDataBase * i_pDataBase, - ocrRoutingParameters * i_pParam, ocrSignal * i_pSignal) -{ - ocrConnector *l_pCon; - ocrVirtualConnector *l_pVirCon; - ocrSignal *l_pSignal; - - for (l_pCon = i_pSignal->CON_LIST; l_pCon; l_pCon = l_pCon->NEXT) { - // parcours des connecteurs virtuels - for (l_pVirCon = l_pCon->VIR_CON_LIST; - l_pVirCon; - l_pVirCon = (ocrVirtualConnector *) l_pVirCon->NEXT) { - //printf ("(%ld,%ld,%ld)\n", l_pVirCon->X, l_pVirCon->Y, l_pVirCon->Z); - // altitude du connecteur - if (l_pVirCon->Z == 0) { - // on déroute sur les 2 niveaux au dessus (ALU2 et ALU3) - - // ALU2 - l_pSignal = findSignal(i_pDataBase, - getWSegmentCV(i_pDataBase->GRID, - l_pVirCon)-> - SIGNAL_INDEX); - if (l_pSignal) - if ( (l_pSignal != i_pSignal) && (!(l_pSignal->HARD)) ) { - // ajoute le signal dans la liste à re-router. - i_pDataBase->RIPUP = addchain(i_pDataBase->RIPUP, - (void *) l_pSignal); - - - //fprintf (stdout, "RIPUP : Suppression du signal (ALU2) %ld \n", l_pSignal->INDEX); - deleteEquipotentielle(i_pParam, i_pDataBase->GRID, - l_pSignal); - l_pSignal->SEGMENT = NULL; - l_pSignal->ROUTED = 0; - i_pDataBase->NB_ROUTED--; - unMarkSegmentAsFree(i_pDataBase, l_pSignal, l_pSignal->INDEX); // XXX - } - // ALU3 - l_pSignal = findSignal(i_pDataBase, - getWSegment(i_pDataBase->GRID, - l_pVirCon->X, - l_pVirCon->Y, - l_pVirCon->Z + - 1)->SIGNAL_INDEX); - if (l_pSignal) - if (l_pSignal != i_pSignal) { - // ajoute le signal dans la liste à re-router. - i_pDataBase->RIPUP = addchain(i_pDataBase->RIPUP, - (void *) l_pSignal); - - - //fprintf (stdout, "RIPUP : Suppression du signal (ALU3) %ld \n", l_pSignal->INDEX); - deleteEquipotentielle(i_pParam, i_pDataBase->GRID, - l_pSignal); - l_pSignal->SEGMENT = NULL; - l_pSignal->ROUTED = 0; - i_pDataBase->NB_ROUTED--; - unMarkSegmentAsFree(i_pDataBase, l_pSignal, l_pSignal->INDEX); // XXX - } - - - } else { - // altitude du connecteur > 0 - // premiere version : on ne fait rien. - // - // future version : - // on déroute immédiatement au dessus si possible - // et sur chaque côté en suivant la direction du plan. - } - - } - // supression du signal lui meme - } - //fprintf (stdout, "RIPUP : Suppression du signal %ld \n", i_pSignal->INDEX); - deleteEquipotentielle(i_pParam, i_pDataBase->GRID, i_pSignal); - unMarkSegmentAsFree(i_pDataBase, i_pSignal, i_pSignal->INDEX); // XXX - i_pSignal->SEGMENT = NULL; - i_pSignal->ROUTED = 0; - countFreeVC(i_pDataBase); -} - /* ripUp plus subtil */ void ripUp3(ocrRoutingDataBase * i_pDataBase, diff --git a/alliance/src/ocr/src/seg/ocrWPlaneLabeling.c b/alliance/src/ocr/src/seg/ocrWPlaneLabeling.c index 5b79339c..e3211e30 100644 --- a/alliance/src/ocr/src/seg/ocrWPlaneLabeling.c +++ b/alliance/src/ocr/src/seg/ocrWPlaneLabeling.c @@ -1,8 +1,17 @@ /* ### -------------------------------------------------- ### - $Author: hcl $ - $Date: 2002/04/25 13:41:33 $ + $Author: xtof $ + $Date: 2006/03/29 17:10:55 $ $Log: ocrWPlaneLabeling.c,v $ + Revision 1.3 2006/03/29 17:10:55 xtof + * gcc4 compatible : no cast like (Foo*)bar=foo; use bar=(Bar*)foo; + + * ALLIANCE_CFLAGS not added anymore to CFLAGS or CXXFLAGS + by alliance.m4 -> must be added explicitely in each + Makefile.am + + * remove configure.in (generated by autostuff) + Revision 1.2 2002/04/25 13:41:33 hcl New ripup/reroute loop, bug-kill (CALU&TALU). @@ -62,7 +71,7 @@ #define OFFSET(x) ( (ocrNaturalInt) (x)->KEY ) static char *res_id = - "$Id: ocrWPlaneLabeling.c,v 1.2 2002/04/25 13:41:33 hcl Exp $"; + "$Id: ocrWPlaneLabeling.c,v 1.3 2006/03/29 17:10:55 xtof Exp $"; typedef struct ocrSubWSegment { ocrWSegment *SEGMENT; @@ -116,10 +125,10 @@ static inline ocrSubWSegment *createSubWSegment(ocrWSegment * segment, pt = (ocrSubWSegment *) mbkalloc(BUFSIZE * sizeof(ocrSubWSegment)); HEAD_OCRSUBWSEGMENT = pt; for (i = 1; i < BUFSIZE; i++) { - (ocrSubWSegment *) pt->SEGMENT = pt + 1; + pt->SEGMENT = pt + 1; pt++; } - (ocrSubWSegment *) pt->SEGMENT = NULL; + pt->SEGMENT = NULL; } pt = HEAD_OCRSUBWSEGMENT; @@ -135,7 +144,7 @@ static inline ocrSubWSegment *createSubWSegment(ocrWSegment * segment, static inline void freeSubWSegment(ocrSubWSegment * sub_segment) { - (ocrSubWSegment *) sub_segment->SEGMENT = HEAD_OCRSUBWSEGMENT; + sub_segment->SEGMENT = HEAD_OCRSUBWSEGMENT; HEAD_OCRSUBWSEGMENT = sub_segment; } diff --git a/alliance/src/ocr/src/seg/ocrWRoutingUtil.c b/alliance/src/ocr/src/seg/ocrWRoutingUtil.c index d68228f5..64ec2468 100644 --- a/alliance/src/ocr/src/seg/ocrWRoutingUtil.c +++ b/alliance/src/ocr/src/seg/ocrWRoutingUtil.c @@ -1,8 +1,17 @@ /* ### -------------------------------------------------- ### - $Author: hcl $ - $Date: 2002/07/16 12:03:55 $ + $Author: xtof $ + $Date: 2006/03/29 17:10:56 $ $Log: ocrWRoutingUtil.c,v $ + Revision 1.8 2006/03/29 17:10:56 xtof + * gcc4 compatible : no cast like (Foo*)bar=foo; use bar=(Bar*)foo; + + * ALLIANCE_CFLAGS not added anymore to CFLAGS or CXXFLAGS + by alliance.m4 -> must be added explicitely in each + Makefile.am + + * remove configure.in (generated by autostuff) + Revision 1.7 2002/07/16 12:03:55 hcl bug... @@ -776,10 +785,10 @@ ocrWSegment *createWSegment(ocrNaturalInt offset, pt = (ocrWSegment *) mbkalloc(BUFSIZE * sizeof(ocrWSegment)); HEAD_OCRWSEGMENT = pt; for (i = 1; i < BUFSIZE; i++) { - (ocrWSegment *) pt->LABELS_LEFT_TOP = pt + 1; + pt->LABELS_LEFT_TOP = pt + 1; pt++; } - (ocrWSegment *) pt->LABELS_LEFT_TOP = NULL; + pt->LABELS_LEFT_TOP = NULL; } pt = HEAD_OCRWSEGMENT; @@ -812,7 +821,7 @@ ocrWSegment *createWSegment(ocrNaturalInt offset, void freeWSegment(ocrWSegment * segment) { - (ocrWSegment *) segment->LABELS_LEFT_TOP = HEAD_OCRWSEGMENT; + segment->LABELS_LEFT_TOP = HEAD_OCRWSEGMENT; HEAD_OCRWSEGMENT = segment; } diff --git a/alliance/src/ocr/src/util/ocrConnectorUtil.c b/alliance/src/ocr/src/util/ocrConnectorUtil.c index 5f54e3b2..a0b03617 100644 --- a/alliance/src/ocr/src/util/ocrConnectorUtil.c +++ b/alliance/src/ocr/src/util/ocrConnectorUtil.c @@ -1,8 +1,17 @@ /* ### -------------------------------------------------- ### - $Author: hcl $ - $Date: 2002/04/25 13:41:34 $ + $Author: xtof $ + $Date: 2006/03/29 17:10:57 $ $Log: ocrConnectorUtil.c,v $ + Revision 1.4 2006/03/29 17:10:57 xtof + * gcc4 compatible : no cast like (Foo*)bar=foo; use bar=(Bar*)foo; + + * ALLIANCE_CFLAGS not added anymore to CFLAGS or CXXFLAGS + by alliance.m4 -> must be added explicitely in each + Makefile.am + + * remove configure.in (generated by autostuff) + Revision 1.3 2002/04/25 13:41:34 hcl New ripup/reroute loop, bug-kill (CALU&TALU). @@ -150,6 +159,7 @@ void countFreeVC(ocrRoutingDataBase * i_pDataBase) l_pCon->critVC = NULL; } fin_lpcon: + ; } } // maj con->NB_VC diff --git a/alliance/src/ocr/src/util/ocrDataBaseUtil.c b/alliance/src/ocr/src/util/ocrDataBaseUtil.c index 35b28bca..9d3fd5e6 100644 --- a/alliance/src/ocr/src/util/ocrDataBaseUtil.c +++ b/alliance/src/ocr/src/util/ocrDataBaseUtil.c @@ -1,8 +1,17 @@ /* ### -------------------------------------------------- ### - $Author: hcl $ - $Date: 2002/04/25 13:41:34 $ + $Author: xtof $ + $Date: 2006/03/29 17:10:57 $ $Log: ocrDataBaseUtil.c,v $ + Revision 1.3 2006/03/29 17:10:57 xtof + * gcc4 compatible : no cast like (Foo*)bar=foo; use bar=(Bar*)foo; + + * ALLIANCE_CFLAGS not added anymore to CFLAGS or CXXFLAGS + by alliance.m4 -> must be added explicitely in each + Makefile.am + + * remove configure.in (generated by autostuff) + Revision 1.2 2002/04/25 13:41:34 hcl New ripup/reroute loop, bug-kill (CALU&TALU). @@ -44,7 +53,7 @@ #include "display.h" static char *res_id = - "$Id: ocrDataBaseUtil.c,v 1.2 2002/04/25 13:41:34 hcl Exp $"; + "$Id: ocrDataBaseUtil.c,v 1.3 2006/03/29 17:10:57 xtof Exp $"; extern ocrOption *g_pOption; #define LEVEL (g_pOption->LEVEL) @@ -492,7 +501,7 @@ void addVirtualConnector(ocrVirtualConnector ** i_pVirConList, ocrVirtualConnector * i_pVirCon) { - (ocrVirtualConnector *) i_pVirCon->NEXT = *i_pVirConList; + i_pVirCon->NEXT = *i_pVirConList; *i_pVirConList = i_pVirCon; } diff --git a/alliance/src/pcbs/src/emulbs/bstools.c b/alliance/src/pcbs/src/emulbs/bstools.c index 0c4f1e84..4e23c7ac 100644 --- a/alliance/src/pcbs/src/emulbs/bstools.c +++ b/alliance/src/pcbs/src/emulbs/bstools.c @@ -119,7 +119,7 @@ static char* unbuf_papat(char* head, struct papat *ppapat) if ( !paiol || ( paiol->MODE!='O' && paiol->MODE!='T' ) ) { - fprintf(stderr, __FUNCTION__": Output with index %d not found\n",index); + fprintf(stderr, "%s : Output with index %d not found\n", __FUNCTION__,index); exit(1); } diff --git a/alliance/src/pcbs/src/emulbs/hardware_io.c b/alliance/src/pcbs/src/emulbs/hardware_io.c index f5d7188d..3e6363e3 100644 --- a/alliance/src/pcbs/src/emulbs/hardware_io.c +++ b/alliance/src/pcbs/src/emulbs/hardware_io.c @@ -8,7 +8,7 @@ /*## E-mail : cao-vlsi@masi.ibp.fr ##*/ /*## ##*/ /*####==============================================================####*/ - +#include #include #include #include @@ -225,7 +225,7 @@ static void checkLPT() if (fd <= 0 ) { - fprintf(stderr, __FUNCTION__ ": Device is not opened\n"); + fprintf(stderr, "%s : %s", __FUNCTION__, "Device is not opened\n"); exit(LPSCAN_ERROR); } @@ -280,7 +280,7 @@ extern int check_mode( ) if ( !InfosVbe ) { - fprintf(stderr, __FUNCTION__ "No info file\n"); + fprintf(stderr,"%s %s" ,__FUNCTION__ , "No info file\n"); exit(1); } @@ -504,7 +504,7 @@ extern int write_read_port( char* buf, unsigned int size) { if (!fd) { - fprintf(stderr,__FUNCTION__": device not opened\n"); + fprintf(stderr, "%s : %s", __FUNCTION__, "device not opened\n"); exit( 1 ); } diff --git a/alliance/src/pcbs/src/emulbs/traduction.c b/alliance/src/pcbs/src/emulbs/traduction.c index 235aec53..8438b252 100644 --- a/alliance/src/pcbs/src/emulbs/traduction.c +++ b/alliance/src/pcbs/src/emulbs/traduction.c @@ -481,7 +481,7 @@ static char ValeurData(int valeur, int inversion) case '*': return '*'; } - fprintf(stderr,__FUNCTION__": Sign '%c' unknown\n",valeur); + fprintf(stderr, "%s : %s%c%s", __FUNCTION__, "Sign '", valeur, "' unknown\n"); exit( 1 ); return 0; } @@ -657,7 +657,7 @@ static void InitData(struct paseq *pat) if ( !ppaiol ) { - fprintf(stderr, __FUNCTION__ ": entry '%s' not found\n", pcel->NAME); + fprintf(stderr, "%s : %s%c%s", __FUNCTION__, "entry '", pcel->NAME, "' not found\n"); exit(1); } diff --git a/alliance/src/s2r/src/postrat.c b/alliance/src/s2r/src/postrat.c index e7f50f57..59028cc3 100644 --- a/alliance/src/s2r/src/postrat.c +++ b/alliance/src/s2r/src/postrat.c @@ -71,10 +71,10 @@ static void resize_layer (model, layer_num) for (rectp = model->LAYERTAB[layer_num]; rectp; rectp = rectp->NEXT) { - (long) rectp->X -= qty; - (long) rectp->Y -= qty; - (long) rectp->DX += 2 * qty; - (long) rectp->DY += 2 * qty; + rectp->X -= qty; + rectp->Y -= qty; + rectp->DX += 2 * qty; + rectp->DY += 2 * qty; } } @@ -94,10 +94,10 @@ static void inv_resize_layer (model, layer_num) for (rectp = model->LAYERTAB[layer_num]; rectp; rectp = rectp->NEXT) { - (long) rectp->X += qty; - (long) rectp->Y += qty; - (long) rectp->DX -= 2 * qty; - (long) rectp->DY -= 2 * qty; + rectp->X += qty; + rectp->Y += qty; + rectp->DX -= 2 * qty; + rectp->DY -= 2 * qty; } } diff --git a/alliance/src/syf/src/Makefile.am b/alliance/src/syf/src/Makefile.am index fc040e21..cbbab12a 100644 --- a/alliance/src/syf/src/Makefile.am +++ b/alliance/src/syf/src/Makefile.am @@ -2,14 +2,15 @@ bin_PROGRAMS = syf -AM_CFLAGS = @ALLIANCE_CFLAGS@ \ +AM_CFLAGS = \ -I$(top_srcdir)/abl/src \ -I$(top_srcdir)/aut/src \ -I$(top_srcdir)/bdd/src \ -I$(top_srcdir)/fsm/src \ -I$(top_srcdir)/ftl/src \ -I$(top_srcdir)/fvh/src \ --I$(top_srcdir)/mbk/src +-I$(top_srcdir)/mbk/src \ +@ALLIANCE_CFLAGS@ syf_LDADD = @ALLIANCE_LIBS@ \ -L$(top_srcdir)/abl/src \ diff --git a/alliance/src/syf/src/syf_comp.c b/alliance/src/syf/src/syf_comp.c index 5aae2120..53ed85cb 100644 --- a/alliance/src/syf/src/syf_comp.c +++ b/alliance/src/syf/src/syf_comp.c @@ -101,7 +101,7 @@ static void SyfRemoveStable( Expr ) freechain( ABL_CAR( Expr ) ); ABL_CDR( Expr ) = (ablexpr *)0; - ABL_ATOM_VALUE( Expr ) = getablatomzero(); + ABL_CAR_L( Expr ) = getablatomzero(); return; } diff --git a/alliance/src/syf/src/syf_synth.c b/alliance/src/syf/src/syf_synth.c index ade88ecb..3ab86dd7 100644 --- a/alliance/src/syf/src/syf_synth.c +++ b/alliance/src/syf/src/syf_synth.c @@ -141,7 +141,7 @@ void SyfSynthReturn2Abl( FsmFigure ) ( ABL_CDDR( Equation ) == (ablexpr *)0 ) ) { Atom = ABL_CADR( Equation ); - ABL_CADR( Equation ) = (ablexpr *)0; + ABL_CADR_L( Equation ) = (ablexpr *)0; freeablexpr( Equation ); ReturnSyfState->ABL_RETURN = Atom; } @@ -299,7 +299,7 @@ void SyfSynthStack2Abl( FsmFigure ) if ( ABL_CDDR( Equation ) == (ablexpr *)0 ) { Atom = ABL_CADR( Equation ); - ABL_CADR( Equation ) = (ablexpr *)0; + ABL_CADR_L( Equation ) = (ablexpr *)0; freeablexpr( Equation ); StackArray[ ScanBit ].ABL = Atom; } @@ -594,7 +594,7 @@ void SyfSynthCtrl2Abl( FsmFigure ) if ( ABL_CDDR( Equation ) == (ablexpr *)0 ) { Atom = ABL_CADR( Equation ); - ABL_CADR( Equation ) = (ablexpr *)0; + ABL_CADR_L( Equation ) = (ablexpr *)0; freeablexpr( Equation ); CtrlArray[ Index ].ABL = Atom; } @@ -804,7 +804,7 @@ void SyfSynthOut2Abl( FsmFigure ) ** Out(i) = OR Locout(j) -> Out(i) = Locout(j) */ Atom = ABL_CADR( Equation ); - ABL_CADR( Equation ) = (ablexpr *)0; + ABL_CADR_L( Equation ) = (ablexpr *)0; freeablexpr( Equation ); ScanSyfOut->ABL = Atom; } @@ -1007,7 +1007,7 @@ void SyfSynthReg2Abl( FsmFigure ) ** Reg(i) = OR E(j) -> Reg(i) = E(j) */ Atom = ABL_CADR( Equation ); - ABL_CADR( Equation ) = (ablexpr *)0; + ABL_CADR_L( Equation ) = (ablexpr *)0; freeablexpr( Equation ); RegArray[ Index ].ABL = Atom; } @@ -1093,7 +1093,7 @@ void SyfSynthReg2Abl( FsmFigure ) if ( ABL_CDDR( Equation ) == (ablexpr *)0 ) { Atom = ABL_CADR( Equation ); - ABL_CADR( Equation ) = (ablexpr *)0; + ABL_CADR_L( Equation ) = (ablexpr *)0; freeablexpr( Equation ); RegArray[ Index ].ABL_SET = Atom; } @@ -1109,7 +1109,7 @@ void SyfSynthReg2Abl( FsmFigure ) if ( ABL_CDDR( Equation ) == (ablexpr *)0 ) { Atom = ABL_CADR( Equation ); - ABL_CADR( Equation ) = (ablexpr *)0; + ABL_CADR_L( Equation ) = (ablexpr *)0; freeablexpr( Equation ); RegArray[ Index ].ABL_RESET = Atom; } diff --git a/alliance/src/vex/src/vex.h b/alliance/src/vex/src/vex.h index eb424448..3b3aaf01 100644 --- a/alliance/src/vex/src/vex.h +++ b/alliance/src/vex/src/vex.h @@ -443,6 +443,7 @@ # define SetVexAtomValue( N, A ) ( (N)->VALUE = (void *)(A) ) # define GetVexOperand( C ) ( (vexexpr *)(C)->DATA ) +# define GetVexOperandL( C ) ( (C)->DATA ) # define SetVexOperand( C, O ) ( (C)->DATA = (void *)(O) ) /*------------------------------------------------------\ diff --git a/alliance/src/vvh/src/vvh_vbh2vpn.c b/alliance/src/vvh/src/vvh_vbh2vpn.c index d1c4c11a..cdaf913d 100644 --- a/alliance/src/vvh/src/vvh_vbh2vpn.c +++ b/alliance/src/vvh/src/vvh_vbh2vpn.c @@ -1098,7 +1098,7 @@ static void VvhVbhTreatCase( ScanCase ) if ( VexGuard->OPERAND->NEXT == (chain_list *)0 ) { VexAtom = GetVexOperand( VexGuard->OPERAND ); - GetVexOperand( VexGuard->OPERAND ) = (vexexpr *)0; + GetVexOperandL( VexGuard->OPERAND ) = (vexexpr *)0; freevexexpr( VexGuard ); VexGuard = VexAtom; } @@ -1111,7 +1111,7 @@ static void VvhVbhTreatCase( ScanCase ) if ( VexGuard->OPERAND->NEXT == (chain_list *)0 ) { VexAtom = GetVexOperand( VexGuard->OPERAND ); - GetVexOperand( VexGuard->OPERAND ) = (vexexpr *)0; + GetVexOperandL( VexGuard->OPERAND ) = (vexexpr *)0; freevexexpr( VexGuard ); VexGuard = VexAtom; } @@ -1158,7 +1158,7 @@ static void VvhVbhTreatCase( ScanCase ) if ( VexGuard->OPERAND->NEXT == (chain_list *)0 ) { VexAtom = GetVexOperand( VexGuard->OPERAND ); - GetVexOperand( VexGuard->OPERAND ) = (vexexpr *)0; + GetVexOperandL( VexGuard->OPERAND ) = (vexexpr *)0; freevexexpr( VexGuard ); VexGuard = VexAtom; }