diff --git a/alliance/src/abv/src/bvl_bcomp_y.y b/alliance/src/abv/src/bvl_bcomp_y.y index 5a8faa4f..ebdcefed 100644 --- a/alliance/src/abv/src/bvl_bcomp_y.y +++ b/alliance/src/abv/src/bvl_bcomp_y.y @@ -737,9 +737,8 @@ signal_declaration char *signame; long sigconf; void *pnt; - long errflg; - errflg = chkdcl ('S',0,$4.VALU,$4.FLAG,$6,$5.FLAG,&sigconf); + /*errflg =*/ chkdcl ('S',0,$4.VALU,$4.FLAG,$6,$5.FLAG,&sigconf); /* ###----------------------------------------------### */ /* First, check the validity of the declaration. */ diff --git a/alliance/src/asimut/src/vh_simulad.c b/alliance/src/asimut/src/vh_simulad.c index d069fd3a..1f9f944a 100644 --- a/alliance/src/asimut/src/vh_simulad.c +++ b/alliance/src/asimut/src/vh_simulad.c @@ -54,22 +54,18 @@ char *argv[]; char usage_flg = 0 ; /* print usage */ char help_flg = 0 ; /* display help */ char init_flg = 0 ; /* description's init. */ - char core_flg = 0 ; /* core file at error */ char sdebug_flg = 0 ; /* debug structural */ char bdebug_flg = 0 ; /* debug behavioural */ char pdebug_flg = 0 ; /* debug pattern */ char ldebug_flg = 0 ; /* debug linker */ char cdebug_flg = 0 ; /* dbeug cycle by cycle */ - char ddebug_flg = 0 ; /* debug delta by delta */ char behav_flg = 0 ; /* behav. description */ char nosim_flg = 0 ; /* no simulation */ char nores_flg = 0 ; /* no result file */ - char makbdd_flg = 0 ; /* trace bdd making */ char bdd_flg = 0 ; /* use bdd or gex */ char xmess_flg = 0 ; /* no execution message */ char randly_flg = 0 ; /* random delays */ char fixdly_flg = 0 ; /* fixed delays */ - char defdly_flg = 0 ; /* default delays */ char bckdly_flg = 0 ; /* backanotated delays */ char trans_flg = 0 ; /* transport delays */ char inert_flg = 1 ; /* inertial delays */ @@ -84,7 +80,6 @@ char *argv[]; unsigned int init_val = 0 ; /* init. constant */ unsigned int comp_mode = 0 ; /* beh compiler mode */ - struct lofig *ptlofig ; struct befig *ptbefig = NULL ; struct befig *ptbef ; struct chain *ptchain ; @@ -192,7 +187,7 @@ char *argv[]; if ((!strcmp (argv [i], "-defaultdelay")) || (!strcmp (argv [i], "-dd"))) { - defdly_flg = 1; + //defdly_flg = 1; delay_mode |= BEH_DELAY_DEFAULT; arg_flg [i] = 1; } @@ -238,7 +233,7 @@ char *argv[]; if (!strcmp (argv [i], "-t")) { - makbdd_flg = 1; + //makbdd_flg = 1; arg_flg [i] = 1; } @@ -260,7 +255,7 @@ char *argv[]; if (!strcmp (argv [i], "-core")) { - core_flg = i + 1; + //core_flg = i + 1; arg_flg [i ] = 1; arg_flg [i+1] = 1; } @@ -327,8 +322,8 @@ char *argv[]; pdebug_flg = 1; break; case 'c': cdebug_flg = 1; break; - case 'd': - ddebug_flg = 1; break; + //case 'd': + //ddebug_flg = 1; break; } } } @@ -527,7 +522,7 @@ char *argv[]; error_flag += ptbefig->ERRFLG; } - ptlofig = vhl_makgst (ptbefig); + /*ptlofig =*/ vhl_makgst (ptbefig); } else diff --git a/alliance/src/boom/src/boom_bdd.c b/alliance/src/boom/src/boom_bdd.c index 097ff828..677a242a 100644 --- a/alliance/src/boom/src/boom_bdd.c +++ b/alliance/src/boom/src/boom_bdd.c @@ -466,7 +466,6 @@ static long BoomBddSetExprKeepAux( Expr ) char *Name; char *Vector; beaux_list *BehAux; - bddnode *BddNode; authelem *Element; long Index; long Number; @@ -519,8 +518,8 @@ static long BoomBddSetExprKeepAux( Expr ) addauthelem( BoomBddHashKeepAux, BehAux->NAME, 0 ); SetBoomBehAuxKeep( BehAux ); - BddNode = addbddcircuitin( (bddcircuit *)0, BehAux->NAME, - 0, BDD_IN_MODE_LAST ); + /*BddNode =*/ addbddcircuitin( (bddcircuit *)0, BehAux->NAME, + 0, BDD_IN_MODE_LAST ); Number++; } @@ -581,7 +580,6 @@ void BoomBehMakeBddNodeNoExplosion( BehFigure ) bereg_list *BehReg; biabl_list *BiAbl; binode_list *BiNode; - bddnode *BddNode; char *Name; char *Vector; long Index; @@ -648,8 +646,8 @@ void BoomBehMakeBddNodeNoExplosion( BehFigure ) if ( Vector == Name ) { - BddNode = addbddcircuitin( (bddcircuit *)0, BehAux->NAME, - 0, BDD_IN_MODE_LAST ); + /*BddNode =*/ addbddcircuitin( (bddcircuit *)0, BehAux->NAME, + 0, BDD_IN_MODE_LAST ); if ( IsBoomBehAuxKeep( BehAux ) ) { diff --git a/alliance/src/bvl/src/bvl_bcomp_y.y b/alliance/src/bvl/src/bvl_bcomp_y.y index fe18eb56..0895be43 100644 --- a/alliance/src/bvl/src/bvl_bcomp_y.y +++ b/alliance/src/bvl/src/bvl_bcomp_y.y @@ -2016,9 +2016,8 @@ signal_declaration char *signame; long sigconf; void *pnt; - long errflg; - errflg = chkdcl ('S',0,$4.VALU,$4.FLAG,$6,$5.FLAG,&sigconf); + chkdcl ('S',0,$4.VALU,$4.FLAG,$6,$5.FLAG,&sigconf); /* ###----------------------------------------------### */ /* First, check the validity of the declaration. */ diff --git a/alliance/src/ctl/src/ctladd.c b/alliance/src/ctl/src/ctladd.c index 2484154a..0240555f 100644 --- a/alliance/src/ctl/src/ctladd.c +++ b/alliance/src/ctl/src/ctladd.c @@ -132,7 +132,6 @@ static ctldecl_list *loc_addctldecl( Figure, Expr, DeclType ) unsigned char DeclType; { ctldecl_list *Decl; - ctldecl_list **PrevDecl; vexexpr *Atom; ctlsym *Sym; char *Name; @@ -184,7 +183,7 @@ static ctldecl_list *loc_addctldecl( Figure, Expr, DeclType ) Index += IndexStep; } - PrevDecl = &Figure->DECLAR[ DeclType ]; +//PrevDecl = &Figure->DECLAR[ DeclType ]; Decl->VEX_ATOM = Expr; Decl->DECL_SYM = Sym; diff --git a/alliance/src/ctp/src/ctp_y.y b/alliance/src/ctp/src/ctp_y.y index 4ec5d63b..c6adc936 100644 --- a/alliance/src/ctp/src/ctp_y.y +++ b/alliance/src/ctp/src/ctp_y.y @@ -682,9 +682,8 @@ subtype_indication .constraint. { ctltype_list *ctltype_pnt; - long mode; - mode = chktab(hshtab,$1,CTP_MODNAM,CTP_SYMDFN); + /*mode = */chktab(hshtab,$1,CTP_MODNAM,CTP_SYMDFN); ctltype_pnt = (ctltype_list *)chktab(hshtab,$2.NAME,CTP_MODNAM,CTP_PNTDFN); @@ -1315,8 +1314,6 @@ primary char Buffer[ 40 ]; long left; long right; - long left_bnd; - long right_bnd; long mode; long flag; @@ -1364,8 +1361,8 @@ primary my_ctp_error (17,$1.NAME); } - left_bnd = chktab (hshtab,$1.NAME,LocalName,CTP_WMNDFN); - right_bnd = chktab (hshtab,$1.NAME,LocalName,CTP_WMXDFN); + /*left_bnd =*/ chktab (hshtab,$1.NAME,LocalName,CTP_WMNDFN); + /*right_bnd =*/ chktab (hshtab,$1.NAME,LocalName,CTP_WMXDFN); left = $1.LEFT; right = $1.RIGHT; @@ -1696,14 +1693,13 @@ attribute_name char *LocalName; long type; long flag; - long mode; long AttrLeft; long AttrRight; long AttrLow; long AttrHigh; LocalName = CTP_MODNAM; - mode = chktab (hshtab,$1.NAME,LocalName,CTP_SYMDFN); + /*mode = */ chktab (hshtab,$1.NAME,LocalName,CTP_SYMDFN); type = chktab (hshtab,$1.NAME,LocalName,CTP_TYPDFN); flag = $3; diff --git a/alliance/src/fvh/src/fbl_bcomp_y.y b/alliance/src/fvh/src/fbl_bcomp_y.y index 4fe127bb..96b8e8b6 100644 --- a/alliance/src/fvh/src/fbl_bcomp_y.y +++ b/alliance/src/fvh/src/fbl_bcomp_y.y @@ -885,9 +885,8 @@ signal_declaration char *signame; long sigconf; void *pnt; - long errflg; - errflg = fbl_chkdcl ('S',0,val_type($4.NAME),$4.FLAG,$6,$5.FLAG,&sigconf); + /*errflg =*/ fbl_chkdcl ('S',0,val_type($4.NAME),$4.FLAG,$6,$5.FLAG,&sigconf); /* ###----------------------------------------------### */ /* First, check the validity of the declaration. */ @@ -2226,7 +2225,6 @@ case_statement unsigned long size=1; unsigned long *size1; long indice=0; - struct choice_chain *ch; struct fbcho **pnt; struct fbcho *tab = NULL; struct choice_chain *nm1lst; @@ -2247,7 +2245,7 @@ case_statement tab[indice].INSTRUCTION = reversetype(FBL_CASPNT->INSTRUCTION); tab[indice].SIZE = FBL_CASPNT->SIZE; tab[indice++].VALUE = FBL_CASPNT->VALUE; - ch = FBL_CASPNT; + /*ch = FBL_CASPNT;*/ FBL_CASPNT =FBL_CASPNT->NEXT; /*free(ch);*/ } @@ -2651,7 +2649,6 @@ primary long in_bound; long out_bound; long mode; - long prtype; long type; mode = chktab (hshtab,$1.NAME,FBL_MODNAM,FBL_SIGDFN); @@ -2742,7 +2739,7 @@ primary (chktab(hshtab,$1.NAME,FBL_MODNAM,FBL_TYPDFN) != -1)) { expr1.IDENT = $1.NAME; - prtype = chktab(hshtab,$1.NAME,FBL_MODNAM,FBL_USRDFN); + /*prtype =*/ chktab(hshtab,$1.NAME,FBL_MODNAM,FBL_USRDFN); if(val_type((FBL_BEFPNT->BETYP + type -1)->NAME) !=-1) expr1.TYPE = chktab(hshtab,namealloc("bit"),FBL_MODNAM,FBL_TYPDFN); else diff --git a/alliance/src/graal/src/GMV_map.c b/alliance/src/graal/src/GMV_map.c index 7ef31644..093b8a9d 100644 --- a/alliance/src/graal/src/GMV_map.c +++ b/alliance/src/graal/src/GMV_map.c @@ -221,14 +221,12 @@ void CallbackMapEvent ( MyWidget, Event, Args, Argc ) String *Args; int *Argc; { - Display *EventDisplay; char MouseEvent; long X; long Y; rdsbegin(); - EventDisplay = Event->display; MouseEvent = Args[ 0 ][ 0 ] - '0'; X = Event->x; @@ -305,12 +303,8 @@ void CallbackMapExpose( MyWidget, ClientData, CallData ) XtPointer ClientData; XmDrawingAreaCallbackStruct *CallData; { - XExposeEvent *ExposeEvent; - rdsbegin(); - ExposeEvent = (XExposeEvent *)CallData->event; - if ( GraalFirstExpose ) { GraalFirstExpose = GRAAL_FALSE; diff --git a/alliance/src/graal/src/GMX_event.c b/alliance/src/graal/src/GMX_event.c index 3e845a4f..aa6e931c 100644 --- a/alliance/src/graal/src/GMX_event.c +++ b/alliance/src/graal/src/GMX_event.c @@ -719,7 +719,6 @@ void CallbackEvent ( MyWidget, Event, Args, Argc ) String *Args; int *Argc; { - Display *EventDisplay; char MouseEvent; int FlagUp; Position OldLambdaCursorX; @@ -727,8 +726,6 @@ void CallbackEvent ( MyWidget, Event, Args, Argc ) rdsbegin(); - EventDisplay = Event->display; - MouseEvent = atoi( Args[ 0 ] ); if ( MouseEvent == GRAAL_LEAVE ) diff --git a/alliance/src/graal/src/GRM_peek.c b/alliance/src/graal/src/GRM_peek.c index ea712ec7..6c21a061 100644 --- a/alliance/src/graal/src/GRM_peek.c +++ b/alliance/src/graal/src/GRM_peek.c @@ -407,7 +407,6 @@ char GraalRealFlatInstance( Rectangle ) rdsrec_list *Rectangle; { phfig_list *FigureMbk; - phins_list *InstanceMbk; phins_list *SourceMbk; void *Pointer; @@ -419,10 +418,10 @@ char GraalRealFlatInstance( Rectangle ) FigureMbk = addphfig( "_ludo_" ); SourceMbk = (phins_list *)GRAAL_MBK( Rectangle ); - InstanceMbk = addphins( FigureMbk, - SourceMbk->FIGNAME, SourceMbk->INSNAME, - SourceMbk->TRANSF, - SourceMbk->XINS, SourceMbk->YINS ); + /*InstanceMbk =*/ addphins( FigureMbk, + SourceMbk->FIGNAME, SourceMbk->INSNAME, + SourceMbk->TRANSF, + SourceMbk->XINS, SourceMbk->YINS ); Pointer = (void *) Graalflattenphfig( FigureMbk, FigureMbk->PHINS->INSNAME, YES ); diff --git a/alliance/src/loon/src/lon_lib_reader.c b/alliance/src/loon/src/lon_lib_reader.c index f44c1622..9deb019e 100644 --- a/alliance/src/loon/src/lon_lib_reader.c +++ b/alliance/src/loon/src/lon_lib_reader.c @@ -61,7 +61,7 @@ extern chain_list *getfiles_with_ext (char *path, char *ext) struct dirent *entry; char *filename; char *completefilename; - int filenamelength, extensionlength, pathlength; + int filenamelength, extensionlength; chain_list *head; if (!path || !ext) return NULL; @@ -70,7 +70,7 @@ extern chain_list *getfiles_with_ext (char *path, char *ext) if (!dir) return NULL; extensionlength = strlen (ext); - pathlength = strlen (path); +//pathlength = strlen (path); head=NULL; while ((entry = readdir (dir)) != NULL) { diff --git a/alliance/src/loon/src/lon_signal_netlist.c b/alliance/src/loon/src/lon_signal_netlist.c index c34f02a4..3e59cbd9 100644 --- a/alliance/src/loon/src/lon_signal_netlist.c +++ b/alliance/src/loon/src/lon_signal_netlist.c @@ -103,7 +103,6 @@ extern double loins_max_T(loins_list* loins) ptype_list* ptype; port_list* port; locon_list* locon; - char* input; biabl_list* biabl; if (!loins) { @@ -161,7 +160,7 @@ extern double loins_max_T(loins_list* loins) fprintf(stderr,"loins_max_T: no losig name\n"); autexit(1); } - input=(char*) locon->SIG->NAMECHAIN->DATA; + //input=(char*) locon->SIG->NAMECHAIN->DATA; /*finaly eval delay*/ delay=port->T; @@ -184,7 +183,6 @@ extern double loins_max_RC(loins_list* loins, char* output) ptype_list* ptype; port_list* port; locon_list* locon; - char* input; biabl_list* biabl; if (!loins || !output) { @@ -242,7 +240,7 @@ extern double loins_max_RC(loins_list* loins, char* output) fprintf(stderr,"loins_max_RC: no losig name\n"); autexit(1); } - input=(char*) locon->SIG->NAMECHAIN->DATA; + //input=(char*) locon->SIG->NAMECHAIN->DATA; /*finaly eval delay*/ delay=port->R*getcapacitance(output); diff --git a/alliance/src/lvx/src/lvx.c b/alliance/src/lvx/src/lvx.c index 121201d3..32e49c64 100644 --- a/alliance/src/lvx/src/lvx.c +++ b/alliance/src/lvx/src/lvx.c @@ -1765,7 +1765,7 @@ char **argv; { static char figname1 [100], figname2 [100]; lofig_list *lofig1 = NULL, *lofig2 = NULL; - int firstcount = 4, count = 4, flag_flatten = FALSE, flag_ord = FALSE, flag_tie = TRUE; + int firstcount = 4, count = 4, flag_flatten = FALSE, flag_ord = FALSE; int result; presentation (); @@ -1811,7 +1811,7 @@ char **argv; case 'f' : break; case 'o' : flag_ord = TRUE; break; case 'i' : readparamfile (lofig1, lofig2, argv[++count]); break; - case 't' : flag_tie = FALSE; + case 't' : //flag_tie = FALSE; while ((argv[count+1][0] != '-') && (++count < argc)) { delins (lofig1, argv[count]); delins (lofig2, argv[count]); diff --git a/alliance/src/mbkvhdl/src/mvl_drive.c b/alliance/src/mbkvhdl/src/mvl_drive.c index 2224e1a7..f432d4e1 100644 --- a/alliance/src/mbkvhdl/src/mvl_drive.c +++ b/alliance/src/mbkvhdl/src/mvl_drive.c @@ -57,7 +57,6 @@ struct lofig *ptfig; extern char *getsigname (); struct loins *ptins = NULL; struct locon *ptcon = NULL; - struct locon *tmp_ptcon = NULL; struct locon *ptscan = NULL; struct losig *ptsig = NULL; struct chain *ptmodel = NULL; @@ -309,7 +308,7 @@ struct lofig *ptfig; ptcon = ptins->LOCON; while (ptcon != NULL) { - tmp_ptcon = (struct locon *) mvl_vectnam (ptcon,&left,&right,&name,1); + mvl_vectnam (ptcon,&left,&right,&name,1); fprintf (ptfile," %s => ",mvl_vhdlname (name)); if (left != -1) diff --git a/alliance/src/mbkvhdl/src/mvl_scomp_y.y b/alliance/src/mbkvhdl/src/mvl_scomp_y.y index 6fcb77d8..8582dc3d 100644 --- a/alliance/src/mbkvhdl/src/mvl_scomp_y.y +++ b/alliance/src/mbkvhdl/src/mvl_scomp_y.y @@ -399,7 +399,6 @@ formal_port_element .constraint. .BUS. { - struct locon *locon_pnt; struct losig *losig_pnt; long sig_width; long sig_conf; @@ -438,7 +437,7 @@ formal_port_element case (MVL_ICNDFN + MVL_BTVDFN + MVL_NORDFN) : losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','0', sig_name,$6.LEFT,$6.RIGHT); - locon_pnt = mvl_addlocon (MVL_LOFPNT,losig_pnt,'I', + mvl_addlocon (MVL_LOFPNT,losig_pnt,'I', sig_name,$6.LEFT,$6.RIGHT); break; @@ -446,15 +445,15 @@ formal_port_element case (MVL_OCNDFN + MVL_BTVDFN + MVL_NORDFN) : losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','0', sig_name,$6.LEFT,$6.RIGHT); - locon_pnt = mvl_addlocon (MVL_LOFPNT,losig_pnt,'O', + mvl_addlocon (MVL_LOFPNT,losig_pnt,'O', sig_name,$6.LEFT,$6.RIGHT); break; case (MVL_OCNDFN + MVL_MUXDFN + MVL_BUSDFN) : case (MVL_OCNDFN + MVL_MXVDFN + MVL_BUSDFN) : - losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','M', + mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','M', sig_name,$6.LEFT,$6.RIGHT); - locon_pnt = mvl_addlocon (MVL_LOFPNT,losig_pnt,'Z', + mvl_addlocon (MVL_LOFPNT,losig_pnt,'Z', sig_name,$6.LEFT,$6.RIGHT); break; @@ -462,7 +461,7 @@ formal_port_element case (MVL_OCNDFN + MVL_WRVDFN + MVL_BUSDFN) : losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','W', sig_name,$6.LEFT,$6.RIGHT); - locon_pnt = mvl_addlocon (MVL_LOFPNT,losig_pnt,'Z', + mvl_addlocon (MVL_LOFPNT,losig_pnt,'Z', sig_name,$6.LEFT,$6.RIGHT); break; @@ -470,7 +469,7 @@ formal_port_element case (MVL_BCNDFN + MVL_BTVDFN + MVL_NORDFN) : losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','0', sig_name,$6.LEFT,$6.RIGHT); - locon_pnt = mvl_addlocon (MVL_LOFPNT,losig_pnt,'B', + mvl_addlocon (MVL_LOFPNT,losig_pnt,'B', sig_name,$6.LEFT,$6.RIGHT); break; @@ -478,7 +477,7 @@ formal_port_element case (MVL_BCNDFN + MVL_MXVDFN + MVL_BUSDFN) : losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','M', sig_name,$6.LEFT,$6.RIGHT); - locon_pnt = mvl_addlocon (MVL_LOFPNT,losig_pnt,'T', + mvl_addlocon (MVL_LOFPNT,losig_pnt,'T', sig_name,$6.LEFT,$6.RIGHT); break; @@ -486,7 +485,7 @@ formal_port_element case (MVL_BCNDFN + MVL_WRVDFN + MVL_BUSDFN) : losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','W', sig_name,$6.LEFT,$6.RIGHT); - locon_pnt = mvl_addlocon (MVL_LOFPNT,losig_pnt,'T', + mvl_addlocon (MVL_LOFPNT,losig_pnt,'T', sig_name,$6.LEFT,$6.RIGHT); break; @@ -494,7 +493,7 @@ formal_port_element case (MVL_XCNDFN + MVL_BTVDFN + MVL_NORDFN) : losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','0', sig_name,$6.LEFT,$6.RIGHT); - locon_pnt = mvl_addlocon (MVL_LOFPNT,losig_pnt,'X', + mvl_addlocon (MVL_LOFPNT,losig_pnt,'X', sig_name,$6.LEFT,$6.RIGHT); break; default : @@ -735,7 +734,6 @@ local_port_element .constraint. .BUS. { - struct locon *locon_pnt; long sig_width; long sig_conf; char *sig_name; @@ -771,50 +769,42 @@ local_port_element { case (MVL_ICNDFN + MVL_BITDFN + MVL_NORDFN) : case (MVL_ICNDFN + MVL_BTVDFN + MVL_NORDFN) : - locon_pnt = mvl_addlocon (MVL_CHDPNT,NULL,'I', - sig_name,$6.LEFT,$6.RIGHT); + mvl_addlocon (MVL_CHDPNT,NULL,'I', sig_name,$6.LEFT,$6.RIGHT); break; case (MVL_OCNDFN + MVL_BITDFN + MVL_NORDFN) : case (MVL_OCNDFN + MVL_BTVDFN + MVL_NORDFN) : - locon_pnt = mvl_addlocon (MVL_CHDPNT,NULL,'O', - sig_name,$6.LEFT,$6.RIGHT); + mvl_addlocon (MVL_CHDPNT,NULL,'O', sig_name,$6.LEFT,$6.RIGHT); break; case (MVL_OCNDFN + MVL_MUXDFN + MVL_BUSDFN) : case (MVL_OCNDFN + MVL_MXVDFN + MVL_BUSDFN) : - locon_pnt = mvl_addlocon (MVL_CHDPNT,NULL,'Z', - sig_name,$6.LEFT,$6.RIGHT); + mvl_addlocon (MVL_CHDPNT,NULL,'Z', sig_name,$6.LEFT,$6.RIGHT); break; case (MVL_OCNDFN + MVL_WORDFN + MVL_BUSDFN) : case (MVL_OCNDFN + MVL_WRVDFN + MVL_BUSDFN) : - locon_pnt = mvl_addlocon (MVL_CHDPNT,NULL,'Z', - sig_name,$6.LEFT,$6.RIGHT); + mvl_addlocon (MVL_CHDPNT,NULL,'Z', sig_name,$6.LEFT,$6.RIGHT); break; case (MVL_BCNDFN + MVL_BITDFN + MVL_NORDFN) : case (MVL_BCNDFN + MVL_BTVDFN + MVL_NORDFN) : - locon_pnt = mvl_addlocon (MVL_CHDPNT,NULL,'B', - sig_name,$6.LEFT,$6.RIGHT); + mvl_addlocon (MVL_CHDPNT,NULL,'B', sig_name,$6.LEFT,$6.RIGHT); break; case (MVL_BCNDFN + MVL_MUXDFN + MVL_BUSDFN) : case (MVL_BCNDFN + MVL_MXVDFN + MVL_BUSDFN) : - locon_pnt = mvl_addlocon (MVL_CHDPNT,NULL,'T', - sig_name,$6.LEFT,$6.RIGHT); + mvl_addlocon (MVL_CHDPNT,NULL,'T', sig_name,$6.LEFT,$6.RIGHT); break; case (MVL_BCNDFN + MVL_WORDFN + MVL_BUSDFN) : case (MVL_BCNDFN + MVL_WRVDFN + MVL_BUSDFN) : - locon_pnt = mvl_addlocon (MVL_CHDPNT,NULL,'T', - sig_name,$6.LEFT,$6.RIGHT); + mvl_addlocon (MVL_CHDPNT,NULL,'T', sig_name,$6.LEFT,$6.RIGHT); break; case (MVL_XCNDFN + MVL_BITDFN + MVL_NORDFN) : case (MVL_XCNDFN + MVL_BTVDFN + MVL_NORDFN) : - locon_pnt = mvl_addlocon (MVL_CHDPNT,NULL,'X', - sig_name,$6.LEFT,$6.RIGHT); + mvl_addlocon (MVL_CHDPNT,NULL,'X', sig_name,$6.LEFT,$6.RIGHT); break; default : @@ -925,7 +915,6 @@ component_instantiation_statement .port_map_aspect. Semicolon_ERR { - struct loins *loins_pnt ; struct locon *locon_pnt ; struct chain *chain_pnt ; char tampon [256] ; @@ -951,8 +940,7 @@ component_instantiation_statement } if (MVL_ERRFLG == 0) - loins_pnt = addloins (MVL_LOFPNT, $1 , MVL_CHDPNT, - MVL_NM1LST ); + addloins (MVL_LOFPNT, $1 , MVL_CHDPNT, MVL_NM1LST ); } freechain (MVL_NM1LST); diff --git a/alliance/src/mbkvhdlg/src/mvl_drive.c b/alliance/src/mbkvhdlg/src/mvl_drive.c index a7f46b73..b67183ed 100644 --- a/alliance/src/mbkvhdlg/src/mvl_drive.c +++ b/alliance/src/mbkvhdlg/src/mvl_drive.c @@ -97,7 +97,6 @@ struct lofig *ptfig; extern char *getsigname (); struct loins *ptins = NULL; struct locon *ptcon = NULL; - struct locon *tmp_ptcon = NULL; struct locon *ptscan = NULL; struct losig *ptsig = NULL; struct chain *ptmodel = NULL; @@ -344,7 +343,7 @@ struct lofig *ptfig; ptcon = ptins->LOCON; while (ptcon != NULL) { - tmp_ptcon = (struct locon *) mvl_vectnam (ptcon,&left,&right,&name,1); + mvl_vectnam (ptcon,&left,&right,&name,1); fprintf (ptfile," %s => ",mvl_vhdlname (name)); if (left != -1) diff --git a/alliance/src/mbkvhdlg/src/mvl_scomp_y.y b/alliance/src/mbkvhdlg/src/mvl_scomp_y.y index 4de57074..61d2dee9 100644 --- a/alliance/src/mbkvhdlg/src/mvl_scomp_y.y +++ b/alliance/src/mbkvhdlg/src/mvl_scomp_y.y @@ -421,7 +421,6 @@ formal_port_element .constraint. .BUS. { - struct locon *locon_pnt; struct losig *losig_pnt; long sig_width; long sig_conf; @@ -460,7 +459,7 @@ formal_port_element case (MVL_ICNDFN + MVL_BTVDFN + MVL_NORDFN) : losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','0', sig_name,$6.LEFT,$6.RIGHT); - locon_pnt = mvl_addlocon (MVL_LOFPNT,losig_pnt,'I', + mvl_addlocon (MVL_LOFPNT,losig_pnt,'I', sig_name,$6.LEFT,$6.RIGHT); break; @@ -468,15 +467,15 @@ formal_port_element case (MVL_OCNDFN + MVL_BTVDFN + MVL_NORDFN) : losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','0', sig_name,$6.LEFT,$6.RIGHT); - locon_pnt = mvl_addlocon (MVL_LOFPNT,losig_pnt,'O', + mvl_addlocon (MVL_LOFPNT,losig_pnt,'O', sig_name,$6.LEFT,$6.RIGHT); break; case (MVL_OCNDFN + MVL_MUXDFN + MVL_BUSDFN) : case (MVL_OCNDFN + MVL_MXVDFN + MVL_BUSDFN) : - losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','M', + mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','M', sig_name,$6.LEFT,$6.RIGHT); - locon_pnt = mvl_addlocon (MVL_LOFPNT,losig_pnt,'Z', + mvl_addlocon (MVL_LOFPNT,losig_pnt,'Z', sig_name,$6.LEFT,$6.RIGHT); break; @@ -484,7 +483,7 @@ formal_port_element case (MVL_OCNDFN + MVL_WRVDFN + MVL_BUSDFN) : losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','W', sig_name,$6.LEFT,$6.RIGHT); - locon_pnt = mvl_addlocon (MVL_LOFPNT,losig_pnt,'Z', + mvl_addlocon (MVL_LOFPNT,losig_pnt,'Z', sig_name,$6.LEFT,$6.RIGHT); break; @@ -492,7 +491,7 @@ formal_port_element case (MVL_BCNDFN + MVL_BTVDFN + MVL_NORDFN) : losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','0', sig_name,$6.LEFT,$6.RIGHT); - locon_pnt = mvl_addlocon (MVL_LOFPNT,losig_pnt,'B', + mvl_addlocon (MVL_LOFPNT,losig_pnt,'B', sig_name,$6.LEFT,$6.RIGHT); break; @@ -500,7 +499,7 @@ formal_port_element case (MVL_BCNDFN + MVL_MXVDFN + MVL_BUSDFN) : losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','M', sig_name,$6.LEFT,$6.RIGHT); - locon_pnt = mvl_addlocon (MVL_LOFPNT,losig_pnt,'T', + mvl_addlocon (MVL_LOFPNT,losig_pnt,'T', sig_name,$6.LEFT,$6.RIGHT); break; @@ -508,7 +507,7 @@ formal_port_element case (MVL_BCNDFN + MVL_WRVDFN + MVL_BUSDFN) : losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','W', sig_name,$6.LEFT,$6.RIGHT); - locon_pnt = mvl_addlocon (MVL_LOFPNT,losig_pnt,'T', + mvl_addlocon (MVL_LOFPNT,losig_pnt,'T', sig_name,$6.LEFT,$6.RIGHT); break; @@ -516,7 +515,7 @@ formal_port_element case (MVL_XCNDFN + MVL_BTVDFN + MVL_NORDFN) : losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','0', sig_name,$6.LEFT,$6.RIGHT); - locon_pnt = mvl_addlocon (MVL_LOFPNT,losig_pnt,'X', + mvl_addlocon (MVL_LOFPNT,losig_pnt,'X', sig_name,$6.LEFT,$6.RIGHT); break; default : @@ -758,7 +757,6 @@ local_port_element .constraint. .BUS. { - struct locon *locon_pnt; long sig_width; long sig_conf; char *sig_name; @@ -794,50 +792,42 @@ local_port_element { case (MVL_ICNDFN + MVL_BITDFN + MVL_NORDFN) : case (MVL_ICNDFN + MVL_BTVDFN + MVL_NORDFN) : - locon_pnt = mvl_addlocon (MVL_CHDPNT,NULL,'I', - sig_name,$6.LEFT,$6.RIGHT); + mvl_addlocon (MVL_CHDPNT,NULL,'I', sig_name,$6.LEFT,$6.RIGHT); break; case (MVL_OCNDFN + MVL_BITDFN + MVL_NORDFN) : case (MVL_OCNDFN + MVL_BTVDFN + MVL_NORDFN) : - locon_pnt = mvl_addlocon (MVL_CHDPNT,NULL,'O', - sig_name,$6.LEFT,$6.RIGHT); + mvl_addlocon (MVL_CHDPNT,NULL,'O', sig_name,$6.LEFT,$6.RIGHT); break; case (MVL_OCNDFN + MVL_MUXDFN + MVL_BUSDFN) : case (MVL_OCNDFN + MVL_MXVDFN + MVL_BUSDFN) : - locon_pnt = mvl_addlocon (MVL_CHDPNT,NULL,'Z', - sig_name,$6.LEFT,$6.RIGHT); + mvl_addlocon (MVL_CHDPNT,NULL,'Z', sig_name,$6.LEFT,$6.RIGHT); break; case (MVL_OCNDFN + MVL_WORDFN + MVL_BUSDFN) : case (MVL_OCNDFN + MVL_WRVDFN + MVL_BUSDFN) : - locon_pnt = mvl_addlocon (MVL_CHDPNT,NULL,'Z', - sig_name,$6.LEFT,$6.RIGHT); + mvl_addlocon (MVL_CHDPNT,NULL,'Z', sig_name,$6.LEFT,$6.RIGHT); break; case (MVL_BCNDFN + MVL_BITDFN + MVL_NORDFN) : case (MVL_BCNDFN + MVL_BTVDFN + MVL_NORDFN) : - locon_pnt = mvl_addlocon (MVL_CHDPNT,NULL,'B', - sig_name,$6.LEFT,$6.RIGHT); + mvl_addlocon (MVL_CHDPNT,NULL,'B', sig_name,$6.LEFT,$6.RIGHT); break; case (MVL_BCNDFN + MVL_MUXDFN + MVL_BUSDFN) : case (MVL_BCNDFN + MVL_MXVDFN + MVL_BUSDFN) : - locon_pnt = mvl_addlocon (MVL_CHDPNT,NULL,'T', - sig_name,$6.LEFT,$6.RIGHT); + mvl_addlocon (MVL_CHDPNT,NULL,'T', sig_name,$6.LEFT,$6.RIGHT); break; case (MVL_BCNDFN + MVL_WORDFN + MVL_BUSDFN) : case (MVL_BCNDFN + MVL_WRVDFN + MVL_BUSDFN) : - locon_pnt = mvl_addlocon (MVL_CHDPNT,NULL,'T', - sig_name,$6.LEFT,$6.RIGHT); + mvl_addlocon (MVL_CHDPNT,NULL,'T', sig_name,$6.LEFT,$6.RIGHT); break; case (MVL_XCNDFN + MVL_BITDFN + MVL_NORDFN) : case (MVL_XCNDFN + MVL_BTVDFN + MVL_NORDFN) : - locon_pnt = mvl_addlocon (MVL_CHDPNT,NULL,'X', - sig_name,$6.LEFT,$6.RIGHT); + mvl_addlocon (MVL_CHDPNT,NULL,'X', sig_name,$6.LEFT,$6.RIGHT); break; default : diff --git a/alliance/src/mocha/src/mocha_check.c b/alliance/src/mocha/src/mocha_check.c index 5884250f..5f813a19 100644 --- a/alliance/src/mocha/src/mocha_check.c +++ b/alliance/src/mocha/src/mocha_check.c @@ -557,14 +557,13 @@ static void MochaCheckComputeReachableStates( MochaFigure ) mochafig_list *MochaFigure; { - ctlfig_list *CtlFigure; btrtransfunc *BtrTransFunc; bddnode *BddNewSet; bddnode *BddCurrentSet; bddnode *BddReachedSet; bddnode *BddNode; - CtlFigure = MochaFigure->CTL_FIGURE; +//CtlFigure = MochaFigure->CTL_FIGURE; BtrTransFunc = MochaFigure->BTR_TRANS_FUNC; setbddlocalcircuit( MochaFigure->BDD_CIRCUIT ); diff --git a/alliance/src/mocha/src/mocha_syf.c b/alliance/src/mocha/src/mocha_syf.c index 2eb7103f..0cb65a17 100644 --- a/alliance/src/mocha/src/mocha_syf.c +++ b/alliance/src/mocha/src/mocha_syf.c @@ -279,7 +279,6 @@ fsmfig_list *MochaSyfFbhParse( Name ) fsmfig_list *FsmFigure; fsmfig_list *ScanFigure; chain_list *ScanChain; - mochasyfinfo *MochaSyfInfo; fsmstate_list *ScanState; MochaSyfInitializeKeyword(); @@ -295,7 +294,7 @@ fsmfig_list *MochaSyfFbhParse( Name ) ScanChain = ScanChain->NEXT ) { ScanFigure = (fsmfig_list *)ScanChain->DATA; - MochaSyfInfo = MochaSyfaddfsmsyfinfo( ScanFigure ); + /*MochaSyfInfo =*/ MochaSyfaddfsmsyfinfo( ScanFigure ); } } else @@ -517,7 +516,6 @@ static void MochaSyfSynthOut2Abl( FsmFigure ) fsmlocout_list *ScanLocout; mochasyfout *ScanMochaSyfOut; mochasyfstate *ScanMochaSyfState; - mochasyfcode *ScanMochaSyfCode; ablexpr *Equation; ablexpr *Atom; @@ -536,7 +534,7 @@ static void MochaSyfSynthOut2Abl( FsmFigure ) ScanState = ScanState->NEXT ) { ScanMochaSyfState = MOCHA_SYF_STATE( ScanState ); - ScanMochaSyfCode = ScanMochaSyfState->CODE; + //ScanMochaSyfCode = ScanMochaSyfState->CODE; for ( ScanLocout = ScanState->LOCOUT; ScanLocout != (fsmlocout_list *)0; diff --git a/alliance/src/ring/src/deport.c b/alliance/src/ring/src/deport.c index 99974845..c7972e34 100644 --- a/alliance/src/ring/src/deport.c +++ b/alliance/src/ring/src/deport.c @@ -210,7 +210,6 @@ void deport_alim(LST_EQUIPO lst_equipo, BARRE_PLOTS tab_plots[NB_FACES], int i, nbcolatrouver, face; long largmetalpiste, largmetalcol, piste; char niveaupiste; - LST_SEGMENT * segcol; LST_SEGMENT * segpiste; recherche_equipo_alim(&equipo_vdd, &equipo_vss, lst_equipo); @@ -245,7 +244,7 @@ void deport_alim(LST_EQUIPO lst_equipo, BARRE_PLOTS tab_plots[NB_FACES], case NORD: case SUD : niveaupiste = xmetal; - segcol = segy_occ; + //segcol = segy_occ; segpiste = segx_occ; largmetalpiste = xmetal_width; largmetalcol = ymetal_width; @@ -273,7 +272,7 @@ void deport_alim(LST_EQUIPO lst_equipo, BARRE_PLOTS tab_plots[NB_FACES], case EST : case OUEST: niveaupiste = ymetal; - segcol = segx_occ; + //segcol = segx_occ; segpiste = segy_occ; largmetalpiste = ymetal_width; largmetalcol = xmetal_width; @@ -345,7 +344,7 @@ void deport_alim(LST_EQUIPO lst_equipo, BARRE_PLOTS tab_plots[NB_FACES], case NORD: case SUD : niveaupiste = xmetal; - segcol = segy_occ; + //segcol = segy_occ; segpiste = segx_occ; largmetalpiste = xmetal_width; largmetalcol = ymetal_width; @@ -372,7 +371,7 @@ void deport_alim(LST_EQUIPO lst_equipo, BARRE_PLOTS tab_plots[NB_FACES], case EST : case OUEST: niveaupiste = ymetal; - segcol = segx_occ; + //segcol = segx_occ; segpiste = segy_occ; largmetalpiste = ymetal_width; largmetalcol = xmetal_width; diff --git a/alliance/src/ring/src/placement.c b/alliance/src/ring/src/placement.c index 9030658e..ce1477fa 100644 --- a/alliance/src/ring/src/placement.c +++ b/alliance/src/ring/src/placement.c @@ -1744,8 +1744,7 @@ void fabrique_grille_finale(BARRE_PLOTS tab_plots[NB_FACES], { LST_PSEUDO_CON liste, liste_coeur; int face; - char niveau; - long position, largeurmin; + long position; if (mode_debug) printf("Fabrique grille finale\n"); @@ -1762,8 +1761,8 @@ void fabrique_grille_finale(BARRE_PLOTS tab_plots[NB_FACES], switch (face) { case NORD: case SUD : - niveau = ymetal; - largeurmin = ymetal_width; + //niveau = ymetal; + //largeurmin = ymetal_width; while (liste != NULL) { if (mode_debug) diff --git a/alliance/src/ring/src/routage.c b/alliance/src/ring/src/routage.c index d49c9985..5148e269 100644 --- a/alliance/src/ring/src/routage.c +++ b/alliance/src/ring/src/routage.c @@ -185,7 +185,7 @@ void insere_valcurv(long valcurv, PT_COORDONNEES coord, LST_EQUIPO equipo) void ordonne_eq_proj(LST_EQUIPO equipo, COEUR lecoeur) { - ptype_list * lst_proj = NULL, *prec_proj = NULL, *prem = NULL, *deux = NULL, *precprem = NULL; + ptype_list * lst_proj = NULL, *prec_proj = NULL, *prem = NULL, *deux = NULL; long delta = 0, deltamax = 0; prec_proj = lst_proj = (equipo->cour).lst_projetes; @@ -199,7 +199,7 @@ void ordonne_eq_proj(LST_EQUIPO equipo, COEUR lecoeur) printf("Delta %5ld\n", delta); if (delta > deltamax) { prem = lst_proj; - precprem = prec_proj; + //precprem = prec_proj; deux = lst_proj->NEXT; deltamax = delta; } diff --git a/alliance/src/ring/src/struct2.c b/alliance/src/ring/src/struct2.c index 53b61c20..3af34bbb 100644 --- a/alliance/src/ring/src/struct2.c +++ b/alliance/src/ring/src/struct2.c @@ -852,7 +852,7 @@ char layer; void affic_listeseg(tab_seg) LST_SEGMENT tab_seg[NB_FACES]; { - LST_SEGMENT lseg, der; + LST_SEGMENT lseg; int face; static char a1[3] = "A1"; static char a2[3] = "A2"; @@ -876,8 +876,8 @@ LST_SEGMENT tab_seg[NB_FACES]; printf("face %d x1 %5ld y1 %5ld x2 %5ld y2 %5ld -- piste1 %3ld piste2 %3ld -- larg %3ld layer %2s \n", lseg->face, lseg->c1->xabs, lseg->c1->yabs, lseg->c2->xabs, lseg->c2->yabs, lseg->piste1, lseg ->piste2, lseg->largeur, metal); - if (NULL == lseg->suiv) - der = lseg; + //if (NULL == lseg->suiv) + // der = lseg; lseg = lseg->suiv; } diff --git a/alliance/src/rtn/src/rtnadd.c b/alliance/src/rtn/src/rtnadd.c index 46bd1ef9..0a291786 100644 --- a/alliance/src/rtn/src/rtnadd.c +++ b/alliance/src/rtn/src/rtnadd.c @@ -173,7 +173,6 @@ rtldecl_list *addrtldecl( Figure, Atom, Type ) int Type; { rtldecl_list *Decl; - rtldecl_list **PrevDecl; rtlsym *Sym; char *Name; int Width; @@ -221,7 +220,7 @@ rtldecl_list *addrtldecl( Figure, Atom, Type ) Index += IndexStep; } - PrevDecl = &Figure->DECLAR[ Type ]; +//PrevDecl = &Figure->DECLAR[ Type ]; Decl->VEX_ATOM = Atom; Decl->DECL_SYM = Sym; diff --git a/alliance/src/scl/src/scpbuild.c b/alliance/src/scl/src/scpbuild.c index 3bb08363..df395fa9 100644 --- a/alliance/src/scl/src/scpbuild.c +++ b/alliance/src/scl/src/scpbuild.c @@ -1576,7 +1576,6 @@ static schfig_list *loc_buildbox( Figure ) int NumberBoxIn0; int NumberOut; int Middle; - int MiddleIn; for ( Box = Figure->BOX; Box != (schbox_list *)0; @@ -1675,7 +1674,7 @@ static schfig_list *loc_buildbox( Figure ) */ /* TO BE DONE */ Number = 1; - MiddleIn = Box0->NUMBER_IN / 2; + //MiddleIn = Box0->NUMBER_IN / 2; //MiddleInDY = SCP_BOX_CON_BASE_Y; for ( Con = Box0->CON_IN; diff --git a/alliance/src/syf/src/syf_synth.c b/alliance/src/syf/src/syf_synth.c index 159971a1..2049e8ec 100644 --- a/alliance/src/syf/src/syf_synth.c +++ b/alliance/src/syf/src/syf_synth.c @@ -201,7 +201,6 @@ void SyfSynthStack2Abl( FsmFigure ) syfregstack *StackArray; syfregstack *StackNextArray = NULL; syfregstack *StackPrevArray; - syfregstate *RegArray; syfctrl *CtrlArray; long Constant; long StackMask; @@ -223,7 +222,7 @@ void SyfSynthStack2Abl( FsmFigure ) if ( ! SyfInfo->STACK ) return; - RegArray = SyfInfo->REG_ARRAY; +//RegArray = SyfInfo->REG_ARRAY; CtrlArray = SyfInfo->CTRL_ARRAY; StackArray = SyfInfo->STACK_ARRAY; StackCste = -1; @@ -656,7 +655,6 @@ void SyfSynthOut2Abl( FsmFigure ) fsmlocout_list *ScanLocout; syfout *ScanSyfOut; syfstate *ScanSyfState; - syfcode *ScanSyfCode; ablexpr *Equation = NULL; ablexpr *ScanPath; ablexpr *Atom; @@ -686,7 +684,7 @@ void SyfSynthOut2Abl( FsmFigure ) ScanState = ScanState->NEXT ) { ScanSyfState = FSM_SYF_STATE( ScanState ); - ScanSyfCode = ScanSyfState->CODE; + //ScanSyfCode = ScanSyfState->CODE; for ( ScanLocout = ScanState->LOCOUT; ScanLocout != (fsmlocout_list *)0; diff --git a/alliance/src/vasy/src/vasy_mulwait.c b/alliance/src/vasy/src/vasy_mulwait.c index 8e5882d5..e58e62d8 100644 --- a/alliance/src/vasy/src/vasy_mulwait.c +++ b/alliance/src/vasy/src/vasy_mulwait.c @@ -148,7 +148,6 @@ static void VasyMultiWaitHashWrite( VpnFigure, VpnProc ) vexexpr *AsgAtom; char *AtomName; unsigned char *Flags; - chain_list **Support; int AsgIndex; int AsgMin; int AsgMax; @@ -179,7 +178,7 @@ static void VasyMultiWaitHashWrite( VpnFigure, VpnProc ) if ( VpnAction->TYPE == VPN_ACT_ASG_DEFINE ) continue; ActInfo = GetVasyVpnActInfo( VpnAction ); - Support = ActInfo->SUPPORT; + //Support = ActInfo->SUPPORT; Flags = ActInfo->FLAGS; AsgAtom = VpnAction->VEX_ATOM; @@ -237,7 +236,6 @@ static void VasyMultiWaitArcWait2Wait( VpnFigure, VpnProc, BeginTrans, AsgTrans, vpntrans_list *EndTrans; { vasyprocinfo *ProcInfo; - vasytransinfo *TransInfo; vasyactinfo *ActInfo; vasysyminfo *SymInfo; vpnact_list *VpnAction; @@ -246,7 +244,6 @@ static void VasyMultiWaitArcWait2Wait( VpnFigure, VpnProc, BeginTrans, AsgTrans, vpndecl_list *AsgDeclar; vexexpr *AsgAtom; char *AtomName; - chain_list **Support; chain_list **Literal; chain_list **Event; chain_list *ScanChain; @@ -285,7 +282,7 @@ static void VasyMultiWaitArcWait2Wait( VpnFigure, VpnProc, BeginTrans, AsgTrans, addauthelem( VasyHashSens, (char*)VpnSymbol, (long)VpnSymbol ); } - TransInfo = GetVasyVpnTransInfo( AsgTrans ); +//TransInfo = GetVasyVpnTransInfo( AsgTrans ); NumberWrite = 0; @@ -296,7 +293,7 @@ static void VasyMultiWaitArcWait2Wait( VpnFigure, VpnProc, BeginTrans, AsgTrans, if ( VpnAction->TYPE == VPN_ACT_ASG_DEFINE ) continue; ActInfo = GetVasyVpnActInfo( VpnAction ); - Support = ActInfo->SUPPORT; + //Support = ActInfo->SUPPORT; Literal = ActInfo->LITERAL; Event = ActInfo->EVENT; Flags = ActInfo->FLAGS; diff --git a/alliance/src/vasy/src/vasy_onewait.c b/alliance/src/vasy/src/vasy_onewait.c index dac7b65c..387f1bfd 100644 --- a/alliance/src/vasy/src/vasy_onewait.c +++ b/alliance/src/vasy/src/vasy_onewait.c @@ -340,15 +340,12 @@ static void VasyOneWaitAssignVpnSymbol( VpnFigure, VpnProc , VpnTrans, authelem *Element; auth2elem *Element2; chain_list **Support; - chain_list **Literal; chain_list **Event; chain_list **Support2; chain_list **Literal2; chain_list **DefSupport; - chain_list **DefSupport2; unsigned char *DefFlags; unsigned char *DefFlags2; - unsigned char *Flags; unsigned char *Flags2; chain_list *ListOutput; chain_list *SupportBdd; @@ -424,9 +421,9 @@ static void VasyOneWaitAssignVpnSymbol( VpnFigure, VpnProc , VpnTrans, HashSupport = TransInfo->HASH_SUPPORT; ActInfo = GetVasyVpnActInfo( AsgAction ); - Literal = ActInfo->LITERAL; +//Literal = ActInfo->LITERAL; Support = ActInfo->SUPPORT; - Flags = ActInfo->FLAGS; +//Flags = ActInfo->FLAGS; Event = ActInfo->EVENT; ActInfo->SPLIT = 1; @@ -882,7 +879,7 @@ static void VasyOneWaitAssignVpnSymbol( VpnFigure, VpnProc , VpnTrans, } DefAction2 = (vpnact_list *)Element->VALUE; - DefSupport2 = GetVasyVpnActInfoSupport( DefAction2 ); + //DefSupport2 = GetVasyVpnActInfoSupport( DefAction2 ); DefFlags2 = GetVasyVpnActInfoFlags( DefAction2 ); DefAtom2 = DefAction2->VEX_ATOM; diff --git a/alliance/src/vasy/src/vasy_redinst.c b/alliance/src/vasy/src/vasy_redinst.c index b609cf90..8e7619b6 100644 --- a/alliance/src/vasy/src/vasy_redinst.c +++ b/alliance/src/vasy/src/vasy_redinst.c @@ -452,7 +452,6 @@ static void VasyRedInstLateralVpnAct( BeginPlace ) vexexpr *AsgExpr2; vexexpr *AsgExpr3; char *AtomValue; - char *AtomValue2; auth2elem *Element; int AsgIndex; int AsgMin; @@ -556,7 +555,7 @@ static void VasyRedInstLateralVpnAct( BeginPlace ) viewvexexprboundln( AsgExpr2 ); } - AtomValue2 = GetVexAtomValue( AsgAtom2 ); + //AtomValue2 = GetVexAtomValue( AsgAtom2 ); AsgMin2 = getvexvectormin( AsgAtom2 ); AsgMax2 = getvexvectormax( AsgAtom2 ); diff --git a/alliance/src/vasy/src/vasy_synth.c b/alliance/src/vasy/src/vasy_synth.c index e1b3e123..e8c05fe4 100644 --- a/alliance/src/vasy/src/vasy_synth.c +++ b/alliance/src/vasy/src/vasy_synth.c @@ -1114,7 +1114,6 @@ static void VasySynthesisWithSelectVpnProc( VpnFigure, RtlFigure, VpnProc ) vexexpr *ElseData; vexexpr *VexData; vexexpr *VexCond; - char *AtomName; rtlasg_list *RtlAssign; long MaxNode; long NumberNode; @@ -1166,7 +1165,7 @@ static void VasySynthesisWithSelectVpnProc( VpnFigure, RtlFigure, VpnProc ) AsgAtom = VpnAction->VEX_ATOM; AsgExpr = VpnAction->VEX_EXPR; ElseData = AsgExpr; - AtomName = GetVexAtomValue( AsgAtom ); +//AtomName = GetVexAtomValue( AsgAtom ); RtlAtom = dupvexexpr( AsgAtom ); RtlAssign = addrtlasg( RtlFigure, RtlAtom, RTL_ASG_CONDITIONAL ); diff --git a/alliance/src/vbl/src/vbl_bcomp_y.y b/alliance/src/vbl/src/vbl_bcomp_y.y index c803c558..c5f4905f 100644 --- a/alliance/src/vbl/src/vbl_bcomp_y.y +++ b/alliance/src/vbl/src/vbl_bcomp_y.y @@ -1125,7 +1125,6 @@ unlabeled_generate_statement { vbl_name *Range; vbvar_list *VbVar; - vexexpr *Target; short Signed; long Left; long Right; @@ -1164,7 +1163,7 @@ unlabeled_generate_statement VbVar = (vbvar_list *)vbl_addstr( 'f',0, get_type(VBH_TYPE_INTEGER),VBH_TYPE_INTEGER, 'I',$1.IDENT, -1, -1, NULL, 0, 0 ); - Target = VbVar->TARGET; + //Target = VbVar->TARGET; Signed = ( IsVexNodeSigned( VbVar->TARGET ) != 0 ); if ( IsVexAtomBit( VbVar->TARGET ) ) @@ -1319,8 +1318,6 @@ association_element long right; long left_bnd; long right_bnd; - long in_bound; - long out_bound; unsigned char dynamic; long mode; long flag; @@ -1381,8 +1378,8 @@ association_element { if (left <= right) { - in_bound = left - left_bnd; - out_bound = right - left_bnd; + //in_bound = left - left_bnd; + //out_bound = right - left_bnd; if ((left < left_bnd) || (right > right_bnd)) { my_vbl_error (36,$1.NAME); @@ -1390,8 +1387,8 @@ association_element } else { - in_bound = right - left_bnd; - out_bound = left - left_bnd; + //in_bound = right - left_bnd; + //out_bound = left - left_bnd; if ((left > right_bnd) || (right < left_bnd)) { my_vbl_error (36,$1.NAME); @@ -1402,8 +1399,8 @@ association_element { if (left <= right) { - in_bound = left - right_bnd; - out_bound = right - right_bnd; + //in_bound = left - right_bnd; + //out_bound = right - right_bnd; if ((left < right_bnd) || (right > left_bnd)) { my_vbl_error (36,$1.NAME); @@ -1411,8 +1408,8 @@ association_element } else { - in_bound = right - right_bnd; - out_bound = left - right_bnd; + //in_bound = right - right_bnd; + //out_bound = left - right_bnd; if ((left > left_bnd) || (right < right_bnd)) { my_vbl_error (36,$1.NAME); @@ -5193,6 +5190,8 @@ signal_list { vexexpr *Vex; chain_list *Chain; + +#if THIS_IS_DISABLED char *LocalName; if ( chktab(hshtab,$1.NAME,VBL_FUNCNAM,VBL_SYMDFN ) ) @@ -5208,6 +5207,13 @@ signal_list { my_vbl_error(17,$1.NAME); } +#else + if ( !chktab(hshtab,$1.NAME,VBL_FUNCNAM,VBL_SYMDFN) + && !chktab(hshtab,$1.NAME,VBL_MODNAM,VBL_SYMDFN) ) + { + my_vbl_error(17,$1.NAME); + } +#endif if ( ! $1.DYNAMIC ) { @@ -5240,6 +5246,8 @@ signal_list { vexexpr *Vex; chain_list *Chain; + +#if THIS_IS_DISABLED char *LocalName; if ( chktab(hshtab,$2.NAME,VBL_FUNCNAM,VBL_SYMDFN ) ) @@ -5255,6 +5263,13 @@ signal_list { my_vbl_error(17,$2.NAME); } +#else + if ( !chktab(hshtab,$2.NAME,VBL_FUNCNAM,VBL_SYMDFN) + && !chktab(hshtab,$2.NAME,VBL_MODNAM,VBL_SYMDFN) ) + { + my_vbl_error(17,$2.NAME); + } +#endif if ( ! $2.DYNAMIC ) { @@ -6356,8 +6371,6 @@ choice vexexpr *VexCst; long left; long right; - long in_bound; - long out_bound; long left_bnd; long right_bnd; long sig_conf; @@ -6396,8 +6409,8 @@ choice { if (left <= right) { - in_bound = left - left_bnd; - out_bound = right - left_bnd; + //in_bound = left - left_bnd; + //out_bound = right - left_bnd; if ((left < left_bnd) || (right > right_bnd)) { my_vbl_error (36,$1.NAME); @@ -6405,8 +6418,8 @@ choice } else { - in_bound = left - right_bnd; - out_bound = right - right_bnd; + //in_bound = left - right_bnd; + //out_bound = right - right_bnd; if ((left > right_bnd) || (right < left_bnd)) { my_vbl_error (36,$1.NAME); @@ -6417,8 +6430,8 @@ choice { if (left <= right) { - in_bound = right - left_bnd; - out_bound = left - left_bnd; + //in_bound = right - left_bnd; + //out_bound = left - left_bnd; if ((left < right_bnd) || (right > left_bnd)) { my_vbl_error (36,$1.NAME); @@ -6426,8 +6439,8 @@ choice } else { - in_bound = right - right_bnd; - out_bound = left - right_bnd; + //in_bound = right - right_bnd; + //out_bound = left - right_bnd; if ((left > left_bnd) || (right < right_bnd)) { my_vbl_error (36,$1.NAME); @@ -6676,8 +6689,6 @@ primary long right; long left_bnd; long right_bnd; - long in_bound; - long out_bound; long mode; long flag; unsigned char dynamic; @@ -6780,8 +6791,8 @@ primary { if (left <= right) { - in_bound = left - left_bnd; - out_bound = right - left_bnd; + //in_bound = left - left_bnd; + //out_bound = right - left_bnd; if ((left < left_bnd) || (right > right_bnd)) { my_vbl_error (36,$1.NAME); @@ -6789,8 +6800,8 @@ primary } else { - in_bound = right - left_bnd; - out_bound = left - left_bnd; + //in_bound = right - left_bnd; + //out_bound = left - left_bnd; if ((left > right_bnd) || (right < left_bnd)) { my_vbl_error (36,$1.NAME); @@ -6801,8 +6812,8 @@ primary { if (left <= right) { - in_bound = left - right_bnd; - out_bound = right - right_bnd; + //in_bound = left - right_bnd; + //out_bound = right - right_bnd; if ((left < right_bnd) || (right > left_bnd)) { my_vbl_error (36,$1.NAME); @@ -6810,8 +6821,8 @@ primary } else { - in_bound = right - right_bnd; - out_bound = left - right_bnd; + //in_bound = right - right_bnd; + //out_bound = left - right_bnd; if ((left > left_bnd) || (right < right_bnd)) { my_vbl_error (36,$1.NAME); diff --git a/alliance/src/vpn/src/vpnadd.c b/alliance/src/vpn/src/vpnadd.c index 67b9a129..f63bd450 100644 --- a/alliance/src/vpn/src/vpnadd.c +++ b/alliance/src/vpn/src/vpnadd.c @@ -527,7 +527,6 @@ static vpndecl_list *loc_addvpndecl( Figure, Expr, Type, Base ) unsigned char Base; { vpndecl_list *Decl; - vpndecl_list **PrevDecl; vexexpr *Atom; vpnsym *Sym; char *Name; @@ -579,8 +578,6 @@ static vpndecl_list *loc_addvpndecl( Figure, Expr, Type, Base ) Index += IndexStep; } - PrevDecl = &Figure->DECLAR[ Type ]; - Decl->VEX_ATOM = Expr; Decl->DECL_SYM = Sym; Decl->TYPE = Type; diff --git a/alliance/src/vvh/src/vvh_vbh2vpn.c b/alliance/src/vvh/src/vvh_vbh2vpn.c index e5a2156a..f64cecdf 100644 --- a/alliance/src/vvh/src/vvh_vbh2vpn.c +++ b/alliance/src/vvh/src/vvh_vbh2vpn.c @@ -672,7 +672,6 @@ static void VvhVbhTreatIfs( ScanIfs ) vpntrans_list *TrueTrans; vpntrans_list *FalseTrans; vpntrans_list *EndTrans; - vpnarc *VpnArc; vexexpr *VexCond; long Number; @@ -695,21 +694,21 @@ static void VvhVbhTreatIfs( ScanIfs ) BeginPlace = VvhVpnAddPlace( VvhName ); BeginPlace->TYPE = VPN_PLACE_IF; - VpnArc = addvpnarctrans( VvhVpnFigure, VvhPrevTrans, BeginPlace ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, VvhPrevTrans, BeginPlace ); sprintf( VvhName, "if_true.%s.%ld", VvhTopName, Number ); TrueTrans = VvhVpnAddTrans( VvhName ); TrueTrans->TYPE = VPN_TRANS_GUARDED; TrueTrans->VEX_GUARD = dupvexexpr( VexCond ); - VpnArc = addvpnarcplace( VvhVpnFigure, BeginPlace, TrueTrans ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, BeginPlace, TrueTrans ); sprintf( VvhName, "if_false.%s.%ld", VvhTopName, Number ); FalseTrans = VvhVpnAddTrans( VvhName ); FalseTrans->TYPE = VPN_TRANS_GUARDED; FalseTrans->VEX_GUARD = optimvexnotexpr( VexCond ); - VpnArc = addvpnarcplace( VvhVpnFigure, BeginPlace, FalseTrans ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, BeginPlace, FalseTrans ); VvhPrevTrans = TrueTrans; @@ -730,18 +729,18 @@ static void VvhVbhTreatIfs( ScanIfs ) if ( TrueTrans != (vpntrans_list *)0 ) { - VpnArc = addvpnarctrans( VvhVpnFigure, TrueTrans , EndPlace ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, TrueTrans , EndPlace ); } if ( FalseTrans != (vpntrans_list *)0 ) { - VpnArc = addvpnarctrans( VvhVpnFigure, FalseTrans, EndPlace ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, FalseTrans, EndPlace ); } EndTrans = VvhVpnAddTrans( VvhName ); EndTrans->TYPE = VPN_TRANS_IMMEDIATE; - VpnArc = addvpnarcplace( VvhVpnFigure, EndPlace, EndTrans ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, EndPlace, EndTrans ); VvhPrevTrans = EndTrans; } @@ -870,7 +869,6 @@ static void VvhVbhTreatAggregate( ScanAgr ) { vpnplace_list *AssignPlace; vpntrans_list *AssignTrans; - vpnarc *VpnArc; long Number; Number = VvhNumberAsg++; @@ -881,8 +879,8 @@ static void VvhVbhTreatAggregate( ScanAgr ) AssignTrans = VvhVpnAddTrans( VvhName ); AssignTrans->TYPE = VPN_TRANS_ACT_EXEC_CONC; - VpnArc = addvpnarctrans( VvhVpnFigure, VvhPrevTrans, AssignPlace ); - VpnArc = addvpnarcplace( VvhVpnFigure, AssignPlace , AssignTrans ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, VvhPrevTrans, AssignPlace ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, AssignPlace , AssignTrans ); VvhPrevTrans = AssignTrans; @@ -966,7 +964,6 @@ static void VvhVbhTreatCase( ScanCase ) vpntrans_list *PrevTrans; vpntrans_list *CaseTrans; vpntrans_list *EndTrans; - vpnarc *VpnArc; vexexpr *VexCond; vexexpr *VexOthers; vexexpr *VexGuard = NULL; @@ -1177,7 +1174,7 @@ static void VvhVbhTreatCase( ScanCase ) CaseTrans->VEX_GUARD = VexBoolean; - VpnArc = addvpnarcplace( VvhVpnFigure, BeginPlace, CaseTrans ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, BeginPlace, CaseTrans ); VvhPrevTrans = CaseTrans; @@ -1187,7 +1184,7 @@ static void VvhVbhTreatCase( ScanCase ) if ( VvhPrevTrans != (vpntrans_list *)0 ) { - VpnArc = addvpnarctrans( VvhVpnFigure, VvhPrevTrans, EndPlace ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, VvhPrevTrans, EndPlace ); } } @@ -1200,8 +1197,8 @@ static void VvhVbhTreatCase( ScanCase ) EndTrans = VvhVpnAddTrans( VvhName ); EndTrans->TYPE = VPN_TRANS_IMMEDIATE; - VpnArc = addvpnarctrans( VvhVpnFigure, PrevTrans, BeginPlace ); - VpnArc = addvpnarcplace( VvhVpnFigure, EndPlace, EndTrans ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, PrevTrans, BeginPlace ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, EndPlace, EndTrans ); VvhPrevTrans = EndTrans; } @@ -1224,7 +1221,6 @@ static int VvhVbhTreatWait( ScanWait ) vpntrans_list *UntilTrue; vpntrans_list *UntilFalse; vpntrans_list *UntilEnd; - vpnarc *VpnArc; chain_list *Support; vexexpr *VexCond; long Number; @@ -1239,8 +1235,8 @@ static int VvhVbhTreatWait( ScanWait ) WaitPlace->TYPE = VPN_PLACE_WAIT; WaitTrans = VvhVpnAddTrans( VvhName ); - VpnArc = addvpnarctrans( VvhVpnFigure, VvhPrevTrans, WaitPlace ); - VpnArc = addvpnarcplace( VvhVpnFigure, WaitPlace , WaitTrans ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, VvhPrevTrans, WaitPlace ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, WaitPlace , WaitTrans ); WaitTrans->TYPE = VPN_TRANS_INF_WAIT; VvhPrevTrans = WaitTrans; @@ -1275,13 +1271,13 @@ static int VvhVbhTreatWait( ScanWait ) VexCond = VvhVbhTreatTest( UntilTrans, VexCond ); - VpnArc = addvpnarctrans( VvhVpnFigure, WaitTrans , UntilPlace ); - VpnArc = addvpnarcplace( VvhVpnFigure, UntilPlace, UntilTrans ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, WaitTrans , UntilPlace ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, UntilPlace, UntilTrans ); UntilTest = VvhVpnAddPlace( VvhName ); UntilTest->TYPE = VPN_PLACE_UNTIL_TEST; - VpnArc = addvpnarctrans( VvhVpnFigure, UntilTrans, UntilTest ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, UntilTrans, UntilTest ); sprintf( VvhName, "until_true.%s.%ld", VvhTopName, Number ); UntilTrue = VvhVpnAddTrans( VvhName ); @@ -1293,9 +1289,9 @@ static int VvhVbhTreatWait( ScanWait ) UntilFalse->TYPE = VPN_TRANS_GUARDED; UntilFalse->VEX_GUARD = optimvexnotexpr( VexCond ); - VpnArc = addvpnarcplace( VvhVpnFigure, UntilTest , UntilTrue ); - VpnArc = addvpnarcplace( VvhVpnFigure, UntilTest , UntilFalse ); - VpnArc = addvpnarctrans( VvhVpnFigure, UntilFalse, WaitPlace ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, UntilTest , UntilTrue ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, UntilTest , UntilFalse ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, UntilFalse, WaitPlace ); sprintf( VvhName, "end_until.%s.%ld", VvhTopName, Number ); UntilPlace = VvhVpnAddPlace( VvhName ); @@ -1304,8 +1300,8 @@ static int VvhVbhTreatWait( ScanWait ) UntilEnd = VvhVpnAddTrans( VvhName ); UntilEnd->TYPE = VPN_TRANS_IMMEDIATE; - VpnArc = addvpnarctrans( VvhVpnFigure, UntilTrue, UntilPlace ); - VpnArc = addvpnarcplace( VvhVpnFigure, UntilPlace, UntilEnd ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, UntilTrue, UntilPlace ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, UntilPlace, UntilEnd ); WaitPlace->LINK = UntilPlace; @@ -1331,7 +1327,6 @@ static int VvhVbhTreatLoop( ScanLoop ) vpnplace_list *OldEndLoop; vpntrans_list *BeginTrans; vpntrans_list *EndTrans; - vpnarc *VpnArc; long Number; VvhCurrentLine = ScanLoop->LINE; @@ -1342,12 +1337,12 @@ static int VvhVbhTreatLoop( ScanLoop ) BeginPlace = VvhVpnAddPlace( VvhName ); BeginPlace->TYPE = VPN_PLACE_LOOP; - VpnArc = addvpnarctrans( VvhVpnFigure, VvhPrevTrans, BeginPlace ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, VvhPrevTrans, BeginPlace ); BeginTrans = VvhVpnAddTrans( VvhName ); BeginTrans->TYPE = VPN_TRANS_IMMEDIATE; - VpnArc = addvpnarcplace( VvhVpnFigure, BeginPlace, BeginTrans ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, BeginPlace, BeginTrans ); sprintf( VvhName, "end_loop.%s.%s.%ld", ScanLoop->LABEL, VvhTopName, Number ); EndPlace = VvhVpnAddPlace( VvhName ); @@ -1358,7 +1353,7 @@ static int VvhVbhTreatLoop( ScanLoop ) EndTrans = VvhVpnAddTrans( VvhName ); EndTrans->TYPE = VPN_TRANS_IMMEDIATE; - VpnArc = addvpnarcplace( VvhVpnFigure, EndPlace, EndTrans ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, EndPlace, EndTrans ); addauthelem( VvhHashEndLoop , ScanLoop->LABEL, (long)EndPlace ); addauthelem( VvhHashBeginLoop, ScanLoop->LABEL, (long)BeginPlace ); @@ -1376,7 +1371,7 @@ static int VvhVbhTreatLoop( ScanLoop ) if ( VvhPrevTrans != (vpntrans_list *)0 ) { - VpnArc = addvpnarctrans( VvhVpnFigure, VvhPrevTrans, BeginPlace ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, VvhPrevTrans, BeginPlace ); } delauthelem( VvhHashEndLoop , ScanLoop->LABEL ); @@ -1421,7 +1416,6 @@ static void VvhVbhTreatWhile( ScanWhile ) vpntrans_list *TrueTrans; vpntrans_list *FalseTrans; vpntrans_list *EndTrans; - vpnarc *VpnArc; vexexpr *VexCond; long Number; @@ -1433,7 +1427,7 @@ static void VvhVbhTreatWhile( ScanWhile ) BeginPlace = VvhVpnAddPlace( VvhName ); BeginPlace->TYPE = VPN_PLACE_WHILE; - VpnArc = addvpnarctrans( VvhVpnFigure, VvhPrevTrans, BeginPlace ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, VvhPrevTrans, BeginPlace ); sprintf( VvhName, "end_while.%s.%s.%ld", ScanWhile->LABEL, VvhTopName, Number ); EndPlace = VvhVpnAddPlace( VvhName ); @@ -1444,7 +1438,7 @@ static void VvhVbhTreatWhile( ScanWhile ) EndTrans = VvhVpnAddTrans( VvhName ); EndTrans->TYPE = VPN_TRANS_IMMEDIATE; - VpnArc = addvpnarcplace( VvhVpnFigure, EndPlace, EndTrans ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, EndPlace, EndTrans ); addauthelem( VvhHashEndLoop , ScanWhile->LABEL, (long)EndPlace ); addauthelem( VvhHashBeginLoop, ScanWhile->LABEL, (long)BeginPlace ); @@ -1465,8 +1459,8 @@ static void VvhVbhTreatWhile( ScanWhile ) TestPlace = VvhVpnAddPlace( VvhName ); TestPlace->TYPE = VPN_PLACE_WHILE_TEST; - VpnArc = addvpnarcplace( VvhVpnFigure, BeginPlace, TestTrans ); - VpnArc = addvpnarctrans( VvhVpnFigure, TestTrans, TestPlace ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, BeginPlace, TestTrans ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, TestTrans, TestPlace ); sprintf( VvhName, "while_true.%s.%s.%ld", ScanWhile->LABEL, VvhTopName, Number ); TrueTrans = VvhVpnAddTrans( VvhName ); @@ -1478,8 +1472,8 @@ static void VvhVbhTreatWhile( ScanWhile ) FalseTrans->TYPE = VPN_TRANS_GUARDED; FalseTrans->VEX_GUARD = optimvexnotexpr( VexCond ); - VpnArc = addvpnarcplace( VvhVpnFigure, TestPlace, TrueTrans ); - VpnArc = addvpnarcplace( VvhVpnFigure, TestPlace, FalseTrans ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, TestPlace, TrueTrans ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, TestPlace, FalseTrans ); VvhPrevTrans = TrueTrans; @@ -1487,10 +1481,10 @@ static void VvhVbhTreatWhile( ScanWhile ) if ( VvhPrevTrans != (vpntrans_list *)0 ) { - VpnArc = addvpnarctrans( VvhVpnFigure, VvhPrevTrans, BeginPlace ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, VvhPrevTrans, BeginPlace ); } - VpnArc = addvpnarctrans( VvhVpnFigure, FalseTrans, EndPlace ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, FalseTrans, EndPlace ); addvpnline( VvhVpnFigure, &EndPlace->LINE, VvhCurrentLine ); @@ -1527,7 +1521,6 @@ static void VvhVbhTreatFor( ScanFor ) vpntrans_list *EndTrans; vpntrans_list *IncTrans; vpnact_list *VpnAction; - vpnarc *VpnArc; vexexpr *VexLeft; vexexpr *VexRight; vexexpr *VexVar; @@ -1544,7 +1537,7 @@ static void VvhVbhTreatFor( ScanFor ) BeginPlace = VvhVpnAddPlace( VvhName ); BeginPlace->TYPE = VPN_PLACE_FOR; - VpnArc = addvpnarctrans( VvhVpnFigure, VvhPrevTrans, BeginPlace ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, VvhPrevTrans, BeginPlace ); sprintf( VvhName, "end_for.%s.%s.%ld", ScanFor->LABEL, VvhTopName, Number ); EndPlace = VvhVpnAddPlace( VvhName ); @@ -1555,7 +1548,7 @@ static void VvhVbhTreatFor( ScanFor ) EndTrans = VvhVpnAddTrans( VvhName ); EndTrans->TYPE = VPN_TRANS_IMMEDIATE; - VpnArc = addvpnarcplace( VvhVpnFigure, EndPlace, EndTrans ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, EndPlace, EndTrans ); sprintf( VvhName, "for_init.%s.%s.%ld", ScanFor->LABEL, VvhTopName, Number ); InitTrans = VvhVpnAddTrans( VvhName ); @@ -1581,8 +1574,8 @@ static void VvhVbhTreatFor( ScanFor ) LoopPlace = VvhVpnAddPlace( VvhName ); LoopPlace->TYPE = VPN_PLACE_FOR_LOOP; - VpnArc = addvpnarcplace( VvhVpnFigure, BeginPlace, InitTrans ); - VpnArc = addvpnarctrans( VvhVpnFigure, InitTrans, LoopPlace ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, BeginPlace, InitTrans ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, InitTrans, LoopPlace ); sprintf( VvhName, "for_test.%s.%s.%ld", ScanFor->LABEL, VvhTopName, Number ); TestTrans = VvhVpnAddTrans( VvhName ); @@ -1593,8 +1586,8 @@ static void VvhVbhTreatFor( ScanFor ) TestPlace = VvhVpnAddPlace( VvhName ); TestPlace->TYPE = VPN_PLACE_FOR_TEST; - VpnArc = addvpnarcplace( VvhVpnFigure, LoopPlace, TestTrans ); - VpnArc = addvpnarctrans( VvhVpnFigure, TestTrans, TestPlace ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, LoopPlace, TestTrans ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, TestTrans, TestPlace ); sprintf( VvhName, "for_true.%s.%s.%ld", ScanFor->LABEL, VvhTopName, Number ); TrueTrans = VvhVpnAddTrans( VvhName ); @@ -1606,8 +1599,8 @@ static void VvhVbhTreatFor( ScanFor ) FalseTrans->TYPE = VPN_TRANS_GUARDED; FalseTrans->VEX_GUARD = optimvexnotexpr( VexCond ); - VpnArc = addvpnarcplace( VvhVpnFigure, TestPlace, TrueTrans ); - VpnArc = addvpnarcplace( VvhVpnFigure, TestPlace, FalseTrans ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, TestPlace, TrueTrans ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, TestPlace, FalseTrans ); sprintf( VvhName, "for_inc.%s.%s.%ld", ScanFor->LABEL, VvhTopName, Number ); IncPlace = VvhVpnAddPlace( VvhName ); @@ -1632,8 +1625,8 @@ static void VvhVbhTreatFor( ScanFor ) VpnAction = addvpnactasg( VvhVpnFigure, IncTrans, VexVar, VexInc ); addvpnline( VvhVpnFigure, &VpnAction->LINE, VvhCurrentLine ); - VpnArc = addvpnarcplace( VvhVpnFigure, IncPlace , IncTrans ); - VpnArc = addvpnarctrans( VvhVpnFigure, IncTrans , LoopPlace ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, IncPlace , IncTrans ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, IncTrans , LoopPlace ); OldBeginLoop = VvhBeginLoop; OldEndLoop = VvhEndLoop; @@ -1651,10 +1644,10 @@ static void VvhVbhTreatFor( ScanFor ) if ( TrueTrans != (vpntrans_list *)0 ) { - VpnArc = addvpnarctrans( VvhVpnFigure, TrueTrans, IncPlace ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, TrueTrans, IncPlace ); } - VpnArc = addvpnarctrans( VvhVpnFigure, FalseTrans, EndPlace ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, FalseTrans, EndPlace ); addvpnline( VvhVpnFigure, &EndPlace->LINE, VvhCurrentLine ); @@ -1684,7 +1677,6 @@ static int VvhVbhTreatNext( ScanNext ) vpnplace_list *LoopPlace; vpntrans_list *TrueTrans; vpntrans_list *FalseTrans; - vpnarc *VpnArc; vexexpr *VexCond; long Number; @@ -1720,7 +1712,7 @@ static int VvhVbhTreatNext( ScanNext ) } } - VpnArc = addvpnarctrans( VvhVpnFigure, VvhPrevTrans, BeginPlace ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, VvhPrevTrans, BeginPlace ); if ( VexCond != (vexexpr *)0 ) { @@ -1733,23 +1725,23 @@ static int VvhVbhTreatNext( ScanNext ) EndTrans = VvhVpnAddTrans( VvhName ); EndTrans->TYPE = VPN_TRANS_IMMEDIATE; - VpnArc = addvpnarcplace( VvhVpnFigure, EndPlace, EndTrans ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, EndPlace, EndTrans ); sprintf( VvhName, "next_true.%s.%ld", VvhTopName, Number ); TrueTrans = VvhVpnAddTrans( VvhName ); TrueTrans->TYPE = VPN_TRANS_GUARDED; TrueTrans->VEX_GUARD = dupvexexpr( VexCond ); - VpnArc = addvpnarcplace( VvhVpnFigure, BeginPlace, TrueTrans ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, BeginPlace, TrueTrans ); sprintf( VvhName, "next_false.%s.%ld", VvhTopName, Number ); FalseTrans = VvhVpnAddTrans( VvhName ); FalseTrans->TYPE = VPN_TRANS_GUARDED; FalseTrans->VEX_GUARD = optimvexnotexpr( VexCond ); - VpnArc = addvpnarcplace( VvhVpnFigure, BeginPlace, FalseTrans ); - VpnArc = addvpnarctrans( VvhVpnFigure, FalseTrans, EndPlace ); - VpnArc = addvpnarctrans( VvhVpnFigure, TrueTrans , LoopPlace ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, BeginPlace, FalseTrans ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, FalseTrans, EndPlace ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, TrueTrans , LoopPlace ); VvhPrevTrans = EndTrans; @@ -1759,8 +1751,8 @@ static int VvhVbhTreatNext( ScanNext ) TrueTrans = VvhVpnAddTrans( VvhName ); TrueTrans->TYPE = VPN_TRANS_IMMEDIATE; - VpnArc = addvpnarcplace( VvhVpnFigure, BeginPlace, TrueTrans ); - VpnArc = addvpnarctrans( VvhVpnFigure, TrueTrans , LoopPlace ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, BeginPlace, TrueTrans ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, TrueTrans , LoopPlace ); VvhPrevTrans = (vpntrans_list *)0; @@ -1784,7 +1776,6 @@ static int VvhVbhTreatExit( ScanExit ) vpnplace_list *LoopPlace; vpntrans_list *TrueTrans; vpntrans_list *FalseTrans; - vpnarc *VpnArc; vexexpr *VexCond; long Number; @@ -1820,7 +1811,7 @@ static int VvhVbhTreatExit( ScanExit ) } } - VpnArc = addvpnarctrans( VvhVpnFigure, VvhPrevTrans, BeginPlace ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, VvhPrevTrans, BeginPlace ); if ( VexCond != (vexexpr *)0 ) { @@ -1833,23 +1824,23 @@ static int VvhVbhTreatExit( ScanExit ) EndTrans = VvhVpnAddTrans( VvhName ); EndTrans->TYPE = VPN_TRANS_IMMEDIATE; - VpnArc = addvpnarcplace( VvhVpnFigure, EndPlace, EndTrans ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, EndPlace, EndTrans ); sprintf( VvhName, "exit_true.%s.%ld", VvhTopName, Number ); TrueTrans = VvhVpnAddTrans( VvhName ); TrueTrans->TYPE = VPN_TRANS_GUARDED; TrueTrans->VEX_GUARD = dupvexexpr( VexCond ); - VpnArc = addvpnarcplace( VvhVpnFigure, BeginPlace, TrueTrans ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, BeginPlace, TrueTrans ); sprintf( VvhName, "exit_false.%s.%ld", VvhTopName, Number ); FalseTrans = VvhVpnAddTrans( VvhName ); FalseTrans->TYPE = VPN_TRANS_GUARDED; FalseTrans->VEX_GUARD = optimvexnotexpr( VexCond ); - VpnArc = addvpnarcplace( VvhVpnFigure, BeginPlace, FalseTrans ); - VpnArc = addvpnarctrans( VvhVpnFigure, FalseTrans, EndPlace ); - VpnArc = addvpnarctrans( VvhVpnFigure, TrueTrans , LoopPlace ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, BeginPlace, FalseTrans ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, FalseTrans, EndPlace ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, TrueTrans , LoopPlace ); VvhPrevTrans = EndTrans; @@ -1859,8 +1850,8 @@ static int VvhVbhTreatExit( ScanExit ) TrueTrans = VvhVpnAddTrans( VvhName ); TrueTrans->TYPE = VPN_TRANS_IMMEDIATE; - VpnArc = addvpnarcplace( VvhVpnFigure, BeginPlace, TrueTrans ); - VpnArc = addvpnarctrans( VvhVpnFigure, TrueTrans , LoopPlace ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, BeginPlace, TrueTrans ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, TrueTrans , LoopPlace ); VvhPrevTrans = (vpntrans_list *)0; @@ -1880,7 +1871,6 @@ static void VvhVbhTreatCall( ScanCall ) vpnplace_list *CallPlace; vpntrans_list *CallTrans; vpnact_list *VpnAction; - vpnarc *VpnArc; vexexpr *Expr; long Number; @@ -1895,8 +1885,8 @@ static void VvhVbhTreatCall( ScanCall ) CallTrans = VvhVpnAddTrans( VvhName ); CallTrans->TYPE = VPN_TRANS_ACT_EXEC; - VpnArc = addvpnarctrans( VvhVpnFigure, VvhPrevTrans, CallPlace ); - VpnArc = addvpnarcplace( VvhVpnFigure, CallPlace , CallTrans ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, VvhPrevTrans, CallPlace ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, CallPlace , CallTrans ); VvhPrevTrans = CallTrans; @@ -1917,7 +1907,6 @@ static void VvhVbhTreatReturn( ScanReturn ) vpnplace_list *ReturnPlace; vpntrans_list *ReturnTrans; vpnact_list *VpnAction; - vpnarc *VpnArc; vexexpr *Expr; long Number; @@ -1940,15 +1929,15 @@ static void VvhVbhTreatReturn( ScanReturn ) ReturnTrans = VvhVpnAddTrans( VvhName ); ReturnTrans->TYPE = VPN_TRANS_ACT_EXEC; - VpnArc = addvpnarctrans( VvhVpnFigure, VvhPrevTrans, ReturnPlace ); - VpnArc = addvpnarcplace( VvhVpnFigure, ReturnPlace , ReturnTrans ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, VvhPrevTrans, ReturnPlace ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, ReturnPlace , ReturnTrans ); VvhPrevTrans = ReturnTrans; VpnAction = addvpnactreturn( VvhVpnFigure, VvhPrevTrans, Expr ); addvpnline( VvhVpnFigure, &VpnAction->LINE, VvhCurrentLine ); - VpnArc = addvpnarctrans( VvhVpnFigure, VvhPrevTrans, VvhFirstPlace ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, VvhPrevTrans, VvhFirstPlace ); VvhPrevTrans = (vpntrans_list *)0; } @@ -2024,7 +2013,6 @@ static void VvhVbhTreatProcess() vpnplace_list *WaitPlace; vpntrans_list *WaitTrans; vpndecl_list *VpnDeclar; - vpnarc *VpnArc; ptype_list *ScanPType; chain_list *ScanChain; vbpcs_list *ScanProc; @@ -2078,7 +2066,7 @@ static void VvhVbhTreatProcess() VvhProcess->ELABO = BeginTrans; BeginPlace->TOKEN = 1; - VpnArc = addvpnarcplace( VvhVpnFigure, BeginPlace, BeginTrans ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, BeginPlace, BeginTrans ); for ( ScanPType = ScanProc->VARIABLE; ScanPType != (ptype_list *)0; @@ -2129,10 +2117,10 @@ static void VvhVbhTreatProcess() if ( VvhPrevTrans != (vpntrans_list *)0 ) { - VpnArc = addvpnarctrans( VvhVpnFigure, VvhPrevTrans, WaitPlace ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, VvhPrevTrans, WaitPlace ); } - VpnArc = addvpnarcplace( VvhVpnFigure, WaitPlace, WaitTrans ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, WaitPlace, WaitTrans ); WaitTrans->TYPE = VPN_TRANS_INF_WAIT; VvhPrevTrans = WaitTrans; @@ -2142,7 +2130,7 @@ static void VvhVbhTreatProcess() if ( VvhPrevTrans != (vpntrans_list *)0 ) { - VpnArc = addvpnarctrans( VvhVpnFigure, VvhPrevTrans, BeginPlace ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, VvhPrevTrans, BeginPlace ); } VvhNumberProc++; @@ -2160,7 +2148,6 @@ static void VvhVbhTreatFunction() vpnplace_list *BeginPlace; vpntrans_list *BeginTrans; vpndecl_list *VpnDeclar; - vpnarc *VpnArc; ptype_list *ScanPType; vbfun_list *ScanFunc; vbarg_list *ScanArg; @@ -2209,7 +2196,7 @@ static void VvhVbhTreatFunction() VvhFunction->ELABO = BeginTrans; BeginPlace->TOKEN = 1; - VpnArc = addvpnarcplace( VvhVpnFigure, BeginPlace, BeginTrans ); + /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, BeginPlace, BeginTrans ); for ( ScanArg = ScanFunc->ARGUMENT; ScanArg != (vbarg_list *)0; @@ -2282,7 +2269,7 @@ static void VvhVbhTreatFunction() if ( VvhPrevTrans != (vpntrans_list *)0 ) { - VpnArc = addvpnarctrans( VvhVpnFigure, VvhPrevTrans, BeginPlace ); + /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, VvhPrevTrans, BeginPlace ); } VvhNumberFunc++; diff --git a/alliance/src/xfsm/src/XMV_map.c b/alliance/src/xfsm/src/XMV_map.c index 6c42b9ee..7af3d638 100644 --- a/alliance/src/xfsm/src/XMV_map.c +++ b/alliance/src/xfsm/src/XMV_map.c @@ -221,14 +221,12 @@ void CallbackMapEvent ( MyWidget, Event, Args, Argc ) String *Args; int *Argc; { - Display *EventDisplay; char MouseEvent; long X; long Y; autbegin(); - EventDisplay = Event->display; MouseEvent = Args[ 0 ][ 0 ] - '0'; X = Event->x; @@ -305,12 +303,8 @@ void CallbackMapExpose( MyWidget, ClientData, CallData ) XtPointer ClientData; XmDrawingAreaCallbackStruct *CallData; { - XExposeEvent *ExposeEvent; - autbegin(); - ExposeEvent = (XExposeEvent *)CallData->event; - if ( XfsmFirstExpose ) { XfsmFirstExpose = XFSM_FALSE; diff --git a/alliance/src/xfsm/src/XMX_event.c b/alliance/src/xfsm/src/XMX_event.c index fc71e124..3cdcb8f6 100644 --- a/alliance/src/xfsm/src/XMX_event.c +++ b/alliance/src/xfsm/src/XMX_event.c @@ -453,15 +453,12 @@ void CallbackEvent ( MyWidget, Event, Args, Argc ) String *Args; int *Argc; { - Display *EventDisplay; int MouseEvent; Position OldUnitCursorX; Position OldUnitCursorY; autbegin(); - EventDisplay = Event->display; - MouseEvent = atoi( Args[ 0 ] ); if ( MouseEvent == XFSM_LEAVE ) diff --git a/alliance/src/xsch/src/XMV_map.c b/alliance/src/xsch/src/XMV_map.c index a99d2a95..b3f89326 100644 --- a/alliance/src/xsch/src/XMV_map.c +++ b/alliance/src/xsch/src/XMV_map.c @@ -220,14 +220,12 @@ void CallbackMapEvent ( MyWidget, Event, Args, Argc ) String *Args; int *Argc; { - Display *EventDisplay; char MouseEvent; long X; long Y; autbegin(); - EventDisplay = Event->display; MouseEvent = Args[ 0 ][ 0 ] - '0'; X = Event->x; @@ -304,12 +302,8 @@ void CallbackMapExpose( MyWidget, ClientData, CallData ) XtPointer ClientData; XmDrawingAreaCallbackStruct *CallData; { - XExposeEvent *ExposeEvent; - autbegin(); - ExposeEvent = (XExposeEvent *)CallData->event; - if ( XschFirstExpose ) { XschFirstExpose = XSCH_FALSE; diff --git a/alliance/src/xsch/src/XMX_view.c b/alliance/src/xsch/src/XMX_view.c index 89dfafe3..2d1c607d 100644 --- a/alliance/src/xsch/src/XMX_view.c +++ b/alliance/src/xsch/src/XMX_view.c @@ -1817,7 +1817,6 @@ static void XschDrawOrAnd( X1r, Y1r, X2r, Y2r, Ycr, Obj ) long Ycr; xschobj_list *Obj; { - long gs_y; long gs_x; long cs; int i; @@ -1829,7 +1828,7 @@ static void XschDrawOrAnd( X1r, Y1r, X2r, Y2r, Ycr, Obj ) long gas_x; long Radius; - long x, y; + long x; long yc; long y1; long DeltaX; @@ -1854,11 +1853,11 @@ XDrawRectangle( XschGraphicDisplay, n = Obj->ARG1; gs_x = ( 6 * DeltaX ) / 8; - gs_y = ( 7 * DeltaY ) / 8; +//gs_y = ( 7 * DeltaY ) / 8; cs = DeltaX / 8; yc = XschGraphicDy - Ycr; - y = XschGraphicDy - Ycr - gs_y/2; +//y = XschGraphicDy - Ycr - gs_y/2; x = X1r + cs; if ( Obj->ARG3 == 0 )