From 3f1e302fd2ce47e77b1d5ff43a09b516aef8638d Mon Sep 17 00:00:00 2001 From: Ludovic Jacomme Date: Sun, 14 Jun 2009 13:52:35 +0000 Subject: [PATCH] - port 64 bits --- alliance/src/abe/src/beh_dict.c | 4 +- alliance/src/abl/src/abl.h | 16 +- alliance/src/abt/src/bhl_depend.c | 6 +- alliance/src/abt/src/bhl_makbdd.c | 1 + alliance/src/abt/src/bhl_orderbdd.c | 5 +- alliance/src/abv/src/abv.h | 4 +- alliance/src/abv/src/bvl_bcomp_l.l | 8 +- alliance/src/abv/src/bvl_bcomp_y.y | 124 ++++++------ alliance/src/abv/src/bvl_blex.h | 4 +- alliance/src/abv/src/bvl_bspec.c | 62 +++--- alliance/src/abv/src/bvl_bspec.h | 10 +- alliance/src/abv/src/bvl_byacc.h | 28 ++- alliance/src/abv/src/bvl_drive.c | 6 +- alliance/src/abv/src/bvl_parse.c | 4 +- alliance/src/abv/src/bvl_parse.h | 4 +- alliance/src/abv/src/bvl_util.c | 17 +- alliance/src/abv/src/bvl_util.h | 2 +- alliance/src/asimut/src/c_hada_repondeur.c | 1 + alliance/src/asimut/src/c_sr1k_8b.c | 1 + alliance/src/asimut/src/sch.h | 2 + alliance/src/asimut/src/sch_debug.c | 4 +- alliance/src/asimut/src/sch_hash.c | 2 +- alliance/src/asimut/src/vh_debug.c | 6 +- alliance/src/asimut/src/vh_xcomm.c | 10 +- alliance/src/asimut/src/vh_xcomm.h | 4 +- alliance/src/asimut/src/vh_xspec.c | 3 +- alliance/src/aut/src/aut.h | 2 +- alliance/src/aut/src/autenv.c | 2 + alliance/src/aut/src/autexit.c | 2 +- alliance/src/aut/src/autresize.c | 1 + alliance/src/beh/src/beh.h | 1 + alliance/src/beh/src/beh_dict.c | 30 +-- alliance/src/beh/src/beh_rplstable.c | 4 +- alliance/src/beh/src/beh_toolbug.c | 2 +- alliance/src/beh/src/beh_vhvector.c | 3 +- alliance/src/bhl/src/beh_debug.c | 68 +++---- alliance/src/bhl/src/beh_depend.c | 10 +- alliance/src/bhl/src/beh_makquad.c | 4 +- alliance/src/bhl/src/beh_namelist.c | 2 +- alliance/src/boog/src/bog_map_befig.c | 30 +-- alliance/src/boog/src/bog_map_delay.c | 1 + alliance/src/boog/src/bog_normalize_ARITY.h | 2 +- alliance/src/boog/src/bog_normalize_DAG.c | 18 +- alliance/src/boog/src/bog_normalize_DAG.h | 2 +- alliance/src/boog/src/bog_normalize_DC.c | 3 +- .../src/boog/src/bog_normalize_nameindex.c | 8 +- alliance/src/boog/src/bog_signal_utils.c | 2 +- alliance/src/btr/src/btrerror.h | 2 + alliance/src/btr/src/btrfunc.c | 1 + alliance/src/bvl/src/bvl.h | 8 +- alliance/src/bvl/src/bvl_bcomp_l.l | 6 +- alliance/src/bvl/src/bvl_bcomp_y.y | 144 +++++++------- alliance/src/bvl/src/bvl_drive.c | 16 +- alliance/src/bvl/src/bvl_globals.c | 2 +- alliance/src/bvl/src/bvl_parse.c | 8 +- alliance/src/bvl/src/bvl_util.c | 48 ++--- alliance/src/ctp/src/ctp_byacc.h | 6 +- alliance/src/ctp/src/ctp_y.y | 46 ++--- alliance/src/dreal/src/GMC_panel.c | 2 +- alliance/src/dreal/src/GME_panel.c | 2 +- alliance/src/elp/src/elp.h | 1 + alliance/src/elp/src/elp_l.l | 1 + alliance/src/exp/src/ht.c | 36 ++-- alliance/src/exp/src/ht.h | 10 +- alliance/src/fks/src/fkserror.h | 4 +- alliance/src/fks/src/fksparse.c | 2 +- alliance/src/ftl/src/ftlerror.h | 2 + alliance/src/fvh/src/fbl_bcomp_y.y | 178 +++++++++--------- alliance/src/fvh/src/fbl_bspec.c | 38 ++-- alliance/src/fvh/src/fbl_bspec.h | 10 +- alliance/src/fvh/src/fbl_byacc.h | 20 +- alliance/src/genlib/src/dpgen_Adder.c | 34 ++-- alliance/src/genlib/src/dpgen_Nul.c | 14 +- alliance/src/genlib/src/genlib.c | 80 +++----- alliance/src/genlib/src/mgn.h | 22 +-- alliance/src/graal/src/GMC_panel.c | 16 +- alliance/src/graal/src/GME_panel.c | 16 +- alliance/src/graal/src/GMV_panel.c | 8 +- alliance/src/growstk/src/hash.c | 24 +-- alliance/src/growstk/src/hash.h | 2 +- alliance/src/log/src/log.h | 140 +++++++------- alliance/src/log/src/log_bdd0.c | 82 ++++---- alliance/src/log/src/log_bdd1.c | 57 +++--- alliance/src/log/src/log_prefbib.c | 126 ++++++------- alliance/src/log/src/log_thash.c | 65 +++---- alliance/src/log/src/log_thashbdd.c | 64 +++---- alliance/src/log/src/log_thashloc.c | 36 ++-- alliance/src/loon/src/lon_signal_utils.c | 2 +- alliance/src/lynx/src/Windows95.c | 10 +- alliance/src/lynx/src/chklynxrcn.c | 2 +- alliance/src/lynx/src/znc.c | 2 +- alliance/src/m2e/src/m2e.c | 6 +- alliance/src/mbk/src/mbk_lo.c | 44 ++--- alliance/src/mbk/src/mbk_lo_util.c | 20 +- alliance/src/mbk/src/mbk_sys.c | 6 +- alliance/src/mbk/src/mbk_sys.h | 6 +- alliance/src/mbk/src/mbk_util.c | 12 +- alliance/src/mbk/src/mlo.h | 6 +- alliance/src/mbk/src/mut.h | 8 +- alliance/src/mbk/src/rcn_lo.c | 24 +-- alliance/src/mbk/src/rcn_lo_util.c | 18 +- alliance/src/mbkspice/src/spi_parse.c | 50 ++--- alliance/src/mbkvhdl/src/mvl_drive.c | 1 + alliance/src/mbkvhdl/src/mvl_parse.c | 1 + alliance/src/mbkvhdl/src/mvl_scomp_l.l | 12 +- alliance/src/mbkvhdl/src/mvl_scomp_y.y | 70 +++---- alliance/src/mbkvhdl/src/mvl_syacc.h | 2 +- alliance/src/mbkvhdl/src/mvl_util.c | 46 ++--- alliance/src/mbkvhdlg/src/mvl_parse.c | 3 +- alliance/src/mbkvhdlg/src/mvl_scomp_y.y | 66 +++---- alliance/src/mbkvhdlg/src/mvl_syacc.h | 2 +- alliance/src/mbkvhdlg/src/mvl_util.c | 59 +++--- alliance/src/mbkvhdlg/src/x2vy_main.c | 10 +- alliance/src/mbkvti/src/drive_vti_l.c | 9 +- alliance/src/mbkvti/src/parse_vti_p.c | 9 +- alliance/src/ocr/src/seg/mbk_tree.c | 13 +- alliance/src/ocr/src/util/ocrConnectorUtil.c | 9 +- alliance/src/pcbs/src/bvl/bvl_bcomp_y.y | 109 +++++------ alliance/src/pcbs/src/bvl/bvl_byacc.h | 1 + alliance/src/pcbs/src/bvl/bvl_util.c | 2 +- alliance/src/pcbs/src/pcbs/emul_y.y | 2 +- alliance/src/phl/src/pat_debug.c | 72 +++---- alliance/src/ppt/src/pat_decl_l.l | 1 + alliance/src/ppt/src/pat_decl_y.y | 2 +- alliance/src/ppt/src/pat_desc_y.y | 33 ++-- alliance/src/ppt/src/pat_drvpat.c | 51 ++--- alliance/src/ppt/src/pat_savpaseq.c | 6 +- alliance/src/ppt/src/ppt.h | 4 +- alliance/src/proof/src/proof_util.c | 4 +- alliance/src/rds/src/rds.h | 6 +- alliance/src/rds/src/rdserror.h | 2 + alliance/src/rds/src/rprparse.c | 1 + alliance/src/rds/src/rtlacces.c | 2 + alliance/src/rds/src/rutpoly.c | 3 +- alliance/src/rdscif/src/cif_parse.c | 2 +- alliance/src/ring/src/distance.c | 12 +- alliance/src/ring/src/lireplace.c | 4 +- alliance/src/ring/src/posercircuit.c | 20 +- alliance/src/ring/src/routage.c | 12 +- alliance/src/ring/src/struct.c | 2 +- alliance/src/ring/src/struct.h | 4 +- alliance/src/ring/src/struct2.c | 38 ++-- alliance/src/rtd/src/rtd_error.h | 2 + alliance/src/rtn/src/rtnerror.h | 2 + alliance/src/s2r/src/hash.c | 24 +-- alliance/src/s2r/src/hash.h | 2 +- alliance/src/scl/src/scgmain.c | 1 + alliance/src/scl/src/schdel.c | 4 +- alliance/src/syf/src/syf_error.c | 2 +- alliance/src/vbl/src/main.c | 2 +- alliance/src/vbl/src/vbl_bcomp_l.l | 12 +- alliance/src/vbl/src/vbl_bcomp_y.y | 148 +++++++-------- alliance/src/vbl/src/vbl_blex.h | 2 +- alliance/src/vbl/src/vbl_bspec.c | 83 ++++---- alliance/src/vbl/src/vbl_bspec.h | 29 +-- alliance/src/vbl/src/vbl_byacc.h | 13 +- alliance/src/vbl/src/vbl_parse.c | 6 +- alliance/src/vbl/src/vbl_util.c | 22 +-- alliance/src/vbl/src/vhdl.yac | 25 +-- alliance/src/vex/src/vexerror.h | 2 + alliance/src/vpd/src/vpd_error.h | 2 + alliance/src/vpn/src/vpnerror.h | 2 + alliance/src/vst2xnf/src/vst2xnf.c | 6 +- alliance/src/vtl/src/vtlerror.h | 2 + alliance/src/vvh/src/vvh_error.h | 2 + alliance/src/xfsm/src/XMV_panel.c | 12 +- alliance/src/xgra/src/XMV_panel.c | 12 +- alliance/src/xpat/src/XMV_panel.c | 12 +- alliance/src/xsch/src/XMV_panel.c | 12 +- alliance/src/xvpn/src/XMV_panel.c | 12 +- alliance/src/xvpn/src/XVP_error.c | 1 + 171 files changed, 1669 insertions(+), 1624 deletions(-) diff --git a/alliance/src/abe/src/beh_dict.c b/alliance/src/abe/src/beh_dict.c index 1957efeb..1f9bec42 100644 --- a/alliance/src/abe/src/beh_dict.c +++ b/alliance/src/abe/src/beh_dict.c @@ -164,8 +164,8 @@ void beh_addtab (head, key_str, ctx_str, field, valu) struct beden **head; char *key_str; char *ctx_str; -int field; -int valu; +long field; +long valu; { int found = 0; diff --git a/alliance/src/abl/src/abl.h b/alliance/src/abl/src/abl.h index 6a2191bb..1069cf2b 100644 --- a/alliance/src/abl/src/abl.h +++ b/alliance/src/abl/src/abl.h @@ -60,14 +60,14 @@ extern "C" { | | \------------------------------------------------------*/ -# define ABL_OR 0 -# define ABL_AND 1 -# define ABL_XOR 2 -# define ABL_NOT 3 -# define ABL_NOR 4 -# define ABL_NAND 5 -# define ABL_NXOR 6 -# define ABL_STABLE 7 +# define ABL_OR 0L +# define ABL_AND 1L +# define ABL_XOR 2L +# define ABL_NOT 3L +# define ABL_NOR 4L +# define ABL_NAND 5L +# define ABL_NXOR 6L +# define ABL_STABLE 7L /*------------------------------------------------------\ | | diff --git a/alliance/src/abt/src/bhl_depend.c b/alliance/src/abt/src/bhl_depend.c index 288cfe84..3bf1efef 100644 --- a/alliance/src/abt/src/bhl_depend.c +++ b/alliance/src/abt/src/bhl_depend.c @@ -73,7 +73,7 @@ struct chain *pt_exp; if (pt_exp->NEXT != NULL) { - if (((int) ((struct chain *) pt_exp->DATA)->DATA) == ABL_STABLE) + if (((long) ((struct chain *) pt_exp->DATA)->DATA) == ABL_STABLE) { name = ((struct chain *) pt_exp->NEXT->DATA)->DATA; res_chain = addchain (NULL, name); @@ -117,7 +117,7 @@ struct chain *pt_exp; { struct chain *res_chain = NULL; - int value ; + long value ; if (pt_fig->ERRFLG == 0) { @@ -172,7 +172,7 @@ struct befig *pt_fig; struct beout *pt_out; struct bebus *pt_bus; struct biabl *pt_biabl; - unsigned int count = 0; + unsigned long count = 0; /* ###------------------------------------------------------### */ /* if there is no error in the current figure ... */ diff --git a/alliance/src/abt/src/bhl_makbdd.c b/alliance/src/abt/src/bhl_makbdd.c index b8f30c23..14c36426 100644 --- a/alliance/src/abt/src/bhl_makbdd.c +++ b/alliance/src/abt/src/bhl_makbdd.c @@ -51,6 +51,7 @@ # include "abt.h" # include +# include # include "bhl_error.h" # include "bhl_makbdd.h" # include "bhl_orderbdd.h" diff --git a/alliance/src/abt/src/bhl_orderbdd.c b/alliance/src/abt/src/bhl_orderbdd.c index 8c4004f3..fe252762 100644 --- a/alliance/src/abt/src/bhl_orderbdd.c +++ b/alliance/src/abt/src/bhl_orderbdd.c @@ -49,6 +49,7 @@ # include "abt.h" # include +# include # include "bhl_error.h" # include "bhl_orderbdd.h" @@ -257,8 +258,8 @@ static long bhl_sortcompare( ValueArray, Index1, Index2 ) void bhl_orderbdd( BehFigure, AuxFlag, OrderFlag ) befig_list *BehFigure; - int AuxFlag; - int OrderFlag; + long AuxFlag; + long OrderFlag; { struct berin *BehRin; struct beaux *BehAux; diff --git a/alliance/src/abv/src/abv.h b/alliance/src/abv/src/abv.h index 48c7529c..173784cf 100644 --- a/alliance/src/abv/src/abv.h +++ b/alliance/src/abv/src/abv.h @@ -57,8 +57,8 @@ extern "C" { /* functions */ /* ###------------------------------------------------------### */ -extern struct befig *vhdlloadbefig __P((struct befig *pt_befig, char *figname, int trace_mode)); -extern void vhdlsavebefig __P((struct befig *pthedbefig, int trace_mode)); +extern struct befig *vhdlloadbefig __P((struct befig *pt_befig, char *figname, long trace_mode)); +extern void vhdlsavebefig __P((struct befig *pthedbefig, long trace_mode)); #ifdef __cplusplus } diff --git a/alliance/src/abv/src/bvl_bcomp_l.l b/alliance/src/abv/src/bvl_bcomp_l.l index 4c07844d..2d261f0a 100644 --- a/alliance/src/abv/src/bvl_bcomp_l.l +++ b/alliance/src/abv/src/bvl_bcomp_l.l @@ -51,7 +51,7 @@ bvl_name; struct g_type { - int VALU; + long VALU; char FLAG; }; @@ -187,7 +187,7 @@ base_specifier (B|b|O|o|X|x) } {letter}(_?{letter_or_digit})* { - int itoken; + long itoken; itoken = search (yytext); if (itoken == EMPTYHT) @@ -203,7 +203,7 @@ base_specifier (B|b|O|o|X|x) } } ({decimal_literal})|({base}#{based_integer}(\.{based_integer})?#({exponent})?)|({base}:{based_integer}(\.{based_integer})?:({exponent})?) { - yylval.text = mbkalloc ((unsigned int)strlen(yytext)+1); + yylval.text = mbkalloc ((unsigned long)strlen(yytext)+1); strcpy (yylval.text, yytext); return (AbstractLit); } @@ -250,7 +250,7 @@ int yywrap () /* called func. : addht, addhtitem, gethtitem, namealloc */ /* ###--------------------------------------------------------------### */ -static int search (key) +static long search (key) char *key; diff --git a/alliance/src/abv/src/bvl_bcomp_y.y b/alliance/src/abv/src/bvl_bcomp_y.y index 534e2a59..2b814e0d 100644 --- a/alliance/src/abv/src/bvl_bcomp_y.y +++ b/alliance/src/abv/src/bvl_bcomp_y.y @@ -53,7 +53,7 @@ %} %union { - int valu; + long valu; char *text; bvl_ablstr list; bvl_name name; @@ -575,7 +575,7 @@ formal_port_element .signal_kind. { char *signame; - int sigconf; + long sigconf; void *pnt; /* ###----------------------------------------------### */ @@ -599,7 +599,7 @@ formal_port_element beh_addtab (dic,signame,BVL_MODNAM,BVL_SIGDFN,sigconf); beh_addtab (dic,signame,BVL_MODNAM,BVL_WMNDFN,$6.LEFT); beh_addtab (dic,signame,BVL_MODNAM,BVL_WMXDFN,$6.RIGHT); - beh_addtab (dic,signame,BVL_MODNAM,BVL_PNTDFN,(int)pnt); + beh_addtab (dic,signame,BVL_MODNAM,BVL_PNTDFN,(long)pnt); BVL_NM1LST = delchain (BVL_NM1LST, BVL_NM1LST); } @@ -703,7 +703,7 @@ constant_declaration constant_VarAsgn__expression Semicolon_ERR { - int sigconf; + long sigconf; if (chkdcl ('C',0,$4.VALU,$4.FLAG,0,$5.FLAG,&sigconf) == 0) { @@ -731,9 +731,9 @@ signal_declaration Semicolon_ERR { char *signame; - int sigconf; + long sigconf; void *pnt; - int errflg; + long errflg; errflg = chkdcl ('S',0,$4.VALU,$4.FLAG,$6,$5.FLAG,&sigconf); @@ -756,7 +756,7 @@ signal_declaration beh_addtab (dic,signame,BVL_MODNAM,BVL_SIGDFN,sigconf); beh_addtab (dic,signame,BVL_MODNAM,BVL_WMNDFN,$5.LEFT); beh_addtab (dic,signame,BVL_MODNAM,BVL_WMXDFN,$5.RIGHT); - beh_addtab (dic,signame,BVL_MODNAM,BVL_PNTDFN,(int)pnt); + beh_addtab (dic,signame,BVL_MODNAM,BVL_PNTDFN,(long)pnt); BVL_NM1LST = delchain (BVL_NM1LST,BVL_NM1LST); } @@ -881,7 +881,7 @@ unlabeled_conditional_signal_assignment waveform Semicolon_ERR { - int i; + long i; struct beout *beout_pnt; struct bebus *bebus_pnt; struct bereg *bereg_pnt; @@ -895,15 +895,15 @@ unlabeled_conditional_signal_assignment struct bvl_expr expr4; struct bvl_expr expr5; struct bvl_expr expr6; - int rev_flg = 0; - int left_bnd; - int right_bnd; - int left; - int right; - int in_bound; - int out_bound; - int sig_width; - int sig_conf; + long rev_flg = 0; + long left_bnd; + long right_bnd; + long left; + long right; + long in_bound; + long out_bound; + long sig_width; + long sig_conf; expr4 = $5; @@ -1160,7 +1160,7 @@ unlabeled_selected_signal_assignment ...waveform__WHEN__choices.. Semicolon_ERR { - int i; + long i; struct beout *beout_pnt; struct bebus *bebus_pnt; struct bereg *bereg_pnt; @@ -1168,15 +1168,15 @@ unlabeled_selected_signal_assignment struct bebux *bebux_pnt; struct chain *abl_pnt; struct bvl_expr expr1; - int rev_flg = 0; - int left_bnd; - int right_bnd; - int left; - int right; - int in_bound; - int out_bound; - int sig_width; - int sig_conf; + long rev_flg = 0; + long left_bnd; + long right_bnd; + long left; + long right; + long in_bound; + long out_bound; + long sig_width; + long sig_conf; expr1 = bvl_crtabl (ABL_OR ,$8 ,$9,-1,-1); if (BVL_BDDPNT != getlogbddnodeone()) @@ -1474,13 +1474,13 @@ choice { char *val; char val2[256]; - int left; - int right; - int in_bound; - int out_bound; - int left_bnd; - int right_bnd; - int sig_conf; + long left; + long right; + long in_bound; + long out_bound; + long left_bnd; + long right_bnd; + long sig_conf; strcpy (val2,"B\""); sig_conf = beh_chktab (dic,$1.NAME,BVL_MODNAM,BVL_SIGDFN); @@ -1675,13 +1675,13 @@ primary | name { struct bvl_expr expr1; - int left; - int right; - int left_bnd; - int right_bnd; - int in_bound; - int out_bound; - int sig_conf; + long left; + long right; + long left_bnd; + long right_bnd; + long in_bound; + long out_bound; + long sig_conf; sig_conf = beh_chktab (dic,$1.NAME,BVL_MODNAM,BVL_SIGDFN); switch (sig_conf) @@ -1841,7 +1841,7 @@ attribute_name { char extname[100]; char *lclname; - int sig_conf; + long sig_conf; struct bvl_expr expr1; struct bvl_expr expr2; struct chain *ptabl; @@ -2019,16 +2019,16 @@ END_ERR ; %% -void *addstr (ptfig, object, mode, type, flag, name, left, right) +void *addstr ( -struct befig *ptfig; -char object; -int mode; -int type; -char flag; -char *name; -short left; -short right; +struct befig *ptfig, +char object, +long mode, +long type, +char flag, +char *name, +short left, +short right ) { void *pnt = NULL; @@ -2170,19 +2170,19 @@ short right; return (pnt); } -int chkdcl (object,mode,type,flag,kind,constraint,conf) - -char object; -int mode; -int type; -char flag; -int kind; -char constraint; -int *conf; +static long +chkdcl ( +char object, +long mode, +long type, +char flag, +long kind, +char constraint, +long *conf ) { - int errflg = 0; - int lclcnf = 0; + long errflg = 0; + long lclcnf = 0; if (flag != constraint) { diff --git a/alliance/src/abv/src/bvl_blex.h b/alliance/src/abv/src/bvl_blex.h index be1ae33a..79f7e924 100644 --- a/alliance/src/abv/src/bvl_blex.h +++ b/alliance/src/abv/src/bvl_blex.h @@ -36,5 +36,5 @@ /* */ /* ###--------------------------------------------------------------### */ -extern int BVL_LINNUM; /* file's line number */ -static int search (); +extern long BVL_LINNUM; /* file's line number */ +static long search (); diff --git a/alliance/src/abv/src/bvl_bspec.c b/alliance/src/abv/src/bvl_bspec.c index 107952db..d864319e 100644 --- a/alliance/src/abv/src/bvl_bspec.c +++ b/alliance/src/abv/src/bvl_bspec.c @@ -89,8 +89,8 @@ short right; /* array's right bound (= -1 if scalar) */ struct begen *ptgen; struct chain *ptauxnam; struct chain *ptauxnat; - int i; - int inc = 1; + long i; + long inc = 1; ptgen = lastgeneric; ptauxnam = nam_lst; @@ -160,9 +160,7 @@ struct chain *abllst; /* called func. : mbkalloc , bvl_cpyabllst */ /* ###--------------------------------------------------------------### */ -bvl_ablstr bvl_cpyablstr (ablstr) - -bvl_ablstr ablstr; +bvl_ablstr bvl_cpyablstr ( bvl_ablstr ablstr ) { bvl_ablstr pt_ablstr; @@ -196,15 +194,15 @@ bvl_ablstr ablstr; /* bvl_error , addchain , freechain */ /* ###--------------------------------------------------------------### */ -bvl_ablstr bvl_crtabl ( oper, expr1, expr2, left, right ) +bvl_ablstr bvl_crtabl ( -short oper; -bvl_ablstr expr1; -bvl_ablstr expr2; -int left; -int right; +short oper, +bvl_ablstr expr1, +bvl_ablstr expr2, +long left, +long right ) - { +{ char name[256]; char *name2; struct chain *pt_abl1; @@ -213,8 +211,8 @@ int right; struct chain *pt_aux2; bvl_ablstr result; char lcl_buffer[256]; - short inc; - short i; + long inc; + long i; char true_flag_un = 0; char true_flag_zero = 0; @@ -725,7 +723,7 @@ int right; } return (result); - } +} /* ###--------------------------------------------------------------### */ /* function : bvl_select */ @@ -740,16 +738,16 @@ int right; extern bddcircuit *BvlBddCircuit; -void bvl_select (result,pt_str, pt_bdd, pt_ablstr) +void bvl_select ( -bvl_ablstr *result; -struct chain *pt_str; /* pointer on a list of choices */ -bddnode **pt_bdd; /* used to check if a choice is legal */ -bvl_ablstr pt_ablstr; /* tested expression */ +bvl_ablstr *result, +struct chain *pt_str, /* pointer on a list of choices */ +bddnode **pt_bdd, /* used to check if a choice is legal */ +bvl_ablstr pt_ablstr ) /* tested expression */ { char binstr[256]; - int i; + long i; struct chain *pt_auxabl; bddnode *pt_bddres; bddnode *pt_bddnew; @@ -758,8 +756,8 @@ bvl_ablstr pt_ablstr; /* tested expression */ char nomvar[10]; struct chain *pt_newabl; struct chain *pt_newabl2; - static int oth_flg=0; - static int last_width=0; + static long oth_flg=0; + static long last_width=0; result->LIST_ABL = NULL; result->IDENT = NULL; @@ -851,18 +849,18 @@ bvl_ablstr pt_ablstr; /* tested expression */ /* in a string of '0' and '1's */ /* ###--------------------------------------------------------------### */ -int bvl_tobin (trg,src,left,right) +long bvl_tobin ( -char *trg; -char *src; -int left; -int right; +char *trg, +char *src, +long left, +long right ) - { +{ char base; - int indx; - int j = 0; - int errflg = 0; + long indx; + long j = 0; + long errflg = 0; char lcl_trg[256]; lcl_trg[0] = '\0'; diff --git a/alliance/src/abv/src/bvl_bspec.h b/alliance/src/abv/src/bvl_bspec.h index e067c329..7ebfcef8 100644 --- a/alliance/src/abv/src/bvl_bspec.h +++ b/alliance/src/abv/src/bvl_bspec.h @@ -40,7 +40,11 @@ extern bvl_ablstr BVL_EMPSTR; struct begen *bvl_addgen (); struct chain *bvl_cpyabllst (); bvl_ablstr bvl_cpyablstr (); -bvl_ablstr bvl_crtabl (); -void bvl_select (); +extern bvl_ablstr bvl_crtabl ( short oper, bvl_ablstr expr1, bvl_ablstr expr2, long left, long right ); +extern void bvl_select ( +bvl_ablstr *result, +struct chain *pt_str, /* pointer on a list of choices */ +bddnode **pt_bdd, /* used to check if a choice is legal */ +bvl_ablstr pt_ablstr ); /* tested expression */ extern void bvl_error(); -extern int bvl_tobin(); +extern long bvl_tobin ( char *trg, char *src, long left, long right ); diff --git a/alliance/src/abv/src/bvl_byacc.h b/alliance/src/abv/src/bvl_byacc.h index 27deeec8..e1c45a39 100644 --- a/alliance/src/abv/src/bvl_byacc.h +++ b/alliance/src/abv/src/bvl_byacc.h @@ -55,7 +55,7 @@ bvl_name; struct g_type { - int VALU; + long VALU; char FLAG; }; @@ -64,7 +64,7 @@ char *BVL_MODNAM; /* curnennt model name */ bvl_ablstr BVL_SLCEXP; /* structure filled with the */ bvl_ablstr BVL_EMPSTR; /* empty structure used with NOT*/ -extern int BVL_AUXMOD; /* simplify internal sig (= 1) */ +extern long BVL_AUXMOD; /* simplify internal sig (= 1) */ static char *BVL_LBLNAM = NULL; /* label */ static struct chain *BVL_NM1LST = NULL; /* 1-st name liste */ @@ -75,6 +75,7 @@ static struct befig *BVL_BEFPNT = NULL; /* current BEFIG pointer */ static struct beden **dic = NULL; /* dictionary */ +static long chkdcl ( char object, long mode, long type, char flag, long kind, char constraint, long *conf ); struct chain *BVL_INTLST = NULL; struct begen *BVL_GENPNT = NULL; @@ -83,8 +84,21 @@ extern struct befig *BVL_HEDFIG; /* head of befigs */ extern struct begen *bvl_addgen(); -extern bvl_ablstr bvl_crtabl(); -extern bvl_ablstr bvl_cpyablstr(); -extern void bvl_select(); -extern void bvl_error(); -extern void *addstr (); +extern bvl_ablstr bvl_crtabl ( short oper, bvl_ablstr expr1, bvl_ablstr expr2, long left, long right ); +extern bvl_ablstr bvl_cpyablstr ( bvl_ablstr ablstr ); + +extern void bvl_select ( +bvl_ablstr *result, +struct chain *pt_str, /* pointer on a list of choices */ +bddnode **pt_bdd, /* used to check if a choice is legal */ +bvl_ablstr pt_ablstr ); /* tested expression */ +extern void bvl_error ( long code, char *str1 ); +extern void *addstr ( +struct befig *ptfig, +char object, +long mode, +long type, +char flag, +char *name, +short left, +short right ); diff --git a/alliance/src/abv/src/bvl_drive.c b/alliance/src/abv/src/bvl_drive.c index c8bf6aaf..f2ad5946 100644 --- a/alliance/src/abv/src/bvl_drive.c +++ b/alliance/src/abv/src/bvl_drive.c @@ -62,17 +62,17 @@ void vhdlsavebefig (pthedbefig, trace_mode) struct befig *pthedbefig; -int trace_mode; +long trace_mode; { char *suffix; char *str; char *mode; char *type_mark; - int nrlabel = 0; + long nrlabel = 0; FILE *fd; time_t clock; - int left,right; + long left,right; char *name; char *bus; diff --git a/alliance/src/abv/src/bvl_parse.c b/alliance/src/abv/src/bvl_parse.c index 16b9fe24..6f4baf24 100644 --- a/alliance/src/abv/src/bvl_parse.c +++ b/alliance/src/abv/src/bvl_parse.c @@ -60,14 +60,14 @@ struct befig *vhdlloadbefig (pt_befig, figname, trace_mode) struct befig *pt_befig; char *figname; -int trace_mode; +long trace_mode; { char *tok; char *str; struct chain *behsfx_lst = NULL; struct chain *suffix = NULL; - static unsigned int call_nbr = 0; + static unsigned long call_nbr = 0; bddsystem *SaveBddSystem; bddcircuit *SaveBddCircuit; diff --git a/alliance/src/abv/src/bvl_parse.h b/alliance/src/abv/src/bvl_parse.h index de40d554..0f98c307 100644 --- a/alliance/src/abv/src/bvl_parse.h +++ b/alliance/src/abv/src/bvl_parse.h @@ -35,8 +35,8 @@ /* ###--------------------------------------------------------------### */ char BVL_ERRFLG = 0; /* if = 1 no structure is made */ -int BVL_LINNUM = 1; /* file's line number */ -int BVL_AUXMOD; /* simplify internal sig (= 1) */ +long BVL_LINNUM = 1; /* file's line number */ +long BVL_AUXMOD; /* simplify internal sig (= 1) */ char BVL_CURFIL[200]; /* current file's name */ befig_list *BVL_HEDFIG = NULL; diff --git a/alliance/src/abv/src/bvl_util.c b/alliance/src/abv/src/bvl_util.c index 7b3575a5..e75841a5 100644 --- a/alliance/src/abv/src/bvl_util.c +++ b/alliance/src/abv/src/bvl_util.c @@ -51,10 +51,7 @@ /* function : bvl_error */ /* ###--------------------------------------------------------------### */ -void bvl_error (code, str1) - -int code; -char *str1; +void bvl_error ( long code, char *str1 ) { BVL_ERRFLG++; @@ -214,7 +211,7 @@ char *name; char *prv_name; char *tmp_name; char buffer[200]; - int i,j,flag,number; + long i,j,flag,number; static struct beden **namtab=NULL; static char *keywrd [] = { "abs" , "access" , @@ -334,7 +331,7 @@ char *name; { char *new_name ; char tmp1 [256]; - int i = 0; + long i = 0; static struct beden **tab = NULL; if (tab == NULL) @@ -373,7 +370,7 @@ char *name; void *bvl_vectnam(pt_list,left,right,name,type) void *pt_list; -int *left, *right; +long *left, *right; char **name; char type; /* If type = 0 bepor_list, type = 1 bebux_list */ /* If type = 2 bereg_list, type = 3 beaux_list */ @@ -614,10 +611,10 @@ char *bvl_abl2str (expr, chaine, size_pnt) struct chain *expr; /* expression */ char *chaine; /* target string */ -int *size_pnt; /* size of available space */ +long *size_pnt; /* size of available space */ { - int operator; + long operator; char *oper ; struct chain *operand ; static char *str_z = NULL; @@ -667,7 +664,7 @@ int *size_pnt; /* size of available space */ /* "(operand operator operand operator operand ...)" */ /* ###------------------------------------------------------### */ - operator = (int) ((struct chain *) expr->DATA)->DATA; + operator = (long) ((struct chain *) expr->DATA)->DATA; operand = (struct chain *)expr->NEXT->DATA; if (operator == ABL_STABLE) diff --git a/alliance/src/abv/src/bvl_util.h b/alliance/src/abv/src/bvl_util.h index 162acea8..30e9b994 100644 --- a/alliance/src/abv/src/bvl_util.h +++ b/alliance/src/abv/src/bvl_util.h @@ -35,7 +35,7 @@ /* */ /* ###--------------------------------------------------------------### */ -extern int BVL_LINNUM; /* file's line number */ +extern long BVL_LINNUM; /* file's line number */ extern char BVL_ERRFLG; /* Error flag */ extern char BVL_CURFIL[]; /* current file name */ diff --git a/alliance/src/asimut/src/c_hada_repondeur.c b/alliance/src/asimut/src/c_hada_repondeur.c index c95cfe7f..32185a59 100644 --- a/alliance/src/asimut/src/c_hada_repondeur.c +++ b/alliance/src/asimut/src/c_hada_repondeur.c @@ -8,6 +8,7 @@ /* ###--------------------------------------------------------------### */ #include +#include #include "mut.h" #include "log.h" #include "beh.h" diff --git a/alliance/src/asimut/src/c_sr1k_8b.c b/alliance/src/asimut/src/c_sr1k_8b.c index 064ae84e..c434223d 100644 --- a/alliance/src/asimut/src/c_sr1k_8b.c +++ b/alliance/src/asimut/src/c_sr1k_8b.c @@ -38,6 +38,7 @@ #include "vh_ltype.h" #include "vh_lspec.h" #include "vh_xspec.h" +#include "vh_xcomm.h" /* ###--------------------------------------------------------------### */ diff --git a/alliance/src/asimut/src/sch.h b/alliance/src/asimut/src/sch.h index 1ebc0466..2ff47741 100644 --- a/alliance/src/asimut/src/sch.h +++ b/alliance/src/asimut/src/sch.h @@ -10,6 +10,8 @@ #ifndef SCH_SCHDEF #define SCH_SCHDEF +#include "mut.h" + /* ###------------------------------------------------------### */ /* basic defines */ /* ###------------------------------------------------------### */ diff --git a/alliance/src/asimut/src/sch_debug.c b/alliance/src/asimut/src/sch_debug.c index 15726c4b..92df7064 100644 --- a/alliance/src/asimut/src/sch_debug.c +++ b/alliance/src/asimut/src/sch_debug.c @@ -794,7 +794,7 @@ char *type; /* structure's type */ { size = siz [(typ [idx] & TYPE_DFN)]; pntr = (void *) - (((unsigned int) pnt [idx].dat) + (size * nmbrs [1])); + (((unsigned long) pnt [idx].dat) + (size * nmbrs [1])); push (stk, &stkpnt, pntr, pshtype); readflg = 1; } @@ -811,7 +811,7 @@ char *type; /* structure's type */ { size = sizeof (void *); pntr = * (void **) - (((unsigned int) pnt [idx].dat) + (size * nmbrs [1])); + (((unsigned long) pnt [idx].dat) + (size * nmbrs [1])); push (stk, &stkpnt, pntr, pshtype); readflg = 1; } diff --git a/alliance/src/asimut/src/sch_hash.c b/alliance/src/asimut/src/sch_hash.c index 53b8b803..06bde58b 100644 --- a/alliance/src/asimut/src/sch_hash.c +++ b/alliance/src/asimut/src/sch_hash.c @@ -21,7 +21,7 @@ void *ident; { unsigned int index; - index = (unsigned int) ident; + index = (unsigned long) ident; index = (((index >> 2) ^ (index >> 10)) + (index >> 12) + (index >> 20)); index &= index & 0x000000ff; diff --git a/alliance/src/asimut/src/vh_debug.c b/alliance/src/asimut/src/vh_debug.c index bca8bcbb..1d6123e8 100644 --- a/alliance/src/asimut/src/vh_debug.c +++ b/alliance/src/asimut/src/vh_debug.c @@ -36,7 +36,7 @@ char **str ; /* recognized strings */ int i; struct chain *ptr_abl; static char *buffer = NULL; - static int buffer_size = 0; + static long buffer_size = 0; static struct circuit *circuit_pnt = NULL; struct chain *chain_pnt; @@ -1902,7 +1902,7 @@ char *type; /* structure's type */ { size = siz [(typ [idx] & TYPE_DFN)]; pntr = (void *) - (((unsigned int) pnt [idx].dat) + (size * nmbrs [1])); + (((unsigned long) pnt [idx].dat) + (size * nmbrs [1])); push (stk, &stkpnt, pntr, pshtype); readflg = 1; } @@ -1919,7 +1919,7 @@ char *type; /* structure's type */ { size = sizeof (void *); pntr = * (void **) - (((unsigned int) pnt [idx].dat) + (size * nmbrs [1])); + (((unsigned long) pnt [idx].dat) + (size * nmbrs [1])); push (stk, &stkpnt, pntr, pshtype); readflg = 1; } diff --git a/alliance/src/asimut/src/vh_xcomm.c b/alliance/src/asimut/src/vh_xcomm.c index 94619733..753479fc 100644 --- a/alliance/src/asimut/src/vh_xcomm.c +++ b/alliance/src/asimut/src/vh_xcomm.c @@ -51,7 +51,7 @@ /* called funct : mbkalloc, addht, gethtitem, addhtitem, */ /* ###--------------------------------------------------------------### */ -unsigned int vhx_getvalu (pt_lkdins, pt_ptmem, size, pt_func) +unsigned long vhx_getvalu (pt_lkdins, pt_ptmem, size, pt_func) struct lkdins *pt_lkdins ; char **pt_ptmem ; @@ -71,17 +71,17 @@ void (* pt_func) (); pt_mem = (char *) gethtitem (mem_tabl, pt_lkdins); - if (((int) pt_mem) == EMPTYHT) + if (((long) pt_mem) == EMPTYHT) { pt_mem = mbkalloc (size); - addhtitem (mem_tabl, pt_lkdins, (int) pt_mem); + addhtitem (mem_tabl, pt_lkdins, (long) pt_mem); addhtitem (siz_tabl, pt_lkdins, size ); if (pt_func != NULL) (* pt_func) (pt_lkdins, pt_mem); } - size = (unsigned int) gethtitem (siz_tabl, pt_lkdins); + size = (unsigned long) gethtitem (siz_tabl, pt_lkdins); *pt_ptmem = pt_mem; return (size); @@ -93,7 +93,7 @@ void (* pt_func) (); /* called func. : vhx_getvalu */ /* ###--------------------------------------------------------------### */ -unsigned int vhx_getsize (pt_lkdfig) +unsigned long vhx_getsize (pt_lkdfig) struct lkdfig *pt_lkdfig; diff --git a/alliance/src/asimut/src/vh_xcomm.h b/alliance/src/asimut/src/vh_xcomm.h index 25d65de9..fdc2f41f 100644 --- a/alliance/src/asimut/src/vh_xcomm.h +++ b/alliance/src/asimut/src/vh_xcomm.h @@ -8,8 +8,8 @@ /* the simulation funciotns */ /* ###--------------------------------------------------------------### */ -extern unsigned int vhx_getvalu (); -extern unsigned int vhx_getsize (); +extern unsigned long vhx_getvalu (); +extern unsigned long vhx_getsize (); extern char vhx_gexeval (); extern char vhx_muxbit (); extern char vhx_worbit (); diff --git a/alliance/src/asimut/src/vh_xspec.c b/alliance/src/asimut/src/vh_xspec.c index 59270c4e..a477db26 100644 --- a/alliance/src/asimut/src/vh_xspec.c +++ b/alliance/src/asimut/src/vh_xspec.c @@ -14,6 +14,7 @@ #include #include #include "mut.h" +#include "mlo.h" #include "beh.h" #include "log.h" #include "pat.h" @@ -1153,7 +1154,7 @@ unsigned char value; unsigned int l_tim = 0; /* Statistics last_time access */ unsigned int res = 0; - switch((unsigned int)ctx) + switch((unsigned long)ctx) { case CTXPRB : if (value == '1') diff --git a/alliance/src/aut/src/aut.h b/alliance/src/aut/src/aut.h index 18fe8f61..e81ca9da 100644 --- a/alliance/src/aut/src/aut.h +++ b/alliance/src/aut/src/aut.h @@ -268,7 +268,7 @@ extern "C" { | | \------------------------------------------------------*/ - extern void autexit __P((int Value)); + extern void autexit __P((long Value)); /*------------------------------------------------------\ | | diff --git a/alliance/src/aut/src/autenv.c b/alliance/src/aut/src/autenv.c index 9b290b14..c7e7f878 100644 --- a/alliance/src/aut/src/autenv.c +++ b/alliance/src/aut/src/autenv.c @@ -43,8 +43,10 @@ # include # include +# include # include # include +# include # include # include "aut.h" diff --git a/alliance/src/aut/src/autexit.c b/alliance/src/aut/src/autexit.c index 37f18d57..90cd20ba 100644 --- a/alliance/src/aut/src/autexit.c +++ b/alliance/src/aut/src/autexit.c @@ -86,7 +86,7 @@ void autexit( Value ) - int Value; + long Value; { long *Core = (long *)1; diff --git a/alliance/src/aut/src/autresize.c b/alliance/src/aut/src/autresize.c index 4aa12a15..68f7a8ca 100644 --- a/alliance/src/aut/src/autresize.c +++ b/alliance/src/aut/src/autresize.c @@ -42,6 +42,7 @@ \------------------------------------------------------------*/ # include +# include # include # include diff --git a/alliance/src/beh/src/beh.h b/alliance/src/beh/src/beh.h index e2d4b0de..cb64ddde 100644 --- a/alliance/src/beh/src/beh.h +++ b/alliance/src/beh/src/beh.h @@ -277,6 +277,7 @@ begex_list; /* ###------------------------------------------------------### */ extern struct beaux *beh_addbeaux (); +extern struct bequad *beh_addbequad (); extern struct bebux *beh_addbebux (); extern struct bebus *beh_addbebus (); extern struct befig *beh_addbefig (); diff --git a/alliance/src/beh/src/beh_dict.c b/alliance/src/beh/src/beh_dict.c index 423dc220..ba3f8824 100644 --- a/alliance/src/beh/src/beh_dict.c +++ b/alliance/src/beh/src/beh_dict.c @@ -52,7 +52,7 @@ char *key; { struct beden *entry; - int i ; + long i ; if (BEH_DCEHED == NULL) { @@ -91,7 +91,7 @@ char *key; { struct bedrd *recrd; - int i ; + long i ; if (BEH_DCRHED == NULL) { @@ -134,7 +134,7 @@ struct beden **beh_initab () { struct beden **head; - int i; + long i; head = (struct beden **) mbkalloc (sizeof(struct beden *) * BEH_HSZDFN); @@ -156,17 +156,17 @@ void beh_addtab (head, key_str, ctx_str, field, valu) struct beden **head; char *key_str; char *ctx_str; -int field; -int valu; +long field; +long valu; { - int found = 0; - unsigned int key ; - unsigned int index ; + long found = 0; + unsigned long key ; + unsigned long index ; struct beden *entry_pnt ; struct bedrd *recrd_pnt ; - key = ((unsigned int) key_str) + ((unsigned int) ctx_str); + key = ((unsigned long) key_str) + ((unsigned long) ctx_str); index = key % BEH_HSZDFN; entry_pnt = head [index]; @@ -238,17 +238,17 @@ long beh_chktab (head, key_str, ctx_str, field) struct beden **head ; char *key_str; char *ctx_str; -int field ; +long field ; { - int found = 0; + long found = 0; long valu = 0; - unsigned int key ; - unsigned int index ; + unsigned long key ; + unsigned long index ; struct beden *entry_pnt; struct bedrd *recrd_pnt; - key = ((unsigned int) key_str) + ((unsigned int) ctx_str); + key = ((unsigned long) key_str) + ((unsigned long) ctx_str); index = key % BEH_HSZDFN; entry_pnt = head [index]; @@ -317,7 +317,7 @@ struct beden **pt_hash; struct beden *pt_entry ; struct beden *pt_nxtentry; struct bedrd *pt_record ; - int i ; + long i ; if (pt_hash != NULL) { diff --git a/alliance/src/beh/src/beh_rplstable.c b/alliance/src/beh/src/beh_rplstable.c index 928b6eeb..e40564be 100644 --- a/alliance/src/beh/src/beh_rplstable.c +++ b/alliance/src/beh/src/beh_rplstable.c @@ -48,11 +48,11 @@ struct chain *pt_abl; struct chain *opr_lst; char *sig_nam; struct chain *new_abl; - unsigned int opera ; + unsigned long opera ; if (pt_abl->NEXT != NULL) { - opera = (unsigned int) ((struct chain *) pt_abl->DATA)->DATA; + opera = (unsigned long) ((struct chain *) pt_abl->DATA)->DATA; if (opera == STABLE) { sig_nam = (char *) ((struct chain *) pt_abl->NEXT->DATA)->DATA; diff --git a/alliance/src/beh/src/beh_toolbug.c b/alliance/src/beh/src/beh_toolbug.c index f832783a..f478f5f5 100644 --- a/alliance/src/beh/src/beh_toolbug.c +++ b/alliance/src/beh/src/beh_toolbug.c @@ -68,7 +68,7 @@ int nbr1; fprintf (stderr,"cannot drive empty or erroneous description\n"); break; case 15 : - fprintf (stderr,"illegal bit string value : `%c`\n",nbr1); + fprintf (stderr,"illegal bit string value : `%c`\n",(char)nbr1); break; case 16 : fprintf (stderr,"the same expression cannot be used twice\n"); diff --git a/alliance/src/beh/src/beh_vhvector.c b/alliance/src/beh/src/beh_vhvector.c index 23496cae..257183c1 100644 --- a/alliance/src/beh/src/beh_vhvector.c +++ b/alliance/src/beh/src/beh_vhvector.c @@ -30,6 +30,7 @@ /* ###--------------------------------------------------------------### */ #include +#include #include "mut.h" #include "log.h" #include "beh.h" @@ -46,7 +47,7 @@ char *name; { char *new_name ; char tmp1 [256] ; - int i = 0 ; + long i = 0 ; static struct beden **tab = NULL; /* ###------------------------------------------------------### */ diff --git a/alliance/src/bhl/src/beh_debug.c b/alliance/src/bhl/src/beh_debug.c index 0b37458d..4dbb34e8 100644 --- a/alliance/src/bhl/src/beh_debug.c +++ b/alliance/src/bhl/src/beh_debug.c @@ -36,7 +36,7 @@ #include "beh_debug.h" static char *buffer = NULL; -static unsigned int buff_size = 0; +static unsigned long buff_size = 0; static struct circuit *circuit_pnt = NULL; @@ -55,7 +55,7 @@ char **str; /* recognized strings */ { - int i; + long i; struct chain *ptr_abl; struct chain *chain_pnt; @@ -79,7 +79,7 @@ char **str; /* recognized strings */ char **string_pnt; char *character_pnt; - int *int_pnt; + long *int_pnt; /* ###------------------------------------------------------### */ /* initialization */ @@ -516,7 +516,7 @@ char **str; /* recognized strings */ case integer_DFN : - int_pnt = (int *) curpnt.data; + int_pnt = (long *) curpnt.data; typ [integer_DFN] = IMMEDIATE_DFN | d_DFN | integer_DFN; pnt [integer_DFN].imd = *int_pnt; @@ -641,17 +641,17 @@ char **str; /* recognized strings */ /* called func. : none */ /* ###--------------------------------------------------------------### */ -static int splitline (words, line) +static long splitline (words, line) char **words; char *line ; { char *heap = *words; - int new = 1; - int wrdcnt = 0; - int i = 0; - int j = 0; + long new = 1; + long wrdcnt = 0; + long i = 0; + long j = 0; /* ###------------------------------------------------------### */ /* copy the line read from input into the words until a */ @@ -692,12 +692,12 @@ char *line ; static void push (stk, stkpnt, data, type) struct stack *stk; -int *stkpnt; +long *stkpnt; void *data; short type; { - int stkidx = *stkpnt; + long stkidx = *stkpnt; if (stkidx == STKSIZ_DFN) fprintf (stdout, "beh_debug :\tSTACK OVERFLOW !!\tSTACK OVERFLOW !!\n"); @@ -724,11 +724,11 @@ short type; static void pop (stkpnt, count) -int *stkpnt; -int count; +long *stkpnt; +long count; { - int stkidx = *stkpnt; + long stkidx = *stkpnt; if (stkidx <= count) stkidx = 0; @@ -748,7 +748,7 @@ int count; static struct chain *goforward (pnt, count) struct chain *pnt; -int count; +long count; { while ((count > 0) && (pnt != NULL) && (pnt->NEXT != NULL)) @@ -767,17 +767,17 @@ int count; /* called func. : none */ /* ###--------------------------------------------------------------### */ -static int translate (words, wrdcnt, strgs, nmbrs, flags, indxs) +static long translate (words, wrdcnt, strgs, nmbrs, flags, indxs) char **words; /* list of words */ -int wrdcnt; /* number of words */ +long wrdcnt; /* number of words */ char **strgs; /* list of recognized strings */ -int *nmbrs; /* words translated to numbers */ +long *nmbrs; /* words translated to numbers */ char *flags; /* set if word is a number */ -int *indxs; /* words' index in strgs table */ +long *indxs; /* words' index in strgs table */ { - int i , j; + long i , j; /* ###------------------------------------------------------### */ /* initialize flags and indxs */ @@ -813,10 +813,10 @@ int *indxs; /* words' index in strgs table */ static void getsize (siz) -unsigned int siz []; +unsigned long siz []; { - int i; + long i; for (i=0 ; i +#include +#include #include "mut.h" #include "log.h" #include "beh.h" @@ -57,7 +59,7 @@ struct chain *pt_exp; struct chain *del_chain = NULL; struct chain *tmp_chain = NULL; struct chain *mem_chain = NULL; - int value ; + long value ; if (pt_fig->ERRFLG == 0) { @@ -97,7 +99,7 @@ struct chain *pt_exp; exit( pt_fig->ERRFLG ); } else - tmp_chain->DATA = (void *) value; + tmp_chain->DATA = (chain_list *) value; tmp_chain = tmp_chain->NEXT; } @@ -129,7 +131,7 @@ struct befig *pt_fig; struct beout *pt_out ; struct bebus *pt_bus ; struct biabl *pt_biabl ; - unsigned int count = 0; + unsigned long count = 0; /* ###------------------------------------------------------### */ /* if there is no error in the current figure ... */ @@ -155,7 +157,7 @@ struct befig *pt_fig; while (pt_rin != NULL) { - addhtitem (rin_list, pt_rin->NAME, (int) pt_rin); + addhtitem (rin_list, pt_rin->NAME, (long) pt_rin); pt_rin = pt_rin->NEXT; } diff --git a/alliance/src/bhl/src/beh_makquad.c b/alliance/src/bhl/src/beh_makquad.c index 0b39b4db..bf8eddf5 100644 --- a/alliance/src/bhl/src/beh_makquad.c +++ b/alliance/src/bhl/src/beh_makquad.c @@ -41,9 +41,7 @@ /* called func. : beh_addbequad */ /* ###--------------------------------------------------------------### */ -void beh_makquad (pt_befig) - -struct befig *pt_befig; +void beh_makquad ( struct befig *pt_befig ) { struct beaux *pt_beaux; diff --git a/alliance/src/bhl/src/beh_namelist.c b/alliance/src/bhl/src/beh_namelist.c index bb405544..db3a89cb 100644 --- a/alliance/src/bhl/src/beh_namelist.c +++ b/alliance/src/bhl/src/beh_namelist.c @@ -88,7 +88,7 @@ struct chain *pt_exp; /* variable list. */ /* ###------------------------------------------------------### */ - if (((int) ((struct chain *) pt_exp->DATA)->DATA) == STABLE) + if (((long) ((struct chain *) pt_exp->DATA)->DATA) == STABLE) { name = ((struct chain *) pt_exp->NEXT->DATA)->DATA; res_chain = addchain (NULL, name); diff --git a/alliance/src/boog/src/bog_map_befig.c b/alliance/src/boog/src/bog_map_befig.c index b97d1127..08f0179d 100644 --- a/alliance/src/boog/src/bog_map_befig.c +++ b/alliance/src/boog/src/bog_map_befig.c @@ -54,7 +54,7 @@ static lofig_list *lofig; /*befig in mapping*/ static befig_list* befig; /*index of losig*/ -static long index; +static long loc_index; @@ -63,7 +63,7 @@ static long index; /****************************************************************************/ extern void setindex(long new_index) { - index = new_index; + loc_index = new_index; } @@ -73,8 +73,8 @@ extern void setindex(long new_index) extern long getindex() { long ret; - ret=index; - index++; + ret=loc_index; + loc_index++; return ret; } @@ -128,7 +128,7 @@ extern losig_list* make_equi(losig_list* losig_sce, losig_list* losig_dest) for (namechain=losig_dest->NAMECHAIN; namechain; namechain=namechain->NEXT) { name=(char*) namechain->DATA; losig_dest->NAMECHAIN=addchain(losig_dest->NAMECHAIN,name); - addauthelem(HTABLE,name,(int)losig_dest); + addauthelem(HTABLE,name,(long)losig_dest); } losig_dest->TYPE=losig_sce->TYPE; @@ -210,9 +210,9 @@ static void add_losig_to_lofig() addlocon(lofig,bepor->NAME,losig,bepor->DIRECTION); /*seek fast*/ - if (isvss(bepor->NAME)) addauthelem(HTABLE,VSS,(int) losig); - else if (isvdd(bepor->NAME)) addauthelem(HTABLE,VDD,(int) losig); - else addauthelem(HTABLE,bepor->NAME,(int) losig); + if (isvss(bepor->NAME)) addauthelem(HTABLE,VSS,(long) losig); + else if (isvdd(bepor->NAME)) addauthelem(HTABLE,VDD,(long) losig); + else addauthelem(HTABLE,bepor->NAME,(long) losig); } /*copy of INTERNAL signals*/ @@ -221,21 +221,21 @@ static void add_losig_to_lofig() index=getindex(); losig=addlosig(lofig,index,namechain,INTERNAL/*no more capa parameter*/); /*seek fast*/ - addauthelem(HTABLE,beaux->NAME,(int) losig); + addauthelem(HTABLE,beaux->NAME,(long) losig); } for (bereg=befig->BEREG; bereg; bereg=bereg->NEXT) { namechain=addchain(NULL,bereg->NAME); index=getindex(); losig=addlosig(lofig,index,namechain,INTERNAL/*no more capa parameter*/); - addauthelem(HTABLE,bereg->NAME,(int) losig); + addauthelem(HTABLE,bereg->NAME,(long) losig); } for (bebux=befig->BEBUX; bebux; bebux=bebux->NEXT) { namechain=addchain(NULL,bebux->NAME); index=getindex(); losig=addlosig(lofig,index,namechain,INTERNAL/*no more capa parameter*/); - addauthelem(HTABLE,bebux->NAME,(int) losig); + addauthelem(HTABLE,bebux->NAME,(long) losig); } } @@ -259,7 +259,7 @@ static void add_one_zero_losig() namechain=addchain(NULL,name); index=getindex(); one=addlosig(lofig,index,namechain,INTERNAL/*no more capa parameter*/); - addauthelem(HTABLE,getablatomone(),(int) one); + addauthelem(HTABLE,getablatomone(),(long) one); name=getautoname("zero"); /*report same properties*/ @@ -268,7 +268,7 @@ static void add_one_zero_losig() namechain=addchain(NULL,name); index=getindex(); zero=addlosig(lofig,index,namechain,INTERNAL/*no more capa parameter*/); - addauthelem(HTABLE,getablatomzero(),(int) zero); + addauthelem(HTABLE,getablatomzero(),(long) zero); } @@ -317,7 +317,7 @@ extern lofig_list* map_befig(befig_list *befig_param, char* lofig_name) befig=befig_param; HTABLE= createauthtable (BLOCK); - index=0; + loc_index=0; begin_count_area(); /*header of lofig created*/ @@ -342,7 +342,7 @@ extern lofig_list* map_befig(befig_list *befig_param, char* lofig_name) destroyauthtable(HTABLE); HTABLE=NULL; - index=0; + loc_index=0; return lofig; } diff --git a/alliance/src/boog/src/bog_map_delay.c b/alliance/src/boog/src/bog_map_delay.c index d400a603..adb1600e 100644 --- a/alliance/src/boog/src/bog_map_delay.c +++ b/alliance/src/boog/src/bog_map_delay.c @@ -29,6 +29,7 @@ #include +#include #include #include #include diff --git a/alliance/src/boog/src/bog_normalize_ARITY.h b/alliance/src/boog/src/bog_normalize_ARITY.h index ff914ddf..4a3b25a3 100644 --- a/alliance/src/boog/src/bog_normalize_ARITY.h +++ b/alliance/src/boog/src/bog_normalize_ARITY.h @@ -44,7 +44,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(abl) ((long)ABL_CDR((chain_list*)ABL_CAR(abl))) #define ABL_ARITY_L(abl) (ABL_CDR((chain_list*)ABL_CAR(abl))) /***************************************************************************/ diff --git a/alliance/src/boog/src/bog_normalize_DAG.c b/alliance/src/boog/src/bog_normalize_DAG.c index 51526281..fb4a12b5 100644 --- a/alliance/src/boog/src/bog_normalize_DAG.c +++ b/alliance/src/boog/src/bog_normalize_DAG.c @@ -42,11 +42,11 @@ #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) -#define IS_ONE(node) ((int)node==1) +#define USED(node) {node=(long)((((long)node<0)?0L:(long)node)+1L);} +#define IS_USING(node) ((long)node==-mark) +#define IS_USED(node) ((long)node!=0) +#define IS_UNUSED(node) ((long)node==0) +#define IS_ONE(node) ((long)node==1) typedef struct equi { @@ -330,7 +330,7 @@ static void unmark_all() /* mark and follow the tree of abl */ /* return 1 if correct abl */ /******************************************************************************/ -static int abl_dispatching(chain_list *abl, int mark) +static long abl_dispatching(chain_list *abl, long mark) { bebux_list *bebux; beaux_list *beaux; @@ -502,12 +502,12 @@ static int abl_dispatching(chain_list *abl, int mark) /* mark each output */ /* return 1 if correct */ /***************************************************************************/ -static int mark_output() +static long mark_output() { bebus_list *bebus; beout_list *beout; biabl_list *biabl; - int mark=1; + long mark=1; /*create new internal signals and mark the path from output to input*/ for (beout=befig->BEOUT; beout; beout=beout->NEXT) { @@ -549,7 +549,7 @@ static int mark_output() /* control cycles in befig and erase unused internal signal */ /* return 1 if correct befig */ /******************************************************************************/ -extern int DAG_control(befig_list *befig_param) +extern long DAG_control(befig_list *befig_param) { equi_list* equi, *equi2; bereg_list *bereg; diff --git a/alliance/src/boog/src/bog_normalize_DAG.h b/alliance/src/boog/src/bog_normalize_DAG.h index bea81431..e66a058e 100644 --- a/alliance/src/boog/src/bog_normalize_DAG.h +++ b/alliance/src/boog/src/bog_normalize_DAG.h @@ -46,7 +46,7 @@ /* control cycles in befig and erase unused internal signal */ /* return 1 if correct befig */ /******************************************************************************/ -extern int DAG_control __P ((befig_list *befig)); +extern long DAG_control __P ((befig_list *befig)); #endif diff --git a/alliance/src/boog/src/bog_normalize_DC.c b/alliance/src/boog/src/bog_normalize_DC.c index c4846aee..19180912 100644 --- a/alliance/src/boog/src/bog_normalize_DC.c +++ b/alliance/src/boog/src/bog_normalize_DC.c @@ -42,7 +42,7 @@ /***************************************************************************/ /* choose '1' or '0' to simplify the expression as well as we can */ /***************************************************************************/ -static void find_d_z_abl(chain_list* abl, int value) +static void find_d_z_abl(chain_list* abl, long value) { if (ABL_ATOM(abl)) { @@ -56,6 +56,7 @@ static void find_d_z_abl(chain_list* abl, int value) /* a pull-up is done for better conductance*/ ABL_CAR_L(abl)=getablatomone()/* = namealloc("'1'")*/; } + return; } /*the first operator influences the most*/ diff --git a/alliance/src/boog/src/bog_normalize_nameindex.c b/alliance/src/boog/src/bog_normalize_nameindex.c index 25fb1e50..0ac01968 100644 --- a/alliance/src/boog/src/bog_normalize_nameindex.c +++ b/alliance/src/boog/src/bog_normalize_nameindex.c @@ -85,7 +85,7 @@ static int control_vector() name=nameindex((char*) ptype->DATA,ptype->TYPE); SEPAR='_'; /*build a bit from a vector*/ - addauthelem(HTABLE,name,(int)nameindex(ptype->DATA,ptype->TYPE)); + addauthelem(HTABLE,name,(long)nameindex(ptype->DATA,ptype->TYPE)); } } else { @@ -349,21 +349,21 @@ extern void change_radical(befig_list* befig) if (!forbid_radical(beaux->NAME)) continue; name=beaux->NAME; /*name begins by MBK_NOT_..... */ beaux->NAME=getautoname(beaux->NAME); - addauthelem(HTABLE,name,(int)beaux->NAME); + addauthelem(HTABLE,name,(long)beaux->NAME); } for (bereg=befig->BEREG; bereg; bereg=bereg->NEXT) { if (!forbid_radical(bereg->NAME)) continue; name=bereg->NAME; bereg->NAME=getautoname(bereg->NAME); - addauthelem(HTABLE,name,(int)bereg->NAME); + addauthelem(HTABLE,name,(long)bereg->NAME); } for (bebux=befig->BEBUX; bebux; bebux=bebux->NEXT) { if (!forbid_radical(bebux->NAME)) continue; name=bebux->NAME; bebux->NAME=getautoname(bebux->NAME); - addauthelem(HTABLE,name,(int)bebux->NAME); + addauthelem(HTABLE,name,(long)bebux->NAME); } for (beaux=befig->BEAUX; beaux; beaux=beaux->NEXT) { diff --git a/alliance/src/boog/src/bog_signal_utils.c b/alliance/src/boog/src/bog_signal_utils.c index e0b22554..59275019 100644 --- a/alliance/src/boog/src/bog_signal_utils.c +++ b/alliance/src/boog/src/bog_signal_utils.c @@ -133,7 +133,7 @@ static void putsignal(signal_list* signal, char* name) /*if doesn't exist hash table, init*/ if (!HTABLE) init_signals(); - addauthelem(HTABLE,name,(int)signal); + addauthelem(HTABLE,name,(long)signal); } diff --git a/alliance/src/btr/src/btrerror.h b/alliance/src/btr/src/btrerror.h index 1e63cdbc..b9640b3b 100644 --- a/alliance/src/btr/src/btrerror.h +++ b/alliance/src/btr/src/btrerror.h @@ -46,6 +46,8 @@ # ifndef BTR_ERROR_H # define BTR_ERROR_H +# include + /*------------------------------------------------------------\ | | | Constants | diff --git a/alliance/src/btr/src/btrfunc.c b/alliance/src/btr/src/btrfunc.c index 9a51022c..825eb280 100644 --- a/alliance/src/btr/src/btrfunc.c +++ b/alliance/src/btr/src/btrfunc.c @@ -43,6 +43,7 @@ # include # include +# include # include # include "mut.h" # include "aut.h" diff --git a/alliance/src/bvl/src/bvl.h b/alliance/src/bvl/src/bvl.h index b2e1f0b3..8339bc7c 100644 --- a/alliance/src/bvl/src/bvl.h +++ b/alliance/src/bvl/src/bvl.h @@ -25,7 +25,7 @@ typedef struct bvl_expr /* a signal's expression */ { char *IDENT ; /* identifier or constant name */ - unsigned int TIME ; /* waveform's delay */ + unsigned long TIME ; /* waveform's delay */ struct chain *LIST_ABL; /* pointer on a list of ABL */ short WIDTH ; /* width of bit vector */ } @@ -42,7 +42,7 @@ bvl_name; struct g_type { - int VALU; + long VALU; char FLAG; }; @@ -51,7 +51,7 @@ struct g_type /* global variables */ /* ###------------------------------------------------------### */ -extern int BVL_AUXMOD ; /* don't keep internal sig (=1) */ +extern long BVL_AUXMOD ; /* don't keep internal sig (=1) */ extern char BVL_ERRFLG ; /* error flag */ extern char BVL_CURFIL []; /* current file name */ extern struct befig *BVL_HEDFIG ; /* list of descriptions */ @@ -72,6 +72,6 @@ extern char *bvl_printabl (); extern void bvl_message (); extern struct befig *vhdlloadbefig (); -extern int vhdlsavebefig (); +extern long vhdlsavebefig (); #endif diff --git a/alliance/src/bvl/src/bvl_bcomp_l.l b/alliance/src/bvl/src/bvl_bcomp_l.l index 1d3c6d84..e3668497 100644 --- a/alliance/src/bvl/src/bvl_bcomp_l.l +++ b/alliance/src/bvl/src/bvl_bcomp_l.l @@ -13,7 +13,7 @@ /* called func. : addht, addhtitem, gethtitem, namealloc */ /* ###--------------------------------------------------------------### */ -static int search (key) +static long search (key) char *key; @@ -198,7 +198,7 @@ base_specifier (B|b|O|o|X|x) \/ { return (Slash ); } {letter}(_?{letter_or_digit})* { - int itoken; + long itoken; itoken = search (yytext); if (itoken == EMPTYHT) @@ -213,7 +213,7 @@ base_specifier (B|b|O|o|X|x) } ({decimal_literal})|({base}#{based_integer}(\.{based_integer})?#({exponent})?)|({base}:{based_integer}(\.{based_integer})?:({exponent})?) { - yylval.text = mbkalloc ((unsigned int)strlen(yytext)+1); + yylval.text = mbkalloc ((unsigned long)strlen(yytext)+1); strcpy (yylval.text, yytext); return (AbstractLit); } diff --git a/alliance/src/bvl/src/bvl_bcomp_y.y b/alliance/src/bvl/src/bvl_bcomp_y.y index 6e92ed9d..c114ab7d 100644 --- a/alliance/src/bvl/src/bvl_bcomp_y.y +++ b/alliance/src/bvl/src/bvl_bcomp_y.y @@ -38,18 +38,18 @@ char *str; /* in a string of '0' and '1's */ /* ###--------------------------------------------------------------### */ -static int tobin (trg, src, left, right) +static long tobin ( -char *trg ; -char *src ; -int left ; -int right; +char *trg , +char *src , +long left , +long right ) - { +{ char base ; - int indx ; - int j = 0; - int errflg = 0; + long indx ; + long j = 0; + long errflg = 0; char lcl_trg [256]; lcl_trg [0] = '\0'; @@ -216,25 +216,25 @@ int right; } return (errflg); - } +} /* ###--------------------------------------------------------------### */ /* function : chkdcl */ /* ###--------------------------------------------------------------### */ -static int chkdcl (object, mode, type, flag, kind, constraint, conf) +static long chkdcl (object, mode, type, flag, kind, constraint, conf) char object ; -int mode ; -int type ; +long mode ; +long type ; char flag ; -int kind ; +long kind ; char constraint; -int *conf ; +long *conf ; { - int errflg = 0; - int lclcnf = 0; + long errflg = 0; + long lclcnf = 0; if (flag != constraint) { @@ -404,8 +404,8 @@ static void *addstr (ptfig, object, mode, type, flag, name, left, right) struct befig *ptfig ; char object; -int mode ; -int type ; +long mode ; +long type ; char flag ; char *name ; short left ; @@ -580,8 +580,8 @@ short right ; /* array's right bound (= -1 if scalar) */ struct begen *ptgen ; struct chain *ptauxnam ; struct chain *ptauxnat ; - int i ; - int inc = 1; + long i ; + long inc = 1; ptgen = last_gen; ptauxnam = nam_lst ; @@ -697,13 +697,13 @@ bvl_ablstr ablstr; /* bvl_error , addchain , freechain */ /* ###--------------------------------------------------------------### */ -static bvl_ablstr crtabl (oper, expr1, expr2, left, right) +static bvl_ablstr crtabl ( -short oper ; -bvl_ablstr expr1; -bvl_ablstr expr2; -int left ; -int right; +short oper , +bvl_ablstr expr1, +bvl_ablstr expr2, +long left , +long right ) { char name [256] ; @@ -1247,7 +1247,7 @@ bvl_ablstr pt_ablstr; /* tested expression */ { char binstr[256]; - int i; + long i; struct chain *pt_auxabl; pNode pt_bddres; pNode pt_bddnew; @@ -1256,8 +1256,8 @@ bvl_ablstr pt_ablstr; /* tested expression */ char nomvar[10]; struct chain *pt_newabl; struct chain *pt_newabl2; - static int oth_flg=0; - static int last_width=0; + static long oth_flg=0; + static long last_width=0; static pCircuit pC = NULL; result->LIST_ABL = NULL; @@ -1871,7 +1871,7 @@ formal_port_element .signal_kind. { char *signame; - int sigconf; + long sigconf; void *pnt; /* ###----------------------------------------------### */ @@ -1895,7 +1895,7 @@ formal_port_element beh_addtab (dic, signame, BVL_MODNAM, BVL_SIGDFN, sigconf); beh_addtab (dic, signame, BVL_MODNAM, BVL_WMNDFN, $6.LEFT); beh_addtab (dic, signame, BVL_MODNAM, BVL_WMXDFN, $6.RIGHT); - beh_addtab (dic, signame, BVL_MODNAM, BVL_PNTDFN, (int)pnt); + beh_addtab (dic, signame, BVL_MODNAM, BVL_PNTDFN, (long)pnt); BVL_NM1LST = delchain (BVL_NM1LST, BVL_NM1LST); } @@ -1984,7 +1984,7 @@ constant_declaration constant_VarAsgn__expression Semicolon_ERR { - int sigconf; + long sigconf; if (chkdcl ('C', 0, $4.VALU, $4.FLAG, 0, $5.FLAG, &sigconf)==0) { @@ -2012,9 +2012,9 @@ signal_declaration Semicolon_ERR { char *signame; - int sigconf; + long sigconf; void *pnt; - int errflg; + long errflg; errflg = chkdcl ('S',0,$4.VALU,$4.FLAG,$6,$5.FLAG,&sigconf); @@ -2037,7 +2037,7 @@ signal_declaration beh_addtab (dic, signame, BVL_MODNAM, BVL_SIGDFN, sigconf); beh_addtab (dic, signame, BVL_MODNAM, BVL_WMNDFN, $5.LEFT); beh_addtab (dic, signame, BVL_MODNAM, BVL_WMXDFN, $5.RIGHT); - beh_addtab (dic, signame, BVL_MODNAM, BVL_PNTDFN, (int)pnt); + beh_addtab (dic, signame, BVL_MODNAM, BVL_PNTDFN, (long)pnt); BVL_NM1LST = delchain (BVL_NM1LST, BVL_NM1LST); } @@ -2163,7 +2163,7 @@ unlabeled_conditional_signal_assignment waveform Semicolon_ERR { - int i ; + long i ; struct beout *beout_pnt; struct bebus *bebus_pnt; struct bereg *bereg_pnt; @@ -2178,15 +2178,15 @@ unlabeled_conditional_signal_assignment struct bvl_expr expr4 ; struct bvl_expr expr5 ; struct bvl_expr expr6 ; - int rev_flg = 0; - int left_bnd ; - int right_bnd; - int left ; - int right ; - int in_bound ; - int out_bound; - int sig_width; - int sig_conf ; + long rev_flg = 0; + long left_bnd ; + long right_bnd; + long left ; + long right ; + long in_bound ; + long out_bound; + long sig_width; + long sig_conf ; delay = $6.TIME; expr4 = $6 ; @@ -2468,7 +2468,7 @@ unlabeled_selected_signal_assignment ...waveform__WHEN__choices.. Semicolon_ERR { - int i; + long i; struct beout *beout_pnt; struct bebus *bebus_pnt; struct bereg *bereg_pnt; @@ -2477,15 +2477,15 @@ unlabeled_selected_signal_assignment struct chain *abl_pnt ; unsigned long delay ; struct bvl_expr expr1 ; - int rev_flg = 0; - int left_bnd; - int right_bnd; - int left; - int right; - int in_bound; - int out_bound; - int sig_width; - int sig_conf; + long rev_flg = 0; + long left_bnd; + long right_bnd; + long left; + long right; + long in_bound; + long out_bound; + long sig_width; + long sig_conf; /* ###----------------------------------------------### */ /* $10 est une structure, pas un pointeur... */ @@ -2791,7 +2791,7 @@ delay_expression : abstractlit time_unit { - unsigned int dly; + unsigned long dly; /* ###----------------------------------------------### */ /* if the delay is not null unset the 'zero delay' */ @@ -2847,13 +2847,13 @@ choice { char *val; char val2[256]; - int left; - int right; - int in_bound; - int out_bound; - int left_bnd; - int right_bnd; - int sig_conf; + long left; + long right; + long in_bound; + long out_bound; + long left_bnd; + long right_bnd; + long sig_conf; strcpy (val2, "B\""); sig_conf = beh_chktab (dic, $1.NAME, BVL_MODNAM, BVL_SIGDFN); @@ -3048,13 +3048,13 @@ primary | name { struct bvl_expr expr1; - int left; - int right; - int left_bnd; - int right_bnd; - int in_bound; - int out_bound; - int sig_conf; + long left; + long right; + long left_bnd; + long right_bnd; + long in_bound; + long out_bound; + long sig_conf; sig_conf = beh_chktab (dic, $1.NAME, BVL_MODNAM, BVL_SIGDFN); switch (sig_conf) @@ -3214,7 +3214,7 @@ attribute_name { char extname [100]; char *lclname ; - int sig_conf ; + long sig_conf ; struct bvl_expr expr1 ; struct bvl_expr expr2 ; struct chain *ptabl ; diff --git a/alliance/src/bvl/src/bvl_drive.c b/alliance/src/bvl/src/bvl_drive.c index c736a8c5..be008512 100644 --- a/alliance/src/bvl/src/bvl_drive.c +++ b/alliance/src/bvl/src/bvl_drive.c @@ -27,10 +27,10 @@ /* bvl_getvers */ /* ###--------------------------------------------------------------### */ -int vhdlsavebefig (pt_fig, trace_mode) +long vhdlsavebefig (pt_fig, trace_mode) struct befig *pt_fig ; -int trace_mode; +long trace_mode; { struct begen *pt_gen = NULL; /* current ptype pnt (generic) */ @@ -49,17 +49,17 @@ int trace_mode; char *kind ; char *direct ; char *transp ; - int nrlabel = 0; - int buff_size = 128; + long nrlabel = 0; + long buff_size = 128; char *buffer ; FILE *fp ; time_t clock ; - int left ; - int right ; + long left ; + long right ; char name [256]; char *time_unit ; - unsigned int time_step ; - int err_flg = 0; + unsigned long time_step ; + long err_flg = 0; if ((pt_fig == NULL) || (pt_fig->ERRFLG != 0)) beh_toolbug (10, "vhdlsavebefig", NULL, 0); diff --git a/alliance/src/bvl/src/bvl_globals.c b/alliance/src/bvl/src/bvl_globals.c index 516b3428..da2430de 100644 --- a/alliance/src/bvl/src/bvl_globals.c +++ b/alliance/src/bvl/src/bvl_globals.c @@ -12,7 +12,7 @@ #include "log.h" #include "beh.h" -int BVL_AUXMOD ; /* don't keep internal sig (=1) */ +long BVL_AUXMOD ; /* don't keep internal sig (=1) */ char BVL_ERRFLG = 0 ; /* error flag */ char BVL_CURFIL [256]; /* current file name */ struct befig *BVL_HEDFIG = NULL; /* list of descriptions */ diff --git a/alliance/src/bvl/src/bvl_parse.c b/alliance/src/bvl/src/bvl_parse.c index a982c34b..70c04d77 100644 --- a/alliance/src/bvl/src/bvl_parse.c +++ b/alliance/src/bvl/src/bvl_parse.c @@ -28,17 +28,17 @@ struct befig *vhdlloadbefig (pt_befig, figname, trace_mode) struct befig *pt_befig ; char *figname ; -unsigned int trace_mode; +unsigned long trace_mode; { extern FILE *bvl_y_in ; - extern int bvl_y_parse (); + extern long bvl_y_parse (); char *tok ; char *str ; - unsigned int check_mode ; + unsigned long check_mode ; struct chain *behsfx_lst = NULL; struct chain *suffix = NULL; - static unsigned int call_nbr = 0 ; + static unsigned long call_nbr = 0 ; /* ###------------------------------------------------------### */ /* read the environment variable VH_BEHSFX to create a list */ diff --git a/alliance/src/bvl/src/bvl_util.c b/alliance/src/bvl/src/bvl_util.c index 0b3d1baa..847efa00 100644 --- a/alliance/src/bvl/src/bvl_util.c +++ b/alliance/src/bvl/src/bvl_util.c @@ -37,7 +37,7 @@ char *bvl_getvers () void bvl_error (code, str1) -int code; +long code; char *str1; { @@ -188,15 +188,15 @@ char *str1; struct bepor *bvl_vpor (pt_por, pt_lft, pt_rit, name) struct bepor *pt_por ; -int *pt_lft ; -int *pt_rit ; +long *pt_lft ; +long *pt_rit ; char *name ; { struct bepor *prv_por = NULL; - int left = -1 ; - int right = -1 ; - int index = -1 ; + long left = -1 ; + long right = -1 ; + long index = -1 ; char tmp_nam [256] ; prv_por = pt_por; @@ -241,15 +241,15 @@ char *name ; struct beaux *bvl_vaux (pt_aux, pt_lft, pt_rit, name) struct beaux *pt_aux ; -int *pt_lft ; -int *pt_rit ; +long *pt_lft ; +long *pt_rit ; char *name ; { struct beaux *prv_aux = NULL; - int left = -1 ; - int right = -1 ; - int index = -1 ; + long left = -1 ; + long right = -1 ; + long index = -1 ; char tmp_nam [256] ; prv_aux = pt_aux; @@ -294,15 +294,15 @@ char *name ; struct bebux *bvl_vbux (pt_bux, pt_lft, pt_rit, name) struct bebux *pt_bux ; -int *pt_lft ; -int *pt_rit ; +long *pt_lft ; +long *pt_rit ; char *name ; { struct bebux *prv_bux = NULL; - int left = -1 ; - int right = -1 ; - int index = -1 ; + long left = -1 ; + long right = -1 ; + long index = -1 ; char tmp_nam [256] ; prv_bux = pt_bux; @@ -347,15 +347,15 @@ char *name ; struct bereg *bvl_vreg (pt_reg, pt_lft, pt_rit, name) struct bereg *pt_reg ; -int *pt_lft ; -int *pt_rit ; +long *pt_lft ; +long *pt_rit ; char *name ; { struct bereg *prv_reg = NULL; - int left = -1 ; - int right = -1 ; - int index = -1 ; + long left = -1 ; + long right = -1 ; + long index = -1 ; char tmp_nam [256] ; prv_reg = pt_reg; @@ -427,10 +427,10 @@ char *bvl_abl2str (expr, chaine, size_pnt) struct chain *expr ; /* expression */ char *chaine ; /* target string */ -int *size_pnt; /* size of available space */ +long *size_pnt; /* size of available space */ { - int operator; + long operator; char *oper ; struct chain *operand ; static char *str_z = NULL; @@ -480,7 +480,7 @@ int *size_pnt; /* size of available space */ /* "(operand operator operand operator operand ...)" */ /* ###------------------------------------------------------### */ - operator = (int) ((struct chain *) expr->DATA)->DATA; + operator = (long) ((struct chain *) expr->DATA)->DATA; operand = (struct chain *) expr->NEXT->DATA; if (operator == STABLE) diff --git a/alliance/src/ctp/src/ctp_byacc.h b/alliance/src/ctp/src/ctp_byacc.h index 64102d18..43ebc954 100644 --- a/alliance/src/ctp/src/ctp_byacc.h +++ b/alliance/src/ctp/src/ctp_byacc.h @@ -40,7 +40,7 @@ static struct dct_entry *addent (); static struct dct_recrd *addrcd (); static struct dct_entry **initab (); static void addtab (); -static int chktab (); +static long chktab (); static void fretab (); static void *ctp_addstr (); static ctltype_list *val_type(); @@ -50,7 +50,7 @@ static struct ptype *reversetype(); extern char CTP_ERRFLG; /* set to 1 in case of error */ extern ctlfig_list *CTP_HEADFIG; /* head of vbfigs */ extern long CTP_LINNUM; -extern int CTP_NUMPTP; +extern long CTP_NUMPTP; extern char *CTP_MODNAM; /*\ @@ -60,7 +60,7 @@ pNode CTP_BDDPNT; ctp_vexstr CTP_SLCEXP; /* structure filled with the */ ctp_vexstr CTP_EMPSTR; /* empty structure used with NOT*/ -static int CTP_NUMTYP = 0; /* nombre de type */ +static long CTP_NUMTYP = 0; /* nombre de type */ static struct chain *CTP_NM1LST = NULL; /* 1-st name liste */ static struct chain *CTP_NM2LST = NULL; /* 2-st name liste */ static struct chain *CTP_INSLST = NULL; /* 3-st name liste */ diff --git a/alliance/src/ctp/src/ctp_y.y b/alliance/src/ctp/src/ctp_y.y index 12f1f447..036a63d2 100644 --- a/alliance/src/ctp/src/ctp_y.y +++ b/alliance/src/ctp/src/ctp_y.y @@ -60,7 +60,7 @@ %} %union { - int valu; + long valu; char *text; chain_list *pcha; ctp_name name; @@ -700,7 +700,7 @@ subtype_indication .constraint. { ctltype_list *ctltype_pnt; - int mode; + long mode; mode = chktab(hshtab,$1,CTP_MODNAM,CTP_SYMDFN); @@ -754,9 +754,9 @@ enumeration_type_definition { char *enumname; char *enumval; - int size; - int indice; - int numbit; + long size; + long indice; + long numbit; char **pnt; chain_list *nm1lst; @@ -961,8 +961,8 @@ range { long Left; long Right; - int ErrorL; - int ErrorR; + long ErrorL; + long ErrorR; ErrorL = ctp_vextonum( $1.VEX, &Left ); ErrorR = ctp_vextonum( $3.VEX, &Right ); @@ -1003,7 +1003,7 @@ type_mark : simple_name { - int type; + long type; $$.NAME = $1; $$.LEFT = -1; $$.RIGHT = -1; @@ -1339,8 +1339,8 @@ primary long right_bnd; long in_bound; long out_bound; - int mode; - int flag; + long mode; + long flag; flag = $1.FLAG; @@ -1393,7 +1393,7 @@ primary right = $1.RIGHT; { - int type; + long type; expr1.IDENT = $1.NAME; type = chktab(hshtab,$1.NAME,LocalName,CTP_TYPDFN); @@ -1610,7 +1610,7 @@ indexed_name vexexpr *VexExpr; vexexpr *VexRet; long Index; - int Error; + long Error; long Def; ScanChain = $2; @@ -1686,8 +1686,8 @@ slice_name char *LocalName; long Left; long Right; - int ErrorL; - int ErrorR; + long ErrorL; + long ErrorR; LocalName = CTP_MODNAM; @@ -1721,9 +1721,9 @@ attribute_name attribute_designator { char *LocalName; - int type; - int flag; - int mode; + long type; + long flag; + long mode; long AttrLeft; long AttrRight; long AttrLow; @@ -1850,7 +1850,7 @@ char *key; { struct dct_entry *entry = NULL; - int i; + long i; if (CTP_DCEHED == NULL) { @@ -1883,7 +1883,7 @@ char *key; { struct dct_recrd *recrd = NULL; - int i; + long i; if (CTP_DCRHED == NULL) { @@ -1912,7 +1912,7 @@ static struct dct_entry **initab () { struct dct_entry **head = NULL; - int i; + long i; head = (struct dct_entry **) autallocblock (sizeof(struct dct_entry *) * CTP_HSZDFN); @@ -2009,7 +2009,7 @@ long valu; } } -static int chktab (head,key_str,ctx_str,field) +static long chktab (head,key_str,ctx_str,field) struct dct_entry **head; char *key_str; @@ -2127,7 +2127,7 @@ struct dct_entry **pt_hash; static void *ctp_addstr(object,mode,prtype,type,flag,name,left,right,exp) char object; -int mode; +long mode; ctltype_list *prtype; unsigned char type; char flag; @@ -2141,7 +2141,7 @@ vexexpr *exp; ctldecl_list *CtlDeclar; void *pnt = NULL; vexexpr *vex_pnt; - int bitsize; + long bitsize; if ( object == 'F' ) { diff --git a/alliance/src/dreal/src/GMC_panel.c b/alliance/src/dreal/src/GMC_panel.c index 9648332b..93c6c47c 100644 --- a/alliance/src/dreal/src/GMC_panel.c +++ b/alliance/src/dreal/src/GMC_panel.c @@ -1091,7 +1091,7 @@ void CallbackChangeRectangleLayer( MyWidget, ClientData, CallData ) { rdsbegin(); - DrealRectangleLayer = (int)ClientData; + DrealRectangleLayer = (long)ClientData; DrealChangeEditMode( DREAL_CREATE_RECTANGLE, DrealPromptCreateRectangle ); diff --git a/alliance/src/dreal/src/GME_panel.c b/alliance/src/dreal/src/GME_panel.c index 90206003..b57f35d6 100644 --- a/alliance/src/dreal/src/GME_panel.c +++ b/alliance/src/dreal/src/GME_panel.c @@ -2116,7 +2116,7 @@ void CallbackModifyRectangleLayer( MyWidget, ClientData, CallData ) { rdsbegin(); - DrealRectangleMLayer = (int)ClientData; + DrealRectangleMLayer = (long)ClientData; DrealPromptModifyRectangle(); diff --git a/alliance/src/elp/src/elp.h b/alliance/src/elp/src/elp.h index 4a0553b3..b1d4930f 100644 --- a/alliance/src/elp/src/elp.h +++ b/alliance/src/elp/src/elp.h @@ -15,6 +15,7 @@ /* les inclusions */ #include +#include #include #include "mut.h" #include "mlo.h" diff --git a/alliance/src/elp/src/elp_l.l b/alliance/src/elp/src/elp_l.l index d07ed271..4a90d975 100644 --- a/alliance/src/elp/src/elp_l.l +++ b/alliance/src/elp/src/elp_l.l @@ -1,5 +1,6 @@ %{ #include +#include #include "elp_y.h" #undef ECHO #define ECHO diff --git a/alliance/src/exp/src/ht.c b/alliance/src/exp/src/ht.c index ff8b557d..da777bce 100644 --- a/alliance/src/exp/src/ht.c +++ b/alliance/src/exp/src/ht.c @@ -68,8 +68,8 @@ void eltremove (htelt_t * list) */ void htremove (ht_t * ht) { - int i; - for (i = 1; i < (int) ht[0]; i++) + long i; + for (i = 1; i < (long) ht[0]; i++) eltremove (ht[i]); free (ht); } @@ -79,12 +79,12 @@ void htremove (ht_t * ht) */ void htstat (ht_t * ht) { - int i; + long i; htelt_t *elt; if (ht) { - static int start=1; - for (i = 1; i < (int) ht[0]; i++) + static long start=1; + for (i = 1; i < (long) ht[0]; i++) for (elt = ht[i]; elt; elt = elt->NEXT) if (elt->USED == 0) { @@ -113,9 +113,9 @@ static int primes[] = { /* creation d'un dictionnaire ** -------------------------- */ -ht_t *htinit (int size) +ht_t *htinit (long size) { - int i; + long i; ht_t *ht; /* prend le premier nombre premier au dela de size */ @@ -138,12 +138,12 @@ ht_t *htinit (int size) /* calcul de la valeur de hachage primaire ** --------------------------------------- */ -static int hash (ht_t * ht, char *key) +static long hash (ht_t * ht, char *key) { - int alveole = 0; - int length = strlen (key); - int segment; - int l; + long alveole = 0; + long length = strlen (key); + long segment; + long l; if (ht == NULL) { @@ -160,7 +160,7 @@ static int hash (ht_t * ht, char *key) segment = 0xFFFF & ((key[l] << 8) | key[l + 1]); alveole = alveole ^ ((segment << 1) | (segment >> 15)); } - alveole %= (int) ht[0]; /* ht[0] == la taille de la table */ + alveole %= (long) ht[0]; /* ht[0] == la taille de la table */ return (alveole + 1); /* +1 car on ne doit rien mettre dans case 0 */ } @@ -174,7 +174,7 @@ static int hash (ht_t * ht, char *key) */ htelt_t *htget (ht_t * ht, char *key) { - int alveole = hash (ht, key); + long alveole = hash (ht, key); htelt_t *p; for (p = ht[alveole]; p && strcmp (p->KEY, key); p = p->NEXT); @@ -187,7 +187,7 @@ htelt_t *htget (ht_t * ht, char *key) */ htelt_t *htadd (ht_t * ht, char *key) { - int alveole = hash (ht, key); + long alveole = hash (ht, key); return ht[alveole] = eltadd (ht[alveole], key); } @@ -197,7 +197,7 @@ htelt_t *htadd (ht_t * ht, char *key) */ htelt_t *htset (ht_t * ht, char *key) { - int alveole = hash (ht, key); + long alveole = hash (ht, key); htelt_t *p; for (p = ht[alveole]; p && strcmp (p->KEY, key); p = p->NEXT); @@ -215,12 +215,12 @@ htelt_t *htsetre (ht_t * ht, char *key) { regex_t preg; htelt_t *elt, *res = NULL; - int i; + long i; if (regcomp(&preg, key, REG_EXTENDED | REG_NOSUB) != 0) return NULL; if (ht) - for (i = 1; i < (int) ht[0]; i++) + for (i = 1; i < (long) ht[0]; i++) for (elt = ht[i]; elt; elt = elt->NEXT) if (regexec (&preg, elt->KEY, (size_t) 0, NULL, 0) == 0) { diff --git a/alliance/src/exp/src/ht.h b/alliance/src/exp/src/ht.h index be5d0cf1..f35c6e38 100644 --- a/alliance/src/exp/src/ht.h +++ b/alliance/src/exp/src/ht.h @@ -11,7 +11,7 @@ typedef union { struct htelt_st *e; double f; - int i; + long i; char *s; } elt_t; @@ -20,9 +20,9 @@ typedef struct htelt_st { struct htelt_st * NEXT; char *KEY; - int TYPE; - int USED; - int FLINE; + long TYPE; + long USED; + long FLINE; char * FNAME; elt_t VAL; } @@ -62,7 +62,7 @@ extern void htremove (ht_t * ht); /* creation du dictionnaire ** ------------------------ */ -extern ht_t *htinit (int size); +extern ht_t *htinit (long size); /* recherche d'une entree dans la table ** rend un pointeur sur l'element diff --git a/alliance/src/fks/src/fkserror.h b/alliance/src/fks/src/fkserror.h index 5e06e86a..eaa96b33 100644 --- a/alliance/src/fks/src/fkserror.h +++ b/alliance/src/fks/src/fkserror.h @@ -46,6 +46,8 @@ # ifndef FKS_ERROR_H # define FKS_ERROR_H +# include + /*------------------------------------------------------------\ | | | Constants | @@ -69,7 +71,7 @@ | | \------------------------------------------------------------*/ -# define fkserror( E, V ) (fks_error( (int)(E), (char *)(V), autbasename(__FILE__,NULL), __LINE__ )) +# define fkserror( E, V ) (fks_error( (long)(E), (char *)(V), autbasename(__FILE__,NULL), __LINE__ )) /*------------------------------------------------------------\ | | diff --git a/alliance/src/fks/src/fksparse.c b/alliance/src/fks/src/fksparse.c index f17147db..a390ff0a 100644 --- a/alliance/src/fks/src/fksparse.c +++ b/alliance/src/fks/src/fksparse.c @@ -76,7 +76,7 @@ | | \------------------------------------------------------------*/ - static int KissLineNumber = 0; + static long KissLineNumber = 0; static char KissBuffer[ KISS_BUFFER_SIZE ]; static char *KissScanBuffer; static FILE *KissFile; diff --git a/alliance/src/ftl/src/ftlerror.h b/alliance/src/ftl/src/ftlerror.h index 994bf41d..6dbb253b 100644 --- a/alliance/src/ftl/src/ftlerror.h +++ b/alliance/src/ftl/src/ftlerror.h @@ -46,6 +46,8 @@ # ifndef FTL_ERROR_H # define FTL_ERROR_H +# include + /*------------------------------------------------------------\ | | | Constants | diff --git a/alliance/src/fvh/src/fbl_bcomp_y.y b/alliance/src/fvh/src/fbl_bcomp_y.y index 206e05e5..0c52fc76 100644 --- a/alliance/src/fvh/src/fbl_bcomp_y.y +++ b/alliance/src/fvh/src/fbl_bcomp_y.y @@ -58,13 +58,13 @@ static void addtab (); static long chktab (); static void fretab (); void *fbl_addstr (); -int fbl_chkdcl (); +long fbl_chkdcl (); struct ptype *reversetype(); struct choice_chain *order_choice(); %} %union { - int valu; + long valu; char *text; struct ptype *ptyp; struct fbpcs proc; @@ -522,7 +522,7 @@ entity_declaration simple_name IS { - int type,size=0; + long type,size=0; struct fbtyp *fbtyp_pnt; char *name; char *name_bit; @@ -687,7 +687,7 @@ formal_port_element .signal_kind. { char *signame; - int sigconf; + long sigconf; void *pnt; /* ###----------------------------------------------### */ @@ -715,7 +715,7 @@ formal_port_element addtab (hshtab,signame,FBL_MODNAM,FBL_WMNDFN,$6.LEFT); addtab (hshtab,signame,FBL_MODNAM,FBL_WMXDFN,$6.RIGHT); addtab (hshtab,signame,FBL_MODNAM,FBL_LBLDFN,$7); - addtab (hshtab,signame,FBL_MODNAM,FBL_PNTDFN,(int)pnt); + addtab (hshtab,signame,FBL_MODNAM,FBL_PNTDFN,(long)pnt); FBL_NM1LST = delchain (FBL_NM1LST, FBL_NM1LST); } @@ -828,7 +828,7 @@ pragma_declaration char name[128]; char value[128]; char *pt; - int field; + long field; field = sscanf((char *)$1,"-- %s %s %s %s", pragma,type,name,value); @@ -854,7 +854,7 @@ constant_declaration constant_VarAsgn__expression Semicolon_ERR { - int sigconf; + long sigconf; if (fbl_chkdcl ('C',0,val_type($4.NAME),$4.FLAG,0,$5.FLAG,&sigconf) == 0) { @@ -883,9 +883,9 @@ signal_declaration Semicolon_ERR { char *signame; - int sigconf; + long sigconf; void *pnt; - int errflg; + long errflg; errflg = fbl_chkdcl ('S',0,val_type($4.NAME),$4.FLAG,$6,$5.FLAG,&sigconf); @@ -917,7 +917,7 @@ signal_declaration addtab (hshtab,signame,FBL_MODNAM,FBL_WMNDFN,$5.LEFT); addtab (hshtab,signame,FBL_MODNAM,FBL_WMXDFN,$5.RIGHT); addtab (hshtab,signame,FBL_MODNAM,FBL_LBLDFN,$6); - addtab (hshtab,signame,FBL_MODNAM,FBL_PNTDFN,(int)pnt); + addtab (hshtab,signame,FBL_MODNAM,FBL_PNTDFN,(long)pnt); FBL_NM1LST = delchain (FBL_NM1LST,FBL_NM1LST); @@ -942,7 +942,7 @@ full_type_declaration addtab(hshtab,$2,FBL_MODNAM,FBL_SIGDFN,FBL_TPEDFN); addtab(hshtab,$2,FBL_MODNAM,FBL_LBLDFN,$4.CLASS); addtab(hshtab,$2,FBL_MODNAM,FBL_TYPDFN,FBL_NUMTYP); - addtab (hshtab,$2,FBL_MODNAM,FBL_PNTDFN,(int)FBL_BEFPNT->BETYP); + addtab (hshtab,$2,FBL_MODNAM,FBL_PNTDFN,(long)FBL_BEFPNT->BETYP); FBL_NUMTYP++; } Semicolon_ERR @@ -969,7 +969,7 @@ subtype_declaration addtab(hshtab,$2,FBL_MODNAM,FBL_SIGDFN,FBL_TPEDFN); addtab(hshtab,$2,FBL_MODNAM,FBL_LBLDFN,$4.CLASS); addtab(hshtab,$2,FBL_MODNAM,FBL_TYPDFN,FBL_NUMTYP); - addtab (hshtab,$2,FBL_MODNAM,FBL_PNTDFN,(int)FBL_BEFPNT->BETYP); + addtab (hshtab,$2,FBL_MODNAM,FBL_PNTDFN,(long)FBL_BEFPNT->BETYP); FBL_NUMTYP++; } Semicolon_ERR @@ -1004,8 +1004,8 @@ enumeration_type_definition RightParen_ERR { char *enumname; - int size=0; - int indice=0; + long size=0; + long indice=0; char **pnt; chain_list *nm1lst; @@ -1034,7 +1034,7 @@ enumeration_type_definition addtab (hshtab,enumname,FBL_MODNAM,FBL_WMNDFN,-1); addtab (hshtab,enumname,FBL_MODNAM,FBL_WMXDFN,-1); addtab (hshtab,enumname,FBL_MODNAM,FBL_LBLDFN,indice); - addtab (hshtab,enumname,FBL_MODNAM,FBL_PNTDFN,(int)pnt); + addtab (hshtab,enumname,FBL_MODNAM,FBL_PNTDFN,(long)pnt); pnt[indice++] = enumname; FBL_NM1LST = delchain (FBL_NM1LST, FBL_NM1LST); @@ -1147,7 +1147,7 @@ discrete_range type_mark : simple_name { - int type; + long type; $$.NAME = $1; $$.LEFT = -1; $$.RIGHT = -1; @@ -1280,7 +1280,7 @@ unlabeled_conditional_signal_assignment waveform Semicolon_ERR { - int i; + long i; struct fbout *fbout_pnt; struct fbbus *fbbus_pnt; struct fbreg *fbreg_pnt; @@ -1294,15 +1294,15 @@ unlabeled_conditional_signal_assignment struct fbl_expr expr4; struct fbl_expr expr5; struct fbl_expr expr6; - int rev_flg = 0; - int left_bnd; - int right_bnd; - int left; - int right; - int in_bound; - int out_bound; - int sig_width; - int sig_conf; + long rev_flg = 0; + long left_bnd; + long right_bnd; + long left; + long right; + long in_bound; + long out_bound; + long sig_width; + long sig_conf; expr4 = $5; @@ -1587,7 +1587,7 @@ unlabeled_selected_signal_assignment ...waveform__WHEN__choices.. Semicolon_ERR { - int i; + long i; struct fbout *fbout_pnt; struct fbbus *fbbus_pnt; struct fbreg *fbreg_pnt; @@ -1595,15 +1595,15 @@ unlabeled_selected_signal_assignment struct fbbux *fbbux_pnt; struct chain *abl_pnt; struct fbl_expr expr1; - int rev_flg = 0; - int left_bnd; - int right_bnd; - int left; - int right; - int in_bound; - int out_bound; - int sig_width; - int sig_conf; + long rev_flg = 0; + long left_bnd; + long right_bnd; + long left; + long right; + long in_bound; + long out_bound; + long sig_width; + long sig_conf; expr1 = fbl_crtabl (ABL_OR ,$8 ,$9,-1,-1); if (FBL_BDDPNT != getlogbddnodeone()) @@ -1979,13 +1979,13 @@ signal_assignment_statement _LESym waveform Semicolon_ERR - { unsigned int type; - int sig_conf,i; - int left_bnd,right_bnd; - int in_bound,out_bound; - int left ,right; - int rev_flg, debut; - int sig_width; + { unsigned long type; + long sig_conf,i; + long left_bnd,right_bnd; + long in_bound,out_bound; + long left ,right; + long rev_flg, debut; + long sig_width; struct chain *abl_pnt; char extname[100]; struct fbl_expr expr; @@ -2225,9 +2225,9 @@ case_statement CASE Semicolon_ERR { - unsigned int size=1; - unsigned int *size1; - int indice=0; + unsigned long size=1; + unsigned long *size1; + long indice=0; struct choice_chain *ch; struct fbcho **pnt; struct fbcho *tab; @@ -2257,7 +2257,7 @@ case_statement tab[indice].SIZE = -1; tab[indice++].VALUE = namealloc("others"); (*pnt) = tab; - size1 = (unsigned int*) FBL_NM1LST->DATA; + size1 = (unsigned long*) FBL_NM1LST->DATA; *size1 = size; FBL_NM1LST = delchain(FBL_NM1LST,FBL_NM1LST); FBL_OTHPNT = 0; @@ -2414,13 +2414,13 @@ choice { char *val; char val2[256]; - int left; - int right; - int in_bound; - int out_bound; - int left_bnd; - int right_bnd; - int sig_conf; + long left; + long right; + long in_bound; + long out_bound; + long left_bnd; + long right_bnd; + long sig_conf; strcpy (val2,"B\""); sig_conf = chktab (hshtab,$1.NAME,FBL_MODNAM,FBL_SIGDFN); @@ -2646,15 +2646,15 @@ primary | name { struct fbl_expr expr1; - int left; - int right; - int left_bnd; - int right_bnd; - int in_bound; - int out_bound; - int mode; - int prtype; - int type; + long left; + long right; + long left_bnd; + long right_bnd; + long in_bound; + long out_bound; + long mode; + long prtype; + long type; mode = chktab (hshtab,$1.NAME,FBL_MODNAM,FBL_SIGDFN); type = chktab(hshtab,$1.NAME,FBL_MODNAM,FBL_TYPDFN); @@ -2769,7 +2769,7 @@ primary else { expr1.IDENT = (char *)chktab(hshtab,$1.NAME,0,FBL_PNTDFN); - expr1.TYPE =(int)-1;/*dec, cast int */ + expr1.TYPE =(long)-1;/*dec, cast long */ $$ = fbl_crtabl (NOPS,expr1,FBL_EMPSTR,in_bound,out_bound); } } @@ -2864,9 +2864,9 @@ attribute_name { char extname[100]; char *lclname; - int sig_conf; - int type; - int kind; + long sig_conf; + long type; + long kind; struct fbl_expr expr1; struct fbl_expr expr2; struct chain *ptabl; @@ -3035,7 +3035,7 @@ char *key; { struct dct_entry *entry; - int i; + long i; if (FBL_DCEHED == 0) { @@ -3068,7 +3068,7 @@ char *key; { struct dct_recrd *recrd; - int i; + long i; if (FBL_DCRHED == 0) { @@ -3105,7 +3105,7 @@ static struct dct_entry **initab () { struct dct_entry **head; - int i; + long i; head = (struct dct_entry **) mbkalloc (sizeof(struct dct_entry *) * FBL_HSZDFN); @@ -3121,12 +3121,12 @@ static void addtab (head,key_str,ctx_str,field,valu) struct dct_entry **head; char *key_str; char *ctx_str; -int field; +long field; long valu; { - int found = 0; - int index; + long found = 0; + long index; struct dct_entry *entry_pnt; struct dct_recrd *recrd_pnt; @@ -3202,11 +3202,11 @@ static long chktab (head,key_str,ctx_str,field) struct dct_entry **head; char *key_str; char *ctx_str; -int field; +long field; { - int found = 0; - int valu = 0; + long found = 0; + long valu = 0; struct dct_entry *entry_pnt; struct dct_recrd *recrd_pnt; @@ -3277,7 +3277,7 @@ struct dct_entry **pt_hash; struct dct_entry *pt_entry; struct dct_entry *pt_nxtentry; struct dct_recrd *pt_record; - int i; + long i; if (pt_hash != 0) { @@ -3310,8 +3310,8 @@ void *fbl_addstr (ptfig,object,mode,prtype,type,flag,name,left,right) struct fbfig *ptfig; char object; -int mode; -int prtype; +long mode; +long prtype; unsigned char type; char flag; char *name; @@ -3511,19 +3511,19 @@ short right; return (pnt); } -int fbl_chkdcl (object,mode,type,flag,kind,constraint,conf) +long fbl_chkdcl (object,mode,type,flag,kind,constraint,conf) char object; -int mode; -int type; +long mode; +long type; char flag; -int kind; +long kind; char constraint; -int *conf; +long *conf; { - int errflg = 0; - int lclcnf = 0; + long errflg = 0; + long lclcnf = 0; if (flag != constraint && constraint !='U' && flag !='U') { @@ -3695,7 +3695,7 @@ int *conf; return (errflg); } -int val_type(name) +long val_type(name) char *name; { if(!name) @@ -3760,7 +3760,7 @@ int val_type(name) struct choice_chain *lastpnt; struct ptype *type; char *val; - unsigned int size; + unsigned long size; { struct choice_chain *pnt; @@ -3776,7 +3776,7 @@ int val_type(name) struct choice_chain *pnt; struct ptype *type; char *val; - unsigned int size; + unsigned long size; { struct choice_chain *aux1; struct choice_chain *aux2; diff --git a/alliance/src/fvh/src/fbl_bspec.c b/alliance/src/fvh/src/fbl_bspec.c index c7f1b681..405453fe 100644 --- a/alliance/src/fvh/src/fbl_bspec.c +++ b/alliance/src/fvh/src/fbl_bspec.c @@ -79,8 +79,8 @@ short right; /* array's right bound (= -1 if scalar) */ struct fbgen *ptgen; struct chain *ptauxnam; struct chain *ptauxnat; - int i; - int inc = 1; + long i; + long inc = 1; ptgen = lastgeneric; ptauxnam = nam_lst; @@ -141,8 +141,8 @@ char *str; { char *resstr; - int i; - int j=0; + long i; + long j=0; resstr = (char *)mbkalloc(100); resstr[0] = '\0'; @@ -226,8 +226,8 @@ fbl_ablstr fbl_crtabl ( oper, expr1, expr2, left, right ) short oper; fbl_ablstr expr1; fbl_ablstr expr2; -int left; -int right; +long left; +long right; { char name[256]; @@ -677,11 +677,11 @@ int right; /* description : transform a ENUMERATE */ /* in a string of '0' and '1's */ /* ###--------------------------------------------------------------### */ -int fbl_bintonum(str) +long fbl_bintonum(str) char* str; { - int res,i=0; + long res,i=0; res = 0; while(str[i]) @@ -699,12 +699,12 @@ char* str; /* in a string of '0' and '1's */ /* ###--------------------------------------------------------------### */ char *fbl_numtobin(num) -int num; +long num; { char val[256]; char *str; - int res,i=1; + long res,i=1; val[255] = '\0'; res = num; @@ -724,18 +724,18 @@ int num; /* in a string of '0' and '1's */ /* ###--------------------------------------------------------------### */ -int fbl_tobin (trg,src,left,right) +long fbl_tobin (trg,src,left,right) char *trg; char *src; -int left; -int right; +long left; +long right; { char base; - int indx; - int j = 0; - int errflg = 0; + long indx; + long j = 0; + long errflg = 0; char lcl_trg[256]; lcl_trg[0] = '\0'; @@ -927,7 +927,7 @@ bddnode **pt_bdd; /* used to check if a choice is legal */ fbl_ablstr *pt_ablstr; /* tested expression */ { char binstr[512]; - int i; + long i; struct chain *pt_auxabl; bddnode *pt_bddres; bddnode *pt_bddnew; @@ -936,8 +936,8 @@ fbl_ablstr *pt_ablstr; /* tested expression */ char nomvar[10]; struct chain *pt_newabl; struct chain *pt_newabl2; - static int oth_flg=0; - static int last_width=0; + static long oth_flg=0; + static long last_width=0; result->LIST_ABL = NULL; result->IDENT = NULL; diff --git a/alliance/src/fvh/src/fbl_bspec.h b/alliance/src/fvh/src/fbl_bspec.h index 7efe5221..ef8ceb44 100644 --- a/alliance/src/fvh/src/fbl_bspec.h +++ b/alliance/src/fvh/src/fbl_bspec.h @@ -57,11 +57,11 @@ extern ablexpr *bddToAbl () ; extern struct chain * fbl_cpyabllst __P((struct chain *abllst)); extern fbl_ablstr fbl_cpyablstr __P((fbl_ablstr ablstr)); - extern fbl_ablstr fbl_crtabl __P((short oper, fbl_ablstr expr1, fbl_ablstr expr2, int left, int right)); - extern char * fbl_numtobin __P((int num)); - extern int fbl_tobin __P((char *trg, char *src, int left, int right)); - extern void loc_fbl_error __P((int code, char *str1)); - extern void fbl_toolbug __P((int code, char *str1, char *str2, int nbr1)); + extern fbl_ablstr fbl_crtabl __P((short oper, fbl_ablstr expr1, fbl_ablstr expr2, long left, long right)); + extern char * fbl_numtobin __P((long num)); + extern long fbl_tobin __P((char *trg, char *src, long left, long right)); + extern void loc_fbl_error __P((long code, char *str1)); + extern void fbl_toolbug __P((long code, char *str1, char *str2, long nbr1)); # define fbl_error( C, S ) \ fprintf( stderr, "%s.%d: ", autbasename(__FILE__,NULL),__LINE__ ); loc_fbl_error( C, S ); diff --git a/alliance/src/fvh/src/fbl_byacc.h b/alliance/src/fvh/src/fbl_byacc.h index 5c7cc04b..7a2600c7 100644 --- a/alliance/src/fvh/src/fbl_byacc.h +++ b/alliance/src/fvh/src/fbl_byacc.h @@ -66,7 +66,7 @@ fbl_name; struct g_type { - int VALU; + long VALU; char FLAG; }; @@ -74,7 +74,7 @@ struct choice_chain { struct choice_chain* NEXT; char *VALUE; - unsigned int SIZE; + unsigned long SIZE; struct ptype *INSTRUCTION; }; @@ -84,7 +84,7 @@ fbl_ablstr FBL_EMPSTR; /* empty structure used with NOT*/ struct bddnode *FBL_BDDPNT = NULL; /* BDD pointer */ static char *FBL_LBLNAM = NULL; /* label */ -static int FBL_NUMTYP = 0; /* nombre de type */ +static long FBL_NUMTYP = 0; /* nombre de type */ static struct chain *FBL_NM1LST = NULL; /* 1-st name liste */ static struct chain *FBL_GRDLST = NULL; /* list of guard's ABL */ static struct chain *FBL_CNDLST = NULL; /* list of conditions (ABL) */ @@ -102,22 +102,22 @@ static authtable *FBL_HASH_ASG_FSM = (authtable *)0; extern char FBL_ERRFLG; /* set to 1 in case of error */ extern struct fbfig *FBL_HEADFIG; /* head of fbfigs */ -extern int FBL_LINNUM; -extern int FBL_NUMPTP; +extern long FBL_LINNUM; +extern long FBL_NUMPTP; static struct dct_entry **hshtab; extern struct fbgen * fbl_addgen __P((struct fbgen *lastgeneric, struct chain *nam_lst, struct chain *nat_lst, char *type, short left, short right)); - extern int val_type __P((char *name)); + extern long val_type __P((char *name)); - extern int fbl_tobin __P((char *trg, char *src, int left, int right)); - extern int fbl_bintonum __P((char *str)); - extern fbl_ablstr fbl_crtabl __P((short oper, fbl_ablstr expr1, fbl_ablstr expr2, int left, int right)); + extern long fbl_tobin __P((char *trg, char *src, long left, long right)); + extern long fbl_bintonum __P((char *str)); + extern fbl_ablstr fbl_crtabl __P((short oper, fbl_ablstr expr1, fbl_ablstr expr2, long left, long right)); extern fbl_ablstr fbl_cpyablstr __P((fbl_ablstr ablstr)); extern void fbl_select(); extern char * fbl_stostr __P((char *str)); extern void fbl_y_error __P((char *str)); - extern int fbl_y_lex __P(()); + extern long fbl_y_lex __P(()); diff --git a/alliance/src/genlib/src/dpgen_Adder.c b/alliance/src/genlib/src/dpgen_Adder.c index f5526446..d417831d 100644 --- a/alliance/src/genlib/src/dpgen_Adder.c +++ b/alliance/src/genlib/src/dpgen_Adder.c @@ -1,5 +1,5 @@ /* - * $Id: dpgen_Adder.c,v 1.2 2002/09/30 16:20:21 czo Exp $ + * $Id: dpgen_Adder.c,v 1.3 2009/06/14 13:51:43 ludo Exp $ * * /----------------------------------------------------------------\ * | | @@ -191,7 +191,7 @@ static void RSA_netlist () "add_sub", GENLIB_ELM ("INB" , i), GENLIB_ELM ("XORB", i), - "VDD", "VSS", 0); + "VDD", "VSS", NULL); } @@ -202,26 +202,26 @@ static void RSA_netlist () GENLIB_ELM ("XORB", i), GENLIB_NAME ("GI_0_%d", i), GENLIB_NAME ("PI_0_%d", i), - "VDD", "VSS", 0); + "VDD", "VSS", NULL); } /* Calcul somme et retenue du LSB */ GENLIB_LOINS ("fulladder_x2", "S0", - GENLIB_ELM ("INA",0), - GENLIB_ELM ("INA",0), - GENLIB_ELM ("INA",0), - GENLIB_ELM ("INA",0), - GENLIB_ELM ("XORB",0), - GENLIB_ELM ("XORB",0), - GENLIB_ELM ("XORB",0), - GENLIB_ELM ("XORB",0), + GENLIB_ELM ("INA",NULL), + GENLIB_ELM ("INA",NULL), + GENLIB_ELM ("INA",NULL), + GENLIB_ELM ("INA",NULL), + GENLIB_ELM ("XORB",NULL), + GENLIB_ELM ("XORB",NULL), + GENLIB_ELM ("XORB",NULL), + GENLIB_ELM ("XORB",NULL), "add_sub", "add_sub", "add_sub", "R_1", - GENLIB_ELM ("S", 0), - "VDD", "VSS", 0); + GENLIB_ELM ("S", NULL), + "VDD", "VSS", NULL); for (n = 1; n <= ilog2 (LV_N); n++) { @@ -233,7 +233,7 @@ static void RSA_netlist () GENLIB_NAME ("R_%d" , iexp2 (n - 1)), GENLIB_NAME ("GI_%d_%d", ilog2 (isr), iexp2(n - 1) + isr), GENLIB_NAME ("R_%d" , iexp2 (n - 1) + isr + 1), - "VDD", "VSS", 0); + "VDD", "VSS", NULL); } /* Calcul des PI GI intermediaires (PG) */ @@ -245,7 +245,7 @@ static void RSA_netlist () GENLIB_NAME ("PI_%d_%d" , n - 1, ipg - 1), GENLIB_NAME ("PI_%d_%d" , ilog2 (npg), inpg), GENLIB_NAME ("PI_%d_%d" , n, inpg), - "VDD", "VSS", 0); + "VDD", "VSS", NULL); GENLIB_LOINS("oa22_x2", GENLIB_NAME ("PG_i2_%d_%d", n, inpg), @@ -253,7 +253,7 @@ static void RSA_netlist () GENLIB_NAME ("GI_%d_%d" , n - 1, ipg - 1), GENLIB_NAME ("GI_%d_%d" , ilog2 (npg), inpg), GENLIB_NAME ("GI_%d_%d" , n, inpg), - "VDD", "VSS", 0); + "VDD", "VSS", NULL); } } } @@ -266,7 +266,7 @@ static void RSA_netlist () GENLIB_NAME ("PI_0_%d", i), GENLIB_NAME ("R_%d", i), GENLIB_ELM ("S", i), - "VDD","VSS",0); + "VDD","VSS",NULL); } diff --git a/alliance/src/genlib/src/dpgen_Nul.c b/alliance/src/genlib/src/dpgen_Nul.c index 6579e69e..2f21729e 100644 --- a/alliance/src/genlib/src/dpgen_Nul.c +++ b/alliance/src/genlib/src/dpgen_Nul.c @@ -1,5 +1,5 @@ /* - * $Id: dpgen_Nul.c,v 1.2 2002/09/30 16:20:22 czo Exp $ + * $Id: dpgen_Nul.c,v 1.3 2009/06/14 13:51:43 ludo Exp $ * * /----------------------------------------------------------------\ * | | @@ -101,7 +101,7 @@ static long create_Netlist_Tree (aOffset, amDepth, amDepthNext) s64printf("i => i0[%ld]", aOffset), "nq => nul", "vdd => vdd", - "vss => vss", 0); + "vss => vss", NULL); } else { LV_prevTreeOut = aOffset; @@ -119,7 +119,7 @@ static long create_Netlist_Tree (aOffset, amDepth, amDepthNext) s64printf("i => i0[%ld]", aOffset), s64printf("nq => nul_%ld", aOffset), "vdd => vdd", - "vss => vss", 0); + "vss => vss", NULL); } LV_oneShift = 1; aOffset++; @@ -184,7 +184,7 @@ static long create_Netlist_Tree (aOffset, amDepth, amDepthNext) sInstance, sI0, sI1, sQ, "vdd => vdd", - "vss => vss", 0); + "vss => vss", NULL); } } @@ -225,7 +225,7 @@ static long create_Netlist_Tree (aOffset, amDepth, amDepthNext) s64printf("i1 => nul_%ld", i1_index), sQ, "vdd => vdd", - "vss => vss", 0); + "vss => vss", NULL); LV_prevTreeOut = cell_index; @@ -258,7 +258,7 @@ static void create_Netlist () offset = 0; - depthNext = get_depth (LV_N, 0); + depthNext = get_depth (LV_N, NULL); do { depth = depthNext; @@ -398,7 +398,7 @@ static void create_Layout () offset = 0; - depthNext = get_depth (LV_N, 0); + depthNext = get_depth (LV_N, NULL); do { depth = depthNext; diff --git a/alliance/src/genlib/src/genlib.c b/alliance/src/genlib/src/genlib.c index cf5c18f6..8f4bf495 100644 --- a/alliance/src/genlib/src/genlib.c +++ b/alliance/src/genlib/src/genlib.c @@ -71,7 +71,7 @@ #include "mbkgen.h" #define __GENLIB__ #include "mgn.h" -static char rcsid[] = "$Id: genlib.c,v 1.12 2003/02/06 09:52:14 fred Exp $"; +static char rcsid[] = "$Id: genlib.c,v 1.13 2009/06/14 13:51:43 ludo Exp $"; /******************************************************************************* * global variables used in genlib * @@ -89,7 +89,7 @@ static chain_list *lolist; static char *checkname(); static void toolong(); static int hassep(); -int is_bus(); +int is_bus(char *name); int bus_decod(); /******************************************************************************* @@ -281,8 +281,7 @@ chain_list *c = NULL; /******************************************************************************* * function DEF_PHFIG * *******************************************************************************/ -void genDEF_PHFIG(name) -char *name; +void genDEF_PHFIG( char *name ) { phfig_list *ptfig; char *s; @@ -3081,8 +3080,7 @@ chain_list *ptchain = NULL; /******************************************************************************* * function LOSIG * *******************************************************************************/ -void genLOSIG(signame) -char *signame; +void genLOSIG( char *signame ) { losig_list *ptsig; chain_list *ptchain, *ptchain1 = NULL; @@ -3167,8 +3165,7 @@ char *s; /******************************************************************************* * function LOCON * *******************************************************************************/ -void genLOCON(conname, direction, signame) -char *conname, direction, *signame; +void genLOCON( char *conname, char direction, char *signame ) { losig_list * ptsig; chain_list * ptchain, *ptchain1 = NULL, *ptchain2 = NULL; @@ -3336,10 +3333,7 @@ char *s = NULL; /* To make -Wall happy */ /******************************************************************************* * function LOTRS * *******************************************************************************/ -void genLOTRS(type, width, length, grid, source, drain) -char type; -unsigned short width, length; -char *grid, *source, *drain; +void genLOTRS( char type, unsigned short width, unsigned short length, char *grid, char *source, char *drain ) { int i = 0; losig_list *s_grid = NULL, *s_source = NULL, *s_drain = NULL, *ptsig = NULL; @@ -3390,8 +3384,7 @@ char *signame = NULL; /* To make -Wall happy */ /******************************************************************************* * function LOSIGMERGE * *******************************************************************************/ -void genLOSIGMERGE(sig1, sig2) -char *sig1, *sig2; +void genLOSIGMERGE( char *sig1, char *sig2 ) { losig_list *ls0, *ls1, *ls2; locon_list *c; @@ -3680,9 +3673,7 @@ char *s, *t; /******************************************************************************* * function FLATTEN_LOFIG * *******************************************************************************/ -void genFLATTEN_LOFIG(insname, concat) -char *insname; -char concat; +void genFLATTEN_LOFIG( char *insname, char concat ) { long i = 0; losig_list *s; @@ -3705,8 +3696,7 @@ losig_list *s; /******************************************************************************* * flattens FLATTEN_ALL_LOINS * *******************************************************************************/ -void genFLATTEN_ALL_LOINS(concat, catal) -char concat, catal; +void genFLATTEN_ALL_LOINS( char concat, int catal ) { chain_list *c, *namelist = NULL; loins_list *l; @@ -3779,10 +3769,7 @@ chain_list *ilist = NULL; /******************************************************************************* * function SC_PLACE * *******************************************************************************/ -void genSC_PLACE(insname, sym, x, y) -char *insname; -int sym; -long x, y; +void genSC_PLACE( char *insname, int sym, long x, long y ) { loins_list * ptins; char *s = namealloc(insname); @@ -3816,9 +3803,7 @@ char *s = namealloc(insname); /******************************************************************************* * function SC_RIGHT * *******************************************************************************/ -void genSC_RIGHT(insname, sym) -char *insname; -int sym; +void genSC_RIGHT( char *insname, int sym ) { loins_list * ptins; char *s = namealloc(insname); @@ -3852,9 +3837,7 @@ char *s = namealloc(insname); /******************************************************************************* * function SC_LEFT * *******************************************************************************/ -void genSC_LEFT(insname, sym) -char *insname; -int sym; +void genSC_LEFT( char *insname, int sym ) { loins_list *ptins; char *s = namealloc(insname); @@ -3886,9 +3869,7 @@ char *s = namealloc(insname); /******************************************************************************* * function SC_TOP * *******************************************************************************/ -void genSC_TOP(insname, sym) -char *insname; -int sym; +void genSC_TOP( char *insname, int sym ) { loins_list *ptins; char *s = namealloc(insname); @@ -3920,9 +3901,7 @@ char *s = namealloc(insname); /******************************************************************************* * function SC_BOTTOM * *******************************************************************************/ -void genSC_BOTTOM(insname, sym) -char *insname; -int sym; +void genSC_BOTTOM( char *insname, int sym ) { loins_list *ptins; char *s = namealloc(insname); @@ -3955,9 +3934,7 @@ char *s = namealloc(insname); /******************************************************************************* * BUS allows the definition of a bus for logical operations * *******************************************************************************/ -char *genBUS(signame, from, to) -char *signame; -long from, to; +char *genBUS( char *signame, long from, long to ) { char sigid[100]; @@ -3974,9 +3951,7 @@ char sigid[100]; /******************************************************************************* * ELM allows the definition of a bus element for logical operations * *******************************************************************************/ -char *genELM(signame, number) -char *signame; -long number; +char *genELM( char *signame, long number ) { char sigid[100]; @@ -3994,9 +3969,7 @@ char sigid[100]; * Do not forget to free a vectorized string that comes out from this * function ! */ -char *genUSED(s, c) - char *s; - int c; +char *genUSED( char *s, int c ) /* Czo */ { char *t, *u; @@ -4015,8 +3988,7 @@ char *t, *u; * loads the net-list description of a cell and create what's necessary to * * physically describe it * *******************************************************************************/ -void genDEF_PHSC(name) -char *name; +void genDEF_PHSC( char *name ) { lofig_list *ptlofig; @@ -4192,8 +4164,7 @@ long d; * something like "abcd[efgh]" will exit on a syntax error * * return 1 if "abcd[23:45]" 0 if "abcd" or "abdc[12]" * *******************************************************************************/ -int is_bus(signame) -char *signame; +int is_bus( char *signame ) { char *t = signame, c; char is_a_bus = 0, flag = 0; @@ -4251,9 +4222,7 @@ char i, where = 0; /* used to say exactly where */ * function bus_decod * * decods the bus name so buses can be used in LOINS & LOCON * *******************************************************************************/ -int bus_decod(busname, signame, first, last) -char *busname, *signame; -long *first, *last; +int bus_decod( char *busname, char *signame, long *first, long *last ) { char *space; char *buffer = mbkstrdup(busname); @@ -4276,8 +4245,7 @@ char *buffer = mbkstrdup(busname); * function toolong * * cheks the validity of the lentgh of a string * *******************************************************************************/ -static void toolong(length) -long length; +static void toolong( long length ) { if (length > BUFSIZ) { (void)fflush(stdout); @@ -4290,8 +4258,7 @@ long length; /******************************************************************************* * checkname : check for busses with single index * *******************************************************************************/ -static char *checkname(name) -char *name; +static char *checkname( char *name ) { static char str[256]; char *s, *t; @@ -4324,8 +4291,7 @@ end: /******************************************************************************* * hassep : check for legal instance names * *******************************************************************************/ -static int hassep(s) -char *s; +static int hassep( char *s ) { for (; *s != '\0'; s++) if (*s == '[' || *s == ']' || diff --git a/alliance/src/genlib/src/mgn.h b/alliance/src/genlib/src/mgn.h index d123de3e..ed499f78 100644 --- a/alliance/src/genlib/src/mgn.h +++ b/alliance/src/genlib/src/mgn.h @@ -94,18 +94,18 @@ extern void genSAVE_LOFIG(); extern void genLOINS(char *, ...); extern void genLOINSE(char *, ...); extern void genLOINSA(); -extern void genLOTRS(); -extern void genLOCON(); -extern void genLOSIGMERGE(); -extern void genFLATTEN_LOFIG(); -extern void genFLATTEN_ALL_LOINS(); -extern void genDEF_PHSC(); +extern void genLOTRS( char type, unsigned short width, unsigned short length, char *grid, char *source, char *drain ); +extern void genLOCON( char *conname, char direction, char *signame ); +extern void genLOSIGMERGE( char *sig1, char *sig2 ); +extern void genFLATTEN_LOFIG( char *insname, char concat ); +extern void genFLATTEN_ALL_LOINS( char concat, int catal ); +extern void genDEF_PHSC( char *name ); extern void genSAVE_PHSC(); -extern void genSC_PLACE(); -extern void genSC_RIGHT(); -extern void genSC_LEFT(); -extern void genSC_TOP(); -extern void genSC_BOTTOM(); +extern void genSC_PLACE( char *insname, int sym, long x, long y ); +extern void genSC_RIGHT( char *insname, int sym ); +extern void genSC_LEFT( char *insname, int sym ); +extern void genSC_TOP( char *insname, int sym ); +extern void genSC_BOTTOM( char *insname, int sym ); extern void genSC_CHANNEL(); extern void genSC_CON_CHANNEL(); extern void genLOGEN(char *, int, ...); diff --git a/alliance/src/graal/src/GMC_panel.c b/alliance/src/graal/src/GMC_panel.c index ad9cf8dd..399be5d2 100644 --- a/alliance/src/graal/src/GMC_panel.c +++ b/alliance/src/graal/src/GMC_panel.c @@ -3140,7 +3140,7 @@ void CallbackChangeSegmentLayer( MyWidget, ClientData, CallData ) { rdsbegin(); - GraalSegmentLayer = (int)ClientData; + GraalSegmentLayer = (long)ClientData; GraalSegmentWidth = GRAAL_SEGMENT_VALUE_TABLE[ GraalSegmentLayer ][0]; if ( GraalSegmentWire == GRAAL_FALSE ) @@ -3310,7 +3310,7 @@ void CallbackChangeViaType( MyWidget, ClientData, CallData ) { rdsbegin(); - GraalViaType = (int)ClientData; + GraalViaType = (long)ClientData; GraalChangeEditMode( GRAAL_CREATE_VIA, GraalPromptCreateVia ); @@ -3409,7 +3409,7 @@ void CallbackChangeBigViaType( MyWidget, ClientData, CallData ) { rdsbegin(); - GraalBigViaType = (int)ClientData; + GraalBigViaType = (long)ClientData; GraalChangeEditMode( GRAAL_CREATE_BIGVIA, GraalPromptCreateBigVia ); @@ -3509,7 +3509,7 @@ void CallbackChangeTransistorType( MyWidget, ClientData, CallData ) { rdsbegin(); - GraalTransistorType = (int)ClientData; + GraalTransistorType = (long)ClientData; GraalTransistorWidth = GRAAL_SEGMENT_VALUE_TABLE[ GraalTransistorType ][0]; if ( GraalTransistorWire == GRAAL_FALSE ) @@ -3680,7 +3680,7 @@ void CallbackChangeConnectorLayer( MyWidget, ClientData, CallData ) { rdsbegin(); - GraalConnectorLayer = (int)ClientData; + GraalConnectorLayer = (long)ClientData; GraalConnectorWidth = GRAAL_SEGMENT_VALUE_TABLE[ GraalConnectorLayer ][0]; GraalChangeEditMode( GRAAL_CREATE_CONNECTOR, @@ -3754,7 +3754,7 @@ void CallbackChangeConnectorOrient( MyWidget, ClientData, CallData ) { rdsbegin(); - GraalConnectorOrient = (int)ClientData; + GraalConnectorOrient = (long)ClientData; GraalChangeEditMode( GRAAL_CREATE_CONNECTOR, GraalPromptCreateConnector ); @@ -3803,7 +3803,7 @@ void CallbackChangeReferenceType( MyWidget, ClientData, CallData ) { rdsbegin(); - GraalReferenceType = (int)ClientData; + GraalReferenceType = (long)ClientData; GraalChangeEditMode( GRAAL_CREATE_REFERENCE, GraalPromptCreateReference ); @@ -3883,7 +3883,7 @@ void CallbackChangeInstanceSym( MyWidget, ClientData, CallData ) { rdsbegin(); - GraalInstanceSym = (int)ClientData; + GraalInstanceSym = (long)ClientData; GraalChangeEditMode( GRAAL_CREATE_INSTANCE, GraalPromptCreateInstance ); diff --git a/alliance/src/graal/src/GME_panel.c b/alliance/src/graal/src/GME_panel.c index 3142cc82..3517c95d 100644 --- a/alliance/src/graal/src/GME_panel.c +++ b/alliance/src/graal/src/GME_panel.c @@ -4422,7 +4422,7 @@ void CallbackModifySegmentLayer( MyWidget, ClientData, CallData ) rdsbegin(); - NewLayer = (int)ClientData; + NewLayer = (long)ClientData; if ( ( GraalSegmentMName == (char *)0 ) && ( ( NewLayer >= CALU1 ) && @@ -4547,7 +4547,7 @@ void CallbackModifyTransistorType( MyWidget, ClientData, CallData ) rdsbegin(); - GraalTransistorMType = (int)ClientData; + GraalTransistorMType = (long)ClientData; MinWidth = GRAAL_SEGMENT_VALUE_TABLE[ GraalTransistorMType ][0]; if ( GraalTransistorMWidth < MinWidth ) GraalTransistorMWidth = MinWidth; @@ -4662,7 +4662,7 @@ void CallbackModifyConnectorLayer( MyWidget, ClientData, CallData ) rdsbegin(); - GraalConnectorMLayer = (int)ClientData; + GraalConnectorMLayer = (long)ClientData; MinWidth = GRAAL_SEGMENT_VALUE_TABLE[ GraalConnectorMLayer ][0]; if ( GraalConnectorMWidth < MinWidth ) GraalConnectorMWidth = MinWidth; @@ -4686,7 +4686,7 @@ void CallbackModifyConnectorOrient( MyWidget, ClientData, CallData ) { rdsbegin(); - GraalConnectorMOrient = (int)ClientData; + GraalConnectorMOrient = (long)ClientData; GraalPromptModifyConnector(); @@ -4796,7 +4796,7 @@ void CallbackModifyReferenceType( MyWidget, ClientData, CallData ) { rdsbegin(); - GraalReferenceMType = (int)ClientData; + GraalReferenceMType = (long)ClientData; GraalPromptModifyReference(); @@ -4887,7 +4887,7 @@ void CallbackModifyInstanceSym( MyWidget, ClientData, CallData ) { rdsbegin(); - GraalInstanceMSym = (int)ClientData; + GraalInstanceMSym = (long)ClientData; GraalPromptModifyInstance(); @@ -4997,7 +4997,7 @@ void CallbackModifyViaType( MyWidget, ClientData, CallData ) { rdsbegin(); - GraalViaMType = (int)ClientData; + GraalViaMType = (long)ClientData; GraalPromptModifyVia(); @@ -5089,7 +5089,7 @@ void CallbackModifyBigViaType( MyWidget, ClientData, CallData ) { rdsbegin(); - GraalViaMType = (int)ClientData; + GraalViaMType = (long)ClientData; GraalPromptModifyBigVia(); diff --git a/alliance/src/graal/src/GMV_panel.c b/alliance/src/graal/src/GMV_panel.c index 280cdccc..db959597 100644 --- a/alliance/src/graal/src/GMV_panel.c +++ b/alliance/src/graal/src/GMV_panel.c @@ -3157,7 +3157,7 @@ void CallbackLayerVisible( MyWidget, ClientData, CallData ) { rdsbegin(); - if ( GRAAL_RDS_ACTIVE_LAYER_TABLE[ (int)ClientData ] == 0 ) + if ( GRAAL_RDS_ACTIVE_LAYER_TABLE[ (long)ClientData ] == 0 ) { GraalSetLayerVisible( ClientData ); } @@ -3179,7 +3179,7 @@ void CallbackNameVisible( MyWidget, ClientData, CallData ) { rdsbegin(); - if ( GRAAL_RDS_ACTIVE_NAME_TABLE[ (int)ClientData ] == 0 ) + if ( GRAAL_RDS_ACTIVE_NAME_TABLE[ (long)ClientData ] == 0 ) { GraalSetNameVisible( ClientData ); } @@ -3201,7 +3201,7 @@ void CallbackLayerInvisible( MyWidget, ClientData, CallData ) { rdsbegin(); - if ( GRAAL_RDS_ACTIVE_LAYER_TABLE[ (int)ClientData ] == 1 ) + if ( GRAAL_RDS_ACTIVE_LAYER_TABLE[ (long)ClientData ] == 1 ) { GraalSetLayerInvisible( ClientData ); } @@ -3223,7 +3223,7 @@ void CallbackNameInvisible( MyWidget, ClientData, CallData ) { rdsbegin(); - if ( GRAAL_RDS_ACTIVE_NAME_TABLE[ (int)ClientData ] == 1 ) + if ( GRAAL_RDS_ACTIVE_NAME_TABLE[ (long)ClientData ] == 1 ) { GraalSetNameInvisible( ClientData ); } diff --git a/alliance/src/growstk/src/hash.c b/alliance/src/growstk/src/hash.c index 772c9edd..71975886 100644 --- a/alliance/src/growstk/src/hash.c +++ b/alliance/src/growstk/src/hash.c @@ -36,15 +36,15 @@ static int primes[] = { void htremove (ht_t * htable) { - int i; - for (i = 1; i < (int)htable[0]; i++) + long i; + for (i = 1; i < (long)htable[0]; i++) freechain (htable[i]); free (htable); } -ht_t *htinit (int size) +ht_t *htinit (long size) { - int i; + long i; ht_t *htable; /* prend le premier nombre premier au dela de size */ @@ -64,12 +64,12 @@ ht_t *htinit (int size) return htable; } -static int hash (ht_t * htable, char *key) +static long hash (ht_t * htable, char *key) { - int alveole = 0; - int length = strlen (key); - int segment; - int l; + long alveole = 0; + long length = strlen (key); + long segment; + long l; if ((key == NULL) || (length == 0)) { @@ -81,13 +81,13 @@ static int hash (ht_t * htable, char *key) segment = 0xFFFF & ((key[l] << 8) | key[l + 1]); alveole = alveole ^ ((segment << 1) | (segment >> 15)); } - alveole %= (int) htable[0]; /* htable[0] == la taille de la table */ + alveole %= (long) htable[0]; /* htable[0] == la taille de la table */ return (alveole + 1); /* +1 car on ne doit rien mettre dans case 0 */ } chain_list *htget (ht_t * htable, char *key) { - int alveole = hash (htable, key); + long alveole = hash (htable, key); chain_list *p; for (p = htable[alveole]; p && strcmp (p->DATA, key); p = p->NEXT); @@ -96,7 +96,7 @@ chain_list *htget (ht_t * htable, char *key) chain_list *htset (ht_t * htable, char *key) { - int alveole = hash (htable, key); + long alveole = hash (htable, key); chain_list *p; for (p = htable[alveole]; p && strcmp (p->DATA, key); p = p->NEXT); diff --git a/alliance/src/growstk/src/hash.h b/alliance/src/growstk/src/hash.h index 2928fc5e..8b52180b 100644 --- a/alliance/src/growstk/src/hash.h +++ b/alliance/src/growstk/src/hash.h @@ -29,7 +29,7 @@ typedef chain_list *ht_t; /* def d'1 table de hachage table de htele_t */ -extern ht_t *htinit (int size); +extern ht_t *htinit (long size); extern void htremove (ht_t * htable); extern chain_list *htset (ht_t * htable, char *key); extern chain_list *htget (ht_t * htable, char *key); diff --git a/alliance/src/log/src/log.h b/alliance/src/log/src/log.h index 10c9f38e..f3946ec8 100644 --- a/alliance/src/log/src/log.h +++ b/alliance/src/log/src/log.h @@ -30,7 +30,7 @@ -/* $Id: log.h,v 1.5 2005/04/15 08:38:49 alliance Exp $ */ +/* $Id: log.h,v 1.6 2009/06/14 13:51:47 ludo Exp $ */ #ifndef LUC_LOG_H #define LUC_LOG_H @@ -75,7 +75,7 @@ typedef struct elemTH { char *key; - int value; + long value; } *pElemTH; @@ -86,9 +86,9 @@ typedef struct elemTH typedef struct tableTH { - int length; + long length; pElemTH pElem; - int count; + long count; } *pTH; @@ -108,7 +108,7 @@ typedef struct tableTH #define CADR(expr) CAR(CDR(expr)) #define ATOM(expr) (!expr->NEXT) #define VALUE_ATOM(expr) (char *) expr->DATA -#define OPER(expr) ((int)(CAR(expr))->DATA) +#define OPER(expr) ((long)(CAR(expr))->DATA) @@ -186,9 +186,9 @@ typedef struct node typedef struct tableBdd { - int lenTableBdd; + long lenTableBdd; pNode *pBdd; - int compteur; + long compteur; } *pTableBdd; @@ -210,7 +210,7 @@ typedef struct vertexLoc typedef struct tableLoc { - int lenTabLoc; + long lenTabLoc; pVertexLoc pLoc; } *pTableLoc; @@ -236,7 +236,7 @@ struct systemBdd chain_list *lpAT; pTableBdd pRT; pNode pAT; - int indiceAT; + long indiceAT; pTableLoc pMC; }; extern struct systemBdd sysBdd; @@ -255,24 +255,24 @@ extern pNode one, zero; /* Prototypes from log_bdd0.c */ - extern pNode initVertexBdd __P((int index, pNode high, pNode low)); + extern pNode initVertexBdd __P((long index, pNode high, pNode low)); extern pNode createNodeTermBdd __P((short index)); - extern void initializeBdd __P((int size)); - extern void destroyBdd __P((int level)); + extern void initializeBdd __P((long size)); + extern void destroyBdd __P((long level)); extern void resetBdd __P(()); - extern int numberNodeAllBdd __P(()); - extern int numberNodeBdd __P((pNode pBdd)); - extern int countNode __P((pNode pt)); - extern int countNodeTdg __P((pNode pt)); + extern long numberNodeAllBdd __P(()); + extern long numberNodeBdd __P((pNode pBdd)); + extern long countNode __P((pNode pt)); + extern long countNodeTdg __P((pNode pt)); extern chain_list * muxAbl __P((pNode high, pNode low, chain_list *a, char **tabName)); extern chain_list * bddToAbl __P((pNode pt, char **tabName)); extern void displayBddLoc __P((short level, pNode pt)); - extern void displayBdd __P((pNode pBdd, int level)); - extern void assignNumNodeBdd __P((pNode bdd, pTH vTable, int *pNodeNumber)); + extern void displayBdd __P((pNode pBdd, long level)); + extern void assignNumNodeBdd __P((pNode bdd, pTH vTable, long *pNodeNumber)); extern void displayGraphicBdd __P((pNode pBdd)); extern void displayBddName __P((short level, pNode pt, char **TabName)); extern pNode notBdd __P((pNode pBdd)); - extern pNode applyTerm __P((int oper, short index, pNode pBdd)); + extern pNode applyTerm __P((long oper, short index, pNode pBdd)); extern pNode applyBinBdd __P((short oper, pNode pBdd1, pNode pBdd2)); extern pNode applyBdd __P((short oper, chain_list *pt)); extern pNode cnstBdd __P((pNode pBdd1, pNode pBddGc)); @@ -282,11 +282,11 @@ extern pNode one, zero; extern pNode simplifPlusDcZeroBdd __P((pNode pGon, pNode pGdc)); extern pNode simplifDcOneBdd __P((pNode pGon, pNode pGdc)); extern pNode simplifDcOneFPGABdd __P((pNode pGon, pNode pGdc)); - extern pNode composeBdd __P((pNode pBdd1, pNode pBdd2, int index)); + extern pNode composeBdd __P((pNode pBdd1, pNode pBdd2, long index)); extern chain_list * addListBdd __P((chain_list *pt, pNode pBdd)); - extern int oneBdd __P((pNode pBdd)); - extern int zeroBdd __P((pNode pBdd)); - extern int equalBdd __P((pNode pBdd1, pNode pBdd2)); + extern long oneBdd __P((pNode pBdd)); + extern long zeroBdd __P((pNode pBdd)); + extern long equalBdd __P((pNode pBdd1, pNode pBdd2)); extern void markBdd __P((pNode pBdd, short value)); extern pNode upVarBdd __P((pNode pF, pNode pFoldIndex, short newIndex)); extern void markAllBdd __P((short value)); @@ -296,12 +296,12 @@ extern pNode one, zero; extern pNode regenereBdd __P((pNode pBdd, struct systemBdd *sysCible, pTH pTHNode)); extern void gcNodeBdd __P((chain_list *pt)); extern void rempTabIndex __P((pNode pt, char *tabIndex)); - extern chain_list * supportIndexBdd __P((pNode pt, int sens)); + extern chain_list * supportIndexBdd __P((pNode pt, long sens)); /* Prototypes from log_bdd1.c */ - extern pCircuit initializeCct __P((char *name, int nbI, int nbO)); + extern pCircuit initializeCct __P((char *name, long nbI, long nbO)); extern void resetCct __P((pCircuit pC)); extern void destroyCct __P((pCircuit pC)); extern pNode searchOutputCct __P((pCircuit pC, char *name)); @@ -310,22 +310,22 @@ extern pNode one, zero; extern short searchInputCct __P((pCircuit pC, char *name)); extern short addInputCct __P((pCircuit pC, char *name)); extern void delInputCct __P((pCircuit pC, char *name)); - extern void displayCct __P((pCircuit pC, int mode)); + extern void displayCct __P((pCircuit pC, long mode)); extern void composeCct __P((pCircuit pC, char *name, pNode pt)); extern void constraintCct __P((pCircuit pC, pNode pt)); extern void proofCct __P((pCircuit pC1, pCircuit pC2)); extern pNode ablToBddCct __P((pCircuit pC, chain_list *expr)); extern void cpOrderCct __P((pCircuit CC1, pCircuit CC2)); extern void upVarCct __P((pCircuit pC, pNode ptOldIndex, short newIndex)); - extern int numberNodeCct __P((pCircuit pC)); - extern int numberNodeTdgCct __P((pCircuit pC)); + extern long numberNodeCct __P((pCircuit pC)); + extern long numberNodeTdgCct __P((pCircuit pC)); extern chain_list * bddToAblCct __P((pCircuit pC, pNode pBdd)); extern void gcNodeCct __P((pCircuit pC)); /* Prototypes from log_prefbib.c */ - extern char * gensym_abl __P((char *name, int num)); + extern char * gensym_abl __P((char *name, long num)); extern void ablError __P((chain_list *expr, char *func)); extern chain_list * createAtom __P((char *name)); extern chain_list * createExpr __P((short oper)); @@ -339,86 +339,86 @@ extern pNode one, zero; extern void displayExprInt __P((chain_list *expr)); extern void displayExpr __P((chain_list *expr)); extern void displayInfExpr __P((chain_list *expr)); - extern char * exprToCharInt __P((chain_list *expr, int mode, char *chaine, int *taille)); - extern char * exprToChar __P((chain_list *expr, int mode)); - extern char * identExprInt __P((chain_list *expr, char *chaine, int *taille)); + extern char * exprToCharInt __P((chain_list *expr, long mode, char *chaine, long *taille)); + extern char * exprToChar __P((chain_list *expr, long mode)); + extern char * identExprInt __P((chain_list *expr, char *chaine, long *taille)); extern char * identExpr __P((chain_list *expr)); - extern int profExpr __P((chain_list *expr)); - extern int profAOExpr __P((chain_list *expr)); + extern long profExpr __P((chain_list *expr)); + extern long profAOExpr __P((chain_list *expr)); extern chain_list * mapCarExpr __P((chain_list *(*func)(), short oper, chain_list *expr)); extern void mapExpr __P((void (*func)(), chain_list *expr)); - extern int anyExpr __P((int (*func)(), chain_list *expr)); - extern int everyExpr __P((int (*func)(), chain_list *expr)); - extern int searchOperExpr __P((chain_list *expr, short oper)); + extern long anyExpr __P((long (*func)(), chain_list *expr)); + extern long everyExpr __P((long (*func)(), chain_list *expr)); + extern long searchOperExpr __P((chain_list *expr, short oper)); extern short searchExprLow __P((chain_list *expr, char *name)); - extern int searchExpr __P((chain_list *expr, char *name)); - extern int equalExpr __P((chain_list *expr1, chain_list *expr2)); - extern int equalVarExpr __P((chain_list *expr1, chain_list *expr2)); - extern int lengthExpr __P((chain_list *expr)); - extern int numberOperBinExpr __P((chain_list *expr)); - extern int numberAtomExpr __P((chain_list *expr)); + extern long searchExpr __P((chain_list *expr, char *name)); + extern long equalExpr __P((chain_list *expr1, chain_list *expr2)); + extern long equalVarExpr __P((chain_list *expr1, chain_list *expr2)); + extern long lengthExpr __P((chain_list *expr)); + extern long numberOperBinExpr __P((chain_list *expr)); + extern long numberAtomExpr __P((chain_list *expr)); extern chain_list * copyExpr __P((chain_list *expr)); extern void substPhyExpr __P((chain_list *expr1, char *name, chain_list *expr2)); extern chain_list * substExpr __P((chain_list *expr1, char *name, chain_list *expr2)); extern chain_list * devXorExpr __P((chain_list *expr)); extern chain_list * devXor2Expr __P((chain_list *expr)); - extern chain_list * flatPolarityExpr __P((chain_list *expr, int signe)); + extern chain_list * flatPolarityExpr __P((chain_list *expr, long signe)); extern void flatArityExpr __P((chain_list *expr)); extern void supportChain_listExprInt __P((chain_list *expr, chain_list **ppCL)); extern chain_list * supportChain_listExpr __P((chain_list *expr)); extern void supportPtype_listExprInt __P((chain_list *expr, ptype_list **ppCL)); extern ptype_list * supportPtype_listExpr __P((chain_list *expr)); - extern chain_list * maxExpr __P((chain_list *expr, int (*func)())); - extern chain_list * minExpr __P((chain_list *expr, int (*func)())); - extern void sortExpr __P((chain_list *expr, int (*func)(), int direction)); - extern int funcNormExpr __P((chain_list *expr)); + extern chain_list * maxExpr __P((chain_list *expr, long (*func)())); + extern chain_list * minExpr __P((chain_list *expr, long (*func)())); + extern void sortExpr __P((chain_list *expr, long (*func)(), long direction)); + extern long funcNormExpr __P((chain_list *expr)); extern void normExpr __P((chain_list *expr)); - extern void deleteNumExpr __P((chain_list *expr, int i)); - extern chain_list * searchNumExpr __P((chain_list *expr, int i)); - extern int numberOccExpr __P((chain_list *exp, char *name)); + extern void deleteNumExpr __P((chain_list *expr, long i)); + extern chain_list * searchNumExpr __P((chain_list *expr, long i)); + extern long numberOccExpr __P((chain_list *exp, char *name)); extern void changeOperExpr __P((chain_list *expr, short oper)); extern chain_list * simplif10Expr __P((chain_list *expr)); extern chain_list * simplifNotExpr __P((chain_list *exp)); - extern chain_list * charToExprInt __P((char *stringExpr, int *cptCar)); + extern chain_list * charToExprInt __P((char *stringExpr, long *cptCar)); extern chain_list * charToExpr __P((char *stringExpr)); - extern char * tokenExpr __P((char *stringExpr, int *cptCar)); - extern int PMExprInt __P((chain_list *expr, chain_list *pattern, ptype_list **bind)); - extern int PMExpr __P((chain_list *expr, chain_list *pattern)); + extern char * tokenExpr __P((char *stringExpr, long *cptCar)); + extern long PMExprInt __P((chain_list *expr, chain_list *pattern, ptype_list **bind)); + extern long PMExpr __P((chain_list *expr, chain_list *pattern)); /* Prototypes from log_thash.c */ - extern int hashTH __P((char *pn)); - extern pTH createTH __P((int len)); + extern long hashTH __P((char *pn)); + extern pTH createTH __P((long len)); extern void destroyTH __P((pTH pTable)); - extern int searchTH __P((pTH pTable, char *key)); - extern int addTH __P((pTH pTable, char *key, int value)); - extern int addExistTH __P((pTH pTable, char *key, int value)); - extern int deleteTH __P((pTH pTable, char *key)); + extern long searchTH __P((pTH pTable, char *key)); + extern long addTH __P((pTH pTable, char *key, long value)); + extern long addExistTH __P((pTH pTable, char *key, long value)); + extern long deleteTH __P((pTH pTable, char *key)); extern void displayTH __P((pTH pTable)); extern void reAllocTH __P((pTH pTable)); /* Prototypes from log_thashbdd.c */ - extern int hashBdd __P((int index, pNode high, pNode low)); - extern int newKeyBdd __P((int index, pNode high, pNode low)); - extern pTableBdd createTableBdd __P((int len)); + extern long hashBdd __P((long index, pNode high, pNode low)); + extern long newKeyBdd __P((long index, pNode high, pNode low)); + extern pTableBdd createTableBdd __P((long len)); extern void destroyTableBdd __P((pTableBdd pTab)); extern pTableBdd reAllocTableBdd __P((pTableBdd pTab)); - extern pNode searchTableBdd __P((pTableBdd pTab, int index, pNode high, pNode low)); - extern int addTableBdd __P((pTableBdd pTab, pNode pBdd)); - extern int deleteTableBdd __P((pTableBdd pTab, pNode pBdd)); + extern pNode searchTableBdd __P((pTableBdd pTab, long index, pNode high, pNode low)); + extern long addTableBdd __P((pTableBdd pTab, pNode pBdd)); + extern long deleteTableBdd __P((pTableBdd pTab, pNode pBdd)); extern void displayHashBdd __P((pTableBdd pTab)); /* Prototypes from log_thashloc.c */ - extern int hashLoc __P((pNode high, pNode low)); - extern pTableLoc createTabLoc __P((int len)); + extern long hashLoc __P((pNode high, pNode low)); + extern pTableLoc createTabLoc __P((long len)); extern void destroyTabLoc __P((pTableLoc pTab)); extern pNode searchTabLoc __P((pTableLoc pTab, pNode high, pNode low, short oper)); - extern int addTabLoc __P((pTableLoc pTab, pNode high, pNode low, pNode father, short oper)); + extern long addTabLoc __P((pTableLoc pTab, pNode high, pNode low, pNode father, short oper)); extern void displayLoc __P((pTableLoc pTab)); extern void videTabLoc __P((pTableLoc pTab)); #endif diff --git a/alliance/src/log/src/log_bdd0.c b/alliance/src/log/src/log_bdd0.c index cf6fc95a..1f671db5 100644 --- a/alliance/src/log/src/log_bdd0.c +++ b/alliance/src/log/src/log_bdd0.c @@ -30,7 +30,7 @@ -#ident "$Id: log_bdd0.c,v 1.5 2006/03/29 17:10:13 xtof Exp $" +#ident "$Id: log_bdd0.c,v 1.6 2009/06/14 13:51:47 ludo Exp $" /****************************************************************************/ /* Produit : librairie BDD - Gestion de BDD */ @@ -63,7 +63,7 @@ return :pointeur sur le noeud cree. pNode initVertexBdd (index, high, low) - int index; + long index; pNode high, low; { pNode pt; @@ -143,7 +143,7 @@ return :rien. void initializeBdd (size) - int size; + long size; { switch (size) { @@ -179,7 +179,7 @@ return :rien. void destroyBdd (level) - int level; + long level; { chain_list *pt; @@ -214,7 +214,7 @@ return :rien. void resetBdd () { - int i; + long i; pNode *pBdd; chain_list *pt; @@ -248,7 +248,7 @@ numberNodeAllBdd :compte le nombre de noeud utilise dans le systeme. return :le nombre de noeud. ------------------------------------------------------------------------------*/ -int +long numberNodeAllBdd () { return ((sysBdd.pRT)->compteur); @@ -262,11 +262,11 @@ parametres :un pointeur de Node. return :le nombre de noeud. ------------------------------------------------------------------------------*/ -int +long numberNodeBdd (pBdd) pNode pBdd; { - int val; + long val; markBdd (pBdd, -1); markBdd (pBdd, 0); @@ -280,9 +280,9 @@ countNode : calcul du nombre de noeuds BDD ------------------------------------------------------- parametres : une pNode ------------------------------------------------------- -return : int +return : long ------------------------------------------------------------------------------*/ -int +long countNode (pt) pNode pt; { @@ -302,9 +302,9 @@ countNodeTdg : calcul du nombre de noeuds equivalent TDG sur un BDD ------------------------------------------------------- parametres : une pNode ------------------------------------------------------- -return : int +return : long ------------------------------------------------------------------------------*/ -int +long countNodeTdg (pt) pNode pt; { @@ -312,7 +312,7 @@ countNodeTdg (pt) { if (pt->mark == 0) { - int val; + long val; pt->mark = 1; val = countNodeTdg (pt->high) + countNodeTdg (pt->low) + 1; markBdd (notBdd (pt), 1); @@ -573,21 +573,21 @@ displayBddLoc (level, pt) pt->mark = 1; if (pt->index > 1) { - printf ("%d\t INDEX = %d\t", (int) pt, (int) pt->index); + printf ("%ld\t INDEX = %ld\t", (long) pt, (long) pt->index); if ((pt->low)->index == 0) printf (" LOW = ZERO"); else if ((pt->low)->index == 1) printf (" LOW = ONE"); else - printf (" LOW = %d", (int) pt->low); + printf (" LOW = %ld", (long) pt->low); if ((pt->high)->index == 0) printf ("\t HIGH = ZERO\n"); else if ((pt->high)->index == 1) printf ("\t HIGH = ONE\n"); else - printf ("\t HIGH = %d\n", (int) pt->high); + printf ("\t HIGH = %ld\n", (long) pt->high); /* appel recursif */ @@ -608,7 +608,7 @@ displayBddLoc (level, pt) void displayBdd (pBdd, level) pNode pBdd; - int level; + long level; { markBdd (pBdd, 0); displayBddLoc (level, pBdd); @@ -625,7 +625,7 @@ void assignNumNodeBdd (bdd, vTable, pNodeNumber) pNode bdd; pTH vTable; - int *pNodeNumber; + long *pNodeNumber; { if (bdd != one && bdd != zero) { @@ -660,9 +660,9 @@ displayGraphicBdd (pBdd) pNode pBdd; { pTH vTable; - int numNode = 2; + long numNode = 2; chain_list *lst, *supp; - int i; + long i; supp = reverse (supportChain_listBdd (pBdd)); @@ -706,9 +706,9 @@ displayGraphicBdd (pBdd) if (i == pt->index) { - int numLow = searchTH (vTable, (char *) pt->low); - int numHigh = searchTH (vTable, (char *) pt->high); - int num = searchTH (vTable, (char *)pt); + long numLow = searchTH (vTable, (char *) pt->low); + long numHigh = searchTH (vTable, (char *) pt->high); + long num = searchTH (vTable, (char *)pt); printf (" %d_(%d)_%d ", numLow, num, numHigh); } @@ -742,20 +742,20 @@ displayBddName (level, pt, TabName) pt->mark = 1; if (pt->index > 1) { - printf ("%d\t INPUT = %s\t", (int) pt, *(TabName + pt->index - 2)); + printf ("%ld\t INPUT = %s\t", (long) pt, *(TabName + pt->index - 2)); if ((pt->high)->index == 0) printf (" HIGH = ZERO"); else if ((pt->high)->index == 1) printf (" HIGH = ONE"); else - printf (" HIGH = %d", (int) pt->high); + printf (" HIGH = %ld", (long) pt->high); if ((pt->low)->index == 0) printf ("\t LOW = ZERO\n"); else if ((pt->low)->index == 1) printf ("\t LOW = ONE\n"); else - printf ("\t LOW = %d\n", (int) pt->low); + printf ("\t LOW = %ld\n", (long) pt->low); if (level == 1) { if ((pt->low)->index > 1) @@ -806,7 +806,7 @@ return :un pointeur de Bdd. pNode applyTerm (oper, index, pBdd) - int oper; + long oper; short index; pNode pBdd; { @@ -1483,7 +1483,7 @@ return :un pointeur de Bdd. pNode composeBdd (pBdd1, pBdd2, index) pNode pBdd1, pBdd2; - int index; + long index; { pNode r1, r2, resul; @@ -1514,7 +1514,7 @@ addListBdd (pt, pBdd) pNode pBdd; { chain_list *new_lstGdb, *pCur, *pCurSup; - int index; + long index; index = pBdd->index; @@ -1556,10 +1556,10 @@ renvoie 1 si le graphe est une tautologie ----------------------------------------------------------------------- parametres :un pointeur de Bdd. ----------------------------------------------------------------------- -return :un int. +return :un long. ------------------------------------------------------------------------------*/ -int +long oneBdd (pBdd) pNode pBdd; { @@ -1575,10 +1575,10 @@ renvoie 1 si le graphe est une antilogie ----------------------------------------------------------------------- parametres :un pointeur de Bdd. ----------------------------------------------------------------------- -return :un int. +return :un long. ------------------------------------------------------------------------------*/ -int +long zeroBdd (pBdd) pNode pBdd; { @@ -1597,7 +1597,7 @@ parametres :deux pointeurs de Bdd. return :un short. ------------------------------------------------------------------------------*/ -int +long equalBdd (pBdd1, pBdd2) pNode pBdd1, pBdd2; { @@ -1670,7 +1670,7 @@ markAllBdd (value) short value; { pNode pBdd, *ppBdd; - int i; + long i; ppBdd = (sysBdd.pRT)->pBdd; @@ -1787,7 +1787,7 @@ regenereBdd (pBdd, sysCible, pTHNode) struct systemBdd *sysCible; pTH pTHNode; { - int resul; + long resul; if ((resul = searchTH (pTHNode, (char *)pBdd)) != EMPTYTH) return ((pNode) resul); @@ -1798,7 +1798,7 @@ regenereBdd (pBdd, sysCible, pTHNode) printf ("gcNode : error - bad index %d\n", pBdd->index); exit (-1); } - resul = (int) initVertexBddAux (pBdd->index, + resul = (long) initVertexBddAux (pBdd->index, regenereBdd (pBdd->high, sysCible, pTHNode), regenereBdd (pBdd->low, sysCible, pTHNode), sysCible); @@ -1831,8 +1831,8 @@ gcNodeBdd (pt) sysBddAux.lpAT = NULL; zeroAux = initVertexBddAux (0, (pNode) 0, (pNode) 1, &sysBddAux); oneAux = initVertexBddAux (1, (pNode) 0, (pNode) 1, &sysBddAux); - addTH (pTHNode, (char *)zero, (int) zeroAux); - addTH (pTHNode, (char *)one, (int) oneAux); + addTH (pTHNode, (char *)zero, (long) zeroAux); + addTH (pTHNode, (char *)one, (long) oneAux); while (pt) { @@ -1882,10 +1882,10 @@ rempTabIndex (pt, tabIndex) chain_list * supportIndexBdd (pt, sens) pNode pt; - int sens; + long sens; { char *tabIndex; - int i; + long i; chain_list *ret; /* initialisation du tableau d'index utilises */ diff --git a/alliance/src/log/src/log_bdd1.c b/alliance/src/log/src/log_bdd1.c index a3b2b81c..b28c5779 100644 --- a/alliance/src/log/src/log_bdd1.c +++ b/alliance/src/log/src/log_bdd1.c @@ -31,14 +31,15 @@ -#ident "$Id: log_bdd1.c,v 1.2 2002/09/30 16:20:43 czo Exp $" +#ident "$Id: log_bdd1.c,v 1.3 2009/06/14 13:51:47 ludo Exp $" /****************************************************************************/ /* Produit : librairie BDD - Gestion de BDD */ /****************************************************************************/ -#include +#include +#include #include "mut.h" #include "log.h" @@ -52,11 +53,11 @@ return :pointeur de circuit. pCircuit initializeCct (name, nbI, nbO) char *name; - int nbI, nbO; + long nbI, nbO; { pCircuit pC; char **pt; - int i; + long i; /* on assure ... */ nbI++; nbO++; @@ -139,7 +140,7 @@ searchOutputCct (pC, name) pCircuit pC; char *name; { - int res; + long res; if ((res = searchTH (pC->pTO, namealloc (name))) != EMPTYTH) return ((pNode) res); @@ -161,7 +162,7 @@ addOutputCct (pC, name, pt) pNode pt; { name = namealloc (name); - addTH (pC->pTO, name, (int)pt); + addTH (pC->pTO, name, (long)pt); } /*------------------------------------------------------------------------------ searchIndexCct :recherche entree associe a un index . @@ -192,8 +193,8 @@ searchInputCct (pC, name) pCircuit pC; char *name; { - int reallocTH; - int resul; + long reallocTH; + long resul; reallocTH = (pC->pTI)->length; resul = searchTH (pC->pTI, namealloc (name)); @@ -202,7 +203,7 @@ searchInputCct (pC, name) if (reallocTH != (pC->pTI)->length) { - int i, j; + long i, j; char **pOldName = pC->pNameI; char **pOldSave = pC->pNameI; char **pt; @@ -250,7 +251,7 @@ addInputCct (pC, name) } else { - int reallocTH; + long reallocTH; index = pC->countI; reallocTH = (pC->pTI)->length; @@ -260,7 +261,7 @@ addInputCct (pC, name) if (reallocTH != (pC->pTI)->length) { - int i, j; + long i, j; char **pOldName = pC->pNameI; char **pOldSave = pC->pNameI; char **pt; @@ -315,7 +316,7 @@ return :rien. void displayCct (pC, mode) pCircuit pC; - int mode; + long mode; { pElemTH pEl; short i, cpt = 0; @@ -380,7 +381,7 @@ composeCct (pC, name, pt) char *name; pNode pt; { - int i; + long i; short index; pElemTH pEl; @@ -394,7 +395,7 @@ composeCct (pC, name, pt) for (i = 0; i < (pC->pTO)->length; i++) { if (pEl->value != EMPTYTH && pEl->value != DELETETH) - pEl->value = (int) composeBdd ((pNode)pEl->value, pt, index); + pEl->value = (long) composeBdd ((pNode)pEl->value, pt, index); pEl++; } deleteTH (pC->pTI, name); /* on elimine name des INPUT */ @@ -412,14 +413,14 @@ constraintCct (pC, pt) pCircuit pC; pNode pt; { - int i; + long i; pElemTH pEl; pEl = (pC->pTO)->pElem; /* pointeur courant de la table pTO */ for (i = 0; i < (pC->pTO)->length; i++) { if (pEl->value != EMPTYTH && pEl->value != DELETETH) - pEl->value = (int) constraintBdd ((pNode)pEl->value, pt); + pEl->value = (long) constraintBdd ((pNode)pEl->value, pt); pEl++; } } @@ -436,7 +437,7 @@ proofCct (pC1, pC2) { pElemTH pEl; pNode noeudCC2; - int i; + long i; short indexCC2; chain_list *expr; @@ -556,7 +557,7 @@ void cpOrderCct (CC1, CC2) pCircuit CC1, CC2; { - int i; + long i; pElemTH pEl1; pElemTH pEl2; char **pt1, **pt2; @@ -601,14 +602,14 @@ upVarCct (pC, ptOldIndex, newIndex) pNode ptOldIndex; short newIndex; { - int i; + long i; pElemTH pEl; pEl = (pC->pTO)->pElem; for (i = 0; i < (pC->pTO)->length; i++) { if (pEl->value != EMPTYTH && pEl->value != DELETETH) - pEl->value = (int) upVarBdd ((pNode)pEl->value, ptOldIndex, newIndex); + pEl->value = (long) upVarBdd ((pNode)pEl->value, ptOldIndex, newIndex); pEl++; } deleteTH (pC->pTI, *(pC->pNameI + newIndex - 2)); @@ -622,12 +623,12 @@ numberNodeCct : calcule le nombre de noeud d'un circuit retour : un entier. ---------------------------------------------------------------------------*/ -int +long numberNodeCct (pC) pCircuit pC; { pElemTH pEl; - int i, number_node; + long i, number_node; number_node = 0; markAllBdd (0); @@ -650,12 +651,12 @@ numberNodeTdgCct : calcule le nombre de noeud equivalent TDG d'un circuit retour : un entier. ---------------------------------------------------------------------------*/ -int +long numberNodeTdgCct (pC) pCircuit pC; { pElemTH pEl; - int i, number_node; + long i, number_node; number_node = 0; markAllBdd (0); @@ -704,7 +705,7 @@ gcNodeCct (pC) pNode zeroAux, oneAux; pTH pTHNode; pElemTH pEl; - int j; + long j; pTHNode = createTH (MEDIUM); sysBddAux.pRT = createTableBdd (MEDIUM); @@ -713,8 +714,8 @@ gcNodeCct (pC) sysBddAux.lpAT = NULL; zeroAux = initVertexBddAux (0, (pNode) 0, (pNode) 1, &sysBddAux); oneAux = initVertexBddAux (1, (pNode) 0, (pNode) 1, &sysBddAux); - addTH (pTHNode, (char *)zero, (int) zeroAux); - addTH (pTHNode, (char *)one, (int) oneAux); + addTH (pTHNode, (char *)zero, (long) zeroAux); + addTH (pTHNode, (char *)one, (long) oneAux); /* on regenere les graphes */ @@ -723,7 +724,7 @@ gcNodeCct (pC) for (j = 0; j < (pC->pTO)->length; j++) { if (pEl->value != EMPTYTH && pEl->value != DELETETH) - pEl->value = (int) regenereBdd ((pNode) pEl->value, &sysBddAux, pTHNode); + pEl->value = (long) regenereBdd ((pNode) pEl->value, &sysBddAux, pTHNode); pEl++; } diff --git a/alliance/src/log/src/log_prefbib.c b/alliance/src/log/src/log_prefbib.c index 1f833474..e0019e5a 100644 --- a/alliance/src/log/src/log_prefbib.c +++ b/alliance/src/log/src/log_prefbib.c @@ -31,7 +31,7 @@ -#ident "$Id: log_prefbib.c,v 1.3 2002/09/30 16:20:43 czo Exp $" +#ident "$Id: log_prefbib.c,v 1.4 2009/06/14 13:51:47 ludo Exp $" /****************************************************************************/ /* Produit : librairie ABL - Gestion de representations prefixees */ @@ -58,7 +58,7 @@ retour : un pointeur de chaine de caracteres. char * gensym_abl (name, num) char *name; - int num; + long num; { char *name1; char number[3]; @@ -87,7 +87,7 @@ ablError (expr, func) chain_list *expr; char *func; { - int oper = OPER (expr); + long oper = OPER (expr); if (oper < MIN_OPER || oper > MAX_OPER) { @@ -342,7 +342,7 @@ void displayExprInt (expr) chain_list *expr; { - int oper; + long oper; if (ATOM (expr)) printf (" %s", VALUE_ATOM (expr)); @@ -386,7 +386,7 @@ void displayInfExpr (expr) chain_list *expr; { - int oper; + long oper; if (ATOM (expr)) /* Traitement atomique */ printf ("%s", VALUE_ATOM (expr)); @@ -423,12 +423,12 @@ displayInfExpr (expr) char * exprToCharInt (expr, mode, chaine, taille) chain_list *expr; - int mode; + long mode; char *chaine; - int *taille; + long *taille; { char *oper; - int lenVA; + long lenVA; if (ATOM (expr)) { @@ -481,7 +481,7 @@ exprToCharInt (expr, mode, chaine, taille) else /*----- prefixe -----*/ { - int lenOPER = strlen (oper); + long lenOPER = strlen (oper); strncat (chaine, "(", 1); strncat (chaine, oper, lenOPER); while ((expr = CDR (expr))) @@ -504,10 +504,10 @@ exprToCharInt (expr, mode, chaine, taille) char * exprToChar (expr, mode) chain_list *expr; - int mode; + long mode; { char *chaine; - int taille; + long taille; taille = 100; chaine = (char *) mbkalloc (100); @@ -526,7 +526,7 @@ char * identExprInt (expr, chaine, taille) chain_list *expr; char *chaine; - int *taille; + long *taille; { if (ATOM (expr)) return chaine; @@ -534,7 +534,7 @@ identExprInt (expr, chaine, taille) { chain_list *expr1; char arite[3]; - int oper = OPER (expr); + long oper = OPER (expr); switch (oper) { @@ -588,9 +588,9 @@ identExpr (expr) chain_list *expr; { char *chaine, *bidon; - int taille, i; + long taille, i; chain_list *expr1; - int flag_alloc = 0; + long flag_alloc = 0; taille = 100; @@ -648,7 +648,7 @@ identExpr (expr) ------------------------------------------------------------------ FUNCTION : calcule la profondeur d'une expression. ------------------------------------------------------------------*/ -int +long profExpr (expr) chain_list *expr; { @@ -656,7 +656,7 @@ profExpr (expr) return 0; else { - int max = 0, profCar; + long max = 0, profCar; while ((expr = CDR (expr))) { @@ -674,7 +674,7 @@ profExpr (expr) FUNCTION : calcule la profondeur d'une expression sans tenir compte des inverseurs. ------------------------------------------------------------------*/ -int +long profAOExpr (expr) chain_list *expr; { @@ -682,7 +682,7 @@ profAOExpr (expr) return 0; else { - int max = 0, profCar, oper = OPER (expr); + long max = 0, profCar, oper = OPER (expr); while ((expr = CDR (expr))) { @@ -744,9 +744,9 @@ mapExpr (func, expr) renvoie 1 s'il y a eu au moins un appel de func qui a renvoye 1. (OU logique) ------------------------------------------------------------------*/ -int +long anyExpr (func, expr) - int (*func) (); + long (*func) (); chain_list *expr; { while ((expr = CDR (expr))) @@ -763,9 +763,9 @@ anyExpr (func, expr) renvoie 1 si tout les appels de func ont renvoye 1. (ET logique) ------------------------------------------------------------------*/ -int +long everyExpr (func, expr) - int (*func) (); + long (*func) (); chain_list *expr; { while ((expr = CDR (expr))) @@ -782,7 +782,7 @@ everyExpr (func, expr) ------------------------------------------------------------------ FUNCTION : renvoie 1 si oper existe dans expr, 0 sinon. ------------------------------------------------------------------*/ -int +long searchOperExpr (expr, oper) chain_list *expr; short oper; @@ -829,7 +829,7 @@ searchExprLow (expr, name) ------------------------------------------------------------------ FUNCTION : renvoie 1 si namealloc(name) existe dans expr, 0 sinon. ------------------------------------------------------------------*/ -int +long searchExpr (expr, name) chain_list *expr; char *name; @@ -843,7 +843,7 @@ searchExpr (expr, name) ------------------------------------------------------------------ FUNCTION : renvoie 1 si expr1 = expr2, 0 sinon. ------------------------------------------------------------------*/ -int +long equalExpr (expr1, expr2) chain_list *expr1, *expr2; { @@ -879,7 +879,7 @@ equalExpr (expr1, expr2) ------------------------------------------------------------------ FUNCTION : renvoie 1 si expr1 = expr2 aux variables pres, 0 sinon. ------------------------------------------------------------------*/ -int +long equalVarExpr (expr1, expr2) chain_list *expr1, *expr2; { @@ -918,7 +918,7 @@ equalVarExpr (expr1, expr2) FUNCTION : renvoie la taille de l'expression au premier niveau. (en fait l'arite de l'operateur) ------------------------------------------------------------------*/ -int +long lengthExpr (expr) chain_list *expr; { @@ -926,7 +926,7 @@ lengthExpr (expr) return 1; else { - int cpt = 0; + long cpt = 0; while ((expr = CDR (expr))) cpt++; @@ -940,7 +940,7 @@ lengthExpr (expr) FUNCTION : renvoie le nombre d'operateurs binaires (equivalent) d'une expression. ------------------------------------------------------------------*/ -int +long numberOperBinExpr (expr) chain_list *expr; { @@ -948,7 +948,7 @@ numberOperBinExpr (expr) return 0; else { - int cpt = -1; + long cpt = -1; if (OPER (expr) == NOT) return numberOperBinExpr (CADR (expr)); @@ -965,7 +965,7 @@ numberOperBinExpr (expr) ------------------------------------------------------------------ FUNCTION : renvoie le nombre d'atomes de l'expression. ------------------------------------------------------------------*/ -int +long numberAtomExpr (expr) chain_list *expr; { @@ -973,7 +973,7 @@ numberAtomExpr (expr) return 1; else { - int cpt = 0; + long cpt = 0; while ((expr = CDR (expr))) cpt += numberAtomExpr (CAR (expr)); @@ -1171,7 +1171,7 @@ devXor2Expr (expr) chain_list * flatPolarityExpr (expr, signe) chain_list *expr; - int signe; + long signe; { short oper; chain_list *pt; @@ -1240,7 +1240,7 @@ void flatArityExpr (expr) chain_list *expr; { - int oper; + long oper; chain_list *expr1, *expr2, *exprBefore; if (!ATOM (expr)) @@ -1405,12 +1405,12 @@ supportPtype_listExpr (expr) IDENT : maxExpr ------------------------------------------------------------------ FUNCTION : renvoie le max des arguments d'une expression avec une - fonction de comparaison func renvoyant un int. + fonction de comparaison func renvoyant un long. ------------------------------------------------------------------ */ chain_list * maxExpr (expr, func) chain_list *expr; - int (*func) (); + long (*func) (); { chain_list *expr1; @@ -1427,13 +1427,13 @@ maxExpr (expr, func) IDENT : minExpr ------------------------------------------------------------------ FUNCTION : renvoie le min des arguments d'une expression avec une - fonction de comparaison func renvoyant un int. + fonction de comparaison func renvoyant un long. ------------------------------------------------------------------ */ chain_list * minExpr (expr, func) chain_list *expr; - int (*func) (); + long (*func) (); { chain_list *expr1; @@ -1450,17 +1450,17 @@ minExpr (expr, func) IDENT : sortExpr ------------------------------------------------------------------ FUNCTION : trie les arguments d'une expression a partir d'une fonction - func renvoyant un int. + func renvoyant un long. direction = 1 croissant ; direction = 0 decroissant ------------------------------------------------------------------ */ void sortExpr (expr, func, direction) chain_list *expr; - int (*func) (); - int direction; + long (*func) (); + long direction; { chain_list *expr1; - int okPermu = 1; + long okPermu = 1; if (!ATOM (expr)) /* ce n'est pas un atome */ { @@ -1497,12 +1497,12 @@ sortExpr (expr, func, direction) ex : (and a (xor w g) b (or x f) (or e g o) (xor t h k)) --> (and (or x f) (or e o g) (xor g w) (xor t h k) b a) ------------------------------------------------------------------ */ -int +long funcNormExpr (expr) chain_list *expr; { if (ATOM (expr)) - return ((int) VALUE_ATOM (expr)); + return ((long) VALUE_ATOM (expr)); else if (OPER (expr) == NOT) if (ATOM (CADR (expr))) return (NOT * 100 + 10); @@ -1544,9 +1544,9 @@ return : rien. void deleteNumExpr (expr, i) chain_list *expr; - int i; + long i; { - int co = 0; + long co = 0; chain_list *e = expr, *pt; if (lengthExpr (expr) <= i) @@ -1584,9 +1584,9 @@ return : un chain_list * chain_list * searchNumExpr (expr, i) chain_list *expr; - int i; + long i; { - int co = 0; + long co = 0; chain_list *e = expr; while ((expr = CDR (expr))) @@ -1606,23 +1606,23 @@ numberOccExpr : renvoie le nombre d'occurences d'une variable dans expr. ------------------------------------------------------ parametres : un ABL et une variable. ------------------------------------------------------- -return : un int. +return : un long. ----------------------------------------------------------------------------*/ -int +long numberOccExpr (exp, name) chain_list *exp; char *name; { if (ATOM (exp)) { - if ((int) name == (int) VALUE_ATOM (exp)) + if ((long) name == (long) VALUE_ATOM (exp)) return 1; else return 0; } else { - int cpt = 0; + long cpt = 0; while ((exp = CDR (exp))) cpt += numberOccExpr (CAR (exp), name); @@ -1642,7 +1642,7 @@ changeOperExpr (expr, oper) chain_list *expr; short oper; { - int op = (int) oper; + long op = (long) oper; if (ATOM (expr)) { @@ -1675,7 +1675,7 @@ simplif10Expr (expr) { short oper = OPER (expr); chain_list *auxExpr = createExpr (oper), *args, *res; - int cpt1 = 0; + long cpt1 = 0; for (args = CDR (expr); args; args = CDR (args)) { @@ -1888,7 +1888,7 @@ return : expr. chain_list * charToExprInt (stringExpr, cptCar) char *stringExpr; - int *cptCar; + long *cptCar; { char *tokOper; char *tok; @@ -2012,7 +2012,7 @@ chain_list * charToExpr (stringExpr) char *stringExpr; { - int cptCar = 0; + long cptCar = 0; return charToExprInt (stringExpr, &cptCar); } @@ -2027,11 +2027,11 @@ return : (, ), ou une chaine de caractere. char * tokenExpr (stringExpr, cptCar) char *stringExpr; - int *cptCar; + long *cptCar; { char *tok; - int i; - int compteur = *cptCar; + long i; + long compteur = *cptCar; for (; isspace (stringExpr[compteur]); compteur++); /* suppression ds blancs */ @@ -2070,7 +2070,7 @@ PMExprInt : Pattern Matching entre expr et pattern (and (not a) (not a)) avec le pattern (and x x) renvoie 1 ------------------------------------------------------------------------------ retour : 0 ou 1 -----------------------------------------------------------------------------*/ int +----------------------------------------------------------------------------*/ long PMExprInt (expr, pattern, bind) chain_list *expr, *pattern; ptype_list **bind; @@ -2122,11 +2122,11 @@ PMExpr : Pattern Matching entre expr et pattern ------------------------------------------------------------------------------ retour : 0 ou 1 ----------------------------------------------------------------------------*/ -int +long PMExpr (expr, pattern) chain_list *expr, *pattern; { - int ret; + long ret; ptype_list *bind = NULL; /* on mettra dans "bind" le couple (char * pattern, expr) */ diff --git a/alliance/src/log/src/log_thash.c b/alliance/src/log/src/log_thash.c index 1d34e212..04a3ecb7 100644 --- a/alliance/src/log/src/log_thash.c +++ b/alliance/src/log/src/log_thash.c @@ -31,13 +31,14 @@ -#ident "$Id: log_thash.c,v 1.2 2002/09/30 16:20:43 czo Exp $" +#ident "$Id: log_thash.c,v 1.3 2009/06/14 13:51:47 ludo Exp $" /****************************************************************************/ /* Produit : librairie TSH - Gestion de tables de hachage */ /****************************************************************************/ #include +#include #include "mut.h" #include "log.h" @@ -50,7 +51,7 @@ a. creation de table pTH createTH(len) - int len; + long len; b. destruction de la table @@ -59,29 +60,29 @@ c. recherche d'un element - int searchTH(pTable,key) + long searchTH(pTable,key) pTH pTable; char *key; d. ajout d'un element (ecrasement de la valeur s'il existe deja un element dans la table possedant la meme cle) - int addTH(pTable,key,value) + long addTH(pTable,key,value) pTH pTable; char *key; - int value; + long value; e. test d'existence et ajout d'un element dans la table.( renvoie 0 si l'element n'existait pas avant son ajout, 1 sinon). - int addExistTH(pTable,key,value) + long addExistTH(pTable,key,value) pTH pTable; char *key; - int value; + long value; f. destruction d'un element - int deleteTH(pTable,key) + long deleteTH(pTable,key) pTH pTable; char *key; @@ -99,12 +100,12 @@ /*--------------- la fonction de base pour le hachage.---------------- */ -int +long hashTH (pn) char *pn; { - /* return(abs((int) pn * ((int) pn >> 5) >> 4)); */ + /* return(abs((long) pn * ((long) pn >> 5) >> 4)); */ return (((unsigned long) pn >> 2)); } @@ -113,11 +114,11 @@ hashTH (pn) pTH createTH (len) - int len; + long len; { pTH pTable; pElemTH pEl; - int i; + long i; if (len <= 0) { @@ -156,13 +157,13 @@ destroyTH (pTable) renvoie -1 si la recherche echoue. */ -int +long searchTH (pTable, key) pTH pTable; char *key; { - int co = 0; - int indice = 0; + long co = 0; + long indice = 0; pElemTH pEl; indice = hashTH (key) % pTable->length; @@ -177,7 +178,7 @@ searchTH (pTable, key) pEl = (pTable->pElem) + indice; if (pEl->value != EMPTYTH && pEl->value != DELETETH) { - if ((int) key == (int) pEl->key) + if ((long) key == (long) pEl->key) return (pEl->value); } else if (pEl->value == EMPTYTH) @@ -190,15 +191,15 @@ searchTH (pTable, key) /* ajout d'un element a la table */ -int +long addTH (pTable, key, value) pTH pTable; char *key; - int value; + long value; { - int indice = 0; + long indice = 0; pElemTH pEl; - int co = 0; + long co = 0; if (value == EMPTYTH || value == DELETETH) { @@ -226,7 +227,7 @@ addTH (pTable, key, value) pEl->key = key; return (value); } - else if ((int) pEl->key == (int) key) + else if ((long) pEl->key == (long) key) { pTable->count--; pEl->value = value; @@ -240,15 +241,15 @@ addTH (pTable, key, value) /* test d'existence et ajout d'un element a la table */ -int +long addExistTH (pTable, key, value) pTH pTable; char *key; - int value; + long value; { - int indice = 0; + long indice = 0; pElemTH pEl; - int co = 0; + long co = 0; if (value == EMPTYTH || value == DELETETH) { @@ -276,7 +277,7 @@ addExistTH (pTable, key, value) pEl->key = key; return (0); } - else if ((int) pEl->key == (int) key) + else if ((long) pEl->key == (long) key) { pTable->count--; pEl->value = value; @@ -294,14 +295,14 @@ addExistTH (pTable, key, value) /* elimination d'un element de la table */ -int +long deleteTH (pTable, key) pTH pTable; char *key; { - int indice = 0; + long indice = 0; pElemTH pEl; - int co = 0; + long co = 0; indice = hashTH (key) % pTable->length; do @@ -314,7 +315,7 @@ deleteTH (pTable, key) pEl = (pTable->pElem) + indice; if (pEl->value != EMPTYTH && pEl->value != DELETETH) { - if ((int) key == (int) pEl->key) + if ((long) key == (long) pEl->key) { pTable->count--; pEl->value = DELETETH; @@ -335,7 +336,7 @@ void displayTH (pTable) pTH pTable; { - int i; + long i; pElemTH pEl; pEl = pTable->pElem; printf ("================== DISPLAYTH ================\n"); @@ -361,7 +362,7 @@ reAllocTH (pTable) { pTH tabBis; pElemTH pEl; - int i; + long i; pEl = pTable->pElem; tabBis = createTH ((pTable->length) * 5); diff --git a/alliance/src/log/src/log_thashbdd.c b/alliance/src/log/src/log_thashbdd.c index a21f66d6..ed83c61f 100644 --- a/alliance/src/log/src/log_thashbdd.c +++ b/alliance/src/log/src/log_thashbdd.c @@ -30,7 +30,7 @@ -#ident "$Id: log_thashbdd.c,v 1.3 2006/03/29 17:10:13 xtof Exp $" +#ident "$Id: log_thashbdd.c,v 1.4 2009/06/14 13:51:47 ludo Exp $" /*-------------------------------------------------------------------------- la table de hachage des BDD @@ -54,7 +54,7 @@ a. creation de table pTableBdd createTableBdd(len) - int len; + long len; b. destruction de la table @@ -70,18 +70,18 @@ pNode searchTableBdd(pTab,index,high,low) pTableBdd pTab; - int index; + long index; pNode high,low; e. ajout d'un element - int addTableBdd(pTab,pBdd) + long addTableBdd(pTab,pBdd) pTableBdd pTab; pNode pBdd; f. destruction d'un element - int deleteTableBdd(pTab,key) + long deleteTableBdd(pTab,key) pTableBdd pTab; pNode pBdd; @@ -100,23 +100,23 @@ /*-------------------- la fonction de hachage ---------------------------- */ -int +long hashBdd (index, high, low) - int index; + long index; pNode high, low; { - return (abs (index + ((int) high << 1) + (int) low + - ((int) high >> 4) + ((int) low >> 5))); + return (abs (index + ((long) high << 1) + (long) low + + ((long) high >> 4) + ((long) low >> 5))); } /*--------------- la fonction de changement de cle ------------------------- */ -int +long newKeyBdd (index, high, low) - int index; + long index; pNode high, low; { - return (index + (index << 2) + (int) high + ((int) low << 1)); + return (index + (index << 2) + (long) high + ((long) low << 1)); } /*--------------- La table de hachage pour des BDD ------------ */ @@ -128,11 +128,11 @@ newKeyBdd (index, high, low) pTableBdd createTableBdd (len) - int len; + long len; { pTableBdd pTab; pNode *pBdd; - int i; + long i; if (!(pTab = (pTableBdd) mbkalloc (sizeof (struct tableBdd)))) { @@ -179,7 +179,7 @@ return :rien. /* void markBddLst(pC,value) pCircuit pC; - int value; + long value; { pNode pBdd; @@ -200,7 +200,7 @@ pTableBdd reAllocTableBdd (pTab) pTableBdd pTab; { - int i; + long i; pNode *pBdd; pTableBdd pTabBis; @@ -227,13 +227,13 @@ reAllocTableBdd (pTab) pNode searchTableBdd (pTab, index, high, low) pTableBdd pTab; - int index; + long index; pNode high, low; { - int co = 0; + long co = 0; pNode pBddCur; - int key = index; - int indice; + long key = index; + long indice; do { @@ -255,18 +255,18 @@ searchTableBdd (pTab, index, high, low) /* ajout d'un element a la table */ -int +long addTableBdd (pTab, pBdd) pTableBdd pTab; pNode pBdd; { - int co = 0; + long co = 0; pNode *pBddCur; - int index = pBdd->index; + long index = pBdd->index; pNode high = pBdd->high; pNode low = pBdd->low; - int key = index; - int indice; + long key = index; + long indice; if (pTab->compteur++ > (pTab->lenTableBdd) * 8 / 10) /* remplissage au 8/10 */ return (TABLE_PLEINE); @@ -290,17 +290,17 @@ addTableBdd (pTab, pBdd) /* elimination d'un element de la table */ -int +long deleteTableBdd (pTab, pBdd) pTableBdd pTab; pNode pBdd; { - int co = 0; + long co = 0; pNode *pBddCur; pNode high = pBdd->high; pNode low = pBdd->low; - int key = pBdd->index; - int indice; + long key = pBdd->index; + long indice; do { @@ -319,7 +319,7 @@ deleteTableBdd (pTab, pBdd) key = newKeyBdd (key, high, low); } while (pBddCur != NULL); - return ((int) NULL); + return ((long) NULL); } /* affichage des elements de la table */ @@ -328,8 +328,8 @@ void displayHashBdd (pTab) pTableBdd pTab; { - int i; - int co = 0; + long i; + long co = 0; pNode *pBdd; pBdd = pTab->pBdd; diff --git a/alliance/src/log/src/log_thashloc.c b/alliance/src/log/src/log_thashloc.c index b9da9914..fbc1dd5a 100644 --- a/alliance/src/log/src/log_thashloc.c +++ b/alliance/src/log/src/log_thashloc.c @@ -30,12 +30,14 @@ -#ident "$Id: log_thashloc.c,v 1.2 2002/09/30 16:20:44 czo Exp $" +#ident "$Id: log_thashloc.c,v 1.3 2009/06/14 13:51:47 ludo Exp $" /*-------------------------------------------------------------------------- la table de hachage local la version du 14.12.90 -------------------------------------------------------------------------- */ +#include +#include #include "mut.h" #include "log.h" @@ -51,7 +53,7 @@ a. creation de table pTableLoc createTabLoc(len) - int len; + long len; b. destruction de la table @@ -71,7 +73,7 @@ e. ajout d'un element - int addTabLoc(pTab,pLoc) + long addTabLoc(pTab,pLoc) pTableLoc pTab; pVertexLoc pLoc; @@ -85,13 +87,13 @@ /*-------------------- la fonction de hachage ---------------------------- */ -int +long hashLoc (high, low) pNode high, low; { return (abs (high->index + low->index + - (((int) high) >> 4) + (((int) low) >> 5) + - (int) high + (int) low)); + (((long) high) >> 4) + (((long) low) >> 5) + + (long) high + (long) low)); } /*--------------- La table de hachage pour des LOC ------------ */ @@ -103,11 +105,11 @@ hashLoc (high, low) pTableLoc createTabLoc (len) - int len; + long len; { pTableLoc pTab; pVertexLoc pLoc; - int i; + long i; if (!(pTab = (pTableLoc) mbkalloc (sizeof (struct tableLoc)))) { @@ -150,7 +152,7 @@ searchTabLoc (pTab, high, low, oper) short oper; { pVertexLoc pLoc; - int indice; + long indice; /* un seul acces permis */ @@ -165,14 +167,14 @@ searchTabLoc (pTab, high, low, oper) /* ajout d'un element a la table */ -int +long addTabLoc (pTab, high, low, father, oper) pTableLoc pTab; pNode high, low, father; short oper; { pVertexLoc pLoc; - int indice; + long indice; /* un seul acces permis */ @@ -192,8 +194,8 @@ void displayLoc (pTab) pTableLoc pTab; { - int i; - int co = 0; + long i; + long co = 0; pVertexLoc pLoc; pLoc = pTab->pLoc; @@ -206,12 +208,12 @@ displayLoc (pTab) if (pLoc[i].oper != EMPTYTH) { co++; - printf ("****** indice %d ****** \n", i); - printf ("HIGH %d LOW %d FATHER %d\n", (int) pLoc[i].high, (int) pLoc[i].low, (int) pLoc[i].father); + printf ("****** indice %ld ****** \n", i); + printf ("HIGH %d LOW %ld FATHER %ld\n", (long) pLoc[i].high, (long) pLoc[i].low, (long) pLoc[i].father); printf ("\n"); } } - printf ("\n****** Nombre de noeuds dans la table = %d\n", co); + printf ("\n****** Nombre de noeuds dans la table = %ld\n", co); } @@ -229,7 +231,7 @@ videTabLoc (pTab) pTableLoc pTab; { pVertexLoc pLoc; - int i; + long i; pLoc = pTab->pLoc; diff --git a/alliance/src/loon/src/lon_signal_utils.c b/alliance/src/loon/src/lon_signal_utils.c index 7be0a57e..7fde9ca6 100644 --- a/alliance/src/loon/src/lon_signal_utils.c +++ b/alliance/src/loon/src/lon_signal_utils.c @@ -129,7 +129,7 @@ static void putsignal(signal_list* signal, char* name) /*if doesn't exist hash table, init*/ if (!HTABLE) init_signals(); - addauthelem(HTABLE,name,(int)signal); + addauthelem(HTABLE,name,(long)signal); } diff --git a/alliance/src/lynx/src/Windows95.c b/alliance/src/lynx/src/Windows95.c index 0c2080a3..05dee335 100644 --- a/alliance/src/lynx/src/Windows95.c +++ b/alliance/src/lynx/src/Windows95.c @@ -171,7 +171,7 @@ losig_list *Signal; Rec->X+Rec->DX, Rec->Y+Rec->DY); for( ptdebug = Rec->USER ; ptdebug ; ptdebug = ptdebug->NEXT ) - printf("[%5ld-%08X] ", ptdebug->TYPE, (int)(ptdebug->DATA) ); + printf("[%5ld-%08lX] ", ptdebug->TYPE, (long)(ptdebug->DATA) ); printf("\n"); } @@ -370,12 +370,12 @@ GrgWindow *WinInfo; n'y est deja pas present */ if(GrgWinDebug) - fprintf(stderr," (%6ld;%6ld)-(%6ld;%6ld) USERS: %X\n", + fprintf(stderr," (%6ld;%6ld)-(%6ld;%6ld) USERS: %lX\n", ScanchRec->REC[i]->X, ScanchRec->REC[i]->Y, ScanchRec->REC[i]->X+ScanchRec->REC[i]->DX, ScanchRec->REC[i]->Y+ScanchRec->REC[i]->DY, - (int)(ScanchRec->REC[i]->USER) ); + (long)(ScanchRec->REC[i]->USER) ); R=ScanchRec->REC[i]; if(R->USER!=(ptype_list*)1) @@ -404,8 +404,8 @@ GrgWindow *WinInfo; R->USER=scanmystack->PILE[scanmystack->CASEIN]; if(GrgWinDebug) - fprintf(stderr," (%6ld;%6ld)-(%6ld;%6ld) USERS: %X\n", - R->X,R->Y,R->X+R->DX,R->Y+R->DY,(int)(R->USER) ); + fprintf(stderr," (%6ld;%6ld)-(%6ld;%6ld) USERS: %lX\n", + R->X,R->Y,R->X+R->DX,R->Y+R->DY,(long)(R->USER) ); if(scanmystack->CASEIN==0) scanmystack=scanmystack->NEXT; diff --git a/alliance/src/lynx/src/chklynxrcn.c b/alliance/src/lynx/src/chklynxrcn.c index 4aa00131..0405979e 100644 --- a/alliance/src/lynx/src/chklynxrcn.c +++ b/alliance/src/lynx/src/chklynxrcn.c @@ -202,7 +202,7 @@ lofig_list *fig; fprintf(stderr," %s",scan->NAME); for(ptptype = scan->USER ; ptptype ; ptptype = ptptype->NEXT ) - printf("[%ld-%08X] ", ptptype->TYPE, (int)(ptptype->DATA) ); + printf("[%ld-%08lX] ", ptptype->TYPE, (long)(ptptype->DATA) ); printf("*\n"); if(getptype(scan->USER,RDSLOCON)) diff --git a/alliance/src/lynx/src/znc.c b/alliance/src/lynx/src/znc.c index aef9360d..06252fd7 100644 --- a/alliance/src/lynx/src/znc.c +++ b/alliance/src/lynx/src/znc.c @@ -551,7 +551,7 @@ WinZnc *winznc; for(scanwin=*(winznc->ChZnc+i);scanwin;scanwin=scanwin->NEXT) { zone=(znc*)(scanwin->DATA); - fprintf(stderr,"\t%X : (%ld,%ld)-(%ld,%ld) [%s]\n", (int)zone, + fprintf(stderr,"\t%lX : (%ld,%ld)-(%ld,%ld) [%s]\n", (long)zone, zone->x1, zone->y1, zone->x2, diff --git a/alliance/src/m2e/src/m2e.c b/alliance/src/m2e/src/m2e.c index 596c0a00..f72b19cf 100644 --- a/alliance/src/m2e/src/m2e.c +++ b/alliance/src/m2e/src/m2e.c @@ -881,9 +881,9 @@ void TraitSignaux(lofig_list *ptfig) *p = '_'; /* remplace l'espace par _ dans les signaux indices */ if((pt = getptype(psig->USER,(long)DEDALE)) != NULL) { - if((int)pt->DATA != class) { - fprintf(po,"Change Class %d;\n",(int)pt->DATA) ; - class = (int)pt->DATA; + if((long)pt->DATA != class) { + fprintf(po,"Change Class %ld;\n",(long)pt->DATA) ; + class = (long)pt->DATA; } } else diff --git a/alliance/src/mbk/src/mbk_lo.c b/alliance/src/mbk/src/mbk_lo.c index 7ca18456..65d0a72f 100644 --- a/alliance/src/mbk/src/mbk_lo.c +++ b/alliance/src/mbk/src/mbk_lo.c @@ -30,7 +30,7 @@ * Modified by pnt 2002 */ -#ident "$Id: mbk_lo.c,v 1.7 2003/04/03 14:46:30 xtof Exp $" +#ident "$Id: mbk_lo.c,v 1.8 2009/06/14 13:51:52 ludo Exp $" #include #include @@ -41,7 +41,7 @@ #include "rcn.h" #include "mbk_lo.h" -int NB_TAT_LOSIG = 0; +long NB_TAT_LOSIG = 0; /******************************************************************************* * global variable for netlist view * *******************************************************************************/ @@ -383,10 +383,10 @@ losig_list *ptsig; losig_list *pthead; ptype_list *pt; chain_list *ptchain; -int high; -int low; -int i; -int sigsize; +long high; +long low; +long i; +long sigsize; sigsize = getsigsize( ptfig ); @@ -855,9 +855,9 @@ losig_list *getlosig(lofig_list *ptfig, long index) { losig_list *ptsig; ptype_list *pt; -int low; -int high; -int sigsize; +long low; +long high; +long sigsize; sigsize = getsigsize( ptfig ); low = (index % sigsize); @@ -1010,13 +1010,13 @@ chain_list *ptscan; char *ptchar; char buffer[50]; char *result = NULL; -register int nseparmin = 1000; +register long nseparmin = 1000; if (ptsig == NULL) return NULL; for (ptscan = ptsig->NAMECHAIN; ptscan; ptscan = ptscan->NEXT) { - register int nsepar = 0; + register long nsepar = 0; if (ptscan->DATA != NULL) { for (ptchar = (char *)ptscan->DATA; *ptchar != '\0'; ptchar++) if (*ptchar == SEPAR) @@ -1481,13 +1481,13 @@ else * function getsigsize() * *******************************************************************************/ -int getsigsize(lofig_list *ptfig) +long getsigsize(lofig_list *ptfig) { ptype_list *ptl; ptl = getptype( ptfig->USER, PTSIGSIZE ); if( ptl ) - return( (int)(ptl->DATA) ); + return( (long)(ptl->DATA) ); return( SIGSIZE ); } @@ -1496,7 +1496,7 @@ int getsigsize(lofig_list *ptfig) * function setsigsize() * *******************************************************************************/ -void setsigsize(lofig_list *ptfig, int nb) +void setsigsize(lofig_list *ptfig, long nb) { ptype_list *ptl; @@ -1528,7 +1528,7 @@ void delloconuser(locon_list *ptlocon) ptype_list *scanptype; ptype_list *next; ptype_list *prev; - int del; + long del; prev = NULL; for( scanptype = ptlocon->USER ; scanptype ; scanptype = next ) @@ -1570,7 +1570,7 @@ void dellofiguser(lofig_list *ptlofig) ptype_list *scanptype; ptype_list *next; ptype_list *prev; - int del; + long del; prev = NULL; for( scanptype = ptlofig->USER ; scanptype ; scanptype = next ) @@ -1615,7 +1615,7 @@ void delloinsuser(loins_list *ptloins) ptype_list *scanptype; ptype_list *next; ptype_list *prev; - int del; + long del; prev = NULL; for( scanptype = ptloins->USER ; scanptype ; scanptype = next ) @@ -1657,7 +1657,7 @@ void dellotrsuser(lotrs_list *ptlotrs) ptype_list *scanptype; ptype_list *next; ptype_list *prev; - int del; + long del; prev = NULL; for( scanptype = ptlotrs->USER ; scanptype ; scanptype = next ) @@ -1695,7 +1695,7 @@ void dellosiguser(losig_list *ptlosig) ptype_list *scanptype; ptype_list *next; ptype_list *prev; - int del; + long del; prev = NULL; for( scanptype = ptlosig->USER ; scanptype ; scanptype = next ) @@ -1959,7 +1959,7 @@ void dellocapuser(locap_list *ptlocap) ptype_list *scanptype = NULL ; ptype_list *next = NULL ; ptype_list *prev = NULL ; - int del = 0 ; + long del = 0 ; for(scanptype = ptlocap -> USER ; scanptype != NULL ; scanptype = next) { @@ -2222,7 +2222,7 @@ void delloresuser(lores_list *ptlores) ptype_list *scanptype = NULL ; ptype_list *next = NULL ; ptype_list *prev = NULL ; - int del = 0 ; + long del = 0 ; for(scanptype = ptlores -> USER ; scanptype != NULL ; scanptype = next) { @@ -2485,7 +2485,7 @@ void delloselfuser(loself_list *ptloself) ptype_list *scanptype = NULL ; ptype_list *next = NULL ; ptype_list *prev = NULL ; - int del = 0 ; + long del = 0 ; for(scanptype = ptloself -> USER ; scanptype != NULL ; scanptype = next) { diff --git a/alliance/src/mbk/src/mbk_lo_util.c b/alliance/src/mbk/src/mbk_lo_util.c index 4bcde19c..4ebac3a8 100644 --- a/alliance/src/mbk/src/mbk_lo_util.c +++ b/alliance/src/mbk/src/mbk_lo_util.c @@ -28,7 +28,7 @@ * Modified by Czo 1997,98 */ -#ident "$Id: mbk_lo_util.c,v 1.4 2002/09/30 16:20:49 czo Exp $" +#ident "$Id: mbk_lo_util.c,v 1.5 2009/06/14 13:51:52 ludo Exp $" #include #include @@ -1264,7 +1264,7 @@ void debugctc2 ( lofig_list *ptfig ) printf( "Information sur la figure %s.\n", ptfig->NAME ); for( sig = ptfig->LOSIG ; sig ; sig = sig->NEXT ) { - printf( "Signal %2ld (%08X)\n", sig->INDEX, (unsigned int) sig ); + printf( "Signal %2ld (%08X)\n", sig->INDEX, (unsigned long) sig ); if( sig->PRCN ) { for( scanchain = sig->PRCN->PCTC ; @@ -1274,12 +1274,12 @@ void debugctc2 ( lofig_list *ptfig ) { ptctc = ( loctc_list* )( scanchain->DATA ); printf( - " CTC (%08X) entre le signal %2ld (%08X) et le signal %2ld (%08X).\n", - (unsigned int)ptctc, + " CTC (%lX) entre le signal %2ld (%lX) et le signal %2ld (%lX).\n", + (unsigned long)ptctc, ptctc->SIG1->INDEX, - (unsigned int)ptctc->SIG1, + (unsigned long)ptctc->SIG1, ptctc->SIG2->INDEX, - (unsigned int)ptctc->SIG2 + (unsigned long)ptctc->SIG2 ); } } @@ -1304,9 +1304,9 @@ void debugctc ( losig_list *headlosig, int niveau ) ptctc = (loctc_list*)( scanctc->DATA ); if( getptype( ptctc->USER, FLATTEN_CTC ) ) { - printf( "(%d) FLATTEN_CTC trouve dans la CTC (%08X) entre %ld.%ld et %ld.%ld.\n", + printf( "(%d) FLATTEN_CTC trouve dans la CTC (%lX) entre %ld.%ld et %ld.%ld.\n", niveau, - (unsigned int)ptctc, + (unsigned long)ptctc, ptctc->SIG1->INDEX, ptctc->NODE1, ptctc->SIG2->INDEX, @@ -1324,9 +1324,9 @@ void debugctc ( losig_list *headlosig, int niveau ) } if( !scanctc2 ) { - printf( "(%d) CTC (%08X) entre %ld:%ld et %ld:%ld sur signal %ld non trouvee sur l'autre signal.\n", + printf( "(%d) CTC (%lX) entre %ld:%ld et %ld:%ld sur signal %ld non trouvee sur l'autre signal.\n", niveau, - (unsigned int)ptctc, + (unsigned long)ptctc, ptctc->SIG1->INDEX, ptctc->NODE1, ptctc->SIG2->INDEX, ptctc->NODE2, scanlosig->INDEX diff --git a/alliance/src/mbk/src/mbk_sys.c b/alliance/src/mbk/src/mbk_sys.c index 80355188..c3937990 100644 --- a/alliance/src/mbk/src/mbk_sys.c +++ b/alliance/src/mbk/src/mbk_sys.c @@ -28,7 +28,7 @@ * Modified by Czo 1997,98 */ -#ident "$Id: mbk_sys.c,v 1.3 2002/09/30 16:20:50 czo Exp $" +#ident "$Id: mbk_sys.c,v 1.4 2009/06/14 13:51:52 ludo Exp $" #include #include @@ -55,7 +55,7 @@ int STAT_AUTOACKCHLD; long mbkalloc_stat = 0; /* statistics on maximun allocated memory */ -void *mbkalloc(unsigned int nbytes) +void *mbkalloc(size_t nbytes) { void *pt; @@ -69,7 +69,7 @@ void *pt; return pt; } -void *mbkrealloc(void *pt, unsigned int nbytes) +void *mbkrealloc(void *pt, size_t nbytes) { mbkalloc_stat += nbytes; diff --git a/alliance/src/mbk/src/mbk_sys.h b/alliance/src/mbk/src/mbk_sys.h index fc58f281..6b0f08c6 100644 --- a/alliance/src/mbk/src/mbk_sys.h +++ b/alliance/src/mbk/src/mbk_sys.h @@ -26,7 +26,7 @@ * Date : 18/12/91 * Author : Frederic Petrot * Modified by Czo 1997,98 - * $Id: mbk_sys.h,v 1.2 2002/09/30 16:20:50 czo Exp $ + * $Id: mbk_sys.h,v 1.3 2009/06/14 13:51:52 ludo Exp $ */ #ifndef _MBK_SYS_H_ @@ -44,8 +44,8 @@ extern FILE* mbkfopen __P((const char *name, const char *extension, const char *mode)); extern FILE *mbkfopentrace __P((const char *name, const char *extension, const char *mode)); extern void mbkfopen_infos __P((const FILE *in, const char *filename, const char *name, const char *extension, const char *mode, const char filter)); - extern void* mbkalloc __P((unsigned int nbytes)); - extern void* mbkrealloc __P((void *pt, unsigned int nbytes)); + extern void* mbkalloc __P((size_t nbytes)); + extern void* mbkrealloc __P((void *pt, size_t nbytes)); extern void mbkfree __P((void *ptr)); void ps(); extern void mbkackchld __P((int)); diff --git a/alliance/src/mbk/src/mbk_util.c b/alliance/src/mbk/src/mbk_util.c index 7c1319fa..8189fe9c 100644 --- a/alliance/src/mbk/src/mbk_util.c +++ b/alliance/src/mbk/src/mbk_util.c @@ -28,7 +28,7 @@ * Modified by Czo 1997,98 */ -#ident "$Id: mbk_util.c,v 1.5 2003/10/20 10:04:39 xtof Exp $" +#ident "$Id: mbk_util.c,v 1.6 2009/06/14 13:51:52 ludo Exp $" #include #include @@ -872,7 +872,7 @@ char *mbkstrdup(const char *s) if (s == NULL) return NULL; - t = (char *)mbkalloc((unsigned int)(strlen(s) + 1)); + t = (char *)mbkalloc((size_t)(strlen(s) + 1)); return strcpy(t, s); } @@ -916,7 +916,7 @@ static char **table; if (!size) loadcatalog(&table, &size, 'F'); return size ? - (int)bsearch(&figname, table, size, sizeof(char *), pstrcmp) : 0; + (long)bsearch(&figname, table, size, sizeof(char *), pstrcmp) : 0; } /******************************************************************************* @@ -931,7 +931,7 @@ static char **table; if (!size) loadcatalog(&table, &size, 'G'); return size ? - (int)bsearch(&figname, table, size, sizeof(char *), pstrcmp) : 0; + (long)bsearch(&figname, table, size, sizeof(char *), pstrcmp) : 0; } /******************************************************************************* @@ -946,7 +946,7 @@ static char **table; if (!size) loadcatalog(&table, &size, 'C'); return size ? - (int)bsearch(&figname, table, size, sizeof(char *), pstrcmp) : 0; + (long)bsearch(&figname, table, size, sizeof(char *), pstrcmp) : 0; } /******************************************************************************* @@ -961,7 +961,7 @@ static char **table; if (!size) loadcatalog(&table, &size, 'D'); return size ? - (int)bsearch(&figname, table, size, sizeof(char *), pstrcmp) : 0; + (long)bsearch(&figname, table, size, sizeof(char *), pstrcmp) : 0; } /******************************************************************************* diff --git a/alliance/src/mbk/src/mlo.h b/alliance/src/mbk/src/mlo.h index 23df975d..60a76ec8 100644 --- a/alliance/src/mbk/src/mlo.h +++ b/alliance/src/mbk/src/mlo.h @@ -27,7 +27,7 @@ * Author : Frederic Petrot * Modified by Czo 1997,98 * Modified by pnt 2002 - * $Id: mlo.h,v 1.7 2002/09/30 16:20:50 czo Exp $ + * $Id: mlo.h,v 1.8 2009/06/14 13:51:52 ludo Exp $ */ #ifndef _MLO_H_ @@ -298,8 +298,8 @@ typedef struct loself /* analog inductor extern char * getsigname __P((losig_list *ptsig)); extern void lofigchain __P((lofig_list *ptfig)); extern void viewlo __P(()); - extern void setsigsize __P((lofig_list*, int)); - extern int getsigsize __P((lofig_list* )); + extern void setsigsize __P((lofig_list*, long)); + extern long getsigsize __P((lofig_list* )); extern void dellosiguser __P((losig_list*)); extern void dellotrsuser __P((lotrs_list*)); extern void delloinsuser __P((loins_list*)); diff --git a/alliance/src/mbk/src/mut.h b/alliance/src/mbk/src/mut.h index e32f7c46..b0663a47 100644 --- a/alliance/src/mbk/src/mut.h +++ b/alliance/src/mbk/src/mut.h @@ -26,7 +26,7 @@ * Date : 31/08/93 * Author : Frederic Petrot * Modified by Czo 1997,98 - * $Id: mut.h,v 1.8 2003/10/20 08:55:22 xtof Exp $ + * $Id: mut.h,v 1.9 2009/06/14 13:51:52 ludo Exp $ */ #ifndef _MUT_H_ @@ -35,6 +35,8 @@ #include #include #include +#include +#include #ifdef __cplusplus extern "C" { @@ -278,8 +280,8 @@ extern void mbkexit __P(( int ExitValue )); /* new exit handler system */ /******************************************************************************* * externals for mbk_sys.c functions * *******************************************************************************/ - extern void *mbkalloc __P((unsigned int nbytes)); - extern void *mbkrealloc __P((void *pt, unsigned int nbytes)); + extern void *mbkalloc __P((size_t nbytes)); + extern void *mbkrealloc __P((void *pt, size_t nbytes)); extern void mbkfree __P((void *ptr)); extern char *mbkgetenv __P((const char *name)); extern FILE *mbkfopen __P((const char *name, const char *extension, const char *mode)); diff --git a/alliance/src/mbk/src/rcn_lo.c b/alliance/src/mbk/src/rcn_lo.c index 781dc356..cd2d322a 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.4 2006/03/29 17:10:33 xtof Exp $" +#ident "$Id: rcn_lo.c,v 1.5 2009/06/14 13:51:52 ludo Exp $" /******************************************************************************* * rcn : acces functions to logical rc network structures * @@ -1096,7 +1096,7 @@ lonode_list *getlonode(ptsig, index) losig_list *ptsig; long index; { - int taille; + long taille; ptype_list *head; chain_list *scan; int max; @@ -1111,7 +1111,7 @@ long index; EXIT(1); } - taille = (int)(getptype( ptsig->PRCN->USER, RCN_SIZETAB )->DATA); + taille = (long)(getptype( ptsig->PRCN->USER, RCN_SIZETAB )->DATA); scan = head->DATA; pos=0; @@ -1144,7 +1144,7 @@ lonode_list *givelonode(ptsig, index) losig_list *ptsig; long index; { - int taille; + long taille; ptype_list *head; chain_list *scan; chain_list *prev; @@ -1173,7 +1173,7 @@ long index; EXIT(1); } - taille = (int)(getptype( ptsig->PRCN->USER, RCN_SIZETAB )->DATA); + taille = (long)(getptype( ptsig->PRCN->USER, RCN_SIZETAB )->DATA); scan = head->DATA; prev = head->DATA; @@ -1495,7 +1495,7 @@ loctc_list* heaploctc() ptctc=HEAD_CTC_FREE; for(i=1;iSIG1 = ptctc+1; + ptctc->SIG1 = (struct losig *)ptctc+1; ptctc->NODE1 = -1000; ptctc++; } @@ -1627,7 +1627,7 @@ losig_list *ptsig; { chain_list *head; chain_list *scan; - int taille; + long taille; ptype_list *ptl; int i; lonode_list *ptnode; @@ -1651,7 +1651,7 @@ losig_list *ptsig; exit(-1); } - taille = (int)(getptype( ptsig->PRCN->USER, RCN_SIZETAB )->DATA ); + taille = (long)(getptype( ptsig->PRCN->USER, RCN_SIZETAB )->DATA ); for( scan = head; scan ; scan = scan->NEXT ) { for( i=0 ; iUSER, RCN_LONODE ); if( ! head ) return; - taille = (int)(getptype( ptrcnet->USER, RCN_SIZETAB )->DATA); + taille = (long)(getptype( ptrcnet->USER, RCN_SIZETAB )->DATA); for( scan = (chain_list*)(head->DATA) ; scan ; scan = scan->NEXT ) { for( i=0 ; iDATA, + printf( " [16] Wire %lX inexistant trouve sur le noeud %d.\n", + (long)scanchain->DATA, i ); } diff --git a/alliance/src/mbk/src/rcn_lo_util.c b/alliance/src/mbk/src/rcn_lo_util.c index 0a5c646b..0e4c0d53 100644 --- a/alliance/src/mbk/src/rcn_lo_util.c +++ b/alliance/src/mbk/src/rcn_lo_util.c @@ -21,7 +21,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ident "$Id: rcn_lo_util.c,v 1.3 2003/04/03 14:46:30 xtof Exp $" +#ident "$Id: rcn_lo_util.c,v 1.4 2009/06/14 13:51:52 ludo Exp $" /******************************************************************************* * rcn : acces functions to logical rc network structures * @@ -62,7 +62,7 @@ todolist* breakloop2 __P(( losig_list*, void connexe_rec __P(( losig_list*, lowire_list*, lonode_list*, - int + long )); /******************************************************************************/ @@ -451,7 +451,7 @@ losig_list *ptsig; void connexe_rec( losig_list *ptsig, lowire_list *from, lonode_list *ptnode, - int index + long index ) { ptype_list *ptl; @@ -474,9 +474,9 @@ void connexe_rec( losig_list *ptsig, ptnode = getlonode( ptsig, from->NODE1 ); ptl = getptype( ptnode->USER, CONNEXE ); - if( (int)(ptl->DATA) != 0 ) + if( (long)(ptl->DATA) != 0 ) { - if( (int)(ptl->DATA) != index ) + if( (long)(ptl->DATA) != index ) { fflush( stdout ); fprintf( stderr, "RCN ERROR in connexe()\n" ); @@ -500,14 +500,14 @@ void connexe_rec( losig_list *ptsig, next = getlonode( ptsig, from->NODE1 ); ptl = getptype( next->USER, CONNEXE ); - if( (int)(ptl->DATA) == 0 ) + if( (long)(ptl->DATA) == 0 ) { ptl->DATA = (void*)(index); connexe_rec( ptsig, from, next, index ); } else { - if( (int)(ptl->DATA) != index ) + if( (long)(ptl->DATA) != index ) { fflush( stdout ); fprintf( stderr, "RCN ERROR in connexe()\n" ); @@ -525,7 +525,7 @@ int connexe( losig_list *ptsig ) lowire_list *scanlowire; ptype_list *ptl; lonode_list *ptnode; - int index; + long index; if( !gettabnode( ptsig->PRCN ) ) { @@ -565,7 +565,7 @@ int connexe( losig_list *ptsig ) ptnode = getlonode( ptsig, scanlowire->NODE1 ); ptl = getptype( ptnode->USER, CONNEXE ); - if( (int)(ptl->DATA) != 0 ) + if( (long)(ptl->DATA) != 0 ) continue; index++; diff --git a/alliance/src/mbkspice/src/spi_parse.c b/alliance/src/mbkspice/src/spi_parse.c index c81557f5..c5229d53 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: xtof $ $Date: 2006/03/29 17:10:37 $ $Revision: 1.5 $" +#ident "$Author: ludo $ $Date: 2009/06/14 13:51:54 $ $Revision: 1.6 $" /******************************************************************************* * * @@ -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.5 $" ); - printf( "Date : %s\n", "$Date: 2006/03/29 17:10:37 $" ); + printf( "Revision : %s\n", "$Revision: 1.6 $" ); + printf( "Date : %s\n", "$Date: 2009/06/14 13:51:54 $" ); printf( "Separateur : '%c'\n", SPI_SEPAR ); printf( "Nom de noeud : %s\n", SPI_NETNAME ); @@ -1989,7 +1989,7 @@ char mode; for( scanlocon = ptfig->LOCON ; scanlocon ; scanlocon = scanlocon->NEXT ) { - scanlocon->PNODE = reverse( (chain_list*)scanlocon->PNODE ); + scanlocon->PNODE = (struct num *)reverse( (chain_list*)scanlocon->PNODE ); ptnodename = getptype( scanlocon->USER, PNODENAME ); for( sc1 = (chain_list*)( ptnodename->DATA ) ; sc1 ; sc1 = sc1->NEXT ) @@ -2004,7 +2004,7 @@ char mode; } } - ptfig->LOCON = reverse( (chain_list*)ptfig->LOCON ); + ptfig->LOCON = (locon_list *)reverse( (chain_list*)ptfig->LOCON ); /* On cree les transistors */ @@ -2846,8 +2846,8 @@ circuit *ptcir; printf("Interface :\n"); for( sc = ptcir->CINTERF; sc; sc = sc->NEXT ) - printf(" %8X %4d %4d %4d %s\n", - ((unsigned int)(sc->DATA)), + printf(" %ld %4d %4d %4d %s\n", + ((unsigned long)(sc->DATA)), ((noeud*)(sc->DATA))->SPICE, ((noeud*)(sc->DATA))->SIGNAL, ((noeud*)(sc->DATA))->RCN, @@ -2856,28 +2856,28 @@ circuit *ptcir; for(scantrans = ptcir->TRANS; scantrans; scantrans = scantrans->SUIV) { printf("Transitor : %s\n",scantrans->NOM); - printf(" DRAIN %8X %4d %4d %4d %s\n", - (unsigned int)scantrans->DRAIN, + printf(" DRAIN %ld %4d %4d %4d %s\n", + (unsigned long)scantrans->DRAIN, scantrans->DRAIN->SPICE, scantrans->DRAIN->SIGNAL, scantrans->DRAIN->RCN, scantrans->DRAIN->NOM ? scantrans->DRAIN->NOM : "" ); - printf(" GRILLE %8X %4d %4d %4d %s\n", - (unsigned int)scantrans->GRILLE, + printf(" GRILLE %ld %4d %4d %4d %s\n", + (unsigned long)scantrans->GRILLE, scantrans->GRILLE->SPICE, scantrans->GRILLE->SIGNAL, scantrans->GRILLE->RCN, scantrans->GRILLE->NOM ? scantrans->GRILLE->NOM : "" ); - printf(" SOURCE %8X %4d %4d %4d %s\n", - (unsigned int)scantrans->SOURCE, + printf(" SOURCE %ld %4d %4d %4d %s\n", + (unsigned long)scantrans->SOURCE, scantrans->SOURCE->SPICE, scantrans->SOURCE->SIGNAL, scantrans->SOURCE->RCN, scantrans->SOURCE->NOM ? scantrans->SOURCE->NOM : "" ); if( scantrans->SUBST ) { - printf(" SUBST %8X %4d %4d %4d %s\n", - (unsigned int)scantrans->SUBST, + printf(" SUBST %ld %4d %4d %4d %s\n", + (unsigned long)scantrans->SUBST, scantrans->SUBST->SPICE, scantrans->SUBST->SIGNAL, scantrans->SUBST->RCN, @@ -2895,14 +2895,14 @@ circuit *ptcir; for(scanresi = ptcir->RESI ; scanresi; scanresi = scanresi->SUIV ) { printf("Resistance : %s\n",scanresi->NOM); - printf(" N1 %8X %4d %4d %4d %s\n", - (unsigned int)scanresi->N1, + printf(" N1 %ld %4d %4d %4d %s\n", + (unsigned long)scanresi->N1, scanresi->N1->SPICE, scanresi->N1->SIGNAL, scanresi->N1->RCN, scanresi->N1->NOM ? scanresi->N1->NOM : "" ); - printf(" N2 %8X %4d %4d %4d %s\n", - (unsigned int)scanresi->N2, + printf(" N2 %ld %4d %4d %4d %s\n", + (unsigned long)scanresi->N2, scanresi->N2->SPICE, scanresi->N2->SIGNAL, scanresi->N2->RCN, @@ -2913,14 +2913,14 @@ circuit *ptcir; for(scancapa = ptcir->CAPA ; scancapa; scancapa = scancapa->SUIV ) { printf("Capacite : %s\n",scancapa->NOM); - printf(" N1 %8X %4d %4d %4d %s\n", - (unsigned int)scancapa->N1, + printf(" N1 %ld %4d %4d %4d %s\n", + (unsigned long)scancapa->N1, scancapa->N1->SPICE, scancapa->N1->SIGNAL, scancapa->N1->RCN, scancapa->N1->NOM ? scancapa->N1->NOM : "" ); - printf(" N2 %8X %4d %4d %4d %s\n", - (unsigned int)scancapa->N2, + printf(" N2 %ld %4d %4d %4d %s\n", + (unsigned long)scancapa->N2, scancapa->N2->SPICE, scancapa->N2->SIGNAL, scancapa->N2->RCN, @@ -2932,8 +2932,8 @@ circuit *ptcir; { printf("Instance %s basee sur %s\n",scaninst->NOM, scaninst->MODELE); for( sc = scaninst->IINTERF; sc; sc = sc->NEXT ) - printf(" %8X %4d %4d %4d %s\n", - ((unsigned int)(sc->DATA)), + printf(" %ld %4d %4d %4d %s\n", + ((unsigned long)(sc->DATA)), ((noeud*)(sc->DATA))->SPICE, ((noeud*)(sc->DATA))->SIGNAL, ((noeud*)(sc->DATA))->RCN, diff --git a/alliance/src/mbkvhdl/src/mvl_drive.c b/alliance/src/mbkvhdl/src/mvl_drive.c index 7fe22028..8f0726be 100644 --- a/alliance/src/mbkvhdl/src/mvl_drive.c +++ b/alliance/src/mbkvhdl/src/mvl_drive.c @@ -37,6 +37,7 @@ #include #include #include +#include #include "mvl_utype.h" #include "mvl_utdef.h" #include "mvl_drive.h" diff --git a/alliance/src/mbkvhdl/src/mvl_parse.c b/alliance/src/mbkvhdl/src/mvl_parse.c index cefbb6cf..a70e0ff5 100644 --- a/alliance/src/mbkvhdl/src/mvl_parse.c +++ b/alliance/src/mbkvhdl/src/mvl_parse.c @@ -31,6 +31,7 @@ /* ###--------------------------------------------------------------### */ #include +#include #include #include #include diff --git a/alliance/src/mbkvhdl/src/mvl_scomp_l.l b/alliance/src/mbkvhdl/src/mvl_scomp_l.l index ee524166..daf0e8d0 100644 --- a/alliance/src/mbkvhdl/src/mvl_scomp_l.l +++ b/alliance/src/mbkvhdl/src/mvl_scomp_l.l @@ -27,7 +27,7 @@ /* called func. : addht, addhtitem, gethtitem, namealloc */ /* ###--------------------------------------------------------------### */ -static int search (key) +static long search (key) char *key; @@ -255,7 +255,7 @@ base_specifier (B|b|O|o|X|x) return(Slash); } {letter}(_?{letter_or_digit})* { - int itoken; + long itoken; itoken = search (yytext); if (itoken == EMPTYHT) @@ -269,22 +269,22 @@ base_specifier (B|b|O|o|X|x) } } ({decimal_literal})|({base}#{based_integer}(\.{based_integer})?#({exponent})?)|({base}:{based_integer}(\.{based_integer})?:({exponent})?) { - yylval.text = mbkalloc((unsigned int)strlen(yytext)+1); + yylval.text = mbkalloc((size_t)strlen(yytext)+1); strcpy(yylval.text,yytext); return ( AbstractLit ); } '({graphic_character}|\"|\%)' { - yylval.text = mbkalloc((unsigned int)strlen(yytext)+1); + yylval.text = mbkalloc((unsigned long)strlen(yytext)+1); strcpy(yylval.text,yytext); return ( CharacterLit ); } (\"({graphic_character}|(\"\")|\%)*\")|(\%({graphic_character}|(\%\%)|\")*\%) { - yylval.text = mbkalloc((unsigned int)strlen(yytext)+1); + yylval.text = mbkalloc((size_t)strlen(yytext)+1); strcpy(yylval.text,yytext); return ( StringLit ); } {base_specifier}(\"{extended_digit}(_?{extended_digit})*\"|\%{extended_digit}(_?{extended_digit})*\%) { - yylval.text = mbkalloc((unsigned int)strlen(yytext)+1); + yylval.text = mbkalloc((size_t)strlen(yytext)+1); strcpy(yylval.text,yytext); return ( BitStringLit ); } diff --git a/alliance/src/mbkvhdl/src/mvl_scomp_y.y b/alliance/src/mbkvhdl/src/mvl_scomp_y.y index de187368..a65faf66 100644 --- a/alliance/src/mbkvhdl/src/mvl_scomp_y.y +++ b/alliance/src/mbkvhdl/src/mvl_scomp_y.y @@ -34,7 +34,7 @@ static struct lofig *MVL_CHDHED = NULL; /* childs list */ %} %union { - int valu; + long valu; char *text; char flag; mvl_name name; @@ -67,7 +67,7 @@ static struct lofig *MVL_CHDHED = NULL; /* childs list */ %token Identifier %token DecimalInt %token DecimalReal -%token AbstractLit +%token AbstractLit %token BasedInt %token BasedReal %token CharacterLit @@ -398,11 +398,11 @@ formal_port_element { struct locon *locon_pnt; struct losig *losig_pnt; - int sig_width; - int sig_conf; + long sig_width; + long sig_conf; char *sig_name; struct chain *sig_list; - int local_err; + long local_err; local_err = $6.ERR_FLG; if ( ($6.LEFT == -1) && (($5 == MVL_BTVDFN) || @@ -503,7 +503,7 @@ formal_port_element if (local_err == 0) { mvl_addtab (MVL_HSHTAB,sig_name,MVL_MODNAM,MVL_PNTDFN, - (int)losig_pnt); + (long)losig_pnt); mvl_addtab (MVL_HSHTAB,sig_name,MVL_MODNAM,MVL_SIGDFN, sig_conf); mvl_addtab (MVL_HSHTAB,sig_name,MVL_MODNAM,MVL_LFTDFN, @@ -594,11 +594,11 @@ signal_declaration Semicolon_ERR { struct losig *losig_pnt; - int sig_width; - int sig_conf; + long sig_width; + long sig_conf; char *sig_name; struct chain *sig_list; - int local_err; + long local_err; local_err = $5.ERR_FLG; if (($5.LEFT==-1) && (($4==MVL_BTVDFN) || ($4==MVL_RGVDFN))) @@ -651,7 +651,7 @@ signal_declaration if (local_err == 0) { mvl_addtab (MVL_HSHTAB,sig_name,MVL_MODNAM,MVL_PNTDFN, - (int)losig_pnt); + (long)losig_pnt); mvl_addtab (MVL_HSHTAB,sig_name,MVL_MODNAM,MVL_SIGDFN, sig_conf); mvl_addtab (MVL_HSHTAB,sig_name,MVL_MODNAM,MVL_LFTDFN, @@ -733,11 +733,11 @@ local_port_element .BUS. { struct locon *locon_pnt; - int sig_width; - int sig_conf; + long sig_width; + long sig_conf; char *sig_name; struct chain *sig_list; - int local_err = 0; + long local_err = 0; if (($6.ERR_FLG != 0) || (MVL_CHDPNT == NULL)) local_err = 1; @@ -878,8 +878,8 @@ component_instantiation_statement : a_label simple_name { - int con_count; - int local_err = 0; + long con_count; + long local_err = 0; MVL_CONRNK = 0; MVL_CHDNAM = $2; @@ -927,7 +927,7 @@ component_instantiation_statement struct chain *chain_pnt ; char *prt_name ; char tampon [256] ; - int i = 0; + long i = 0; if (MVL_CHDPNT != NULL) { @@ -990,11 +990,11 @@ association_element Arrow actual_port_name { - int sig_width; - int con_pos; + long sig_width; + long con_pos; struct chain *sig_list1; struct chain *sig_list2; - int local_err = 0; + long local_err = 0; if (MVL_CHDPNT == NULL) local_err = 1; @@ -1043,14 +1043,14 @@ association_element } | actual_port_name { - int sig_width ; + long sig_width ; struct chain *sig_list1 ; char *prt_name ; - int prt_width ; - int left_bnd ; - int right_bnd ; - int local_err = 0; - int i ; + long prt_width ; + long left_bnd ; + long right_bnd ; + long local_err = 0; + long i ; if (MVL_CHDPNT == NULL) local_err = 1; @@ -1243,15 +1243,15 @@ primary { mvl_expr expr; struct losig *losig_pnt; - int i; - int left; - int right; - int left_bnd; - int right_bnd; - int sig_width; - int rev_flg; - int in_bound; - int out_bound; + long i; + long left; + long right; + long left_bnd; + long right_bnd; + long sig_width; + long rev_flg; + long in_bound; + long out_bound; if (mvl_chktab (MVL_HSHTAB,$1.NAME,MVL_MODNAM,MVL_SIGDFN) != 0) { @@ -1462,7 +1462,7 @@ Semicolon_ERR abstractlit : AbstractLit - { $$ = atoi ($1); } + { $$ = atol ($1); } ; RightParen_ERR diff --git a/alliance/src/mbkvhdl/src/mvl_syacc.h b/alliance/src/mbkvhdl/src/mvl_syacc.h index 3ef3402c..d79f7c37 100644 --- a/alliance/src/mbkvhdl/src/mvl_syacc.h +++ b/alliance/src/mbkvhdl/src/mvl_syacc.h @@ -41,7 +41,7 @@ extern struct dct_entry **MVL_HSHTAB; /* dictionnary's entry points */ extern struct dct_entry **mvl_initab(); extern void mvl_addtab(); -extern int mvl_chktab(); +extern long mvl_chktab(); extern void mvl_fretab(); extern void mvl_error(); extern void mvl_warning(); diff --git a/alliance/src/mbkvhdl/src/mvl_util.c b/alliance/src/mbkvhdl/src/mvl_util.c index 1523322b..3e9472a8 100644 --- a/alliance/src/mbkvhdl/src/mvl_util.c +++ b/alliance/src/mbkvhdl/src/mvl_util.c @@ -56,8 +56,8 @@ char *key_str; char *ctx_str; { - int found = 0; - int index; + long found = 0; + long index; struct dct_entry *entry_pnt; struct dct_entry *last_entry = NULL; struct dct_recrd *recrd_pnt; @@ -123,7 +123,7 @@ struct dct_entry **mvl_initab () { struct dct_entry **head; - int i; + long i; head = (struct dct_entry **) mbkalloc (sizeof(struct dct_entry *) * MVL_HSZDFN); @@ -139,7 +139,7 @@ struct dct_entry **mvl_initab () /* content : print out warning messages on the standard error output */ /* ###--------------------------------------------------------------### */ void mvl_warning (code,str1) -int code; +long code; char *str1; { static char first_time = 0; @@ -174,10 +174,10 @@ char *str1; /* ###--------------------------------------------------------------### */ void mvl_toolbug (code,str1,str2,nbr1) -int code; +long code; char *str1; char *str2; -int nbr1; +long nbr1; { (void) fprintf (stderr,"Fatal error %d executing `%s`: ", code,str1); @@ -197,9 +197,9 @@ int nbr1; /* ###--------------------------------------------------------------### */ void mvl_message (code,str1,nmb1) -int code; +long code; char *str1; -int nmb1; +long nmb1; { switch (code) @@ -217,12 +217,12 @@ void mvl_addtab (head,key_str,ctx_str,field,valu) struct dct_entry **head; char *key_str; char *ctx_str; -int field; -int valu; +long field; +long valu; { - int found = 0; - int index; + long found = 0; + long index; struct dct_entry *entry_pnt; struct dct_recrd *recrd_pnt; @@ -296,16 +296,16 @@ int valu; /* ###--------------------------------------------------------------### */ /* function : mvl_chktab */ /* ###--------------------------------------------------------------### */ -int mvl_chktab (head,key_str,ctx_str,field) +long mvl_chktab (head,key_str,ctx_str,field) struct dct_entry **head; char *key_str; char *ctx_str; -int field; +long field; { - int found = 0; - int valu = 0; + long found = 0; + long valu = 0; struct dct_entry *entry_pnt; struct dct_recrd *recrd_pnt; @@ -379,7 +379,7 @@ struct dct_entry **pt_hash; struct dct_entry *pt_entry; struct dct_entry *pt_nxtentry; struct dct_recrd *pt_record; - int i; + long i; if (pt_hash != NULL) { @@ -413,7 +413,7 @@ struct dct_entry **pt_hash; /* ###--------------------------------------------------------------### */ void mvl_error (code,str1) -int code; +long code; char *str1; { @@ -535,7 +535,7 @@ char *key; { struct dct_entry *entry; - int i; + long i; if (MVL_DCEHED == NULL) { @@ -571,7 +571,7 @@ char *key; { struct dct_recrd *recrd; - int i; + long i; if (MVL_DCRHED == NULL) { @@ -643,7 +643,7 @@ char *name; char *prv_name; char *tmp_name; char buffer[200]; - int i,j,flag,number; + long i,j,flag,number; static struct dct_entry **namtab=NULL; if (namtab == NULL) @@ -697,7 +697,7 @@ char *name; new_name = namealloc (buffer); } mvl_addtab (namtab,new_name,NULL,MVL_NEWDFN,1); - mvl_addtab (namtab,tmp_name,NULL,MVL_PNTDFN,(int)new_name); + mvl_addtab (namtab,tmp_name,NULL,MVL_PNTDFN,(long)new_name); mvl_addtab (namtab,tmp_name,NULL,MVL_NAMDFN,1); } @@ -740,7 +740,7 @@ char *new_name; void *mvl_vectnam(pt_list,left,right,name,type) void *pt_list; -int *left, *right; +long *left, *right; char **name; char type; diff --git a/alliance/src/mbkvhdlg/src/mvl_parse.c b/alliance/src/mbkvhdlg/src/mvl_parse.c index d3f16e7a..9baffe56 100644 --- a/alliance/src/mbkvhdlg/src/mvl_parse.c +++ b/alliance/src/mbkvhdlg/src/mvl_parse.c @@ -6,9 +6,10 @@ /* description : Parser VHDL --> MBK */ /* */ /* ###--------------------------------------------------------------### */ -#ident "$Id: mvl_parse.c,v 1.1 2002/04/26 09:51:07 ludo Exp $" +#ident "$Id: mvl_parse.c,v 1.2 2009/06/14 13:51:56 ludo Exp $" #include #include +#include #include #include #include "mvl_parse.h" diff --git a/alliance/src/mbkvhdlg/src/mvl_scomp_y.y b/alliance/src/mbkvhdlg/src/mvl_scomp_y.y index 0db1044f..1f86a042 100644 --- a/alliance/src/mbkvhdlg/src/mvl_scomp_y.y +++ b/alliance/src/mbkvhdlg/src/mvl_scomp_y.y @@ -42,7 +42,7 @@ static long base ; %} %union { - int valu; + long valu; char *text; char flag; mvl_name name; @@ -421,11 +421,11 @@ formal_port_element { struct locon *locon_pnt; struct losig *losig_pnt; - int sig_width; - int sig_conf; + long sig_width; + long sig_conf; char *sig_name; struct chain *sig_list; - int local_err; + long local_err; local_err = $6.ERR_FLG; if ( ($6.LEFT == -1) && (($5 == MVL_BTVDFN) || @@ -526,7 +526,7 @@ formal_port_element if (local_err == 0) { mvl_addtab (MVL_HSHTAB,sig_name,MVL_MODNAM,MVL_PNTDFN, - (int)losig_pnt); + (long)losig_pnt); mvl_addtab (MVL_HSHTAB,sig_name,MVL_MODNAM,MVL_SIGDFN, sig_conf); mvl_addtab (MVL_HSHTAB,sig_name,MVL_MODNAM,MVL_LFTDFN, @@ -617,11 +617,11 @@ signal_declaration Semicolon_ERR { struct losig *losig_pnt; - int sig_width; - int sig_conf; + long sig_width; + long sig_conf; char *sig_name; struct chain *sig_list; - int local_err; + long local_err; local_err = $5.ERR_FLG; if (($5.LEFT==-1) && (($4==MVL_BTVDFN) || ($4==MVL_RGVDFN))) @@ -674,7 +674,7 @@ signal_declaration if (local_err == 0) { mvl_addtab (MVL_HSHTAB,sig_name,MVL_MODNAM,MVL_PNTDFN, - (int)losig_pnt); + (long)losig_pnt); mvl_addtab (MVL_HSHTAB,sig_name,MVL_MODNAM,MVL_SIGDFN, sig_conf); mvl_addtab (MVL_HSHTAB,sig_name,MVL_MODNAM,MVL_LFTDFN, @@ -757,11 +757,11 @@ local_port_element .BUS. { struct locon *locon_pnt; - int sig_width; - int sig_conf; + long sig_width; + long sig_conf; char *sig_name; struct chain *sig_list; - int local_err = 0; + long local_err = 0; if (($6.ERR_FLG != 0) || (MVL_CHDPNT == NULL)) local_err = 1; @@ -902,8 +902,8 @@ component_instantiation_statement : a_label simple_name { - int con_count; - int local_err = 0; + long con_count; + long local_err = 0; MVL_CONRNK = 0; MVL_CHDNAM = $2; @@ -954,7 +954,7 @@ component_instantiation_statement struct logen *genmod ; char *prt_name ; char tampon [256] ; - int i = 0; + long i = 0; if (MVL_CHDPNT != NULL) { @@ -1218,11 +1218,11 @@ association_element Arrow actual_port_name { - int sig_width; - int con_pos; + long sig_width; + long con_pos; struct chain *sig_list1; struct chain *sig_list2; - int local_err = 0; + long local_err = 0; if (MVL_CHDPNT == NULL) local_err = 1; @@ -1271,14 +1271,14 @@ association_element } | actual_port_name { - int sig_width ; + long sig_width ; struct chain *sig_list1 ; char *prt_name ; - int prt_width ; - int left_bnd ; - int right_bnd ; - int local_err = 0; - int i ; + long prt_width ; + long left_bnd ; + long right_bnd ; + long local_err = 0; + long i ; if (MVL_CHDPNT == NULL) local_err = 1; @@ -1471,15 +1471,15 @@ primary { mvl_expr expr; struct losig *losig_pnt; - int i; - int left; - int right; - int left_bnd; - int right_bnd; - int sig_width; - int rev_flg; - int in_bound; - int out_bound; + long i; + long left; + long right; + long left_bnd; + long right_bnd; + long sig_width; + long rev_flg; + long in_bound; + long out_bound; if (mvl_chktab (MVL_HSHTAB,$1.NAME,MVL_MODNAM,MVL_SIGDFN) != 0) { diff --git a/alliance/src/mbkvhdlg/src/mvl_syacc.h b/alliance/src/mbkvhdlg/src/mvl_syacc.h index 2ede43d6..6ee111be 100644 --- a/alliance/src/mbkvhdlg/src/mvl_syacc.h +++ b/alliance/src/mbkvhdlg/src/mvl_syacc.h @@ -18,7 +18,7 @@ extern struct dct_entry **MVL_HSHTAB; /* dictionnary's entry points */ extern struct dct_entry **mvl_initab(); extern void mvl_addtab(); -extern int mvl_chktab(); +extern long mvl_chktab(); extern void mvl_fretab(); extern void mvl_error(); extern void mvl_warning(); diff --git a/alliance/src/mbkvhdlg/src/mvl_util.c b/alliance/src/mbkvhdlg/src/mvl_util.c index d3c9f18a..f821e4ba 100644 --- a/alliance/src/mbkvhdlg/src/mvl_util.c +++ b/alliance/src/mbkvhdlg/src/mvl_util.c @@ -13,9 +13,10 @@ /* mvl_initab , mvl_deltab, */ /* */ /* ###--------------------------------------------------------------### */ -#ident "$Id: mvl_util.c,v 1.1 2002/04/26 09:51:07 ludo Exp $" +#ident "$Id: mvl_util.c,v 1.2 2009/06/14 13:51:56 ludo Exp $" #include #include +#include #include #include #include "mvl_utype.h" @@ -32,15 +33,15 @@ struct dct_entry **head; char *key_str; char *ctx_str; - { - int found = 0; - int index; +{ + long found = 0; + long index; struct dct_entry *entry_pnt; struct dct_entry *last_entry = NULL; struct dct_recrd *recrd_pnt; struct dct_recrd *last_recrd = NULL; - index = (int)key_str % MVL_HSZDFN; + index = (long)key_str % MVL_HSZDFN; entry_pnt = head [index]; while (entry_pnt != NULL) @@ -91,7 +92,7 @@ char *ctx_str; } } } - } +} /* ###--------------------------------------------------------------### */ /* function : mvl_initab */ @@ -100,7 +101,7 @@ struct dct_entry **mvl_initab () { struct dct_entry **head; - int i; + long i; head = (struct dct_entry **) mbkalloc (sizeof(struct dct_entry *) * MVL_HSZDFN); @@ -116,7 +117,7 @@ struct dct_entry **mvl_initab () /* content : print out warning messages on the standard error output */ /* ###--------------------------------------------------------------### */ void mvl_warning (code,str1) -int code; +long code; char *str1; { static char first_time = 0; @@ -151,10 +152,10 @@ char *str1; /* ###--------------------------------------------------------------### */ void mvl_toolbug (code,str1,str2,nbr1) -int code; +long code; char *str1; char *str2; -int nbr1; +long nbr1; { (void) fprintf (stderr,"Fatal error %d executing `%s`: ", code,str1); @@ -174,9 +175,9 @@ int nbr1; /* ###--------------------------------------------------------------### */ void mvl_message (code,str1,nmb1) -int code; +long code; char *str1; -int nmb1; +long nmb1; { switch (code) @@ -194,16 +195,16 @@ void mvl_addtab (head,key_str,ctx_str,field,valu) struct dct_entry **head; char *key_str; char *ctx_str; -int field; -int valu; +long field; +long valu; { - int found = 0; - int index; + long found = 0; + long index; struct dct_entry *entry_pnt; struct dct_recrd *recrd_pnt; - index = (int) key_str % MVL_HSZDFN; + index = (long) key_str % MVL_HSZDFN; entry_pnt = head[index]; while (entry_pnt != NULL) @@ -273,20 +274,20 @@ int valu; /* ###--------------------------------------------------------------### */ /* function : mvl_chktab */ /* ###--------------------------------------------------------------### */ -int mvl_chktab (head,key_str,ctx_str,field) +long mvl_chktab (head,key_str,ctx_str,field) struct dct_entry **head; char *key_str; char *ctx_str; -int field; +long field; { - int found = 0; - int valu = 0; + long found = 0; + long valu = 0; struct dct_entry *entry_pnt; struct dct_recrd *recrd_pnt; - entry_pnt = head [(int)key_str % MVL_HSZDFN]; + entry_pnt = head [(long)key_str % MVL_HSZDFN]; while (entry_pnt != NULL) { @@ -356,7 +357,7 @@ struct dct_entry **pt_hash; struct dct_entry *pt_entry; struct dct_entry *pt_nxtentry; struct dct_recrd *pt_record; - int i; + long i; if (pt_hash != NULL) { @@ -390,7 +391,7 @@ struct dct_entry **pt_hash; /* ###--------------------------------------------------------------### */ void mvl_error (code,str1) -int code; +long code; char *str1; { @@ -512,7 +513,7 @@ char *key; { struct dct_entry *entry; - int i; + long i; if (MVL_DCEHED == NULL) { @@ -548,7 +549,7 @@ char *key; { struct dct_recrd *recrd; - int i; + long i; if (MVL_DCRHED == NULL) { @@ -620,7 +621,7 @@ char *name; char *prv_name; char *tmp_name; char buffer[200]; - int i,j,flag,number; + long i,j,flag,number; static struct dct_entry **namtab=NULL; if (namtab == NULL) @@ -667,7 +668,7 @@ char *name; new_name = namealloc (buffer); } mvl_addtab (namtab,new_name,NULL,MVL_NEWDFN,1); - mvl_addtab (namtab,tmp_name,NULL,MVL_PNTDFN,(int)new_name); + mvl_addtab (namtab,tmp_name,NULL,MVL_PNTDFN,(long)new_name); mvl_addtab (namtab,tmp_name,NULL,MVL_NAMDFN,1); } @@ -710,7 +711,7 @@ char *new_name; void *mvl_vectnam(pt_list,left,right,name,type) void *pt_list; -int *left, *right; +long *left, *right; char **name; char type; diff --git a/alliance/src/mbkvhdlg/src/x2vy_main.c b/alliance/src/mbkvhdlg/src/x2vy_main.c index 12fd5de1..b6d28605 100644 --- a/alliance/src/mbkvhdlg/src/x2vy_main.c +++ b/alliance/src/mbkvhdlg/src/x2vy_main.c @@ -1,7 +1,10 @@ /* * $Log: x2vy_main.c,v $ - * Revision 1.1 2002/04/26 09:51:07 ludo - * Initial revision + * Revision 1.2 2009/06/14 13:51:57 ludo + * - port 64 bits + * + * 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 @@ -35,10 +38,11 @@ * */ -#ident "$Id: x2vy_main.c,v 1.1 2002/04/26 09:51:07 ludo Exp $" +#ident "$Id: x2vy_main.c,v 1.2 2009/06/14 13:51:57 ludo Exp $" #include #include +#include #include #include #include diff --git a/alliance/src/mbkvti/src/drive_vti_l.c b/alliance/src/mbkvti/src/drive_vti_l.c index e5d1106f..7e7d62b3 100644 --- a/alliance/src/mbkvti/src/drive_vti_l.c +++ b/alliance/src/mbkvti/src/drive_vti_l.c @@ -30,6 +30,9 @@ * Modified, rewritten and maintained by Frederic Petrot since september 1990 * * Modified by Gregoire Avot : RC wire support. * * $Log: drive_vti_l.c,v $ +* Revision 1.4 2009/06/14 13:51:58 ludo +* - port 64 bits +* * Revision 1.3 2002/09/30 16:21:00 czo * support/users * @@ -150,7 +153,7 @@ struct rcnhns *org; ptl=getptype(ptnode->USER,HNSRCN_X); if(ptl) { - fprintf(ptfile,"X %d ",(int)ptl->DATA); + fprintf(ptfile,"X %ld ",(long)ptl->DATA); return; } @@ -185,7 +188,7 @@ int linelength; char *s; int *old_index; /* table indexed by the file indexes giving mbk's one */ static char tn, tp; -int idx_rcn=1; +long idx_rcn=1; lorcnet_list *ptrcnet; num_list *scannum; lonode_list *ptnode; @@ -290,7 +293,7 @@ lowire_list *scanwire; (void)fprintf(ptfile, "%ld ", ptcon->SIG->INDEX); (void)fprintf(ptfile, "%d ", idx_rcn); ptnode=getlonode(ptcon->SIG,scannum->DATA); - ptnode->USER=addptype(ptnode->USER,HNSRCN_X,(void*)idx_rcn); + ptnode->USER= (void *)addptype(ptnode->USER,HNSRCN_X,(void*)idx_rcn); (void)fprintf(ptfile, "%s;\n", busname(ptcon->NAME)); idx_rcn++; } diff --git a/alliance/src/mbkvti/src/parse_vti_p.c b/alliance/src/mbkvti/src/parse_vti_p.c index b20d1ed2..8c8d1aa1 100644 --- a/alliance/src/mbkvti/src/parse_vti_p.c +++ b/alliance/src/mbkvti/src/parse_vti_p.c @@ -40,6 +40,9 @@ /* * $Log: parse_vti_p.c,v $ + * Revision 1.4 2009/06/14 13:51:58 ludo + * - port 64 bits + * * Revision 1.3 2002/09/30 16:21:00 czo * support/users * @@ -77,7 +80,7 @@ * rcs version number consistency * */ -#ident "$Id: parse_vti_p.c,v 1.3 2002/09/30 16:21:00 czo Exp $" +#ident "$Id: parse_vti_p.c,v 1.4 2009/06/14 13:51:58 ludo Exp $" #include #include @@ -124,7 +127,7 @@ point_list *ptpoint; \ phcon_list *ptcon; \ \ for (ptcon = figure->PHCON; ptcon; ptcon = ptcon->NEXT) \ - if (((int)(getptype(ptcon->USER, (long)VTIPARSER)->DATA)) == refnum) \ + if (((long)(getptype(ptcon->USER, (long)VTIPARSER)->DATA)) == refnum) \ break; \ \ if (ptcon == (phcon_list *)NULL) \ @@ -146,7 +149,7 @@ phins_list *ptins; \ ptins = getphins(figure, insname); \ ptnewfig = getphfig(ptins->FIGNAME, 'P'); \ for (ptcon = ptnewfig->PHCON; ptcon; ptcon = ptcon->NEXT) \ - if ((int)(getptype(ptcon->USER, (long)VTIPARSER)->DATA) == refnum) \ + if ((long)(getptype(ptcon->USER, (long)VTIPARSER)->DATA) == refnum) \ break; \ \ if (ptcon == (phcon_list *)NULL) \ diff --git a/alliance/src/ocr/src/seg/mbk_tree.c b/alliance/src/ocr/src/seg/mbk_tree.c index edb7ef35..60b6127e 100644 --- a/alliance/src/ocr/src/seg/mbk_tree.c +++ b/alliance/src/ocr/src/seg/mbk_tree.c @@ -1,8 +1,11 @@ /* ### -------------------------------------------------- ### - $Author: hcl $ - $Date: 2002/03/15 14:37:22 $ + $Author: ludo $ + $Date: 2009/06/14 13:51:59 $ $Log: mbk_tree.c,v $ + Revision 1.2 2009/06/14 13:51:59 ludo + - port 64 bits + Revision 1.1 2002/03/15 14:37:22 hcl Ca roule. @@ -36,7 +39,7 @@ #include "mbk_tree.h" static char *res_id = - "$Id: mbk_tree.c,v 1.1 2002/03/15 14:37:22 hcl Exp $"; + "$Id: mbk_tree.c,v 1.2 2009/06/14 13:51:59 ludo Exp $"; /*****************************************************************************/ /* Global variables */ @@ -63,8 +66,8 @@ rbtree *HEAD_RBTREE = NULL; /* red-black tree buffer head */ static inline int static_defaultcompare(void *first, void *second) { - return ((int) first == - (int) second) ? 0 : (((int) first > (int) second) ? 1 : -1); + return ((long) first == + (long) second) ? 0 : (((long) first > (long) second) ? 1 : -1); } /** red-black tree node creation function **/ diff --git a/alliance/src/ocr/src/util/ocrConnectorUtil.c b/alliance/src/ocr/src/util/ocrConnectorUtil.c index a0b03617..1741b7af 100644 --- a/alliance/src/ocr/src/util/ocrConnectorUtil.c +++ b/alliance/src/ocr/src/util/ocrConnectorUtil.c @@ -1,8 +1,11 @@ /* ### -------------------------------------------------- ### - $Author: xtof $ - $Date: 2006/03/29 17:10:57 $ + $Author: ludo $ + $Date: 2009/06/14 13:52:00 $ $Log: ocrConnectorUtil.c,v $ + Revision 1.5 2009/06/14 13:52:00 ludo + - port 64 bits + Revision 1.4 2006/03/29 17:10:57 xtof * gcc4 compatible : no cast like (Foo*)bar=foo; use bar=(Bar*)foo; @@ -273,7 +276,7 @@ createHashTable(ocrRoutingDataBase * i_pDataBase, phfig_list * i_pPhFig) for (l_pInst = i_pPhFig->PHINS; l_pInst; l_pInst = l_pInst->NEXT) { addhtitem(i_pDataBase->HTABLE, - (void *) l_pInst->INSNAME, (int) (l_pInst)); + (void *) l_pInst->INSNAME, (long) (l_pInst)); } display(LEVEL, DEBUG, "%s\n", " done"); diff --git a/alliance/src/pcbs/src/bvl/bvl_bcomp_y.y b/alliance/src/pcbs/src/bvl/bvl_bcomp_y.y index 37f520e2..ffd74b1a 100644 --- a/alliance/src/pcbs/src/bvl/bvl_bcomp_y.y +++ b/alliance/src/pcbs/src/bvl/bvl_bcomp_y.y @@ -11,6 +11,7 @@ %{ #include +#include #include "mut.h" #include "log.h" #include "beh.h" @@ -22,7 +23,7 @@ %} %union { - int valu; + long valu; char *text; bvl_ablstr list; bvl_name name; @@ -528,7 +529,7 @@ formal_port_element .signal_kind. { char *signame; - int sigconf; + long sigconf; void *pnt; /* ###----------------------------------------------### */ @@ -552,7 +553,7 @@ formal_port_element beh_addtab (dic,signame,BVL_MODNAM,BVL_SIGDFN,sigconf); beh_addtab (dic,signame,BVL_MODNAM,BVL_WMNDFN,$6.LEFT); beh_addtab (dic,signame,BVL_MODNAM,BVL_WMXDFN,$6.RIGHT); - beh_addtab (dic,signame,BVL_MODNAM,BVL_PNTDFN,(int)pnt); + beh_addtab (dic,signame,BVL_MODNAM,BVL_PNTDFN,(long)pnt); BVL_NM1LST = delchain (BVL_NM1LST, BVL_NM1LST); } @@ -641,7 +642,7 @@ constant_declaration constant_VarAsgn__expression Semicolon_ERR { - int sigconf; + long sigconf; if (chkdcl ('C',0,$4.VALU,$4.FLAG,0,$5.FLAG,&sigconf) == 0) { @@ -669,9 +670,9 @@ signal_declaration Semicolon_ERR { char *signame; - int sigconf; + long sigconf; void *pnt; - int errflg; + long errflg; errflg = chkdcl ('S',0,$4.VALU,$4.FLAG,$6,$5.FLAG,&sigconf); @@ -694,7 +695,7 @@ signal_declaration beh_addtab (dic,signame,BVL_MODNAM,BVL_SIGDFN,sigconf); beh_addtab (dic,signame,BVL_MODNAM,BVL_WMNDFN,$5.LEFT); beh_addtab (dic,signame,BVL_MODNAM,BVL_WMXDFN,$5.RIGHT); - beh_addtab (dic,signame,BVL_MODNAM,BVL_PNTDFN,(int)pnt); + beh_addtab (dic,signame,BVL_MODNAM,BVL_PNTDFN,(long)pnt); BVL_NM1LST = delchain (BVL_NM1LST,BVL_NM1LST); } @@ -819,7 +820,7 @@ unlabeled_conditional_signal_assignment waveform Semicolon_ERR { - int i; + long i; struct beout *beout_pnt; struct bebus *bebus_pnt; struct bereg *bereg_pnt; @@ -833,15 +834,15 @@ unlabeled_conditional_signal_assignment struct bvl_expr expr4; struct bvl_expr expr5; struct bvl_expr expr6; - int rev_flg = 0; - int left_bnd; - int right_bnd; - int left; - int right; - int in_bound; - int out_bound; - int sig_width; - int sig_conf; + long rev_flg = 0; + long left_bnd; + long right_bnd; + long left; + long right; + long in_bound; + long out_bound; + long sig_width; + long sig_conf; expr4 = $5; @@ -1098,7 +1099,7 @@ unlabeled_selected_signal_assignment ...waveform__WHEN__choices.. Semicolon_ERR { - int i; + long i; struct beout *beout_pnt; struct bebus *bebus_pnt; struct bereg *bereg_pnt; @@ -1106,15 +1107,15 @@ unlabeled_selected_signal_assignment struct bebux *bebux_pnt; struct chain *abl_pnt; struct bvl_expr expr1; - int rev_flg = 0; - int left_bnd; - int right_bnd; - int left; - int right; - int in_bound; - int out_bound; - int sig_width; - int sig_conf; + long rev_flg = 0; + long left_bnd; + long right_bnd; + long left; + long right; + long in_bound; + long out_bound; + long sig_width; + long sig_conf; expr1 = bvl_crtabl (OR ,$8 ,$9,-1,-1); if (BVL_BDDPNT != one) @@ -1382,13 +1383,13 @@ choice { char *val; char val2[256]; - int left; - int right; - int in_bound; - int out_bound; - int left_bnd; - int right_bnd; - int sig_conf; + long left; + long right; + long in_bound; + long out_bound; + long left_bnd; + long right_bnd; + long sig_conf; strcpy (val2,"B\""); sig_conf = beh_chktab (dic,$1.NAME,BVL_MODNAM,BVL_SIGDFN); @@ -1583,13 +1584,13 @@ primary | name { struct bvl_expr expr1; - int left; - int right; - int left_bnd; - int right_bnd; - int in_bound; - int out_bound; - int sig_conf; + long left; + long right; + long left_bnd; + long right_bnd; + long in_bound; + long out_bound; + long sig_conf; sig_conf = beh_chktab (dic,$1.NAME,BVL_MODNAM,BVL_SIGDFN); switch (sig_conf) @@ -1749,7 +1750,7 @@ attribute_name { char extname[100]; char *lclname; - int sig_conf; + long sig_conf; struct bvl_expr expr1; struct bvl_expr expr2; struct chain *ptabl; @@ -1933,8 +1934,8 @@ void *addstr (ptfig, object, mode, type, flag, name, left, right) struct befig *ptfig; char object; -int mode; -int type; +long mode; +long type; char flag; char *name; short left; @@ -2080,19 +2081,19 @@ short right; return (pnt); } -int chkdcl (object,mode,type,flag,kind,constraint,conf) +static long chkdcl ( -char object; -int mode; -int type; -char flag; -int kind; -char constraint; -int *conf; +char object, +long mode, +long type, +char flag, +long kind, +char constraint, +long *conf ) { - int errflg = 0; - int lclcnf = 0; + long errflg = 0; + long lclcnf = 0; if (flag != constraint) { diff --git a/alliance/src/pcbs/src/bvl/bvl_byacc.h b/alliance/src/pcbs/src/bvl/bvl_byacc.h index 0efe39dc..6c24fade 100644 --- a/alliance/src/pcbs/src/bvl/bvl_byacc.h +++ b/alliance/src/pcbs/src/bvl/bvl_byacc.h @@ -66,3 +66,4 @@ static struct dct_entry **initab (); static void addtab (); static int chktab (); static void fretab (); +static long chkdcl ( char object, long mode, long type, char flag, long kind, char constraint, long *conf ); diff --git a/alliance/src/pcbs/src/bvl/bvl_util.c b/alliance/src/pcbs/src/bvl/bvl_util.c index f96f183d..4c1a9763 100644 --- a/alliance/src/pcbs/src/bvl/bvl_util.c +++ b/alliance/src/pcbs/src/bvl/bvl_util.c @@ -625,7 +625,7 @@ int *size_pnt; /* size of available space */ /* "(operand operator operand operator operand ...)" */ /* ###------------------------------------------------------### */ - operator = (int) ((struct chain *) expr->DATA)->DATA; + operator = (long) ((struct chain *) expr->DATA)->DATA; operand = (struct chain *)expr->NEXT->DATA; if (operator == STABLE) diff --git a/alliance/src/pcbs/src/pcbs/emul_y.y b/alliance/src/pcbs/src/pcbs/emul_y.y index 3d3f1476..b94d3514 100644 --- a/alliance/src/pcbs/src/pcbs/emul_y.y +++ b/alliance/src/pcbs/src/pcbs/emul_y.y @@ -183,7 +183,7 @@ if (gethtitem(HSH_PGA_USED,pga)!=EMPTYHT) {fprintf(stderr,"%d: connector PGA %c else addhtitem(HSH_PGA_USED,pga, 1); /******* chargement des donnees ******/ -addhtitem(HSH_DATA, pga, (int)EMUL[$1]); +addhtitem(HSH_DATA, pga, (long)EMUL[$1]); } ; diff --git a/alliance/src/phl/src/pat_debug.c b/alliance/src/phl/src/pat_debug.c index 2b44bbd3..bad6bff9 100644 --- a/alliance/src/phl/src/pat_debug.c +++ b/alliance/src/phl/src/pat_debug.c @@ -49,7 +49,7 @@ long *typ ; /* child struct. or data type */ char **str ; /* recognized strings */ { - int i; + long i; struct paseq *paseq_pnt; struct pagrp *pagrp_pnt; @@ -62,7 +62,7 @@ char **str ; /* recognized strings */ char **string_pnt; char *character_pnt; - int *integer_pnt; + long *integer_pnt; /* ###------------------------------------------------------### */ /* initialization */ @@ -350,7 +350,7 @@ char **str ; /* recognized strings */ case integer_DFN : - integer_pnt = (int *) curpnt.data; + integer_pnt = (long *) curpnt.data; typ [integer_DFN] = IMMEDIATE_DFN | d_DFN | integer_DFN; pnt [integer_DFN].imd = *integer_pnt; @@ -390,7 +390,7 @@ char **str ; /* recognized strings */ break; case u_DFN : - printf ("%u\n", (unsigned int) pnt[i].imd); + printf ("%lu\n", (unsigned long) pnt[i].imd); break; case c_DFN : @@ -398,7 +398,7 @@ char **str ; /* recognized strings */ break; case d_DFN : - printf ("%d\n", (int) pnt[i].imd); + printf ("%ld\n", (long) pnt[i].imd); break; case l_DFN : @@ -406,7 +406,7 @@ char **str ; /* recognized strings */ break; case x_DFN : - printf ("0x%x\n", (unsigned int) pnt[i].imd); + printf ("0x%lx\n", (unsigned long) pnt[i].imd); break; } } @@ -439,17 +439,17 @@ char **str ; /* recognized strings */ /* called func. : none */ /* ###--------------------------------------------------------------### */ -static int splitline (words, line) +static long splitline (words, line) char **words; char *line ; { char *heap = *words; - int new = 1; - int wrdcnt = 0; - int i = 0; - int j = 0; + long new = 1; + long wrdcnt = 0; + long i = 0; + long j = 0; /* ###------------------------------------------------------### */ /* copy the line read from input into the words until a */ @@ -490,12 +490,12 @@ char *line ; static void push (stk, stkpnt, data, type) struct stack *stk; -int *stkpnt; +long *stkpnt; void *data; short type; { - int stkidx = *stkpnt; + long stkidx = *stkpnt; if (stkidx == STKSIZ_DFN) pat_message (2, "pat_debug", NULL, 0); @@ -522,11 +522,11 @@ short type; static void pop (stkpnt, count) -int *stkpnt; -int count; +long *stkpnt; +long count; { - int stkidx = *stkpnt; + long stkidx = *stkpnt; if (stkidx <= count) stkidx = 0; @@ -546,7 +546,7 @@ int count; static struct chain *go_forward (pnt, count) struct chain *pnt; -int count; +long count; { while ((count > 0) && (pnt != NULL) && (pnt->NEXT != NULL)) @@ -565,17 +565,17 @@ int count; /* called func. : none */ /* ###--------------------------------------------------------------### */ -static int translate (words, wrdcnt, strgs, nmbrs, flags, indxs) +static long translate (words, wrdcnt, strgs, nmbrs, flags, indxs) char **words ; /* list of words */ -int wrdcnt; /* number of words */ +long wrdcnt; /* number of words */ char **strgs ; /* list of recognized strings */ -int *nmbrs ; /* words translated to numbers */ +long *nmbrs ; /* words translated to numbers */ char *flags ; /* set if word is a number */ -int *indxs ; /* words' index in strgs table */ +long *indxs ; /* words' index in strgs table */ { - int i , j; + long i , j; /* ###------------------------------------------------------### */ /* initialize flags and indxs */ @@ -611,10 +611,10 @@ int *indxs ; /* words' index in strgs table */ static void get_size (siz) -unsigned int siz []; +unsigned long siz []; { - int i; + long i; for (i=0 ; i +#include #include "mut.h" #include "pat.h" #include "pat_type.h" diff --git a/alliance/src/ppt/src/pat_decl_y.y b/alliance/src/ppt/src/pat_decl_y.y index 2556d184..cb06a141 100644 --- a/alliance/src/ppt/src/pat_decl_y.y +++ b/alliance/src/ppt/src/pat_decl_y.y @@ -32,7 +32,7 @@ %{ #include -#include +#include #include "mut.h" #include "pat.h" #include "ppt.h" diff --git a/alliance/src/ppt/src/pat_desc_y.y b/alliance/src/ppt/src/pat_desc_y.y index 7a5ebbe6..32680b41 100644 --- a/alliance/src/ppt/src/pat_desc_y.y +++ b/alliance/src/ppt/src/pat_desc_y.y @@ -32,7 +32,8 @@ %{ #include -#include +#include +#include #include "mut.h" #include "pat.h" #include "ppt.h" @@ -276,11 +277,11 @@ char *value ; struct paini *ptini = lastini; char *frc ; char *cmp ; - int length ; - int size = 1; - int index = 1; - int i ; - int inc ; + long length ; + long size = 1; + long index = 1; + long i ; + long inc ; char extname [100]; char format = 'B'; @@ -394,11 +395,11 @@ struct paevt *lastevt; short index ; char compare; char value ; -int rank ; +long rank ; { struct paiol *ptiol ; - int i ; + long i ; char cmp_val; char frc_val; char *frc ; @@ -482,13 +483,13 @@ int rank ; static void islegal (index, value, flag, status) -int index; /* ptiol's index */ +long index; /* ptiol's index */ char value; /* value (+,-,*,0,...,9,a,...,f)*/ char flag; /* comparison flag (C,F) */ -int status; /* (0,1,2) (bit,array,inside) */ +long status; /* (0,1,2) (bit,array,inside) */ { - int code = -1; + long code = -1; char comp = flag; struct paiol *ptiol; @@ -609,7 +610,7 @@ struct paseq *pat_descpat (fp, ptseq, maxpat, mode) FILE *fp ; struct paseq *ptseq ; -unsigned int maxpat; +unsigned long maxpat; unsigned char mode ; /* the description style */ { @@ -620,7 +621,7 @@ unsigned char mode ; /* the description style */ struct papat *lastpat; extern FILE *pat_decl_y_in; - int i ; + long i ; if ((ptseq == NULL) || (ptseq->ERRFLG != 0)) ERR_FLG += pat_error (100, NULL, ' ', 0); @@ -887,7 +888,7 @@ unsigned char mode ; /* the description style */ %union { - int valu; + long valu; float fval; char immd; char *text; @@ -1031,7 +1032,7 @@ Identifier...Identifier.. ...Identifier.. { char name[256]; - int i; + long i; strcpy (name, $1); for (i=0; i #include +#include #include "mut.h" #include "pat.h" @@ -51,14 +52,14 @@ struct papat *ptpat; struct paini *ptini = ptpat->PAINI; char buffer [1024] ; /* register's value */ char name [ 256] ; /* current register's root name */ - int indx ; /* current register's index */ + long indx ; /* current register's index */ char oldname [ 256] ; /* previous root name */ char direction = '?'; /* array's direction */ - int redvar ; /* = 2 if (name + index) */ - int oldred ; /* previous value of redvar */ - int left ; /* the left bound of an array */ - int right ; /* the right bound of an array */ - int i = 0 ; + long redvar ; /* = 2 if (name + index) */ + long oldred ; /* previous value of redvar */ + long left ; /* the left bound of an array */ + long right ; /* the right bound of an array */ + long i = 0 ; /* ###------------------------------------------------------### */ /* split the register's name into a root name and an index. */ @@ -189,14 +190,14 @@ struct papat *ptpat; /* called func. : dclini, mbkalloc, mbkfree, pat_error */ /* ###--------------------------------------------------------------### */ -int pat_drvpat (fp, ptseq, labelsiz) +long pat_drvpat (fp, ptseq, labelsiz) FILE *fp ; /* result file pointer */ struct paseq *ptseq ; /* paseq structure to be drived */ -unsigned int labelsiz; /* length of the longest label */ +unsigned long labelsiz; /* length of the longest label */ { - int tmpc ; + long tmpc ; time_t clock ; struct papat *ptpat = NULL; /* current pattern */ @@ -205,18 +206,18 @@ unsigned int labelsiz; /* length of the longest label */ struct pacom *svcom = NULL; /* last comment of OLDPACOM */ struct pagrp *ptgrp = NULL; /* current input-output array */ struct paiol *ptiol = NULL; /* current input-output element */ - int iol_idx = 0 ; /* index in input-output list */ - int stt_nbr = 0 ; /* # of stm. since last comment */ - int pat_nbr = 0 ; /* # of patterns */ + long iol_idx = 0 ; /* index in input-output list */ + long stt_nbr = 0 ; /* # of stm. since last comment */ + long pat_nbr = 0 ; /* # of patterns */ - int row = 1 ; /* maximum length of I/O names */ - int column = 5 ; /* number of char. in a pattern */ + long row = 1 ; /* maximum length of I/O names */ + long column = 5 ; /* number of char. in a pattern */ - int indx ; - int left ; /* left bound of an array */ - int right ; /* right bound of an array */ - int redvar ; - int oldred ; + long indx ; + long left ; /* left bound of an array */ + long right ; /* right bound of an array */ + long redvar ; + long oldred ; char name [256]; char oldname [256]; char pat_date [ 32]; @@ -225,14 +226,14 @@ unsigned int labelsiz; /* length of the longest label */ char format ; /* input-output format */ char seprt ; /* name separator left par or , */ - int i ; - int j ; - int compare ; + long i ; + long j ; + long compare ; char sflag = 'S'; /* processed or unprocessed */ - int length ; /* length of string */ - int ret_val = 0 ; /* value to be returned */ + long length ; /* length of string */ + long ret_val = 0 ; /* value to be returned */ - unsigned int t_step ; /* time step */ + unsigned long t_step ; /* time step */ unsigned char zd_flg ; /* zero delay flag (if != 0) */ static char *model = NULL; /* model : " :?1 2 34;" */ diff --git a/alliance/src/ppt/src/pat_savpaseq.c b/alliance/src/ppt/src/pat_savpaseq.c index 66a60982..7ecf6832 100644 --- a/alliance/src/ppt/src/pat_savpaseq.c +++ b/alliance/src/ppt/src/pat_savpaseq.c @@ -42,17 +42,17 @@ /* called func. : makfopen , pat_error, pat_warning, pat_drvpat */ /* ###--------------------------------------------------------------### */ -int pat_savpaseq (name, ptseq, labelsiz) +long pat_savpaseq (name, ptseq, labelsiz) char *name ; /* name of the drived file */ struct paseq *ptseq ; /* list of existing sequences */ -unsigned int labelsiz; /* length of the longest label */ +unsigned long labelsiz; /* length of the longest label */ { static FILE *fp = NULL; static char *sfx = NULL; char *str ; - int err_flg = 0 ; + long err_flg = 0 ; /* ###------------------------------------------------------### */ /* read the environment variable VH_PATSFX to get the */ diff --git a/alliance/src/ppt/src/ppt.h b/alliance/src/ppt/src/ppt.h index 07dff9cb..997572b1 100644 --- a/alliance/src/ppt/src/ppt.h +++ b/alliance/src/ppt/src/ppt.h @@ -31,8 +31,8 @@ extern struct paseq *pat_lodpaseq (); /* parser */ extern struct paseq *pat_prspat (); /* pat format parser */ -extern int pat_savpaseq (); /* driver */ -extern int pat_drvpat (); /* pat format driver */ +extern long pat_savpaseq (); /* driver */ +extern long pat_drvpat (); /* pat format driver */ extern char *pat_pattostr (); #endif diff --git a/alliance/src/proof/src/proof_util.c b/alliance/src/proof/src/proof_util.c index 365cae43..841937f6 100644 --- a/alliance/src/proof/src/proof_util.c +++ b/alliance/src/proof/src/proof_util.c @@ -1082,8 +1082,8 @@ gcNodeBeh (beh, lstbeh) sysBddAux.lpAT = NULL; zeroAux = initVertexBddAux (0, (pNode)0, (pNode)1, &sysBddAux); oneAux = initVertexBddAux (1, (pNode)0, (pNode)1, &sysBddAux); - addTH (pTHNode, (char *)zero, (int)zeroAux); - addTH (pTHNode, (char *)one, (int)oneAux); + addTH (pTHNode, (char *)zero, (long)zeroAux); + addTH (pTHNode, (char *)one, (long)oneAux); /* si lstbeh = 1 on garbage sur toutes les befig */ /* sinon on ne prends que la premiere befig */ diff --git a/alliance/src/rds/src/rds.h b/alliance/src/rds/src/rds.h index 971e9f1c..ed5aaacb 100644 --- a/alliance/src/rds/src/rds.h +++ b/alliance/src/rds/src/rds.h @@ -13,6 +13,8 @@ # ifndef RDS_210_H # define RDS_210_H +# include + #ifndef __P # if defined(__STDC__) || defined(__GNUC__) # define __P(x) x @@ -51,11 +53,11 @@ # define rdsfreeblock( Pointer ) \ \ - ( rdsfree( (char *)( Pointer ), (unsigned int)0 ) ) + ( rdsfree( (char *)( Pointer ), (unsigned long)0 ) ) # define rdsfreeheap( Pointer, SizeOf ) \ \ - ( rdsfree( (char *)( Pointer ), (unsigned int)( SizeOf ) ) ) + ( rdsfree( (char *)( Pointer ), (unsigned long)( SizeOf ) ) ) /*------------------------------------------------------------\ | | diff --git a/alliance/src/rds/src/rdserror.h b/alliance/src/rds/src/rdserror.h index 17bcf80c..ec12054d 100644 --- a/alliance/src/rds/src/rdserror.h +++ b/alliance/src/rds/src/rdserror.h @@ -20,6 +20,8 @@ # ifndef RDS_ERROR_H # define RDS_ERROR_H +# include + /*------------------------------------------------------------\ | | | Constants | diff --git a/alliance/src/rds/src/rprparse.c b/alliance/src/rds/src/rprparse.c index 3b2fcfb7..b902c72c 100644 --- a/alliance/src/rds/src/rprparse.c +++ b/alliance/src/rds/src/rprparse.c @@ -21,6 +21,7 @@ # include # include # include +# include # include # include diff --git a/alliance/src/rds/src/rtlacces.c b/alliance/src/rds/src/rtlacces.c index aa1fc46c..656a23a0 100644 --- a/alliance/src/rds/src/rtlacces.c +++ b/alliance/src/rds/src/rtlacces.c @@ -16,6 +16,8 @@ \------------------------------------------------------------*/ # include +# include +# include # include # include diff --git a/alliance/src/rds/src/rutpoly.c b/alliance/src/rds/src/rutpoly.c index 46a908f5..c0f11f1b 100644 --- a/alliance/src/rds/src/rutpoly.c +++ b/alliance/src/rds/src/rutpoly.c @@ -17,6 +17,7 @@ # include # include +# include # include # include @@ -567,7 +568,7 @@ unsigned *new_coord_numb; EXIT(1); } /* On recopie ces valeurs definitives dans le nouveau tableau */ - (void)memcpy((char *)xtab, (char *)tab, (int)nb_x * sizeof(long)); + (void)memcpy((char *)xtab, (char *)tab, (size_t)nb_x * sizeof(long)); for (i = 0; i < coord_numb; i++) /* Puis on s'occupe des ordonnees de la meme facon */ diff --git a/alliance/src/rdscif/src/cif_parse.c b/alliance/src/rdscif/src/cif_parse.c index 7faa5a7c..28af3615 100644 --- a/alliance/src/rdscif/src/cif_parse.c +++ b/alliance/src/rdscif/src/cif_parse.c @@ -1166,7 +1166,7 @@ void CifCommandDefineDelete() ciferror( CIF_ERROR_SYMBOL_STARTED, NULL, CifLineCounter ); } - CifDelSymbol( CifGetUnsigned ); + CifDelSymbol( CifGetUnsigned() ); } /*------------------------------------------------------------\ diff --git a/alliance/src/ring/src/distance.c b/alliance/src/ring/src/distance.c index ea75e584..2e549e4d 100644 --- a/alliance/src/ring/src/distance.c +++ b/alliance/src/ring/src/distance.c @@ -181,7 +181,7 @@ PT_COORDONNEES existe_con_precalim(long x2, long y2, long w2, char l2, int face, PT_COORDONNEES coordalim = NULL; if (mode_debug) - printf("Existeprecalim x %ld y %ld face %d ptcoor %d\n\n", x2, y2, face, (int)liste_coor); + printf("Existeprecalim x %ld y %ld face %d ptcoor %ld\n\n", x2, y2, face, (long)liste_coor); switch (face) { case NORD: @@ -258,14 +258,14 @@ PT_COORDONNEES existe_con_suiv(long x1, long y1, long w1, char l1, PT_COORDONNEES coordalim = NULL; if (mode_debug) - printf("Existesuivalim x %ld y %ld face %d ptcoor %d\n\n", x1, y1, face, (int)liste_coor); + printf("Existesuivalim x %ld y %ld face %d ptcoor %ld\n\n", x1, y1, face, (long)liste_coor); switch (face) { case NORD: case SUD: while (NULL != liste_coor) { if (mode_debug) - printf("ptcoor %d proprio %d x %ld\n", (int) liste_coor, (int)liste_coor->proprio, liste_coor->xabs); + printf("ptcoor %;d proprio %;d x %ld\n", (long) liste_coor, (long)liste_coor->proprio, liste_coor->xabs); if (NULL != liste_coor->proprio) { con = ((LST_PSEUDO_CON)liste_coor->proprio); @@ -281,7 +281,7 @@ PT_COORDONNEES existe_con_suiv(long x1, long y1, long w1, char l1, coordalim = liste_coor; } if (mode_debug) - printf("ptcoordalim %d\n", (int) coordalim); + printf("ptcoordalim %ld\n", (long) coordalim); } liste_coor = liste_coor->suiv; @@ -295,7 +295,7 @@ PT_COORDONNEES existe_con_suiv(long x1, long y1, long w1, char l1, case OUEST: while (NULL != liste_coor) { if (mode_debug) - printf("ptcoor %d proprio %d x %ld\n", (int) liste_coor, (int)liste_coor->proprio, liste_coor->yabs); + printf("ptcoor %ld proprio %ld x %ld\n", (long) liste_coor, (long)liste_coor->proprio, liste_coor->yabs); if (NULL != liste_coor->proprio) { con = ((LST_PSEUDO_CON)liste_coor->proprio); @@ -311,7 +311,7 @@ PT_COORDONNEES existe_con_suiv(long x1, long y1, long w1, char l1, coordalim = liste_coor; } if (mode_debug) - printf("ptcoordalim %d\n", (int) coordalim); + printf("ptcoordalim %ld\n", (long) coordalim); } liste_coor = liste_coor->suiv; diff --git a/alliance/src/ring/src/lireplace.c b/alliance/src/ring/src/lireplace.c index f14225b7..8f22bd39 100644 --- a/alliance/src/ring/src/lireplace.c +++ b/alliance/src/ring/src/lireplace.c @@ -247,7 +247,7 @@ void fabrique_equipo(chain_list *nomplot[NB_FACES], COEUR lecoeur, while (con_coeur != NULL) { sig_coeur = con_coeur->SIG; /* un signal unique par connecteur */ if (mode_debug) - printf("pointeur Sigcoeur %d\n", (int) sig_coeur); + printf("pointeur Sigcoeur %ld\n", (long) sig_coeur); if (mode_debug) printf("*******NOM concoeur %s signal %ld*********\n", con_coeur->NAME, sig_coeur->INDEX); @@ -380,7 +380,7 @@ locon_list *existe_sig_plot(losig_list *sig_coeur, loins_list *plot, while (con_plot != NULL) { if (mode_debug) - printf("\tpointeur nom %d\n",(int)con_plot); + printf("\tpointeur nom %ld\n",(long)con_plot); sig_plot = con_plot->SIG; /* un signal unique par connecteur */ diff --git a/alliance/src/ring/src/posercircuit.c b/alliance/src/ring/src/posercircuit.c index 4a1dbba5..b4b3dce6 100644 --- a/alliance/src/ring/src/posercircuit.c +++ b/alliance/src/ring/src/posercircuit.c @@ -178,7 +178,7 @@ void poser_segments_eq(LST_EQUIPO equipo, COEUR lecoeur, lofig_list *circuit_lo) precseg = (LST_SEGMENT) lst_seg->DATA; - /*if (mode_debug) printf("pointeur ptprecseg %d face %d\n",(int) precseg,(int)precseg->face); */ + /*if (mode_debug) printf("pointeur ptprecseg %ld face %ld\n",(long) precseg,(long)precseg->face); */ if (VRAI_SEG == precseg->vraifaux) { switch (precseg->face) { @@ -268,8 +268,8 @@ void poser_vias_eq(LST_EQUIPO equipo, COEUR lecoeur, phfig_list *circuit_ph) } if (mode_debug) - printf("seg pt %d layer %d ptc1 %d ptc2 %d piste1 %ld piste2 %ld\n", (int) seg, (int)seg->layer, - (int)seg->c1, (int)seg->c2, seg->piste1, seg->piste2); + printf("seg pt %ld layer %ld ptc1 %ld ptc2 %ld piste1 %ld piste2 %ld\n", (long) seg, (long)seg->layer, + (long)seg->c1, (long)seg->c2, seg->piste1, seg->piste2); if (FAUX_SEG == seg->vraifaux) break; @@ -309,7 +309,7 @@ void poser_vias_eq(LST_EQUIPO equipo, COEUR lecoeur, phfig_list *circuit_ph) } if (mode_debug) - printf("seg pt %d layer %d x1 %ld y1 %ld x2 %ld y2 %ld\n", (int) seg, (int)seg->layer, x1, y1, x2, + printf("seg pt %ld layer %ld x1 %ld y1 %ld x2 %ld y2 %ld\n", (long) seg, (long)seg->layer, x1, y1, x2, y2); liste = lst_seg; @@ -358,7 +358,7 @@ void poser_vias_eq(LST_EQUIPO equipo, COEUR lecoeur, phfig_list *circuit_ph) } if (mode_debug) - printf("*seg2 pt %d layer %d x1 %ld y1 %ld x2 %ld y2 %ld\n", (int) seg2, (int)seg2->layer, + printf("*seg2 pt %ld layer %ld x1 %ld y1 %ld x2 %ld y2 %ld\n", (long) seg2, (long)seg2->layer, x1seg2, y1seg2, x2seg2, y2seg2); /* ------------------------------*/ @@ -523,7 +523,7 @@ void traite_equipo_ext(chain_list *nom_plot[NB_FACES], chain_list *liste_plotsph while (con_circuit != NULL) { sig_circuit = con_circuit->SIG; /* un signal unique par connecteur */ if (mode_debug) - printf("pointeur Sigcircuit %d\n", (int) sig_circuit); + printf("pointeur Sigcircuit %ld\n", (long) sig_circuit); if (mode_debug) printf("*******NOM concircuit %s signal %ld*********\n", con_circuit->NAME, sig_circuit->INDEX); @@ -868,8 +868,8 @@ void poser_vias_visavisalim(LST_EQUIPO equipo, COEUR lecoeur, } if (mode_debug) - printf("seg pt %d layer %d ptc1 %d ptc2 %d piste1 %ld piste2 %ld\n", (int) seg, (int)seg->layer, - (int)seg->c1, (int)seg->c2, seg->piste1, seg->piste2); + printf("seg pt %ld layer %ld ptc1 %ld ptc2 %ld piste1 %ld piste2 %ld\n", (long) seg, (long)seg->layer, + (long)seg->c1, (long)seg->c2, seg->piste1, seg->piste2); if (FAUX_SEG == seg->vraifaux) break; @@ -926,7 +926,7 @@ void poser_vias_visavisalim(LST_EQUIPO equipo, COEUR lecoeur, } if (mode_debug) - printf("seg pt %d layer %d x1 %ld y1 %ld x2 %ld y2 %ld\n", (int) seg, (int)seg->layer, x1, y1, x2, + printf("seg pt %ld layer %ld x1 %ld y1 %ld x2 %ld y2 %ld\n", (long) seg, (long)seg->layer, x1, y1, x2, y2); liste = lst_seg; @@ -974,7 +974,7 @@ void poser_vias_visavisalim(LST_EQUIPO equipo, COEUR lecoeur, } if (mode_debug) - printf("*seg2 pt %d layer %d x1 %ld y1 %ld x2 %ld y2 %ld\n", (int) seg2, (int)seg2->layer, + printf("*seg2 pt %ld layer %ld x1 %ld y1 %ld x2 %ld y2 %ld\n", (long) seg2, (long)seg2->layer, x1seg2, y1seg2, x2seg2, y2seg2); /* ----------------------------- */ diff --git a/alliance/src/ring/src/routage.c b/alliance/src/ring/src/routage.c index 9a0a818d..88d5874f 100644 --- a/alliance/src/ring/src/routage.c +++ b/alliance/src/ring/src/routage.c @@ -330,8 +330,8 @@ void construit_couronne(long piste_cour[NB_FACES], long piste_infalim[NB_FACES], break; } if (mode_debug) - printf("construit cour face %d debutcoorx %ld nouveaucoin x %ld debpt %d coinpt%d\n", - (int)prec_con->face, debut_coor->xabs, nouveaucoin->xabs, (int)debut_coor, (int)nouveaucoin); + printf("construit cour face %ld debutcoorx %ld nouveaucoin x %ld debpt %ld coinpt%ld\n", + (long)prec_con->face, debut_coor->xabs, nouveaucoin->xabs, (long)debut_coor, (long)nouveaucoin); } /* fin du if */ else { @@ -362,12 +362,12 @@ void construit_couronne(long piste_cour[NB_FACES], long piste_infalim[NB_FACES], change_face = 0; if (mode_debug) - printf("prec-con-pt %d\n", (int)prec_con); + printf("prec-con-pt %ld\n", (long)prec_con); while ((NULL != lst_proj) && (!change_face)) { con = (LST_PSEUDO_CON)((PT_COORDONNEES)lst_proj->DATA)->proprio; if (mode_debug) - printf("con-pt %d\n", (int)con); + printf("con-pt %ld\n", (long)con); change_face = prec_con->face != con->face; if (!change_face) { prec_con = con; @@ -495,8 +495,8 @@ void construit_couronne(long piste_cour[NB_FACES], long piste_infalim[NB_FACES], } /* fin du else */ if (mode_debug) - printf("construit cour face %d debutcoorx %ld coin x %ld debpt %d coinpt%d\n", (int)prec_con->face, - debut_coor->xabs, coin->xabs, (int)debut_coor, (int)coin); + printf("construit cour face %ld debutcoorx %ld coin x %ld debpt %ld coinpt%ld\n", (long)prec_con->face, + debut_coor->xabs, coin->xabs, (long)debut_coor, (long)coin); } /* fin du 1er while */ diff --git a/alliance/src/ring/src/struct.c b/alliance/src/ring/src/struct.c index 58e2f64c..e838422d 100644 --- a/alliance/src/ring/src/struct.c +++ b/alliance/src/ring/src/struct.c @@ -830,7 +830,7 @@ LST_EQUIPO lst_equipo; } if (mode_debug) - printf("INSNAME %s face %d ptcon %d\n", ((loins_list * ) (con->con_lo)->ROOT)->INSNAME, (int)face, (int)con); + printf("INSNAME %s face %ld ptcon %ld\n", ((loins_list * ) (con->con_lo)->ROOT)->INSNAME, (long)face, (long)con); if (tab_coeur[face] == NULL) { if (mode_debug) diff --git a/alliance/src/ring/src/struct.h b/alliance/src/ring/src/struct.h index 65739911..edaa217a 100644 --- a/alliance/src/ring/src/struct.h +++ b/alliance/src/ring/src/struct.h @@ -379,9 +379,9 @@ extern void alloue_etchaine_segment(); extern int segment_libre(); extern void affic_listeseg(); extern phcon_list *cherche_conph_circuit(); -extern int croisement_con_alim(); +extern long croisement_con_alim(); extern void largeur_vddvss(); -extern int croisementok_alimequi(); +extern long croisementok_alimequi(); extern long compte_nbplotsface(); #endif /* __STRUCT_H */ diff --git a/alliance/src/ring/src/struct2.c b/alliance/src/ring/src/struct2.c index 3c0dc573..85acf180 100644 --- a/alliance/src/ring/src/struct2.c +++ b/alliance/src/ring/src/struct2.c @@ -322,7 +322,7 @@ GRILLE grille[NB_FACES]; lp = grille[face].lst_pas; while (lp != NULL) { - printf("x %5ld ----- y %5ld proprio %d\n", (lp)->xabs, (lp)->yabs, (int)lp->proprio); + printf("x %5ld ----- y %5ld proprio %ld\n", (lp)->xabs, (lp)->yabs, (long)lp->proprio); if (lp->suiv == NULL) der = lp; lp = lp->suiv; @@ -631,8 +631,8 @@ LST_EQUIPO equipo; } if (mode_debug) - printf("alloue et chaine face %d c1x %ld c2 x %ld c1pt %d c2pt%d\n", (int)face, seg->c1->xabs, seg->c2->xabs, - (int)seg->c1, (int)seg->c2); + printf("alloue et chaine face %ld c1x %ld c2 x %ld c1pt %ld c2pt%ld\n", (long)face, seg->c1->xabs, seg->c2->xabs, + (long)seg->c1, (long)seg->c2); seg->largeur = largeur; seg->layer = layer; @@ -741,7 +741,7 @@ char layer; long aux; /* - if (mode_debug) printf("SEGMENT LIBRE tabseg %d listeseg %d\n",(int) tab_seg, (int) liste_seg); + if (mode_debug) printf("SEGMENT LIBRE tabseg %ld listeseg %ld\n",(long) tab_seg, (long) liste_seg); */ /* on classe les colonnes et les pistes */ @@ -885,7 +885,7 @@ LST_SEGMENT tab_seg[NB_FACES]; /* printf("PAR DERRIERE\n"); while (der) { printf("face %d x1 %5ld y1 %5ld x2 %5ld y2 %5ld ---- piste1 %3ld piste2 %3ld --- larg %3ld layer %d \n", - der->face,der->c1->xabs,der->c1->yabs,der->c2->xabs,der->c2->yabs,der->piste1,der->piste2,der->largeur,(int)der->layer); + der->face,der->c1->xabs,der->c1->yabs,der->c2->xabs,der->c2->yabs,der->piste1,der->piste2,der->largeur,(long)der->layer); der = der->prec; } */ @@ -938,7 +938,7 @@ phfig_list *circuit_ph; /*-----------------------------------------------------------------------------------*/ -int croisement_con_alim(ptcoor, concoeur, ptalim) +long croisement_con_alim(ptcoor, concoeur, ptalim) PT_COORDONNEES ptcoor; LST_PSEUDO_CON concoeur; chain_list *ptalim; @@ -950,7 +950,7 @@ chain_list *ptalim; int i, nbcolatrouver; if (mode_debug) - printf("\tCroisement con avec alim %s larg %ld face %d x %ld y %ld\n", concoeur->nom_con, concoeur->largeur, + printf("\tCroisement con avec alim %s larg %ld face %ld x %ld y %ld\n", concoeur->nom_con, concoeur->largeur, concoeur->face, ptcoor->xabs, ptcoor->yabs); nbcolatrouver = (concoeur->largeur + pitch) / (2 * pitch); @@ -963,7 +963,7 @@ chain_list *ptalim; if ((NULL != lst_coor) && (NULL == lst_coor->proprio)) lst_coor = lst_coor->suiv; else - return ((int) 1); + return ((long) 1); } lst_coor = ptcoor->prec; @@ -971,7 +971,7 @@ chain_list *ptalim; if ((NULL != lst_coor) && (NULL == lst_coor->proprio)) lst_coor = lst_coor->prec; else - return ((int) 1); + return ((long) 1); } switch (concoeur->face) { @@ -1011,16 +1011,16 @@ chain_list *ptalim; con->nom_con, position, diff, con->largeur); if (diff < 0) - return((int) -diff); + return((long) -diff); if (diff < dminmetalmetal) - return ((int) pitch); + return ((long) pitch); } ptalim = ptalim->NEXT; } - return((int) 0); + return((long) 0); } /*-----------------------------------------------------------------------------------------*/ @@ -1105,7 +1105,7 @@ long *largvdd, *largvss; /* si testlayer =0 */ /*-----------------------------------------------------------------------------------*/ -int croisementok_alimequi(concoeur, ptalim, testlayer) +long croisementok_alimequi(concoeur, ptalim, testlayer) LST_PSEUDO_CON concoeur; chain_list *ptalim; char testlayer; @@ -1115,7 +1115,7 @@ char testlayer; char metalcol = 0; if (mode_debug) - printf("\tCroisement con avec alim equi %s larg %ld face %d x %ld y %ld\n", concoeur->nom_con, concoeur->largeur, + printf("\tCroisement con avec alim equi %s larg %ld face %ld x %ld y %ld\n", concoeur->nom_con, concoeur->largeur, concoeur->face, concoeur->coord->xabs, concoeur->coord->yabs); switch (concoeur->face) { @@ -1147,32 +1147,32 @@ char testlayer; } if (mode_debug) - printf("\tCroisement conplot avec alim equi %s larg %ld face %d position%ld\n", con->nom_con, + printf("\tCroisement conplot avec alim equi %s larg %ld face %ld position%ld\n", con->nom_con, con->largeur, con->face, position); if (position < positioncour) { if (((position + con->largeur / 2) >= positioncour) && ((con->layer == metalcol) || (testlayer)) ) { if (mode_debug) printf("croisement trouve\n"); - return((int) 1); + return((long) 1); } } else if (position > positioncour) { if (((position - con->largeur / 2) <= positioncour) && ((con->layer == metalcol) || (testlayer)) ) { if (mode_debug) printf("croisement trouve\n"); - return((int) 1); + return((long) 1); } } else if ((con->layer == metalcol) || (testlayer)) { if (mode_debug) printf("croisement trouve\n"); - return ((int) 1); + return ((long) 1); } } ptalim = ptalim->NEXT; } - return((int) 0); + return((long) 0); } /*----------------------------------------------------------------------------------*/ diff --git a/alliance/src/rtd/src/rtd_error.h b/alliance/src/rtd/src/rtd_error.h index 154d4618..428291e4 100644 --- a/alliance/src/rtd/src/rtd_error.h +++ b/alliance/src/rtd/src/rtd_error.h @@ -46,6 +46,8 @@ # ifndef RTD_ERROR_H # define RTD_ERROR_H +# include + /*------------------------------------------------------------\ | | | Constants | diff --git a/alliance/src/rtn/src/rtnerror.h b/alliance/src/rtn/src/rtnerror.h index 6130baac..48fb7be4 100644 --- a/alliance/src/rtn/src/rtnerror.h +++ b/alliance/src/rtn/src/rtnerror.h @@ -46,6 +46,8 @@ # ifndef RTL_ERROR_H # define RTL_ERROR_H +# include + /*------------------------------------------------------------\ | | | Constants | diff --git a/alliance/src/s2r/src/hash.c b/alliance/src/s2r/src/hash.c index 772c9edd..71975886 100644 --- a/alliance/src/s2r/src/hash.c +++ b/alliance/src/s2r/src/hash.c @@ -36,15 +36,15 @@ static int primes[] = { void htremove (ht_t * htable) { - int i; - for (i = 1; i < (int)htable[0]; i++) + long i; + for (i = 1; i < (long)htable[0]; i++) freechain (htable[i]); free (htable); } -ht_t *htinit (int size) +ht_t *htinit (long size) { - int i; + long i; ht_t *htable; /* prend le premier nombre premier au dela de size */ @@ -64,12 +64,12 @@ ht_t *htinit (int size) return htable; } -static int hash (ht_t * htable, char *key) +static long hash (ht_t * htable, char *key) { - int alveole = 0; - int length = strlen (key); - int segment; - int l; + long alveole = 0; + long length = strlen (key); + long segment; + long l; if ((key == NULL) || (length == 0)) { @@ -81,13 +81,13 @@ static int hash (ht_t * htable, char *key) segment = 0xFFFF & ((key[l] << 8) | key[l + 1]); alveole = alveole ^ ((segment << 1) | (segment >> 15)); } - alveole %= (int) htable[0]; /* htable[0] == la taille de la table */ + alveole %= (long) htable[0]; /* htable[0] == la taille de la table */ return (alveole + 1); /* +1 car on ne doit rien mettre dans case 0 */ } chain_list *htget (ht_t * htable, char *key) { - int alveole = hash (htable, key); + long alveole = hash (htable, key); chain_list *p; for (p = htable[alveole]; p && strcmp (p->DATA, key); p = p->NEXT); @@ -96,7 +96,7 @@ chain_list *htget (ht_t * htable, char *key) chain_list *htset (ht_t * htable, char *key) { - int alveole = hash (htable, key); + long alveole = hash (htable, key); chain_list *p; for (p = htable[alveole]; p && strcmp (p->DATA, key); p = p->NEXT); diff --git a/alliance/src/s2r/src/hash.h b/alliance/src/s2r/src/hash.h index 2928fc5e..8b52180b 100644 --- a/alliance/src/s2r/src/hash.h +++ b/alliance/src/s2r/src/hash.h @@ -29,7 +29,7 @@ typedef chain_list *ht_t; /* def d'1 table de hachage table de htele_t */ -extern ht_t *htinit (int size); +extern ht_t *htinit (long size); extern void htremove (ht_t * htable); extern chain_list *htset (ht_t * htable, char *key); extern chain_list *htget (ht_t * htable, char *key); diff --git a/alliance/src/scl/src/scgmain.c b/alliance/src/scl/src/scgmain.c index ef9ff892..15195a2b 100644 --- a/alliance/src/scl/src/scgmain.c +++ b/alliance/src/scl/src/scgmain.c @@ -45,6 +45,7 @@ # include "scl.h" # include +# include # include "scg.h" # include "scgmain.h" diff --git a/alliance/src/scl/src/schdel.c b/alliance/src/scl/src/schdel.c index 1ca856fe..89e301c4 100644 --- a/alliance/src/scl/src/schdel.c +++ b/alliance/src/scl/src/schdel.c @@ -212,8 +212,8 @@ int delschfig( Name ) loc_delschcon( Figure->CON_IN ); loc_delschcon( Figure->CON_OUT ); - loc_delschnet( Figure->CON_OUT ); - loc_delschbox( Figure->CON_OUT ); + loc_delschnet( Figure->NET ); + loc_delschbox( Figure->BOX ); freeschfig( Figure ); diff --git a/alliance/src/syf/src/syf_error.c b/alliance/src/syf/src/syf_error.c index f47cc6ee..5a2e9153 100644 --- a/alliance/src/syf/src/syf_error.c +++ b/alliance/src/syf/src/syf_error.c @@ -103,7 +103,7 @@ void SyfDisplayError( File, Line, Error, Text ) fprintf( stderr, "Missing scan-port declaration in figure \"%s\"\n", Text ); break; case SYF_ERROR_UNKNOWN_ENCODE_TYPE : - fprintf( stderr, "Unknown encode type \"%c\"\n", (int)Text ); + fprintf( stderr, "Unknown encode type \"%c\"\n", (char)((long)Text) ); break; case SYF_ERROR_BAD_STACK_NO_PUSH : fprintf( stderr, "Bad stack, no \"push\" in figure \"%s\"\n", Text ); diff --git a/alliance/src/vbl/src/main.c b/alliance/src/vbl/src/main.c index ed35e517..0b5454c8 100644 --- a/alliance/src/vbl/src/main.c +++ b/alliance/src/vbl/src/main.c @@ -33,7 +33,7 @@ # include "vbl.h" # ifdef VBL_DEBUG - extern int vbl_y_debug; + extern long vbl_y_debug; # endif /*------------------------------------------------------------\ diff --git a/alliance/src/vbl/src/vbl_bcomp_l.l b/alliance/src/vbl/src/vbl_bcomp_l.l index f615304a..f5ca2eb3 100644 --- a/alliance/src/vbl/src/vbl_bcomp_l.l +++ b/alliance/src/vbl/src/vbl_bcomp_l.l @@ -55,7 +55,7 @@ vbl_name; struct g_type { - int VALU; + long VALU; char FLAG; }; @@ -168,19 +168,19 @@ static el_mc tab_mc []= }; -static int find_mc(s) +static long find_mc(s) char *s; { char loc[512]; - int l; + long l; el_mc *pt; l=strlen(s); strcpy(loc,s); while(l--) loc[l]=tolower(loc[l]); /* conversion en minuscules */ pt= (el_mc *) bsearch(loc, (char *)tab_mc,VBL_NB_MC,sizeof(el_mc), - (int (*)(const void *, const void *)) strcmp); + (long (*)(const void *, const void *)) strcmp); if (pt==NULL) return(-1); return(pt->kval); @@ -243,7 +243,7 @@ base_specifier (B|b|O|o|X|x) \/ { return(Slash); } {letter}(_?{letter_or_digit})* { - int itoken; + long itoken; itoken=find_mc(yytext); if (itoken== -1) { @@ -256,7 +256,7 @@ base_specifier (B|b|O|o|X|x) } } ({decimal_literal})|({base}#{based_integer}(\.{based_integer})?#({exponent})?)|({base}:{based_integer}(\.{based_integer})?:({exponent})?) { - yylval.text = mbkalloc((unsigned int)strlen(yytext)+1); + yylval.text = mbkalloc((unsigned long)strlen(yytext)+1); strcpy(yylval.text,yytext); return ( AbstractLit ); } diff --git a/alliance/src/vbl/src/vbl_bcomp_y.y b/alliance/src/vbl/src/vbl_bcomp_y.y index 45a4d8ac..2434a1c0 100644 --- a/alliance/src/vbl/src/vbl_bcomp_y.y +++ b/alliance/src/vbl/src/vbl_bcomp_y.y @@ -47,9 +47,9 @@ #if 1 # define my_fprintf fprintf( stdout, "%s %d : ", basename(__FILE__), __LINE__ ); fprintf # define my_vbl_error(N,V) \ - do { fprintf( stderr, "%s %d : ", basename(__FILE__), __LINE__); vbl_error(N,V); } while(0) + do { fprintf( stderr, "%s %d : ", basename(__FILE__), __LINE__); vbl_error( (long)N, (char *)V); } while(0) # define my_vbl_warning(N,V) \ - do { fprintf( stderr, "%s %d : ", basename(__FILE__), __LINE__); vbl_warning(N,V); } while(0) + do { fprintf( stderr, "%s %d : ", basename(__FILE__), __LINE__); vbl_warning((long)N, (char *)V); } while(0) #else # define my_fprintf fprintf # define my_vbl_error vbl_error @@ -63,7 +63,7 @@ %} %union { - int valu; + long valu; char *text; chain_list *pcha; vbl_name name; @@ -496,13 +496,13 @@ package_declaration chain_list *ScanChain; char *Name; char **FuncArray; - int Index; + long Index; long Left; long Right; long AttrLeft; long AttrRight; long Dir; - int Signed; + long Signed; vbcst_list *VbhCst; vbaux_list *VbhAux; vbmod_list *VbhMod; @@ -519,7 +519,7 @@ package_declaration extern char *vbl_func_std_logic_arith[]; extern char *vbl_func_std_numeric_std[]; - int size=0; + long size=0; struct vbtyp *vbtyp_pnt; VBL_BEFPNT->NAME = $2; VBL_BEFPNT->IS_PACKAGE = 1; @@ -989,7 +989,7 @@ component_instantiation_statement vbpor_list *VbPor; vbins_list *VbIns; vbmap_list *VbMap; - int Explicit; + long Explicit; VbMod = (vbmod_list *)chktab(hshtab,$2.NAME,VBL_MODNAM,VBL_PNTDFN); VbIns = VBL_BEINS; @@ -1318,8 +1318,8 @@ association_element long in_bound; long out_bound; unsigned char dynamic; - int mode; - int flag; + long mode; + long flag; VBL_COMPNAM = VBL_SAVCOMPNAM; VBL_SAVCOMPNAM = (char *)0; @@ -1423,7 +1423,7 @@ association_element } { - int type; + long type; expr1.IDENT = $1.NAME; type = chktab(hshtab,$1.NAME,LocalName,VBL_TYPDFN); @@ -1830,7 +1830,7 @@ attribute_specification Semicolon_ERR { char Buffer[ 512 ]; - int length; + long length; length = strlen( $9 ); @@ -1907,13 +1907,13 @@ entity_declaration chain_list *ScanChain; char *Name; char **FuncArray; - int Index; + long Index; long Left; long Right; long AttrLeft; long AttrRight; long Dir; - int Signed; + long Signed; vbcst_list *VbhCst; vbaux_list *VbhAux; vbmod_list *VbhMod; @@ -1930,7 +1930,7 @@ entity_declaration extern char *vbl_func_std_logic_arith[]; extern char *vbl_func_std_numeric_std[]; - int size=0; + long size=0; struct vbtyp *vbtyp_pnt; VBL_BEFPNT->NAME = $2; VBL_MODNAM = $2; @@ -2345,8 +2345,8 @@ range { long Left; long Right; - int ErrorL; - int ErrorR; + long ErrorL; + long ErrorR; ErrorL = vbl_vextonum( $1.VEX, &Left ); ErrorR = vbl_vextonum( $3.VEX, &Right ); @@ -2818,7 +2818,7 @@ procedure_parameter_element char *codedsigname; char buffer[ 128 ]; vbtyp_list *TypeEnum; - int EnumSize; + long EnumSize; vbarg_list *VbPar; short Signed; long Left; @@ -3039,7 +3039,7 @@ function_parameter_element char *codedsigname; char buffer[ 128 ]; vbtyp_list *TypeEnum; - int EnumSize; + long EnumSize; vbarg_list *VbPar; short Signed; long Left; @@ -3239,7 +3239,7 @@ subprogram_specification : PROCEDURE designator { - int Mode; + long Mode; VBL_FUNCNAM = $2; @@ -3275,7 +3275,7 @@ subprogram_specification | FUNCTION designator { - int Mode; + long Mode; VBL_FUNCNAM = $2; @@ -3310,7 +3310,7 @@ subprogram_specification long Right; long AttrLeft; long AttrRight; - int EnumSize; + long EnumSize; vbtyp_list *VbType; vexexpr *VexRet; @@ -3608,7 +3608,7 @@ variable_declaration char *codedsigname; char buffer[ 128 ]; vbtyp_list *TypeEnum; - int EnumSize; + long EnumSize; vbvar_list *VbVar; short Signed; long Left; @@ -3830,7 +3830,7 @@ signal_declaration long Right; long AttrLeft; long AttrRight; - int EnumSize; + long EnumSize; vbaux_list *VbAux; vexexpr *VexInit; struct vbl_expr expr1; @@ -4101,7 +4101,7 @@ subtype_indication { struct vbtyp *vbtyp_pnt; struct vbfun *vbfun_pnt; - int mode; + long mode; mode = chktab(hshtab,$1,VBL_MODNAM,VBL_SYMDFN); @@ -4183,9 +4183,9 @@ enumeration_type_definition char buffer[ 128 ]; char *enumname; char *enumval; - int size; - int indice; - int numbit; + long size; + long indice; + long numbit; char **pnt; chain_list *nm1lst; @@ -4376,7 +4376,7 @@ index_subtype_definition if ( ( $$.TYPE == 0 ) || ( $$.FLAG == 0 ) ) { - my_vbl_error(83,$1); + my_vbl_error(83,$1.NAME); } } ; @@ -4406,7 +4406,7 @@ type_mark simple_name { vbtyp_list *VbType; - int type; + long type; $$.NAME = $1; $$.LEFT = -1; $$.RIGHT = -1; @@ -4550,10 +4550,10 @@ unlabeled_conditional_signal_assignment long Index; vbl_vexstr *ExprCnd; vbl_vexstr *ExprVal; - int ProcessType; - int Type; - int Mode; - int Width; + long ProcessType; + long Type; + long Mode; + long Width; long Left; long Right; long Left_bnd; @@ -4858,16 +4858,16 @@ unlabeled_selected_signal_assignment vexexpr *VexTarget; vexexpr *VexGuard; char *Value; - int SizeValue; - int NumberChoice; - int Type; - int Mode; + long SizeValue; + long NumberChoice; + long Type; + long Mode; long Left; long Right; long Left_bnd; long Right_bnd; long Line; - int ProcessType; + long ProcessType; unsigned char Dynamic; if ( $5.AGGREG ) @@ -5462,7 +5462,7 @@ unlabeled_loop_statement .iteration_scheme. : /*empty*/ { - $$ = vbl_crtvex( EMPTYOP,NULL ,NULL ,-1,-1,0); + $$ = vbl_crtvex( EMPTYOP,VBL_EMPSTR ,VBL_EMPSTR ,-1,-1,0); } | iteration_scheme { @@ -5540,7 +5540,7 @@ sensitivity_clause .condition_clause. : /*empty*/ - { $$ = vbl_crtvex (EMPTYOP ,NULL ,NULL ,-1,-1,0); } + { $$ = vbl_crtvex (EMPTYOP ,VBL_EMPSTR ,VBL_EMPSTR ,-1,-1,0); } | condition_clause { $$ = $1; @@ -5689,9 +5689,9 @@ variable_assignment_statement expression Semicolon_ERR { - unsigned int type; + unsigned long type; char *codedsigname; - int mode; + long mode; long left ,right; long left_bnd ,right_bnd; char buffer[128]; @@ -5880,8 +5880,8 @@ signal_assignment_statement waveform Semicolon_ERR { - unsigned int type; - int mode; + unsigned long type; + long mode; char buffer[128]; char *codedsigname; char *LocalName; @@ -6170,9 +6170,9 @@ case_statement CASE Semicolon_ERR { - unsigned int size=0; - unsigned int *size1; - int indice=0; + unsigned long size=0; + unsigned long *size1; + long indice=0; struct choice_chain *ch; struct vbcho **pnt; struct vbcho *tab; @@ -6210,7 +6210,7 @@ case_statement tab[indice++].VALUES = addchain( NULL, namealloc("others") ); } (*pnt) = tab; - size1 = (unsigned int*) VBL_INSLST->DATA; + size1 = (unsigned long*) VBL_INSLST->DATA; *size1 = size; VBL_INSLST = delchain(VBL_INSLST,VBL_INSLST); } @@ -6245,7 +6245,7 @@ case_statement_alternative { struct choice_chain *NewChoice; char *Value; - int Length; + long Length; NewChoice = (struct choice_chain*)autallocblock(sizeof(struct choice_chain)); NewChoice->VALUES = (chain_list *)0; @@ -6350,13 +6350,13 @@ choice | name { vexexpr *VexCst; - int left; - int right; - int in_bound; - int out_bound; - int left_bnd; - int right_bnd; - int sig_conf; + long left; + long right; + long in_bound; + long out_bound; + long left_bnd; + long right_bnd; + long sig_conf; if ( ( $1.NAME[0] == '"' ) || ( $1.NAME[0] == '\'') ) { @@ -6560,7 +6560,7 @@ simple_expression term { if ( $1 == VEX_NEG ) { - $$ = vbl_crtvex( VEX_NEG,$2,NULL,-1,-1,0); + $$ = vbl_crtvex( VEX_NEG,$2,VBL_EMPSTR,-1,-1,0); } else { @@ -6674,8 +6674,8 @@ primary long right_bnd; long in_bound; long out_bound; - int mode; - int flag; + long mode; + long flag; unsigned char dynamic; flag = $1.FLAG; @@ -6836,7 +6836,7 @@ primary else \*/ { - int type; + long type; expr1.IDENT = $1.NAME; type = chktab(hshtab,$1.NAME,LocalName,VBL_TYPDFN); @@ -7156,7 +7156,7 @@ indexed_name vexexpr *VexExpr; vexexpr *VexRet; long Index; - int Error; + long Error; long Def; ScanChain = $2; @@ -7323,8 +7323,8 @@ slice_name char *LocalName; long Left; long Right; - int ErrorL; - int ErrorR; + long ErrorL; + long ErrorR; if ( chktab(hshtab,$1,VBL_FUNCNAM,VBL_SYMDFN ) ) { @@ -7380,9 +7380,9 @@ attribute_name attribute_designator { char *LocalName; - int type; - int flag; - int mode; + long type; + long flag; + long mode; long AttrLeft; long AttrRight; long AttrLow; @@ -7421,7 +7421,7 @@ attribute_name ( flag == VBL_EVENT ) ) { if ( LocalName != VBL_MODNAM ) - my_vbl_error (79,$1); + my_vbl_error (79,$1.NAME); } else { @@ -7609,7 +7609,7 @@ char *key; { struct dct_entry *entry; - int i; + long i; if (VBL_DCEHED == NULL) { @@ -7642,7 +7642,7 @@ char *key; { struct dct_recrd *recrd; - int i; + long i; if (VBL_DCRHED == NULL) { @@ -7682,7 +7682,7 @@ static struct dct_entry **initab () { struct dct_entry **head; - int i; + long i; head = (struct dct_entry **) autallocblock (sizeof(struct dct_entry *) * VBL_HSZDFN); @@ -7783,7 +7783,7 @@ long valu; } -static int chktab (head,key_str,ctx_str,field) +static long chktab (head,key_str,ctx_str,field) struct dct_entry **head; char *key_str; @@ -7904,7 +7904,7 @@ struct dct_entry **pt_hash; static void *vbl_addstr(object,mode,prtype,type,flag,name,left,right,exp,kind,dynamic) char object; -int mode; +long mode; vbtyp_list *prtype; unsigned char type; char flag; @@ -7931,7 +7931,7 @@ unsigned char dynamic; char genmodflg = 0; char lclmod = 'X'; vexexpr *vex_pnt; - int bitsize; + long bitsize; switch (object) { @@ -8300,7 +8300,7 @@ static vbtyp_list *val_type(name) static vbtyp_list *get_type(val) - int val; + long val; { vbtyp_list *Type; diff --git a/alliance/src/vbl/src/vbl_blex.h b/alliance/src/vbl/src/vbl_blex.h index cf956417..251c2f31 100644 --- a/alliance/src/vbl/src/vbl_blex.h +++ b/alliance/src/vbl/src/vbl_blex.h @@ -42,6 +42,6 @@ extern long VBL_LINNUM; /* file's line number */ typedef struct { char nom[VBL_LG_MC]; - int kval; + long kval; } el_mc; diff --git a/alliance/src/vbl/src/vbl_bspec.c b/alliance/src/vbl/src/vbl_bspec.c index 0d90c93a..5fcff5ed 100644 --- a/alliance/src/vbl/src/vbl_bspec.c +++ b/alliance/src/vbl/src/vbl_bspec.c @@ -35,7 +35,7 @@ #include "vbl_bedef.h" #include "vbl_bspec.h" -static int VblEvalError = 0; +static long VblEvalError = 0; /* ###--------------------------------------------------------------### */ /* function : vbl_stostr */ @@ -49,8 +49,8 @@ char *str; { char *resstr; - int i; - int j=0; + long i; + long j=0; resstr = (char *)mbkalloc(100); resstr[0] = '\0'; @@ -89,9 +89,7 @@ char *str; /* vbl_error , addchain , freechain */ /* ###--------------------------------------------------------------### */ -vbtyp_list *vbl_getbasetype( type ) - - int type; +vbtyp_list *vbl_getbasetype( long type ) { vbtyp_list *ScanType; @@ -113,12 +111,12 @@ vbtyp_list *vbl_getbasetype( type ) return( ScanType ); } -vexexpr *vbl_dynamicvexatom( Name, Left, Right, Dynamic ) +vexexpr *vbl_dynamicvexatom( - char *Name; - long Left; - long Right; - unsigned char Dynamic; + char *Name, + long Left, + long Right, + unsigned char Dynamic ) { vexexpr *Result; @@ -146,19 +144,19 @@ vexexpr *vbl_dynamicvexatom( Name, Left, Right, Dynamic ) } -vbl_vexstr vbl_crtvex( oper, expr1, expr2, left, right, dynamic ) +vbl_vexstr vbl_crtvex( -short oper; -vbl_vexstr expr1; -vbl_vexstr expr2; -long left; -long right; -unsigned char dynamic; +short oper, +vbl_vexstr expr1, +vbl_vexstr expr2, +long left, +long right, +unsigned char dynamic ) { char name[128]; vbl_vexstr result; char lcl_buffer[128]; - int Length; + long Length; vbtyp_list *BaseType1; vbtyp_list *BaseType2; vbtyp_list *VbhType; @@ -543,7 +541,7 @@ unsigned char dynamic; vbl_toolbug (4,"vbl_crtvex","arithmetic operators",0); else { - int Width; + long Width; result.VEX = createvexbinexpr( oper, 1, expr1.VEX, expr2.VEX ); @@ -669,7 +667,7 @@ long vbl_bintonum(str) char* str; { - int res,i=0; + long res,i=0; res = 0; while(str[i]) @@ -686,8 +684,7 @@ char* str; /* description : transform a ENUMERATE */ /* in a string of '0' and '1's */ /* ###--------------------------------------------------------------### */ -char *vbl_numtobin(num) -long num; +char *vbl_numtobin( long num ) { char val[256]; @@ -712,9 +709,7 @@ long num; /* store a user-type value, given the scope width */ /*------------------------------------------------------------*/ -int vbl_codeSize( Size ) - - long Size; +long vbl_codeSize( long Size ) { return( getvexintnumbit( Size ) ); } @@ -724,10 +719,7 @@ int vbl_codeSize( Size ) /* store an integer value, given the left and right */ /*------------------------------------------------------------*/ -int vbl_intSize( Left, Right ) - - long Left; - long Right; +long vbl_intSize( long Left, long Right ) { return( getvexintervalnumbit( Left, Right ) ); } @@ -738,14 +730,14 @@ int vbl_intSize( Left, Right ) /* description : transform a ENUMERATE */ /* in a string of '0' and '1' and '-' */ /* ###--------------------------------------------------------------### */ -char *vbl_enumbitstring(num,size,numbit) -int num; -int size; -int numbit; +char *vbl_enumbitstring( +long num, +long size, +long numbit ) { char val[40]; - int i; + long i; long shiftnum; long sup_bound; /* (1 << (numbit-1)) */ long inf_bound; /* size & ~(1 << (numbit-1)) */ @@ -801,18 +793,18 @@ long j, k; return s; } -int vbl_tobin (trg,src,left,right) +long vbl_tobin ( -char *trg; -char *src; -int left; -int right; +char *trg, +char *src, +long left, +long right ) { char base; - int indx; - int j = 0; - int type = -1; + long indx; + long j = 0; + long type = -1; char lcl_trg[256]; unsigned long Value; unsigned long Mask; @@ -1159,10 +1151,7 @@ static long vbl_vexeval( Vex ) return( Value ); } -int vbl_vextonum( Vex, PValue ) - - vexexpr *Vex; - long *PValue; +long vbl_vextonum( vexexpr *Vex, long *PValue ) { VblEvalError = 0; *PValue = vbl_vexeval( Vex ); diff --git a/alliance/src/vbl/src/vbl_bspec.h b/alliance/src/vbl/src/vbl_bspec.h index 20903725..88af9f5b 100644 --- a/alliance/src/vbl/src/vbl_bspec.h +++ b/alliance/src/vbl/src/vbl_bspec.h @@ -40,7 +40,7 @@ typedef struct vbl_expr char *IDENT; /* identifier or constant name */ vexexpr *VEX; /* pointer on bvl_abllst list */ short TYPE; - int WIDTH; /* width of bit vector */ + long WIDTH; /* width of bit vector */ char SIGNED; char AGGREG; } @@ -61,7 +61,7 @@ vbl_name; struct g_type { - int VALU; + long VALU; char FLAG; }; @@ -69,7 +69,7 @@ struct choice_chain { struct choice_chain* NEXT; chain_list *VALUES; - unsigned int SIZE; + unsigned long SIZE; struct ptype *INSTRUCTION; }; @@ -79,15 +79,16 @@ extern struct vbfig *VBL_HEADFIG; extern struct vbmap *VBL_GENMAP; -extern vbl_vexstr vbl_crtvex (); -extern char *vbl_numtobin (); -extern char *vbl_enumbitstring(); -extern int vbl_codeSize(); -extern vexexpr *vbl_dynamicvexatom(); -extern int vbl_intSize(); -extern int vbl_vextonum(); -extern vbtyp_list *vbl_getbasetype(); - extern void vbl_error(); - extern void vbl_warning(); - extern int vbl_tobin(); +extern vbl_vexstr vbl_crtvex( short oper, vbl_vexstr expr1, vbl_vexstr expr2, + long left, long right, unsigned char dynamic ); +extern char *vbl_numtobin( long num ); +extern char *vbl_enumbitstring( long num, long size, long numbit ); +extern long vbl_codeSize( long Size ); +extern vexexpr *vbl_dynamicvexatom( char *Name, long Left, long Right, unsigned char Dynamic ); +extern long vbl_intSize( long Left, long Right ); +extern long vbl_vextonum( vexexpr *Vex, long *PValue ); +extern vbtyp_list *vbl_getbasetype( long type ); +extern long vbl_tobin ( char *trg, char *src, long left, long right ); +extern void vbl_error ( long code, char *str1 ); +extern void vbl_warning ( long code, char *str1 ); diff --git a/alliance/src/vbl/src/vbl_byacc.h b/alliance/src/vbl/src/vbl_byacc.h index 0ef0ad7a..4013d74d 100644 --- a/alliance/src/vbl/src/vbl_byacc.h +++ b/alliance/src/vbl/src/vbl_byacc.h @@ -40,7 +40,7 @@ static struct dct_entry *addent (); static struct dct_recrd *addrcd (); static struct dct_entry **initab (); static void addtab (); -static int chktab (); +static long chktab (); static void fretab (); static void *vbl_addstr (); static vbtyp_list *val_type(); @@ -52,8 +52,8 @@ static struct choice_chain *order_choice(); extern char VBL_ERRFLG; /* set to 1 in case of error */ extern struct vbfig *VBL_HEADFIG; /* head of vbfigs */ extern long VBL_LINNUM; -extern int VBL_NUMPTP; -extern int VBL_NUMCHOICE; +extern long VBL_NUMPTP; +extern long VBL_NUMCHOICE; /*\ pNode VBL_BDDPNT; @@ -70,7 +70,7 @@ char *VBL_GNRNAM; /* current generate name */ vbl_vexstr VBL_SLCEXP; /* structure filled with the */ vbl_vexstr VBL_EMPSTR; /* empty structure used with NOT*/ -static int VBL_NUMTYP = 0; /* nombre de type */ +static long VBL_NUMTYP = 0; /* nombre de type */ static struct chain *VBL_NM1LST = NULL; /* 1-st name liste */ static struct chain *VBL_NM2LST = NULL; /* 2-st name liste */ static struct chain *VBL_INSLST = NULL; /* 3-st name liste */ @@ -94,7 +94,7 @@ static chain_list *VBL_GNR_BEGNR = (chain_list *)0; static struct authtable *VBL_ENUMVAL = NULL; static struct choice_chain *VBL_CASPNT = NULL; -static int VBL_CASSIZE = 0; +static long VBL_CASSIZE = 0; static struct ptype *VBL_OTHPNT = NULL; static struct ptype *VBL_PTYPE = NULL; @@ -105,7 +105,8 @@ static struct dct_entry **hshtab; extern struct vbgen *bvl_addgen(); -extern vbl_vexstr vbl_crtvex(); +extern vbl_vexstr vbl_crtvex( short oper, vbl_vexstr expr1, vbl_vexstr expr2, + long left, long right, unsigned char dynamic ); extern vbl_vexstr bvl_cpyvexstr(); extern vbl_vexstr bvl_select(); extern char *bvl_stostr(); diff --git a/alliance/src/vbl/src/vbl_parse.c b/alliance/src/vbl/src/vbl_parse.c index fc267771..e7d1b65b 100644 --- a/alliance/src/vbl/src/vbl_parse.c +++ b/alliance/src/vbl/src/vbl_parse.c @@ -68,7 +68,7 @@ \------------------------------------------------------------*/ extern FILE *vbl_y_in; - extern int vbl_y_parse(); + extern long vbl_y_parse(); extern char VBL_ERRFLG; extern vbfig_list *VBL_HEADFIG; extern vbmap_list *VBL_GENMAP; @@ -86,8 +86,8 @@ vbfig_list *getvbfiggenmap( InputFileName, Extention, GenericMap ) char *Extention; vbmap_list *GenericMap; { - int Value; - int Index; + long Value; + long Index; static char *AllianceExtention[] = { "vst", "vbe", "fsm" }; diff --git a/alliance/src/vbl/src/vbl_util.c b/alliance/src/vbl/src/vbl_util.c index 529a46de..7cd36107 100644 --- a/alliance/src/vbl/src/vbl_util.c +++ b/alliance/src/vbl/src/vbl_util.c @@ -52,8 +52,8 @@ char VBL_ERRFLG = 0; /* if = 1 no structure is made */ char *VBL_FILENAME = (char *)0; long VBL_LINNUM = 1; /* file's line number */ -int VBL_NUMPTP = 0; /* file's line number */ -int VBL_NUMCHOICE = 0; +long VBL_NUMPTP = 0; /* file's line number */ +long VBL_NUMCHOICE = 0; vbfig_list *VBL_HEADFIG = (vbfig_list *)0; vbmap_list *VBL_GENMAP = (vbmap_list *)0; @@ -106,10 +106,10 @@ vbmap_list *VBL_GENMAP = (vbmap_list *)0; /* ###--------------------------------------------------------------### */ void vbl_toolbug (code,str1,str2,nbr1) -int code; +long code; char *str1; char *str2; -int nbr1; +long nbr1; { (void) fprintf (stderr,"Fatal error %d executing `%s`: ", code,str1); @@ -187,9 +187,9 @@ int nbr1; /* ###--------------------------------------------------------------### */ void vbl_message (code,str1,nmb1) -int code; +long code; char *str1; -int nmb1; +long nmb1; { switch (code) @@ -252,10 +252,7 @@ int nmb1; /* function : vbl_error */ /* ###--------------------------------------------------------------### */ -void vbl_error (code,str1) - -int code; -char *str1; +void vbl_error ( long code, char *str1 ) { VBL_ERRFLG++; @@ -515,10 +512,7 @@ char *str1; autexit(1); } -void vbl_warning (code,str1) - -int code; -char *str1; +void vbl_warning ( long code, char *str1 ) { (void)fprintf (stderr,"Warning %d line %ld in file %s :",code,VBL_LINNUM, VBL_FILENAME); diff --git a/alliance/src/vbl/src/vhdl.yac b/alliance/src/vbl/src/vhdl.yac index 6ac73d42..e76aa73d 100644 --- a/alliance/src/vbl/src/vhdl.yac +++ b/alliance/src/vbl/src/vhdl.yac @@ -186,11 +186,14 @@ * ****************************************************************************/ /* -** $Header: /dsk/l1/alliance/cvsroot/alliance/src/vbl/src/vhdl.yac,v 1.1 2002/03/21 13:41:36 ludo Exp $$$ +** $Header: /dsk/l1/alliance/cvsroot/alliance/src/vbl/src/vhdl.yac,v 1.2 2009/06/14 13:52:17 ludo Exp $$$ ** ** $Log: vhdl.yac,v $ -** Revision 1.1 2002/03/21 13:41:36 ludo -** Initial revision +** Revision 1.2 2009/06/14 13:52:17 ludo +** - port 64 bits +** +** Revision 1.1.1.1 2002/03/21 13:41:36 ludo +** ** $$ * Revision 4.0 87/11/30 15:58:01 rbratton * Check in of VHDL version 4.0 (version reported in thesis). @@ -293,21 +296,21 @@ extern HASH_ENTRY hashtab[]; /* hash table of id indices and names */ -extern int ANY_NAME; /* generic hash table index for error recovery */ +extern long ANY_NAME; /* generic hash table index for error recovery */ extern SYM_PTR ANYPTR; /* generic symbol table ptr for error recovery */ SYM_PTR sym1, sym2, sym3; /* temp variables for symbol table pointers */ NODE_PTR nod1, nod2, nod3; /* temp variables for node list pointers */ -int op1, op2, op3; /* temporary variables for op indices */ +long op1, op2, op3; /* temporary variables for op indices */ -int is_childless; /* attribute of architecture body */ -int is_structure; /* attribute of architecture body */ +long is_childless; /* attribute of architecture body */ +long is_structure; /* attribute of architecture body */ %} %union { - int y_tok; /* token */ - int y_op; /* Index to op table entry */ - int y_hash; /* Index to hash table entry */ - int y_str; /* Index to string storage */ + long y_tok; /* token */ + long y_op; /* Index to op table entry */ + long y_hash; /* Index to hash table entry */ + long y_str; /* Index to string storage */ SYM_PTR y_sym; /* Pointer to symbol table entry */ long y_val; /* Floating point number (32 bits) */ /* (also handles integer values) */ diff --git a/alliance/src/vex/src/vexerror.h b/alliance/src/vex/src/vexerror.h index 8660781b..1cc5351a 100644 --- a/alliance/src/vex/src/vexerror.h +++ b/alliance/src/vex/src/vexerror.h @@ -46,6 +46,8 @@ # ifndef VEX_ERROR_H # define VEX_ERROR_H +# include + /*------------------------------------------------------------\ | | | Constants | diff --git a/alliance/src/vpd/src/vpd_error.h b/alliance/src/vpd/src/vpd_error.h index 31c1a3ea..96af997f 100644 --- a/alliance/src/vpd/src/vpd_error.h +++ b/alliance/src/vpd/src/vpd_error.h @@ -46,6 +46,8 @@ # ifndef VPD_ERROR_H # define VPD_ERROR_H +# include + /*------------------------------------------------------------\ | | | Constants | diff --git a/alliance/src/vpn/src/vpnerror.h b/alliance/src/vpn/src/vpnerror.h index 0acf67fe..72897318 100644 --- a/alliance/src/vpn/src/vpnerror.h +++ b/alliance/src/vpn/src/vpnerror.h @@ -46,6 +46,8 @@ # ifndef VPN_ERROR_H # define VPN_ERROR_H +# include + /*------------------------------------------------------------\ | | | Constants | diff --git a/alliance/src/vst2xnf/src/vst2xnf.c b/alliance/src/vst2xnf/src/vst2xnf.c index 29f35a33..7197bfe4 100644 --- a/alliance/src/vst2xnf/src/vst2xnf.c +++ b/alliance/src/vst2xnf/src/vst2xnf.c @@ -299,13 +299,13 @@ int val; char *s = getsigname(ls); if ((val = gethtitem(h, s)) == EMPTYHT) /* the name is unique up to now */ - addhtitem(h, s, (int)ls); + addhtitem(h, s, (long)ls); /* that suck because I assume sizeof(int) == sizeof (void *), which insn't true on some beasts */ - else if (val != (int)ls) { + else if (val != (long)ls) { /* that sucks: two signals have same name, so I return the concatenation of the signal name and its index. */ - sprintf(buffer, "%s%d", s, ls->INDEX); + sprintf(buffer, "%s%ld", s, ls->INDEX); s = namealloc(buffer); } return xnfvector(s,buffer); diff --git a/alliance/src/vtl/src/vtlerror.h b/alliance/src/vtl/src/vtlerror.h index e607a447..09bdc6d2 100644 --- a/alliance/src/vtl/src/vtlerror.h +++ b/alliance/src/vtl/src/vtlerror.h @@ -46,6 +46,8 @@ # ifndef VTL_ERROR_H # define VTL_ERROR_H +# include + /*------------------------------------------------------------\ | | | Constants | diff --git a/alliance/src/vvh/src/vvh_error.h b/alliance/src/vvh/src/vvh_error.h index a5a281e1..51ce4afe 100644 --- a/alliance/src/vvh/src/vvh_error.h +++ b/alliance/src/vvh/src/vvh_error.h @@ -46,6 +46,8 @@ # ifndef VVH_ERROR_H # define VVH_ERROR_H +# include + /*------------------------------------------------------------\ | | | Constants | diff --git a/alliance/src/xfsm/src/XMV_panel.c b/alliance/src/xfsm/src/XMV_panel.c index fd2653c2..3ba099b3 100644 --- a/alliance/src/xfsm/src/XMV_panel.c +++ b/alliance/src/xfsm/src/XMV_panel.c @@ -1480,9 +1480,9 @@ void CallbackLayerVisible( MyWidget, ClientData, CallData ) { autbegin(); - if ( XFSM_ACTIVE_LAYER_TABLE[ (int)ClientData ] == 0 ) + if ( XFSM_ACTIVE_LAYER_TABLE[ (long)ClientData ] == 0 ) { - XfsmSetLayerVisible( (int)ClientData ); + XfsmSetLayerVisible( (long)ClientData ); } autend(); @@ -1502,9 +1502,9 @@ void CallbackLayerInvisible( MyWidget, ClientData, CallData ) { autbegin(); - if ( XFSM_ACTIVE_LAYER_TABLE[ (int)ClientData ] ) + if ( XFSM_ACTIVE_LAYER_TABLE[ (long)ClientData ] ) { - XfsmSetLayerInvisible( (int)ClientData ); + XfsmSetLayerInvisible( (long)ClientData ); } autend(); @@ -1524,7 +1524,7 @@ void CallbackNameVisible( MyWidget, ClientData, CallData ) { autbegin(); - if ( XFSM_ACTIVE_NAME_TABLE[ (int)ClientData ] == 0 ) + if ( XFSM_ACTIVE_NAME_TABLE[ (long)ClientData ] == 0 ) { XfsmSetNameVisible( ClientData ); } @@ -1546,7 +1546,7 @@ void CallbackNameInvisible( MyWidget, ClientData, CallData ) { autbegin(); - if ( XFSM_ACTIVE_NAME_TABLE[ (int)ClientData ] ) + if ( XFSM_ACTIVE_NAME_TABLE[ (long)ClientData ] ) { XfsmSetNameInvisible( ClientData ); } diff --git a/alliance/src/xgra/src/XMV_panel.c b/alliance/src/xgra/src/XMV_panel.c index 4a528d62..afe0f0d7 100644 --- a/alliance/src/xgra/src/XMV_panel.c +++ b/alliance/src/xgra/src/XMV_panel.c @@ -1438,9 +1438,9 @@ void CallbackLayerVisible( MyWidget, ClientData, CallData ) { autbegin(); - if ( XGRA_ACTIVE_LAYER_TABLE[ (int)ClientData ] == 0 ) + if ( XGRA_ACTIVE_LAYER_TABLE[ (long)ClientData ] == 0 ) { - XgraSetLayerVisible( (int)ClientData ); + XgraSetLayerVisible( (long)ClientData ); } autend(); @@ -1460,9 +1460,9 @@ void CallbackLayerInvisible( MyWidget, ClientData, CallData ) { autbegin(); - if ( XGRA_ACTIVE_LAYER_TABLE[ (int)ClientData ] ) + if ( XGRA_ACTIVE_LAYER_TABLE[ (long)ClientData ] ) { - XgraSetLayerInvisible( (int)ClientData ); + XgraSetLayerInvisible( (long)ClientData ); } autend(); @@ -1482,7 +1482,7 @@ void CallbackNameVisible( MyWidget, ClientData, CallData ) { autbegin(); - if ( XGRA_ACTIVE_NAME_TABLE[ (int)ClientData ] == 0 ) + if ( XGRA_ACTIVE_NAME_TABLE[ (long)ClientData ] == 0 ) { XgraSetNameVisible( ClientData ); } @@ -1504,7 +1504,7 @@ void CallbackNameInvisible( MyWidget, ClientData, CallData ) { autbegin(); - if ( XGRA_ACTIVE_NAME_TABLE[ (int)ClientData ] ) + if ( XGRA_ACTIVE_NAME_TABLE[ (long)ClientData ] ) { XgraSetNameInvisible( ClientData ); } diff --git a/alliance/src/xpat/src/XMV_panel.c b/alliance/src/xpat/src/XMV_panel.c index 7e3c717c..f6033286 100644 --- a/alliance/src/xpat/src/XMV_panel.c +++ b/alliance/src/xpat/src/XMV_panel.c @@ -1508,9 +1508,9 @@ void CallbackLayerVisible( MyWidget, ClientData, CallData ) { autbegin(); - if ( XPAT_ACTIVE_LAYER_TABLE[ (int)ClientData ] == 0 ) + if ( XPAT_ACTIVE_LAYER_TABLE[ (long)ClientData ] == 0 ) { - XpatSetLayerVisible( (int)ClientData ); + XpatSetLayerVisible( (long)ClientData ); } autend(); @@ -1530,9 +1530,9 @@ void CallbackLayerInvisible( MyWidget, ClientData, CallData ) { autbegin(); - if ( XPAT_ACTIVE_LAYER_TABLE[ (int)ClientData ] ) + if ( XPAT_ACTIVE_LAYER_TABLE[ (long)ClientData ] ) { - XpatSetLayerInvisible( (int)ClientData ); + XpatSetLayerInvisible( (long)ClientData ); } autend(); @@ -1552,7 +1552,7 @@ void CallbackNameVisible( MyWidget, ClientData, CallData ) { autbegin(); - if ( XPAT_ACTIVE_NAME_TABLE[ (int)ClientData ] == 0 ) + if ( XPAT_ACTIVE_NAME_TABLE[ (long)ClientData ] == 0 ) { XpatSetNameVisible( ClientData ); } @@ -1574,7 +1574,7 @@ void CallbackNameInvisible( MyWidget, ClientData, CallData ) { autbegin(); - if ( XPAT_ACTIVE_NAME_TABLE[ (int)ClientData ] ) + if ( XPAT_ACTIVE_NAME_TABLE[ (long)ClientData ] ) { XpatSetNameInvisible( ClientData ); } diff --git a/alliance/src/xsch/src/XMV_panel.c b/alliance/src/xsch/src/XMV_panel.c index eb0c1221..303dbb2b 100644 --- a/alliance/src/xsch/src/XMV_panel.c +++ b/alliance/src/xsch/src/XMV_panel.c @@ -2294,9 +2294,9 @@ void CallbackLayerVisible( MyWidget, ClientData, CallData ) { autbegin(); - if ( XSCH_ACTIVE_LAYER_TABLE[ (int)ClientData ] == 0 ) + if ( XSCH_ACTIVE_LAYER_TABLE[ (long)ClientData ] == 0 ) { - XschSetLayerVisible( (int)ClientData ); + XschSetLayerVisible( (long)ClientData ); } autend(); @@ -2316,9 +2316,9 @@ void CallbackLayerInvisible( MyWidget, ClientData, CallData ) { autbegin(); - if ( XSCH_ACTIVE_LAYER_TABLE[ (int)ClientData ] ) + if ( XSCH_ACTIVE_LAYER_TABLE[ (long)ClientData ] ) { - XschSetLayerInvisible( (int)ClientData ); + XschSetLayerInvisible( (long)ClientData ); } autend(); @@ -2338,7 +2338,7 @@ void CallbackNameVisible( MyWidget, ClientData, CallData ) { autbegin(); - if ( XSCH_ACTIVE_NAME_TABLE[ (int)ClientData ] == 0 ) + if ( XSCH_ACTIVE_NAME_TABLE[ (long)ClientData ] == 0 ) { XschSetNameVisible( ClientData ); } @@ -2360,7 +2360,7 @@ void CallbackNameInvisible( MyWidget, ClientData, CallData ) { autbegin(); - if ( XSCH_ACTIVE_NAME_TABLE[ (int)ClientData ] ) + if ( XSCH_ACTIVE_NAME_TABLE[ (long)ClientData ] ) { XschSetNameInvisible( ClientData ); } diff --git a/alliance/src/xvpn/src/XMV_panel.c b/alliance/src/xvpn/src/XMV_panel.c index 1cd6db72..2f07d0d7 100644 --- a/alliance/src/xvpn/src/XMV_panel.c +++ b/alliance/src/xvpn/src/XMV_panel.c @@ -1476,9 +1476,9 @@ void CallbackLayerVisible( MyWidget, ClientData, CallData ) { autbegin(); - if ( XVPN_ACTIVE_LAYER_TABLE[ (int)ClientData ] == 0 ) + if ( XVPN_ACTIVE_LAYER_TABLE[ (long)ClientData ] == 0 ) { - XvpnSetLayerVisible( (int)ClientData ); + XvpnSetLayerVisible( (long)ClientData ); } autend(); @@ -1498,9 +1498,9 @@ void CallbackLayerInvisible( MyWidget, ClientData, CallData ) { autbegin(); - if ( XVPN_ACTIVE_LAYER_TABLE[ (int)ClientData ] ) + if ( XVPN_ACTIVE_LAYER_TABLE[ (long)ClientData ] ) { - XvpnSetLayerInvisible( (int)ClientData ); + XvpnSetLayerInvisible( (long)ClientData ); } autend(); @@ -1520,7 +1520,7 @@ void CallbackNameVisible( MyWidget, ClientData, CallData ) { autbegin(); - if ( XVPN_ACTIVE_NAME_TABLE[ (int)ClientData ] == 0 ) + if ( XVPN_ACTIVE_NAME_TABLE[ (long)ClientData ] == 0 ) { XvpnSetNameVisible( ClientData ); } @@ -1542,7 +1542,7 @@ void CallbackNameInvisible( MyWidget, ClientData, CallData ) { autbegin(); - if ( XVPN_ACTIVE_NAME_TABLE[ (int)ClientData ] ) + if ( XVPN_ACTIVE_NAME_TABLE[ (long)ClientData ] ) { XvpnSetNameInvisible( ClientData ); } diff --git a/alliance/src/xvpn/src/XVP_error.c b/alliance/src/xvpn/src/XVP_error.c index e62b02aa..5e613b56 100644 --- a/alliance/src/xvpn/src/XVP_error.c +++ b/alliance/src/xvpn/src/XVP_error.c @@ -43,6 +43,7 @@ \------------------------------------------------------------*/ # include +# include # include # include # include