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

Code cleanup with gcc 4.8.1 (RHEL6/devtoolset2). 

This version of gcc is even more thorough in finding unused variables.
This commit is contained in:
Jean-Paul Chaput 2014-02-19 00:15:46 +01:00
parent 97aee2580b
commit 17ace03ec5
37 changed files with 213 additions and 304 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
alliance/src/abv/src/bvl_bcomp_y.y
View File

@ -737,9 +737,8 @@ signal_declaration
char *signame; char *signame;
long sigconf; long sigconf;
void *pnt; 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. */ /* First, check the validity of the declaration. */

17
alliance/src/asimut/src/vh_simulad.c
View File

@ -54,22 +54,18 @@ char *argv[];
char usage_flg = 0 ; /* print usage */ char usage_flg = 0 ; /* print usage */
char help_flg = 0 ; /* display help */ char help_flg = 0 ; /* display help */
char init_flg = 0 ; /* description's init. */ char init_flg = 0 ; /* description's init. */
char core_flg = 0 ; /* core file at error */
char sdebug_flg = 0 ; /* debug structural */ char sdebug_flg = 0 ; /* debug structural */
char bdebug_flg = 0 ; /* debug behavioural */ char bdebug_flg = 0 ; /* debug behavioural */
char pdebug_flg = 0 ; /* debug pattern */ char pdebug_flg = 0 ; /* debug pattern */
char ldebug_flg = 0 ; /* debug linker */ char ldebug_flg = 0 ; /* debug linker */
char cdebug_flg = 0 ; /* dbeug cycle by cycle */ char cdebug_flg = 0 ; /* dbeug cycle by cycle */
char ddebug_flg = 0 ; /* debug delta by delta */
char behav_flg = 0 ; /* behav. description */ char behav_flg = 0 ; /* behav. description */
char nosim_flg = 0 ; /* no simulation */ char nosim_flg = 0 ; /* no simulation */
char nores_flg = 0 ; /* no result file */ char nores_flg = 0 ; /* no result file */
char makbdd_flg = 0 ; /* trace bdd making */
char bdd_flg = 0 ; /* use bdd or gex */ char bdd_flg = 0 ; /* use bdd or gex */
char xmess_flg = 0 ; /* no execution message */ char xmess_flg = 0 ; /* no execution message */
char randly_flg = 0 ; /* random delays */ char randly_flg = 0 ; /* random delays */
char fixdly_flg = 0 ; /* fixed delays */ char fixdly_flg = 0 ; /* fixed delays */
char defdly_flg = 0 ; /* default delays */
char bckdly_flg = 0 ; /* backanotated delays */ char bckdly_flg = 0 ; /* backanotated delays */
char trans_flg = 0 ; /* transport delays */ char trans_flg = 0 ; /* transport delays */
char inert_flg = 1 ; /* inertial delays */ char inert_flg = 1 ; /* inertial delays */
@ -84,7 +80,6 @@ char *argv[];
unsigned int init_val = 0 ; /* init. constant */ unsigned int init_val = 0 ; /* init. constant */
unsigned int comp_mode = 0 ; /* beh compiler mode */ unsigned int comp_mode = 0 ; /* beh compiler mode */
struct lofig *ptlofig ;
struct befig *ptbefig = NULL ; struct befig *ptbefig = NULL ;
struct befig *ptbef ; struct befig *ptbef ;
struct chain *ptchain ; struct chain *ptchain ;
@ -192,7 +187,7 @@ char *argv[];
if ((!strcmp (argv [i], "-defaultdelay")) if ((!strcmp (argv [i], "-defaultdelay"))
|| (!strcmp (argv [i], "-dd"))) || (!strcmp (argv [i], "-dd")))
{ {
defdly_flg = 1; //defdly_flg = 1;
delay_mode |= BEH_DELAY_DEFAULT; delay_mode |= BEH_DELAY_DEFAULT;
arg_flg [i] = 1; arg_flg [i] = 1;
} }
@ -238,7 +233,7 @@ char *argv[];
if (!strcmp (argv [i], "-t")) if (!strcmp (argv [i], "-t"))
{ {
makbdd_flg = 1; //makbdd_flg = 1;
arg_flg [i] = 1; arg_flg [i] = 1;
} }
@ -260,7 +255,7 @@ char *argv[];
if (!strcmp (argv [i], "-core")) if (!strcmp (argv [i], "-core"))
{ {
core_flg = i + 1; //core_flg = i + 1;
arg_flg [i ] = 1; arg_flg [i ] = 1;
arg_flg [i+1] = 1; arg_flg [i+1] = 1;
} }
@ -327,8 +322,8 @@ char *argv[];
pdebug_flg = 1; break; pdebug_flg = 1; break;
case 'c': case 'c':
cdebug_flg = 1; break; cdebug_flg = 1; break;
case 'd': //case 'd':
ddebug_flg = 1; break; //ddebug_flg = 1; break;
} }
} }
} }
@ -527,7 +522,7 @@ char *argv[];
error_flag += ptbefig->ERRFLG; error_flag += ptbefig->ERRFLG;
} }
ptlofig = vhl_makgst (ptbefig); /*ptlofig =*/ vhl_makgst (ptbefig);
} }
else else

6
alliance/src/boom/src/boom_bdd.c
View File

@ -466,7 +466,6 @@ static long BoomBddSetExprKeepAux( Expr )
char *Name; char *Name;
char *Vector; char *Vector;
beaux_list *BehAux; beaux_list *BehAux;
bddnode *BddNode;
authelem *Element; authelem *Element;
long Index; long Index;
long Number; long Number;
@ -519,7 +518,7 @@ static long BoomBddSetExprKeepAux( Expr )
addauthelem( BoomBddHashKeepAux, BehAux->NAME, 0 ); addauthelem( BoomBddHashKeepAux, BehAux->NAME, 0 );
SetBoomBehAuxKeep( BehAux ); SetBoomBehAuxKeep( BehAux );
BddNode = addbddcircuitin( (bddcircuit *)0, BehAux->NAME, /*BddNode =*/ addbddcircuitin( (bddcircuit *)0, BehAux->NAME,
0, BDD_IN_MODE_LAST ); 0, BDD_IN_MODE_LAST );
Number++; Number++;
@ -581,7 +580,6 @@ void BoomBehMakeBddNodeNoExplosion( BehFigure )
bereg_list *BehReg; bereg_list *BehReg;
biabl_list *BiAbl; biabl_list *BiAbl;
binode_list *BiNode; binode_list *BiNode;
bddnode *BddNode;
char *Name; char *Name;
char *Vector; char *Vector;
long Index; long Index;
@ -648,7 +646,7 @@ void BoomBehMakeBddNodeNoExplosion( BehFigure )
if ( Vector == Name ) if ( Vector == Name )
{ {
BddNode = addbddcircuitin( (bddcircuit *)0, BehAux->NAME, /*BddNode =*/ addbddcircuitin( (bddcircuit *)0, BehAux->NAME,
0, BDD_IN_MODE_LAST ); 0, BDD_IN_MODE_LAST );
if ( IsBoomBehAuxKeep( BehAux ) ) if ( IsBoomBehAuxKeep( BehAux ) )

3
alliance/src/bvl/src/bvl_bcomp_y.y
View File

@ -2016,9 +2016,8 @@ signal_declaration
char *signame; char *signame;
long sigconf; long sigconf;
void *pnt; 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. */ /* First, check the validity of the declaration. */

3
alliance/src/ctl/src/ctladd.c
View File

@ -132,7 +132,6 @@ static ctldecl_list *loc_addctldecl( Figure, Expr, DeclType )
unsigned char DeclType; unsigned char DeclType;
{ {
ctldecl_list *Decl; ctldecl_list *Decl;
ctldecl_list **PrevDecl;
vexexpr *Atom; vexexpr *Atom;
ctlsym *Sym; ctlsym *Sym;
char *Name; char *Name;
@ -184,7 +183,7 @@ static ctldecl_list *loc_addctldecl( Figure, Expr, DeclType )
Index += IndexStep; Index += IndexStep;
} }
PrevDecl = &Figure->DECLAR[ DeclType ]; //PrevDecl = &Figure->DECLAR[ DeclType ];
Decl->VEX_ATOM = Expr; Decl->VEX_ATOM = Expr;
Decl->DECL_SYM = Sym; Decl->DECL_SYM = Sym;

12
alliance/src/ctp/src/ctp_y.y
View File

@ -682,9 +682,8 @@ subtype_indication
.constraint. .constraint.
{ {
ctltype_list *ctltype_pnt; 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); ctltype_pnt = (ctltype_list *)chktab(hshtab,$2.NAME,CTP_MODNAM,CTP_PNTDFN);
@ -1315,8 +1314,6 @@ primary
char Buffer[ 40 ]; char Buffer[ 40 ];
long left; long left;
long right; long right;
long left_bnd;
long right_bnd;
long mode; long mode;
long flag; long flag;
@ -1364,8 +1361,8 @@ primary
my_ctp_error (17,$1.NAME); my_ctp_error (17,$1.NAME);
} }
left_bnd = chktab (hshtab,$1.NAME,LocalName,CTP_WMNDFN); /*left_bnd =*/ chktab (hshtab,$1.NAME,LocalName,CTP_WMNDFN);
right_bnd = chktab (hshtab,$1.NAME,LocalName,CTP_WMXDFN); /*right_bnd =*/ chktab (hshtab,$1.NAME,LocalName,CTP_WMXDFN);
left = $1.LEFT; left = $1.LEFT;
right = $1.RIGHT; right = $1.RIGHT;
@ -1696,14 +1693,13 @@ attribute_name
char *LocalName; char *LocalName;
long type; long type;
long flag; long flag;
long mode;
long AttrLeft; long AttrLeft;
long AttrRight; long AttrRight;
long AttrLow; long AttrLow;
long AttrHigh; long AttrHigh;
LocalName = CTP_MODNAM; 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); type = chktab (hshtab,$1.NAME,LocalName,CTP_TYPDFN);
flag = $3; flag = $3;

9
alliance/src/fvh/src/fbl_bcomp_y.y
View File

@ -885,9 +885,8 @@ signal_declaration
char *signame; char *signame;
long sigconf; long sigconf;
void *pnt; 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. */ /* First, check the validity of the declaration. */
@ -2226,7 +2225,6 @@ case_statement
unsigned long size=1; unsigned long size=1;
unsigned long *size1; unsigned long *size1;
long indice=0; long indice=0;
struct choice_chain *ch;
struct fbcho **pnt; struct fbcho **pnt;
struct fbcho *tab = NULL; struct fbcho *tab = NULL;
struct choice_chain *nm1lst; struct choice_chain *nm1lst;
@ -2247,7 +2245,7 @@ case_statement
tab[indice].INSTRUCTION = reversetype(FBL_CASPNT->INSTRUCTION); tab[indice].INSTRUCTION = reversetype(FBL_CASPNT->INSTRUCTION);
tab[indice].SIZE = FBL_CASPNT->SIZE; tab[indice].SIZE = FBL_CASPNT->SIZE;
tab[indice++].VALUE = FBL_CASPNT->VALUE; tab[indice++].VALUE = FBL_CASPNT->VALUE;
ch = FBL_CASPNT; /*ch = FBL_CASPNT;*/
FBL_CASPNT =FBL_CASPNT->NEXT; FBL_CASPNT =FBL_CASPNT->NEXT;
/*free(ch);*/ /*free(ch);*/
} }
@ -2651,7 +2649,6 @@ primary
long in_bound; long in_bound;
long out_bound; long out_bound;
long mode; long mode;
long prtype;
long type; long type;
mode = chktab (hshtab,$1.NAME,FBL_MODNAM,FBL_SIGDFN); mode = chktab (hshtab,$1.NAME,FBL_MODNAM,FBL_SIGDFN);
@ -2742,7 +2739,7 @@ primary
(chktab(hshtab,$1.NAME,FBL_MODNAM,FBL_TYPDFN) != -1)) (chktab(hshtab,$1.NAME,FBL_MODNAM,FBL_TYPDFN) != -1))
{ {
expr1.IDENT = $1.NAME; 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) if(val_type((FBL_BEFPNT->BETYP + type -1)->NAME) !=-1)
expr1.TYPE = chktab(hshtab,namealloc("bit"),FBL_MODNAM,FBL_TYPDFN); expr1.TYPE = chktab(hshtab,namealloc("bit"),FBL_MODNAM,FBL_TYPDFN);
else else

6
alliance/src/graal/src/GMV_map.c
View File

@ -221,14 +221,12 @@ void CallbackMapEvent ( MyWidget, Event, Args, Argc )
String *Args; String *Args;
int *Argc; int *Argc;
{ {
Display *EventDisplay;
char MouseEvent; char MouseEvent;
long X; long X;
long Y; long Y;
rdsbegin(); rdsbegin();
EventDisplay = Event->display;
MouseEvent = Args[ 0 ][ 0 ] - '0'; MouseEvent = Args[ 0 ][ 0 ] - '0';
X = Event->x; X = Event->x;
@ -305,12 +303,8 @@ void CallbackMapExpose( MyWidget, ClientData, CallData )
XtPointer ClientData; XtPointer ClientData;
XmDrawingAreaCallbackStruct *CallData; XmDrawingAreaCallbackStruct *CallData;
{ {
XExposeEvent *ExposeEvent;
rdsbegin(); rdsbegin();
ExposeEvent = (XExposeEvent *)CallData->event;
if ( GraalFirstExpose ) if ( GraalFirstExpose )
{ {
GraalFirstExpose = GRAAL_FALSE; GraalFirstExpose = GRAAL_FALSE;

3
alliance/src/graal/src/GMX_event.c
View File

@ -719,7 +719,6 @@ void CallbackEvent ( MyWidget, Event, Args, Argc )
String *Args; String *Args;
int *Argc; int *Argc;
{ {
Display *EventDisplay;
char MouseEvent; char MouseEvent;
int FlagUp; int FlagUp;
Position OldLambdaCursorX; Position OldLambdaCursorX;
@ -727,8 +726,6 @@ void CallbackEvent ( MyWidget, Event, Args, Argc )
rdsbegin(); rdsbegin();
EventDisplay = Event->display;
MouseEvent = atoi( Args[ 0 ] ); MouseEvent = atoi( Args[ 0 ] );
if ( MouseEvent == GRAAL_LEAVE ) if ( MouseEvent == GRAAL_LEAVE )

3
alliance/src/graal/src/GRM_peek.c
View File

@ -407,7 +407,6 @@ char GraalRealFlatInstance( Rectangle )
rdsrec_list *Rectangle; rdsrec_list *Rectangle;
{ {
phfig_list *FigureMbk; phfig_list *FigureMbk;
phins_list *InstanceMbk;
phins_list *SourceMbk; phins_list *SourceMbk;
void *Pointer; void *Pointer;
@ -419,7 +418,7 @@ char GraalRealFlatInstance( Rectangle )
FigureMbk = addphfig( "_ludo_" ); FigureMbk = addphfig( "_ludo_" );
SourceMbk = (phins_list *)GRAAL_MBK( Rectangle ); SourceMbk = (phins_list *)GRAAL_MBK( Rectangle );
InstanceMbk = addphins( FigureMbk, /*InstanceMbk =*/ addphins( FigureMbk,
SourceMbk->FIGNAME, SourceMbk->INSNAME, SourceMbk->FIGNAME, SourceMbk->INSNAME,
SourceMbk->TRANSF, SourceMbk->TRANSF,
SourceMbk->XINS, SourceMbk->YINS ); SourceMbk->XINS, SourceMbk->YINS );

4
alliance/src/loon/src/lon_lib_reader.c
View File

@ -61,7 +61,7 @@ extern chain_list *getfiles_with_ext (char *path, char *ext)
struct dirent *entry; struct dirent *entry;
char *filename; char *filename;
char *completefilename; char *completefilename;
int filenamelength, extensionlength, pathlength; int filenamelength, extensionlength;
chain_list *head; chain_list *head;
if (!path || !ext) return NULL; if (!path || !ext) return NULL;
@ -70,7 +70,7 @@ extern chain_list *getfiles_with_ext (char *path, char *ext)
if (!dir) return NULL; if (!dir) return NULL;
extensionlength = strlen (ext); extensionlength = strlen (ext);
pathlength = strlen (path); //pathlength = strlen (path);
head=NULL; head=NULL;
while ((entry = readdir (dir)) != NULL) { while ((entry = readdir (dir)) != NULL) {

6
alliance/src/loon/src/lon_signal_netlist.c
View File

@ -103,7 +103,6 @@ extern double loins_max_T(loins_list* loins)
ptype_list* ptype; ptype_list* ptype;
port_list* port; port_list* port;
locon_list* locon; locon_list* locon;
char* input;
biabl_list* biabl; biabl_list* biabl;
if (!loins) { if (!loins) {
@ -161,7 +160,7 @@ extern double loins_max_T(loins_list* loins)
fprintf(stderr,"loins_max_T: no losig name\n"); fprintf(stderr,"loins_max_T: no losig name\n");
autexit(1); autexit(1);
} }
input=(char*) locon->SIG->NAMECHAIN->DATA; //input=(char*) locon->SIG->NAMECHAIN->DATA;
/*finaly eval delay*/ /*finaly eval delay*/
delay=port->T; delay=port->T;
@ -184,7 +183,6 @@ extern double loins_max_RC(loins_list* loins, char* output)
ptype_list* ptype; ptype_list* ptype;
port_list* port; port_list* port;
locon_list* locon; locon_list* locon;
char* input;
biabl_list* biabl; biabl_list* biabl;
if (!loins || !output) { 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"); fprintf(stderr,"loins_max_RC: no losig name\n");
autexit(1); autexit(1);
} }
input=(char*) locon->SIG->NAMECHAIN->DATA; //input=(char*) locon->SIG->NAMECHAIN->DATA;
/*finaly eval delay*/ /*finaly eval delay*/
delay=port->R*getcapacitance(output); delay=port->R*getcapacitance(output);

4
alliance/src/lvx/src/lvx.c
View File

@ -1765,7 +1765,7 @@ char **argv;
{ {
static char figname1 [100], figname2 [100]; static char figname1 [100], figname2 [100];
lofig_list *lofig1 = NULL, *lofig2 = NULL; 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; int result;
presentation (); presentation ();
@ -1811,7 +1811,7 @@ char **argv;
case 'f' : break; case 'f' : break;
case 'o' : flag_ord = TRUE; break; case 'o' : flag_ord = TRUE; break;
case 'i' : readparamfile (lofig1, lofig2, argv[++count]); 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)) { while ((argv[count+1][0] != '-') && (++count < argc)) {
delins (lofig1, argv[count]); delins (lofig1, argv[count]);
delins (lofig2, argv[count]); delins (lofig2, argv[count]);

3
alliance/src/mbkvhdl/src/mvl_drive.c
View File

@ -57,7 +57,6 @@ struct lofig *ptfig;
extern char *getsigname (); extern char *getsigname ();
struct loins *ptins = NULL; struct loins *ptins = NULL;
struct locon *ptcon = NULL; struct locon *ptcon = NULL;
struct locon *tmp_ptcon = NULL;
struct locon *ptscan = NULL; struct locon *ptscan = NULL;
struct losig *ptsig = NULL; struct losig *ptsig = NULL;
struct chain *ptmodel = NULL; struct chain *ptmodel = NULL;
@ -309,7 +308,7 @@ struct lofig *ptfig;
ptcon = ptins->LOCON; ptcon = ptins->LOCON;
while (ptcon != NULL) 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)); fprintf (ptfile," %s => ",mvl_vhdlname (name));
if (left != -1) if (left != -1)

48
alliance/src/mbkvhdl/src/mvl_scomp_y.y
View File

@ -399,7 +399,6 @@ formal_port_element
.constraint. .constraint.
.BUS. .BUS.
{ {
struct locon *locon_pnt;
struct losig *losig_pnt; struct losig *losig_pnt;
long sig_width; long sig_width;
long sig_conf; long sig_conf;
@ -438,7 +437,7 @@ formal_port_element
case (MVL_ICNDFN + MVL_BTVDFN + MVL_NORDFN) : case (MVL_ICNDFN + MVL_BTVDFN + MVL_NORDFN) :
losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','0', losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','0',
sig_name,$6.LEFT,$6.RIGHT); 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); sig_name,$6.LEFT,$6.RIGHT);
break; break;
@ -446,15 +445,15 @@ formal_port_element
case (MVL_OCNDFN + MVL_BTVDFN + MVL_NORDFN) : case (MVL_OCNDFN + MVL_BTVDFN + MVL_NORDFN) :
losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','0', losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','0',
sig_name,$6.LEFT,$6.RIGHT); 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); sig_name,$6.LEFT,$6.RIGHT);
break; break;
case (MVL_OCNDFN + MVL_MUXDFN + MVL_BUSDFN) : case (MVL_OCNDFN + MVL_MUXDFN + MVL_BUSDFN) :
case (MVL_OCNDFN + MVL_MXVDFN + 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); 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); sig_name,$6.LEFT,$6.RIGHT);
break; break;
@ -462,7 +461,7 @@ formal_port_element
case (MVL_OCNDFN + MVL_WRVDFN + MVL_BUSDFN) : case (MVL_OCNDFN + MVL_WRVDFN + MVL_BUSDFN) :
losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','W', losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','W',
sig_name,$6.LEFT,$6.RIGHT); 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); sig_name,$6.LEFT,$6.RIGHT);
break; break;
@ -470,7 +469,7 @@ formal_port_element
case (MVL_BCNDFN + MVL_BTVDFN + MVL_NORDFN) : case (MVL_BCNDFN + MVL_BTVDFN + MVL_NORDFN) :
losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','0', losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','0',
sig_name,$6.LEFT,$6.RIGHT); 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); sig_name,$6.LEFT,$6.RIGHT);
break; break;
@ -478,7 +477,7 @@ formal_port_element
case (MVL_BCNDFN + MVL_MXVDFN + MVL_BUSDFN) : case (MVL_BCNDFN + MVL_MXVDFN + MVL_BUSDFN) :
losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','M', losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','M',
sig_name,$6.LEFT,$6.RIGHT); 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); sig_name,$6.LEFT,$6.RIGHT);
break; break;
@ -486,7 +485,7 @@ formal_port_element
case (MVL_BCNDFN + MVL_WRVDFN + MVL_BUSDFN) : case (MVL_BCNDFN + MVL_WRVDFN + MVL_BUSDFN) :
losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','W', losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','W',
sig_name,$6.LEFT,$6.RIGHT); 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); sig_name,$6.LEFT,$6.RIGHT);
break; break;
@ -494,7 +493,7 @@ formal_port_element
case (MVL_XCNDFN + MVL_BTVDFN + MVL_NORDFN) : case (MVL_XCNDFN + MVL_BTVDFN + MVL_NORDFN) :
losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','0', losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','0',
sig_name,$6.LEFT,$6.RIGHT); 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); sig_name,$6.LEFT,$6.RIGHT);
break; break;
default : default :
@ -735,7 +734,6 @@ local_port_element
.constraint. .constraint.
.BUS. .BUS.
{ {
struct locon *locon_pnt;
long sig_width; long sig_width;
long sig_conf; long sig_conf;
char *sig_name; char *sig_name;
@ -771,50 +769,42 @@ local_port_element
{ {
case (MVL_ICNDFN + MVL_BITDFN + MVL_NORDFN) : case (MVL_ICNDFN + MVL_BITDFN + MVL_NORDFN) :
case (MVL_ICNDFN + MVL_BTVDFN + MVL_NORDFN) : case (MVL_ICNDFN + MVL_BTVDFN + MVL_NORDFN) :
locon_pnt = mvl_addlocon (MVL_CHDPNT,NULL,'I', mvl_addlocon (MVL_CHDPNT,NULL,'I', sig_name,$6.LEFT,$6.RIGHT);
sig_name,$6.LEFT,$6.RIGHT);
break; break;
case (MVL_OCNDFN + MVL_BITDFN + MVL_NORDFN) : case (MVL_OCNDFN + MVL_BITDFN + MVL_NORDFN) :
case (MVL_OCNDFN + MVL_BTVDFN + MVL_NORDFN) : case (MVL_OCNDFN + MVL_BTVDFN + MVL_NORDFN) :
locon_pnt = mvl_addlocon (MVL_CHDPNT,NULL,'O', mvl_addlocon (MVL_CHDPNT,NULL,'O', sig_name,$6.LEFT,$6.RIGHT);
sig_name,$6.LEFT,$6.RIGHT);
break; break;
case (MVL_OCNDFN + MVL_MUXDFN + MVL_BUSDFN) : case (MVL_OCNDFN + MVL_MUXDFN + MVL_BUSDFN) :
case (MVL_OCNDFN + MVL_MXVDFN + MVL_BUSDFN) : case (MVL_OCNDFN + MVL_MXVDFN + MVL_BUSDFN) :
locon_pnt = mvl_addlocon (MVL_CHDPNT,NULL,'Z', mvl_addlocon (MVL_CHDPNT,NULL,'Z', sig_name,$6.LEFT,$6.RIGHT);
sig_name,$6.LEFT,$6.RIGHT);
break; break;
case (MVL_OCNDFN + MVL_WORDFN + MVL_BUSDFN) : case (MVL_OCNDFN + MVL_WORDFN + MVL_BUSDFN) :
case (MVL_OCNDFN + MVL_WRVDFN + MVL_BUSDFN) : case (MVL_OCNDFN + MVL_WRVDFN + MVL_BUSDFN) :
locon_pnt = mvl_addlocon (MVL_CHDPNT,NULL,'Z', mvl_addlocon (MVL_CHDPNT,NULL,'Z', sig_name,$6.LEFT,$6.RIGHT);
sig_name,$6.LEFT,$6.RIGHT);
break; break;
case (MVL_BCNDFN + MVL_BITDFN + MVL_NORDFN) : case (MVL_BCNDFN + MVL_BITDFN + MVL_NORDFN) :
case (MVL_BCNDFN + MVL_BTVDFN + MVL_NORDFN) : case (MVL_BCNDFN + MVL_BTVDFN + MVL_NORDFN) :
locon_pnt = mvl_addlocon (MVL_CHDPNT,NULL,'B', mvl_addlocon (MVL_CHDPNT,NULL,'B', sig_name,$6.LEFT,$6.RIGHT);
sig_name,$6.LEFT,$6.RIGHT);
break; break;
case (MVL_BCNDFN + MVL_MUXDFN + MVL_BUSDFN) : case (MVL_BCNDFN + MVL_MUXDFN + MVL_BUSDFN) :
case (MVL_BCNDFN + MVL_MXVDFN + MVL_BUSDFN) : case (MVL_BCNDFN + MVL_MXVDFN + MVL_BUSDFN) :
locon_pnt = mvl_addlocon (MVL_CHDPNT,NULL,'T', mvl_addlocon (MVL_CHDPNT,NULL,'T', sig_name,$6.LEFT,$6.RIGHT);
sig_name,$6.LEFT,$6.RIGHT);
break; break;
case (MVL_BCNDFN + MVL_WORDFN + MVL_BUSDFN) : case (MVL_BCNDFN + MVL_WORDFN + MVL_BUSDFN) :
case (MVL_BCNDFN + MVL_WRVDFN + MVL_BUSDFN) : case (MVL_BCNDFN + MVL_WRVDFN + MVL_BUSDFN) :
locon_pnt = mvl_addlocon (MVL_CHDPNT,NULL,'T', mvl_addlocon (MVL_CHDPNT,NULL,'T', sig_name,$6.LEFT,$6.RIGHT);
sig_name,$6.LEFT,$6.RIGHT);
break; break;
case (MVL_XCNDFN + MVL_BITDFN + MVL_NORDFN) : case (MVL_XCNDFN + MVL_BITDFN + MVL_NORDFN) :
case (MVL_XCNDFN + MVL_BTVDFN + MVL_NORDFN) : case (MVL_XCNDFN + MVL_BTVDFN + MVL_NORDFN) :
locon_pnt = mvl_addlocon (MVL_CHDPNT,NULL,'X', mvl_addlocon (MVL_CHDPNT,NULL,'X', sig_name,$6.LEFT,$6.RIGHT);
sig_name,$6.LEFT,$6.RIGHT);
break; break;
default : default :
@ -925,7 +915,6 @@ component_instantiation_statement
.port_map_aspect. .port_map_aspect.
Semicolon_ERR Semicolon_ERR
{ {
struct loins *loins_pnt ;
struct locon *locon_pnt ; struct locon *locon_pnt ;
struct chain *chain_pnt ; struct chain *chain_pnt ;
char tampon [256] ; char tampon [256] ;
@ -951,8 +940,7 @@ component_instantiation_statement
} }
if (MVL_ERRFLG == 0) if (MVL_ERRFLG == 0)
loins_pnt = addloins (MVL_LOFPNT, $1 , MVL_CHDPNT, addloins (MVL_LOFPNT, $1 , MVL_CHDPNT, MVL_NM1LST );
MVL_NM1LST );
} }
freechain (MVL_NM1LST); freechain (MVL_NM1LST);

3
alliance/src/mbkvhdlg/src/mvl_drive.c
View File

@ -97,7 +97,6 @@ struct lofig *ptfig;
extern char *getsigname (); extern char *getsigname ();
struct loins *ptins = NULL; struct loins *ptins = NULL;
struct locon *ptcon = NULL; struct locon *ptcon = NULL;
struct locon *tmp_ptcon = NULL;
struct locon *ptscan = NULL; struct locon *ptscan = NULL;
struct losig *ptsig = NULL; struct losig *ptsig = NULL;
struct chain *ptmodel = NULL; struct chain *ptmodel = NULL;
@ -344,7 +343,7 @@ struct lofig *ptfig;
ptcon = ptins->LOCON; ptcon = ptins->LOCON;
while (ptcon != NULL) 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)); fprintf (ptfile," %s => ",mvl_vhdlname (name));
if (left != -1) if (left != -1)

44
alliance/src/mbkvhdlg/src/mvl_scomp_y.y
View File

@ -421,7 +421,6 @@ formal_port_element
.constraint. .constraint.
.BUS. .BUS.
{ {
struct locon *locon_pnt;
struct losig *losig_pnt; struct losig *losig_pnt;
long sig_width; long sig_width;
long sig_conf; long sig_conf;
@ -460,7 +459,7 @@ formal_port_element
case (MVL_ICNDFN + MVL_BTVDFN + MVL_NORDFN) : case (MVL_ICNDFN + MVL_BTVDFN + MVL_NORDFN) :
losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','0', losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','0',
sig_name,$6.LEFT,$6.RIGHT); 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); sig_name,$6.LEFT,$6.RIGHT);
break; break;
@ -468,15 +467,15 @@ formal_port_element
case (MVL_OCNDFN + MVL_BTVDFN + MVL_NORDFN) : case (MVL_OCNDFN + MVL_BTVDFN + MVL_NORDFN) :
losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','0', losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','0',
sig_name,$6.LEFT,$6.RIGHT); 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); sig_name,$6.LEFT,$6.RIGHT);
break; break;
case (MVL_OCNDFN + MVL_MUXDFN + MVL_BUSDFN) : case (MVL_OCNDFN + MVL_MUXDFN + MVL_BUSDFN) :
case (MVL_OCNDFN + MVL_MXVDFN + 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); 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); sig_name,$6.LEFT,$6.RIGHT);
break; break;
@ -484,7 +483,7 @@ formal_port_element
case (MVL_OCNDFN + MVL_WRVDFN + MVL_BUSDFN) : case (MVL_OCNDFN + MVL_WRVDFN + MVL_BUSDFN) :
losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','W', losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','W',
sig_name,$6.LEFT,$6.RIGHT); 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); sig_name,$6.LEFT,$6.RIGHT);
break; break;
@ -492,7 +491,7 @@ formal_port_element
case (MVL_BCNDFN + MVL_BTVDFN + MVL_NORDFN) : case (MVL_BCNDFN + MVL_BTVDFN + MVL_NORDFN) :
losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','0', losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','0',
sig_name,$6.LEFT,$6.RIGHT); 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); sig_name,$6.LEFT,$6.RIGHT);
break; break;
@ -500,7 +499,7 @@ formal_port_element
case (MVL_BCNDFN + MVL_MXVDFN + MVL_BUSDFN) : case (MVL_BCNDFN + MVL_MXVDFN + MVL_BUSDFN) :
losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','M', losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','M',
sig_name,$6.LEFT,$6.RIGHT); 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); sig_name,$6.LEFT,$6.RIGHT);
break; break;
@ -508,7 +507,7 @@ formal_port_element
case (MVL_BCNDFN + MVL_WRVDFN + MVL_BUSDFN) : case (MVL_BCNDFN + MVL_WRVDFN + MVL_BUSDFN) :
losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','W', losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','W',
sig_name,$6.LEFT,$6.RIGHT); 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); sig_name,$6.LEFT,$6.RIGHT);
break; break;
@ -516,7 +515,7 @@ formal_port_element
case (MVL_XCNDFN + MVL_BTVDFN + MVL_NORDFN) : case (MVL_XCNDFN + MVL_BTVDFN + MVL_NORDFN) :
losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','0', losig_pnt = mvl_addlosig (MVL_LOFPNT,MVL_SIGIDX,'E','0',
sig_name,$6.LEFT,$6.RIGHT); 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); sig_name,$6.LEFT,$6.RIGHT);
break; break;
default : default :
@ -758,7 +757,6 @@ local_port_element
.constraint. .constraint.
.BUS. .BUS.
{ {
struct locon *locon_pnt;
long sig_width; long sig_width;
long sig_conf; long sig_conf;
char *sig_name; char *sig_name;
@ -794,50 +792,42 @@ local_port_element
{ {
case (MVL_ICNDFN + MVL_BITDFN + MVL_NORDFN) : case (MVL_ICNDFN + MVL_BITDFN + MVL_NORDFN) :
case (MVL_ICNDFN + MVL_BTVDFN + MVL_NORDFN) : case (MVL_ICNDFN + MVL_BTVDFN + MVL_NORDFN) :
locon_pnt = mvl_addlocon (MVL_CHDPNT,NULL,'I', mvl_addlocon (MVL_CHDPNT,NULL,'I', sig_name,$6.LEFT,$6.RIGHT);
sig_name,$6.LEFT,$6.RIGHT);
break; break;
case (MVL_OCNDFN + MVL_BITDFN + MVL_NORDFN) : case (MVL_OCNDFN + MVL_BITDFN + MVL_NORDFN) :
case (MVL_OCNDFN + MVL_BTVDFN + MVL_NORDFN) : case (MVL_OCNDFN + MVL_BTVDFN + MVL_NORDFN) :
locon_pnt = mvl_addlocon (MVL_CHDPNT,NULL,'O', mvl_addlocon (MVL_CHDPNT,NULL,'O', sig_name,$6.LEFT,$6.RIGHT);
sig_name,$6.LEFT,$6.RIGHT);
break; break;
case (MVL_OCNDFN + MVL_MUXDFN + MVL_BUSDFN) : case (MVL_OCNDFN + MVL_MUXDFN + MVL_BUSDFN) :
case (MVL_OCNDFN + MVL_MXVDFN + MVL_BUSDFN) : case (MVL_OCNDFN + MVL_MXVDFN + MVL_BUSDFN) :
locon_pnt = mvl_addlocon (MVL_CHDPNT,NULL,'Z', mvl_addlocon (MVL_CHDPNT,NULL,'Z', sig_name,$6.LEFT,$6.RIGHT);
sig_name,$6.LEFT,$6.RIGHT);
break; break;
case (MVL_OCNDFN + MVL_WORDFN + MVL_BUSDFN) : case (MVL_OCNDFN + MVL_WORDFN + MVL_BUSDFN) :
case (MVL_OCNDFN + MVL_WRVDFN + MVL_BUSDFN) : case (MVL_OCNDFN + MVL_WRVDFN + MVL_BUSDFN) :
locon_pnt = mvl_addlocon (MVL_CHDPNT,NULL,'Z', mvl_addlocon (MVL_CHDPNT,NULL,'Z', sig_name,$6.LEFT,$6.RIGHT);
sig_name,$6.LEFT,$6.RIGHT);
break; break;
case (MVL_BCNDFN + MVL_BITDFN + MVL_NORDFN) : case (MVL_BCNDFN + MVL_BITDFN + MVL_NORDFN) :
case (MVL_BCNDFN + MVL_BTVDFN + MVL_NORDFN) : case (MVL_BCNDFN + MVL_BTVDFN + MVL_NORDFN) :
locon_pnt = mvl_addlocon (MVL_CHDPNT,NULL,'B', mvl_addlocon (MVL_CHDPNT,NULL,'B', sig_name,$6.LEFT,$6.RIGHT);
sig_name,$6.LEFT,$6.RIGHT);
break; break;
case (MVL_BCNDFN + MVL_MUXDFN + MVL_BUSDFN) : case (MVL_BCNDFN + MVL_MUXDFN + MVL_BUSDFN) :
case (MVL_BCNDFN + MVL_MXVDFN + MVL_BUSDFN) : case (MVL_BCNDFN + MVL_MXVDFN + MVL_BUSDFN) :
locon_pnt = mvl_addlocon (MVL_CHDPNT,NULL,'T', mvl_addlocon (MVL_CHDPNT,NULL,'T', sig_name,$6.LEFT,$6.RIGHT);
sig_name,$6.LEFT,$6.RIGHT);
break; break;
case (MVL_BCNDFN + MVL_WORDFN + MVL_BUSDFN) : case (MVL_BCNDFN + MVL_WORDFN + MVL_BUSDFN) :
case (MVL_BCNDFN + MVL_WRVDFN + MVL_BUSDFN) : case (MVL_BCNDFN + MVL_WRVDFN + MVL_BUSDFN) :
locon_pnt = mvl_addlocon (MVL_CHDPNT,NULL,'T', mvl_addlocon (MVL_CHDPNT,NULL,'T', sig_name,$6.LEFT,$6.RIGHT);
sig_name,$6.LEFT,$6.RIGHT);
break; break;
case (MVL_XCNDFN + MVL_BITDFN + MVL_NORDFN) : case (MVL_XCNDFN + MVL_BITDFN + MVL_NORDFN) :
case (MVL_XCNDFN + MVL_BTVDFN + MVL_NORDFN) : case (MVL_XCNDFN + MVL_BTVDFN + MVL_NORDFN) :
locon_pnt = mvl_addlocon (MVL_CHDPNT,NULL,'X', mvl_addlocon (MVL_CHDPNT,NULL,'X', sig_name,$6.LEFT,$6.RIGHT);
sig_name,$6.LEFT,$6.RIGHT);
break; break;
default : default :

3
alliance/src/mocha/src/mocha_check.c
View File

@ -557,14 +557,13 @@ static void MochaCheckComputeReachableStates( MochaFigure )
mochafig_list *MochaFigure; mochafig_list *MochaFigure;
{ {
ctlfig_list *CtlFigure;
btrtransfunc *BtrTransFunc; btrtransfunc *BtrTransFunc;
bddnode *BddNewSet; bddnode *BddNewSet;
bddnode *BddCurrentSet; bddnode *BddCurrentSet;
bddnode *BddReachedSet; bddnode *BddReachedSet;
bddnode *BddNode; bddnode *BddNode;
CtlFigure = MochaFigure->CTL_FIGURE; //CtlFigure = MochaFigure->CTL_FIGURE;
BtrTransFunc = MochaFigure->BTR_TRANS_FUNC; BtrTransFunc = MochaFigure->BTR_TRANS_FUNC;
setbddlocalcircuit( MochaFigure->BDD_CIRCUIT ); setbddlocalcircuit( MochaFigure->BDD_CIRCUIT );

6
alliance/src/mocha/src/mocha_syf.c
View File

@ -279,7 +279,6 @@ fsmfig_list *MochaSyfFbhParse( Name )
fsmfig_list *FsmFigure; fsmfig_list *FsmFigure;
fsmfig_list *ScanFigure; fsmfig_list *ScanFigure;
chain_list *ScanChain; chain_list *ScanChain;
mochasyfinfo *MochaSyfInfo;
fsmstate_list *ScanState; fsmstate_list *ScanState;
MochaSyfInitializeKeyword(); MochaSyfInitializeKeyword();
@ -295,7 +294,7 @@ fsmfig_list *MochaSyfFbhParse( Name )
ScanChain = ScanChain->NEXT ) ScanChain = ScanChain->NEXT )
{ {
ScanFigure = (fsmfig_list *)ScanChain->DATA; ScanFigure = (fsmfig_list *)ScanChain->DATA;
MochaSyfInfo = MochaSyfaddfsmsyfinfo( ScanFigure ); /*MochaSyfInfo =*/ MochaSyfaddfsmsyfinfo( ScanFigure );
} }
} }
else else
@ -517,7 +516,6 @@ static void MochaSyfSynthOut2Abl( FsmFigure )
fsmlocout_list *ScanLocout; fsmlocout_list *ScanLocout;
mochasyfout *ScanMochaSyfOut; mochasyfout *ScanMochaSyfOut;
mochasyfstate *ScanMochaSyfState; mochasyfstate *ScanMochaSyfState;
mochasyfcode *ScanMochaSyfCode;
ablexpr *Equation; ablexpr *Equation;
ablexpr *Atom; ablexpr *Atom;
@ -536,7 +534,7 @@ static void MochaSyfSynthOut2Abl( FsmFigure )
ScanState = ScanState->NEXT ) ScanState = ScanState->NEXT )
{ {
ScanMochaSyfState = MOCHA_SYF_STATE( ScanState ); ScanMochaSyfState = MOCHA_SYF_STATE( ScanState );
ScanMochaSyfCode = ScanMochaSyfState->CODE; //ScanMochaSyfCode = ScanMochaSyfState->CODE;
for ( ScanLocout = ScanState->LOCOUT; for ( ScanLocout = ScanState->LOCOUT;
ScanLocout != (fsmlocout_list *)0; ScanLocout != (fsmlocout_list *)0;

9
alliance/src/ring/src/deport.c
View File

@ -210,7 +210,6 @@ void deport_alim(LST_EQUIPO lst_equipo, BARRE_PLOTS tab_plots[NB_FACES],
int i, nbcolatrouver, face; int i, nbcolatrouver, face;
long largmetalpiste, largmetalcol, piste; long largmetalpiste, largmetalcol, piste;
char niveaupiste; char niveaupiste;
LST_SEGMENT * segcol;
LST_SEGMENT * segpiste; LST_SEGMENT * segpiste;
recherche_equipo_alim(&equipo_vdd, &equipo_vss, lst_equipo); 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 NORD:
case SUD : case SUD :
niveaupiste = xmetal; niveaupiste = xmetal;
segcol = segy_occ; //segcol = segy_occ;
segpiste = segx_occ; segpiste = segx_occ;
largmetalpiste = xmetal_width; largmetalpiste = xmetal_width;
largmetalcol = ymetal_width; largmetalcol = ymetal_width;
@ -273,7 +272,7 @@ void deport_alim(LST_EQUIPO lst_equipo, BARRE_PLOTS tab_plots[NB_FACES],
case EST : case EST :
case OUEST: case OUEST:
niveaupiste = ymetal; niveaupiste = ymetal;
segcol = segx_occ; //segcol = segx_occ;
segpiste = segy_occ; segpiste = segy_occ;
largmetalpiste = ymetal_width; largmetalpiste = ymetal_width;
largmetalcol = xmetal_width; largmetalcol = xmetal_width;
@ -345,7 +344,7 @@ void deport_alim(LST_EQUIPO lst_equipo, BARRE_PLOTS tab_plots[NB_FACES],
case NORD: case NORD:
case SUD : case SUD :
niveaupiste = xmetal; niveaupiste = xmetal;
segcol = segy_occ; //segcol = segy_occ;
segpiste = segx_occ; segpiste = segx_occ;
largmetalpiste = xmetal_width; largmetalpiste = xmetal_width;
largmetalcol = ymetal_width; largmetalcol = ymetal_width;
@ -372,7 +371,7 @@ void deport_alim(LST_EQUIPO lst_equipo, BARRE_PLOTS tab_plots[NB_FACES],
case EST : case EST :
case OUEST: case OUEST:
niveaupiste = ymetal; niveaupiste = ymetal;
segcol = segx_occ; //segcol = segx_occ;
segpiste = segy_occ; segpiste = segy_occ;
largmetalpiste = ymetal_width; largmetalpiste = ymetal_width;
largmetalcol = xmetal_width; largmetalcol = xmetal_width;

7
alliance/src/ring/src/placement.c
View File

@ -1744,8 +1744,7 @@ void fabrique_grille_finale(BARRE_PLOTS tab_plots[NB_FACES],
{ {
LST_PSEUDO_CON liste, liste_coeur; LST_PSEUDO_CON liste, liste_coeur;
int face; int face;
char niveau; long position;
long position, largeurmin;
if (mode_debug) if (mode_debug)
printf("Fabrique grille finale\n"); printf("Fabrique grille finale\n");
@ -1762,8 +1761,8 @@ void fabrique_grille_finale(BARRE_PLOTS tab_plots[NB_FACES],
switch (face) { switch (face) {
case NORD: case NORD:
case SUD : case SUD :
niveau = ymetal; //niveau = ymetal;
largeurmin = ymetal_width; //largeurmin = ymetal_width;
while (liste != NULL) { while (liste != NULL) {
if (mode_debug) if (mode_debug)

4
alliance/src/ring/src/routage.c
View File

@ -185,7 +185,7 @@ void insere_valcurv(long valcurv, PT_COORDONNEES coord, LST_EQUIPO equipo)
void ordonne_eq_proj(LST_EQUIPO equipo, COEUR lecoeur) 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; long delta = 0, deltamax = 0;
prec_proj = lst_proj = (equipo->cour).lst_projetes; 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); printf("Delta %5ld\n", delta);
if (delta > deltamax) { if (delta > deltamax) {
prem = lst_proj; prem = lst_proj;
precprem = prec_proj; //precprem = prec_proj;
deux = lst_proj->NEXT; deux = lst_proj->NEXT;
deltamax = delta; deltamax = delta;
} }

6
alliance/src/ring/src/struct2.c
View File

@ -852,7 +852,7 @@ char layer;
void affic_listeseg(tab_seg) void affic_listeseg(tab_seg)
LST_SEGMENT tab_seg[NB_FACES]; LST_SEGMENT tab_seg[NB_FACES];
{ {
LST_SEGMENT lseg, der; LST_SEGMENT lseg;
int face; int face;
static char a1[3] = "A1"; static char a1[3] = "A1";
static char a2[3] = "A2"; 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", 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 lseg->face, lseg->c1->xabs, lseg->c1->yabs, lseg->c2->xabs, lseg->c2->yabs, lseg->piste1, lseg
->piste2, lseg->largeur, metal); ->piste2, lseg->largeur, metal);
if (NULL == lseg->suiv) //if (NULL == lseg->suiv)
der = lseg; // der = lseg;
lseg = lseg->suiv; lseg = lseg->suiv;
} }

3
alliance/src/rtn/src/rtnadd.c
View File

@ -173,7 +173,6 @@ rtldecl_list *addrtldecl( Figure, Atom, Type )
int Type; int Type;
{ {
rtldecl_list *Decl; rtldecl_list *Decl;
rtldecl_list **PrevDecl;
rtlsym *Sym; rtlsym *Sym;
char *Name; char *Name;
int Width; int Width;
@ -221,7 +220,7 @@ rtldecl_list *addrtldecl( Figure, Atom, Type )
Index += IndexStep; Index += IndexStep;
} }
PrevDecl = &Figure->DECLAR[ Type ]; //PrevDecl = &Figure->DECLAR[ Type ];
Decl->VEX_ATOM = Atom; Decl->VEX_ATOM = Atom;
Decl->DECL_SYM = Sym; Decl->DECL_SYM = Sym;

3
alliance/src/scl/src/scpbuild.c
View File

@ -1576,7 +1576,6 @@ static schfig_list *loc_buildbox( Figure )
int NumberBoxIn0; int NumberBoxIn0;
int NumberOut; int NumberOut;
int Middle; int Middle;
int MiddleIn;
for ( Box = Figure->BOX; for ( Box = Figure->BOX;
Box != (schbox_list *)0; Box != (schbox_list *)0;
@ -1675,7 +1674,7 @@ static schfig_list *loc_buildbox( Figure )
*/ */
/* TO BE DONE */ /* TO BE DONE */
Number = 1; Number = 1;
MiddleIn = Box0->NUMBER_IN / 2; //MiddleIn = Box0->NUMBER_IN / 2;
//MiddleInDY = SCP_BOX_CON_BASE_Y; //MiddleInDY = SCP_BOX_CON_BASE_Y;
for ( Con = Box0->CON_IN; for ( Con = Box0->CON_IN;

6
alliance/src/syf/src/syf_synth.c
View File

@ -201,7 +201,6 @@ void SyfSynthStack2Abl( FsmFigure )
syfregstack *StackArray; syfregstack *StackArray;
syfregstack *StackNextArray = NULL; syfregstack *StackNextArray = NULL;
syfregstack *StackPrevArray; syfregstack *StackPrevArray;
syfregstate *RegArray;
syfctrl *CtrlArray; syfctrl *CtrlArray;
long Constant; long Constant;
long StackMask; long StackMask;
@ -223,7 +222,7 @@ void SyfSynthStack2Abl( FsmFigure )
if ( ! SyfInfo->STACK ) return; if ( ! SyfInfo->STACK ) return;
RegArray = SyfInfo->REG_ARRAY; //RegArray = SyfInfo->REG_ARRAY;
CtrlArray = SyfInfo->CTRL_ARRAY; CtrlArray = SyfInfo->CTRL_ARRAY;
StackArray = SyfInfo->STACK_ARRAY; StackArray = SyfInfo->STACK_ARRAY;
StackCste = -1; StackCste = -1;
@ -656,7 +655,6 @@ void SyfSynthOut2Abl( FsmFigure )
fsmlocout_list *ScanLocout; fsmlocout_list *ScanLocout;
syfout *ScanSyfOut; syfout *ScanSyfOut;
syfstate *ScanSyfState; syfstate *ScanSyfState;
syfcode *ScanSyfCode;
ablexpr *Equation = NULL; ablexpr *Equation = NULL;
ablexpr *ScanPath; ablexpr *ScanPath;
ablexpr *Atom; ablexpr *Atom;
@ -686,7 +684,7 @@ void SyfSynthOut2Abl( FsmFigure )
ScanState = ScanState->NEXT ) ScanState = ScanState->NEXT )
{ {
ScanSyfState = FSM_SYF_STATE( ScanState ); ScanSyfState = FSM_SYF_STATE( ScanState );
ScanSyfCode = ScanSyfState->CODE; //ScanSyfCode = ScanSyfState->CODE;
for ( ScanLocout = ScanState->LOCOUT; for ( ScanLocout = ScanState->LOCOUT;
ScanLocout != (fsmlocout_list *)0; ScanLocout != (fsmlocout_list *)0;

9
alliance/src/vasy/src/vasy_mulwait.c
View File

@ -148,7 +148,6 @@ static void VasyMultiWaitHashWrite( VpnFigure, VpnProc )
vexexpr *AsgAtom; vexexpr *AsgAtom;
char *AtomName; char *AtomName;
unsigned char *Flags; unsigned char *Flags;
chain_list **Support;
int AsgIndex; int AsgIndex;
int AsgMin; int AsgMin;
int AsgMax; int AsgMax;
@ -179,7 +178,7 @@ static void VasyMultiWaitHashWrite( VpnFigure, VpnProc )
if ( VpnAction->TYPE == VPN_ACT_ASG_DEFINE ) continue; if ( VpnAction->TYPE == VPN_ACT_ASG_DEFINE ) continue;
ActInfo = GetVasyVpnActInfo( VpnAction ); ActInfo = GetVasyVpnActInfo( VpnAction );
Support = ActInfo->SUPPORT; //Support = ActInfo->SUPPORT;
Flags = ActInfo->FLAGS; Flags = ActInfo->FLAGS;
AsgAtom = VpnAction->VEX_ATOM; AsgAtom = VpnAction->VEX_ATOM;
@ -237,7 +236,6 @@ static void VasyMultiWaitArcWait2Wait( VpnFigure, VpnProc, BeginTrans, AsgTrans,
vpntrans_list *EndTrans; vpntrans_list *EndTrans;
{ {
vasyprocinfo *ProcInfo; vasyprocinfo *ProcInfo;
vasytransinfo *TransInfo;
vasyactinfo *ActInfo; vasyactinfo *ActInfo;
vasysyminfo *SymInfo; vasysyminfo *SymInfo;
vpnact_list *VpnAction; vpnact_list *VpnAction;
@ -246,7 +244,6 @@ static void VasyMultiWaitArcWait2Wait( VpnFigure, VpnProc, BeginTrans, AsgTrans,
vpndecl_list *AsgDeclar; vpndecl_list *AsgDeclar;
vexexpr *AsgAtom; vexexpr *AsgAtom;
char *AtomName; char *AtomName;
chain_list **Support;
chain_list **Literal; chain_list **Literal;
chain_list **Event; chain_list **Event;
chain_list *ScanChain; chain_list *ScanChain;
@ -285,7 +282,7 @@ static void VasyMultiWaitArcWait2Wait( VpnFigure, VpnProc, BeginTrans, AsgTrans,
addauthelem( VasyHashSens, (char*)VpnSymbol, (long)VpnSymbol ); addauthelem( VasyHashSens, (char*)VpnSymbol, (long)VpnSymbol );
} }
TransInfo = GetVasyVpnTransInfo( AsgTrans ); //TransInfo = GetVasyVpnTransInfo( AsgTrans );
NumberWrite = 0; NumberWrite = 0;
@ -296,7 +293,7 @@ static void VasyMultiWaitArcWait2Wait( VpnFigure, VpnProc, BeginTrans, AsgTrans,
if ( VpnAction->TYPE == VPN_ACT_ASG_DEFINE ) continue; if ( VpnAction->TYPE == VPN_ACT_ASG_DEFINE ) continue;
ActInfo = GetVasyVpnActInfo( VpnAction ); ActInfo = GetVasyVpnActInfo( VpnAction );
Support = ActInfo->SUPPORT; //Support = ActInfo->SUPPORT;
Literal = ActInfo->LITERAL; Literal = ActInfo->LITERAL;
Event = ActInfo->EVENT; Event = ActInfo->EVENT;
Flags = ActInfo->FLAGS; Flags = ActInfo->FLAGS;

9
alliance/src/vasy/src/vasy_onewait.c
View File

@ -340,15 +340,12 @@ static void VasyOneWaitAssignVpnSymbol( VpnFigure, VpnProc , VpnTrans,
authelem *Element; authelem *Element;
auth2elem *Element2; auth2elem *Element2;
chain_list **Support; chain_list **Support;
chain_list **Literal;
chain_list **Event; chain_list **Event;
chain_list **Support2; chain_list **Support2;
chain_list **Literal2; chain_list **Literal2;
chain_list **DefSupport; chain_list **DefSupport;
chain_list **DefSupport2;
unsigned char *DefFlags; unsigned char *DefFlags;
unsigned char *DefFlags2; unsigned char *DefFlags2;
unsigned char *Flags;
unsigned char *Flags2; unsigned char *Flags2;
chain_list *ListOutput; chain_list *ListOutput;
chain_list *SupportBdd; chain_list *SupportBdd;
@ -424,9 +421,9 @@ static void VasyOneWaitAssignVpnSymbol( VpnFigure, VpnProc , VpnTrans,
HashSupport = TransInfo->HASH_SUPPORT; HashSupport = TransInfo->HASH_SUPPORT;
ActInfo = GetVasyVpnActInfo( AsgAction ); ActInfo = GetVasyVpnActInfo( AsgAction );
Literal = ActInfo->LITERAL; //Literal = ActInfo->LITERAL;
Support = ActInfo->SUPPORT; Support = ActInfo->SUPPORT;
Flags = ActInfo->FLAGS; //Flags = ActInfo->FLAGS;
Event = ActInfo->EVENT; Event = ActInfo->EVENT;
ActInfo->SPLIT = 1; ActInfo->SPLIT = 1;
@ -882,7 +879,7 @@ static void VasyOneWaitAssignVpnSymbol( VpnFigure, VpnProc , VpnTrans,
} }
DefAction2 = (vpnact_list *)Element->VALUE; DefAction2 = (vpnact_list *)Element->VALUE;
DefSupport2 = GetVasyVpnActInfoSupport( DefAction2 ); //DefSupport2 = GetVasyVpnActInfoSupport( DefAction2 );
DefFlags2 = GetVasyVpnActInfoFlags( DefAction2 ); DefFlags2 = GetVasyVpnActInfoFlags( DefAction2 );
DefAtom2 = DefAction2->VEX_ATOM; DefAtom2 = DefAction2->VEX_ATOM;

3
alliance/src/vasy/src/vasy_redinst.c
View File

@ -452,7 +452,6 @@ static void VasyRedInstLateralVpnAct( BeginPlace )
vexexpr *AsgExpr2; vexexpr *AsgExpr2;
vexexpr *AsgExpr3; vexexpr *AsgExpr3;
char *AtomValue; char *AtomValue;
char *AtomValue2;
auth2elem *Element; auth2elem *Element;
int AsgIndex; int AsgIndex;
int AsgMin; int AsgMin;
@ -556,7 +555,7 @@ static void VasyRedInstLateralVpnAct( BeginPlace )
viewvexexprboundln( AsgExpr2 ); viewvexexprboundln( AsgExpr2 );
} }
AtomValue2 = GetVexAtomValue( AsgAtom2 ); //AtomValue2 = GetVexAtomValue( AsgAtom2 );
AsgMin2 = getvexvectormin( AsgAtom2 ); AsgMin2 = getvexvectormin( AsgAtom2 );
AsgMax2 = getvexvectormax( AsgAtom2 ); AsgMax2 = getvexvectormax( AsgAtom2 );

3
alliance/src/vasy/src/vasy_synth.c
View File

@ -1114,7 +1114,6 @@ static void VasySynthesisWithSelectVpnProc( VpnFigure, RtlFigure, VpnProc )
vexexpr *ElseData; vexexpr *ElseData;
vexexpr *VexData; vexexpr *VexData;
vexexpr *VexCond; vexexpr *VexCond;
char *AtomName;
rtlasg_list *RtlAssign; rtlasg_list *RtlAssign;
long MaxNode; long MaxNode;
long NumberNode; long NumberNode;
@ -1166,7 +1165,7 @@ static void VasySynthesisWithSelectVpnProc( VpnFigure, RtlFigure, VpnProc )
AsgAtom = VpnAction->VEX_ATOM; AsgAtom = VpnAction->VEX_ATOM;
AsgExpr = VpnAction->VEX_EXPR; AsgExpr = VpnAction->VEX_EXPR;
ElseData = AsgExpr; ElseData = AsgExpr;
AtomName = GetVexAtomValue( AsgAtom ); //AtomName = GetVexAtomValue( AsgAtom );
RtlAtom = dupvexexpr( AsgAtom ); RtlAtom = dupvexexpr( AsgAtom );
RtlAssign = addrtlasg( RtlFigure, RtlAtom, RTL_ASG_CONDITIONAL ); RtlAssign = addrtlasg( RtlFigure, RtlAtom, RTL_ASG_CONDITIONAL );

75
alliance/src/vbl/src/vbl_bcomp_y.y
View File

@ -1125,7 +1125,6 @@ unlabeled_generate_statement
{ {
vbl_name *Range; vbl_name *Range;
vbvar_list *VbVar; vbvar_list *VbVar;
vexexpr *Target;
short Signed; short Signed;
long Left; long Left;
long Right; long Right;
@ -1164,7 +1163,7 @@ unlabeled_generate_statement
VbVar = (vbvar_list *)vbl_addstr( 'f',0, VbVar = (vbvar_list *)vbl_addstr( 'f',0,
get_type(VBH_TYPE_INTEGER),VBH_TYPE_INTEGER, get_type(VBH_TYPE_INTEGER),VBH_TYPE_INTEGER,
'I',$1.IDENT, -1, -1, NULL, 0, 0 ); 'I',$1.IDENT, -1, -1, NULL, 0, 0 );
Target = VbVar->TARGET; //Target = VbVar->TARGET;
Signed = ( IsVexNodeSigned( VbVar->TARGET ) != 0 ); Signed = ( IsVexNodeSigned( VbVar->TARGET ) != 0 );
if ( IsVexAtomBit( VbVar->TARGET ) ) if ( IsVexAtomBit( VbVar->TARGET ) )
@ -1319,8 +1318,6 @@ association_element
long right; long right;
long left_bnd; long left_bnd;
long right_bnd; long right_bnd;
long in_bound;
long out_bound;
unsigned char dynamic; unsigned char dynamic;
long mode; long mode;
long flag; long flag;
@ -1381,8 +1378,8 @@ association_element
{ {
if (left <= right) if (left <= right)
{ {
in_bound = left - left_bnd; //in_bound = left - left_bnd;
out_bound = right - left_bnd; //out_bound = right - left_bnd;
if ((left < left_bnd) || (right > right_bnd)) if ((left < left_bnd) || (right > right_bnd))
{ {
my_vbl_error (36,$1.NAME); my_vbl_error (36,$1.NAME);
@ -1390,8 +1387,8 @@ association_element
} }
else else
{ {
in_bound = right - left_bnd; //in_bound = right - left_bnd;
out_bound = left - left_bnd; //out_bound = left - left_bnd;
if ((left > right_bnd) || (right < left_bnd)) if ((left > right_bnd) || (right < left_bnd))
{ {
my_vbl_error (36,$1.NAME); my_vbl_error (36,$1.NAME);
@ -1402,8 +1399,8 @@ association_element
{ {
if (left <= right) if (left <= right)
{ {
in_bound = left - right_bnd; //in_bound = left - right_bnd;
out_bound = right - right_bnd; //out_bound = right - right_bnd;
if ((left < right_bnd) || (right > left_bnd)) if ((left < right_bnd) || (right > left_bnd))
{ {
my_vbl_error (36,$1.NAME); my_vbl_error (36,$1.NAME);
@ -1411,8 +1408,8 @@ association_element
} }
else else
{ {
in_bound = right - right_bnd; //in_bound = right - right_bnd;
out_bound = left - right_bnd; //out_bound = left - right_bnd;
if ((left > left_bnd) || (right < right_bnd)) if ((left > left_bnd) || (right < right_bnd))
{ {
my_vbl_error (36,$1.NAME); my_vbl_error (36,$1.NAME);
@ -5193,6 +5190,8 @@ signal_list
{ {
vexexpr *Vex; vexexpr *Vex;
chain_list *Chain; chain_list *Chain;
#if THIS_IS_DISABLED
char *LocalName; char *LocalName;
if ( chktab(hshtab,$1.NAME,VBL_FUNCNAM,VBL_SYMDFN ) ) if ( chktab(hshtab,$1.NAME,VBL_FUNCNAM,VBL_SYMDFN ) )
@ -5208,6 +5207,13 @@ signal_list
{ {
my_vbl_error(17,$1.NAME); 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 ) if ( ! $1.DYNAMIC )
{ {
@ -5240,6 +5246,8 @@ signal_list
{ {
vexexpr *Vex; vexexpr *Vex;
chain_list *Chain; chain_list *Chain;
#if THIS_IS_DISABLED
char *LocalName; char *LocalName;
if ( chktab(hshtab,$2.NAME,VBL_FUNCNAM,VBL_SYMDFN ) ) if ( chktab(hshtab,$2.NAME,VBL_FUNCNAM,VBL_SYMDFN ) )
@ -5255,6 +5263,13 @@ signal_list
{ {
my_vbl_error(17,$2.NAME); 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 ) if ( ! $2.DYNAMIC )
{ {
@ -6356,8 +6371,6 @@ choice
vexexpr *VexCst; vexexpr *VexCst;
long left; long left;
long right; long right;
long in_bound;
long out_bound;
long left_bnd; long left_bnd;
long right_bnd; long right_bnd;
long sig_conf; long sig_conf;
@ -6396,8 +6409,8 @@ choice
{ {
if (left <= right) if (left <= right)
{ {
in_bound = left - left_bnd; //in_bound = left - left_bnd;
out_bound = right - left_bnd; //out_bound = right - left_bnd;
if ((left < left_bnd) || (right > right_bnd)) if ((left < left_bnd) || (right > right_bnd))
{ {
my_vbl_error (36,$1.NAME); my_vbl_error (36,$1.NAME);
@ -6405,8 +6418,8 @@ choice
} }
else else
{ {
in_bound = left - right_bnd; //in_bound = left - right_bnd;
out_bound = right - right_bnd; //out_bound = right - right_bnd;
if ((left > right_bnd) || (right < left_bnd)) if ((left > right_bnd) || (right < left_bnd))
{ {
my_vbl_error (36,$1.NAME); my_vbl_error (36,$1.NAME);
@ -6417,8 +6430,8 @@ choice
{ {
if (left <= right) if (left <= right)
{ {
in_bound = right - left_bnd; //in_bound = right - left_bnd;
out_bound = left - left_bnd; //out_bound = left - left_bnd;
if ((left < right_bnd) || (right > left_bnd)) if ((left < right_bnd) || (right > left_bnd))
{ {
my_vbl_error (36,$1.NAME); my_vbl_error (36,$1.NAME);
@ -6426,8 +6439,8 @@ choice
} }
else else
{ {
in_bound = right - right_bnd; //in_bound = right - right_bnd;
out_bound = left - right_bnd; //out_bound = left - right_bnd;
if ((left > left_bnd) || (right < right_bnd)) if ((left > left_bnd) || (right < right_bnd))
{ {
my_vbl_error (36,$1.NAME); my_vbl_error (36,$1.NAME);
@ -6676,8 +6689,6 @@ primary
long right; long right;
long left_bnd; long left_bnd;
long right_bnd; long right_bnd;
long in_bound;
long out_bound;
long mode; long mode;
long flag; long flag;
unsigned char dynamic; unsigned char dynamic;
@ -6780,8 +6791,8 @@ primary
{ {
if (left <= right) if (left <= right)
{ {
in_bound = left - left_bnd; //in_bound = left - left_bnd;
out_bound = right - left_bnd; //out_bound = right - left_bnd;
if ((left < left_bnd) || (right > right_bnd)) if ((left < left_bnd) || (right > right_bnd))
{ {
my_vbl_error (36,$1.NAME); my_vbl_error (36,$1.NAME);
@ -6789,8 +6800,8 @@ primary
} }
else else
{ {
in_bound = right - left_bnd; //in_bound = right - left_bnd;
out_bound = left - left_bnd; //out_bound = left - left_bnd;
if ((left > right_bnd) || (right < left_bnd)) if ((left > right_bnd) || (right < left_bnd))
{ {
my_vbl_error (36,$1.NAME); my_vbl_error (36,$1.NAME);
@ -6801,8 +6812,8 @@ primary
{ {
if (left <= right) if (left <= right)
{ {
in_bound = left - right_bnd; //in_bound = left - right_bnd;
out_bound = right - right_bnd; //out_bound = right - right_bnd;
if ((left < right_bnd) || (right > left_bnd)) if ((left < right_bnd) || (right > left_bnd))
{ {
my_vbl_error (36,$1.NAME); my_vbl_error (36,$1.NAME);
@ -6810,8 +6821,8 @@ primary
} }
else else
{ {
in_bound = right - right_bnd; //in_bound = right - right_bnd;
out_bound = left - right_bnd; //out_bound = left - right_bnd;
if ((left > left_bnd) || (right < right_bnd)) if ((left > left_bnd) || (right < right_bnd))
{ {
my_vbl_error (36,$1.NAME); my_vbl_error (36,$1.NAME);

3
alliance/src/vpn/src/vpnadd.c
View File

@ -527,7 +527,6 @@ static vpndecl_list *loc_addvpndecl( Figure, Expr, Type, Base )
unsigned char Base; unsigned char Base;
{ {
vpndecl_list *Decl; vpndecl_list *Decl;
vpndecl_list **PrevDecl;
vexexpr *Atom; vexexpr *Atom;
vpnsym *Sym; vpnsym *Sym;
char *Name; char *Name;
@ -579,8 +578,6 @@ static vpndecl_list *loc_addvpndecl( Figure, Expr, Type, Base )
Index += IndexStep; Index += IndexStep;
} }
PrevDecl = &Figure->DECLAR[ Type ];
Decl->VEX_ATOM = Expr; Decl->VEX_ATOM = Expr;
Decl->DECL_SYM = Sym; Decl->DECL_SYM = Sym;
Decl->TYPE = Type; Decl->TYPE = Type;

159
alliance/src/vvh/src/vvh_vbh2vpn.c
View File

@ -672,7 +672,6 @@ static void VvhVbhTreatIfs( ScanIfs )
vpntrans_list *TrueTrans; vpntrans_list *TrueTrans;
vpntrans_list *FalseTrans; vpntrans_list *FalseTrans;
vpntrans_list *EndTrans; vpntrans_list *EndTrans;
vpnarc *VpnArc;
vexexpr *VexCond; vexexpr *VexCond;
long Number; long Number;
@ -695,21 +694,21 @@ static void VvhVbhTreatIfs( ScanIfs )
BeginPlace = VvhVpnAddPlace( VvhName ); BeginPlace = VvhVpnAddPlace( VvhName );
BeginPlace->TYPE = VPN_PLACE_IF; BeginPlace->TYPE = VPN_PLACE_IF;
VpnArc = addvpnarctrans( VvhVpnFigure, VvhPrevTrans, BeginPlace ); /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, VvhPrevTrans, BeginPlace );
sprintf( VvhName, "if_true.%s.%ld", VvhTopName, Number ); sprintf( VvhName, "if_true.%s.%ld", VvhTopName, Number );
TrueTrans = VvhVpnAddTrans( VvhName ); TrueTrans = VvhVpnAddTrans( VvhName );
TrueTrans->TYPE = VPN_TRANS_GUARDED; TrueTrans->TYPE = VPN_TRANS_GUARDED;
TrueTrans->VEX_GUARD = dupvexexpr( VexCond ); TrueTrans->VEX_GUARD = dupvexexpr( VexCond );
VpnArc = addvpnarcplace( VvhVpnFigure, BeginPlace, TrueTrans ); /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, BeginPlace, TrueTrans );
sprintf( VvhName, "if_false.%s.%ld", VvhTopName, Number ); sprintf( VvhName, "if_false.%s.%ld", VvhTopName, Number );
FalseTrans = VvhVpnAddTrans( VvhName ); FalseTrans = VvhVpnAddTrans( VvhName );
FalseTrans->TYPE = VPN_TRANS_GUARDED; FalseTrans->TYPE = VPN_TRANS_GUARDED;
FalseTrans->VEX_GUARD = optimvexnotexpr( VexCond ); FalseTrans->VEX_GUARD = optimvexnotexpr( VexCond );
VpnArc = addvpnarcplace( VvhVpnFigure, BeginPlace, FalseTrans ); /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, BeginPlace, FalseTrans );
VvhPrevTrans = TrueTrans; VvhPrevTrans = TrueTrans;
@ -730,18 +729,18 @@ static void VvhVbhTreatIfs( ScanIfs )
if ( TrueTrans != (vpntrans_list *)0 ) if ( TrueTrans != (vpntrans_list *)0 )
{ {
VpnArc = addvpnarctrans( VvhVpnFigure, TrueTrans , EndPlace ); /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, TrueTrans , EndPlace );
} }
if ( FalseTrans != (vpntrans_list *)0 ) if ( FalseTrans != (vpntrans_list *)0 )
{ {
VpnArc = addvpnarctrans( VvhVpnFigure, FalseTrans, EndPlace ); /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, FalseTrans, EndPlace );
} }
EndTrans = VvhVpnAddTrans( VvhName ); EndTrans = VvhVpnAddTrans( VvhName );
EndTrans->TYPE = VPN_TRANS_IMMEDIATE; EndTrans->TYPE = VPN_TRANS_IMMEDIATE;
VpnArc = addvpnarcplace( VvhVpnFigure, EndPlace, EndTrans ); /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, EndPlace, EndTrans );
VvhPrevTrans = EndTrans; VvhPrevTrans = EndTrans;
} }
@ -870,7 +869,6 @@ static void VvhVbhTreatAggregate( ScanAgr )
{ {
vpnplace_list *AssignPlace; vpnplace_list *AssignPlace;
vpntrans_list *AssignTrans; vpntrans_list *AssignTrans;
vpnarc *VpnArc;
long Number; long Number;
Number = VvhNumberAsg++; Number = VvhNumberAsg++;
@ -881,8 +879,8 @@ static void VvhVbhTreatAggregate( ScanAgr )
AssignTrans = VvhVpnAddTrans( VvhName ); AssignTrans = VvhVpnAddTrans( VvhName );
AssignTrans->TYPE = VPN_TRANS_ACT_EXEC_CONC; AssignTrans->TYPE = VPN_TRANS_ACT_EXEC_CONC;
VpnArc = addvpnarctrans( VvhVpnFigure, VvhPrevTrans, AssignPlace ); /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, VvhPrevTrans, AssignPlace );
VpnArc = addvpnarcplace( VvhVpnFigure, AssignPlace , AssignTrans ); /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, AssignPlace , AssignTrans );
VvhPrevTrans = AssignTrans; VvhPrevTrans = AssignTrans;
@ -966,7 +964,6 @@ static void VvhVbhTreatCase( ScanCase )
vpntrans_list *PrevTrans; vpntrans_list *PrevTrans;
vpntrans_list *CaseTrans; vpntrans_list *CaseTrans;
vpntrans_list *EndTrans; vpntrans_list *EndTrans;
vpnarc *VpnArc;
vexexpr *VexCond; vexexpr *VexCond;
vexexpr *VexOthers; vexexpr *VexOthers;
vexexpr *VexGuard = NULL; vexexpr *VexGuard = NULL;
@ -1177,7 +1174,7 @@ static void VvhVbhTreatCase( ScanCase )
CaseTrans->VEX_GUARD = VexBoolean; CaseTrans->VEX_GUARD = VexBoolean;
VpnArc = addvpnarcplace( VvhVpnFigure, BeginPlace, CaseTrans ); /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, BeginPlace, CaseTrans );
VvhPrevTrans = CaseTrans; VvhPrevTrans = CaseTrans;
@ -1187,7 +1184,7 @@ static void VvhVbhTreatCase( ScanCase )
if ( VvhPrevTrans != (vpntrans_list *)0 ) 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 = VvhVpnAddTrans( VvhName );
EndTrans->TYPE = VPN_TRANS_IMMEDIATE; EndTrans->TYPE = VPN_TRANS_IMMEDIATE;
VpnArc = addvpnarctrans( VvhVpnFigure, PrevTrans, BeginPlace ); /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, PrevTrans, BeginPlace );
VpnArc = addvpnarcplace( VvhVpnFigure, EndPlace, EndTrans ); /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, EndPlace, EndTrans );
VvhPrevTrans = EndTrans; VvhPrevTrans = EndTrans;
} }
@ -1224,7 +1221,6 @@ static int VvhVbhTreatWait( ScanWait )
vpntrans_list *UntilTrue; vpntrans_list *UntilTrue;
vpntrans_list *UntilFalse; vpntrans_list *UntilFalse;
vpntrans_list *UntilEnd; vpntrans_list *UntilEnd;
vpnarc *VpnArc;
chain_list *Support; chain_list *Support;
vexexpr *VexCond; vexexpr *VexCond;
long Number; long Number;
@ -1239,8 +1235,8 @@ static int VvhVbhTreatWait( ScanWait )
WaitPlace->TYPE = VPN_PLACE_WAIT; WaitPlace->TYPE = VPN_PLACE_WAIT;
WaitTrans = VvhVpnAddTrans( VvhName ); WaitTrans = VvhVpnAddTrans( VvhName );
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; WaitTrans->TYPE = VPN_TRANS_INF_WAIT;
VvhPrevTrans = WaitTrans; VvhPrevTrans = WaitTrans;
@ -1275,13 +1271,13 @@ static int VvhVbhTreatWait( ScanWait )
VexCond = VvhVbhTreatTest( UntilTrans, VexCond ); VexCond = VvhVbhTreatTest( UntilTrans, VexCond );
VpnArc = addvpnarctrans( VvhVpnFigure, WaitTrans , UntilPlace ); /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, WaitTrans , UntilPlace );
VpnArc = addvpnarcplace( VvhVpnFigure, UntilPlace, UntilTrans ); /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, UntilPlace, UntilTrans );
UntilTest = VvhVpnAddPlace( VvhName ); UntilTest = VvhVpnAddPlace( VvhName );
UntilTest->TYPE = VPN_PLACE_UNTIL_TEST; UntilTest->TYPE = VPN_PLACE_UNTIL_TEST;
VpnArc = addvpnarctrans( VvhVpnFigure, UntilTrans, UntilTest ); /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, UntilTrans, UntilTest );
sprintf( VvhName, "until_true.%s.%ld", VvhTopName, Number ); sprintf( VvhName, "until_true.%s.%ld", VvhTopName, Number );
UntilTrue = VvhVpnAddTrans( VvhName ); UntilTrue = VvhVpnAddTrans( VvhName );
@ -1293,9 +1289,9 @@ static int VvhVbhTreatWait( ScanWait )
UntilFalse->TYPE = VPN_TRANS_GUARDED; UntilFalse->TYPE = VPN_TRANS_GUARDED;
UntilFalse->VEX_GUARD = optimvexnotexpr( VexCond ); UntilFalse->VEX_GUARD = optimvexnotexpr( VexCond );
VpnArc = addvpnarcplace( VvhVpnFigure, UntilTest , UntilTrue ); /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, UntilTest , UntilTrue );
VpnArc = addvpnarcplace( VvhVpnFigure, UntilTest , UntilFalse ); /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, UntilTest , UntilFalse );
VpnArc = addvpnarctrans( VvhVpnFigure, UntilFalse, WaitPlace ); /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, UntilFalse, WaitPlace );
sprintf( VvhName, "end_until.%s.%ld", VvhTopName, Number ); sprintf( VvhName, "end_until.%s.%ld", VvhTopName, Number );
UntilPlace = VvhVpnAddPlace( VvhName ); UntilPlace = VvhVpnAddPlace( VvhName );
@ -1304,8 +1300,8 @@ static int VvhVbhTreatWait( ScanWait )
UntilEnd = VvhVpnAddTrans( VvhName ); UntilEnd = VvhVpnAddTrans( VvhName );
UntilEnd->TYPE = VPN_TRANS_IMMEDIATE; UntilEnd->TYPE = VPN_TRANS_IMMEDIATE;
VpnArc = addvpnarctrans( VvhVpnFigure, UntilTrue, UntilPlace ); /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, UntilTrue, UntilPlace );
VpnArc = addvpnarcplace( VvhVpnFigure, UntilPlace, UntilEnd ); /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, UntilPlace, UntilEnd );
WaitPlace->LINK = UntilPlace; WaitPlace->LINK = UntilPlace;
@ -1331,7 +1327,6 @@ static int VvhVbhTreatLoop( ScanLoop )
vpnplace_list *OldEndLoop; vpnplace_list *OldEndLoop;
vpntrans_list *BeginTrans; vpntrans_list *BeginTrans;
vpntrans_list *EndTrans; vpntrans_list *EndTrans;
vpnarc *VpnArc;
long Number; long Number;
VvhCurrentLine = ScanLoop->LINE; VvhCurrentLine = ScanLoop->LINE;
@ -1342,12 +1337,12 @@ static int VvhVbhTreatLoop( ScanLoop )
BeginPlace = VvhVpnAddPlace( VvhName ); BeginPlace = VvhVpnAddPlace( VvhName );
BeginPlace->TYPE = VPN_PLACE_LOOP; BeginPlace->TYPE = VPN_PLACE_LOOP;
VpnArc = addvpnarctrans( VvhVpnFigure, VvhPrevTrans, BeginPlace ); /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, VvhPrevTrans, BeginPlace );
BeginTrans = VvhVpnAddTrans( VvhName ); BeginTrans = VvhVpnAddTrans( VvhName );
BeginTrans->TYPE = VPN_TRANS_IMMEDIATE; 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 ); sprintf( VvhName, "end_loop.%s.%s.%ld", ScanLoop->LABEL, VvhTopName, Number );
EndPlace = VvhVpnAddPlace( VvhName ); EndPlace = VvhVpnAddPlace( VvhName );
@ -1358,7 +1353,7 @@ static int VvhVbhTreatLoop( ScanLoop )
EndTrans = VvhVpnAddTrans( VvhName ); EndTrans = VvhVpnAddTrans( VvhName );
EndTrans->TYPE = VPN_TRANS_IMMEDIATE; EndTrans->TYPE = VPN_TRANS_IMMEDIATE;
VpnArc = addvpnarcplace( VvhVpnFigure, EndPlace, EndTrans ); /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, EndPlace, EndTrans );
addauthelem( VvhHashEndLoop , ScanLoop->LABEL, (long)EndPlace ); addauthelem( VvhHashEndLoop , ScanLoop->LABEL, (long)EndPlace );
addauthelem( VvhHashBeginLoop, ScanLoop->LABEL, (long)BeginPlace ); addauthelem( VvhHashBeginLoop, ScanLoop->LABEL, (long)BeginPlace );
@ -1376,7 +1371,7 @@ static int VvhVbhTreatLoop( ScanLoop )
if ( VvhPrevTrans != (vpntrans_list *)0 ) if ( VvhPrevTrans != (vpntrans_list *)0 )
{ {
VpnArc = addvpnarctrans( VvhVpnFigure, VvhPrevTrans, BeginPlace ); /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, VvhPrevTrans, BeginPlace );
} }
delauthelem( VvhHashEndLoop , ScanLoop->LABEL ); delauthelem( VvhHashEndLoop , ScanLoop->LABEL );
@ -1421,7 +1416,6 @@ static void VvhVbhTreatWhile( ScanWhile )
vpntrans_list *TrueTrans; vpntrans_list *TrueTrans;
vpntrans_list *FalseTrans; vpntrans_list *FalseTrans;
vpntrans_list *EndTrans; vpntrans_list *EndTrans;
vpnarc *VpnArc;
vexexpr *VexCond; vexexpr *VexCond;
long Number; long Number;
@ -1433,7 +1427,7 @@ static void VvhVbhTreatWhile( ScanWhile )
BeginPlace = VvhVpnAddPlace( VvhName ); BeginPlace = VvhVpnAddPlace( VvhName );
BeginPlace->TYPE = VPN_PLACE_WHILE; 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 ); sprintf( VvhName, "end_while.%s.%s.%ld", ScanWhile->LABEL, VvhTopName, Number );
EndPlace = VvhVpnAddPlace( VvhName ); EndPlace = VvhVpnAddPlace( VvhName );
@ -1444,7 +1438,7 @@ static void VvhVbhTreatWhile( ScanWhile )
EndTrans = VvhVpnAddTrans( VvhName ); EndTrans = VvhVpnAddTrans( VvhName );
EndTrans->TYPE = VPN_TRANS_IMMEDIATE; EndTrans->TYPE = VPN_TRANS_IMMEDIATE;
VpnArc = addvpnarcplace( VvhVpnFigure, EndPlace, EndTrans ); /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, EndPlace, EndTrans );
addauthelem( VvhHashEndLoop , ScanWhile->LABEL, (long)EndPlace ); addauthelem( VvhHashEndLoop , ScanWhile->LABEL, (long)EndPlace );
addauthelem( VvhHashBeginLoop, ScanWhile->LABEL, (long)BeginPlace ); addauthelem( VvhHashBeginLoop, ScanWhile->LABEL, (long)BeginPlace );
@ -1465,8 +1459,8 @@ static void VvhVbhTreatWhile( ScanWhile )
TestPlace = VvhVpnAddPlace( VvhName ); TestPlace = VvhVpnAddPlace( VvhName );
TestPlace->TYPE = VPN_PLACE_WHILE_TEST; TestPlace->TYPE = VPN_PLACE_WHILE_TEST;
VpnArc = addvpnarcplace( VvhVpnFigure, BeginPlace, TestTrans ); /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, BeginPlace, TestTrans );
VpnArc = addvpnarctrans( VvhVpnFigure, TestTrans, TestPlace ); /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, TestTrans, TestPlace );
sprintf( VvhName, "while_true.%s.%s.%ld", ScanWhile->LABEL, VvhTopName, Number ); sprintf( VvhName, "while_true.%s.%s.%ld", ScanWhile->LABEL, VvhTopName, Number );
TrueTrans = VvhVpnAddTrans( VvhName ); TrueTrans = VvhVpnAddTrans( VvhName );
@ -1478,8 +1472,8 @@ static void VvhVbhTreatWhile( ScanWhile )
FalseTrans->TYPE = VPN_TRANS_GUARDED; FalseTrans->TYPE = VPN_TRANS_GUARDED;
FalseTrans->VEX_GUARD = optimvexnotexpr( VexCond ); FalseTrans->VEX_GUARD = optimvexnotexpr( VexCond );
VpnArc = addvpnarcplace( VvhVpnFigure, TestPlace, TrueTrans ); /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, TestPlace, TrueTrans );
VpnArc = addvpnarcplace( VvhVpnFigure, TestPlace, FalseTrans ); /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, TestPlace, FalseTrans );
VvhPrevTrans = TrueTrans; VvhPrevTrans = TrueTrans;
@ -1487,10 +1481,10 @@ static void VvhVbhTreatWhile( ScanWhile )
if ( VvhPrevTrans != (vpntrans_list *)0 ) 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 ); addvpnline( VvhVpnFigure, &EndPlace->LINE, VvhCurrentLine );
@ -1527,7 +1521,6 @@ static void VvhVbhTreatFor( ScanFor )
vpntrans_list *EndTrans; vpntrans_list *EndTrans;
vpntrans_list *IncTrans; vpntrans_list *IncTrans;
vpnact_list *VpnAction; vpnact_list *VpnAction;
vpnarc *VpnArc;
vexexpr *VexLeft; vexexpr *VexLeft;
vexexpr *VexRight; vexexpr *VexRight;
vexexpr *VexVar; vexexpr *VexVar;
@ -1544,7 +1537,7 @@ static void VvhVbhTreatFor( ScanFor )
BeginPlace = VvhVpnAddPlace( VvhName ); BeginPlace = VvhVpnAddPlace( VvhName );
BeginPlace->TYPE = VPN_PLACE_FOR; 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 ); sprintf( VvhName, "end_for.%s.%s.%ld", ScanFor->LABEL, VvhTopName, Number );
EndPlace = VvhVpnAddPlace( VvhName ); EndPlace = VvhVpnAddPlace( VvhName );
@ -1555,7 +1548,7 @@ static void VvhVbhTreatFor( ScanFor )
EndTrans = VvhVpnAddTrans( VvhName ); EndTrans = VvhVpnAddTrans( VvhName );
EndTrans->TYPE = VPN_TRANS_IMMEDIATE; 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 ); sprintf( VvhName, "for_init.%s.%s.%ld", ScanFor->LABEL, VvhTopName, Number );
InitTrans = VvhVpnAddTrans( VvhName ); InitTrans = VvhVpnAddTrans( VvhName );
@ -1581,8 +1574,8 @@ static void VvhVbhTreatFor( ScanFor )
LoopPlace = VvhVpnAddPlace( VvhName ); LoopPlace = VvhVpnAddPlace( VvhName );
LoopPlace->TYPE = VPN_PLACE_FOR_LOOP; LoopPlace->TYPE = VPN_PLACE_FOR_LOOP;
VpnArc = addvpnarcplace( VvhVpnFigure, BeginPlace, InitTrans ); /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, BeginPlace, InitTrans );
VpnArc = addvpnarctrans( VvhVpnFigure, InitTrans, LoopPlace ); /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, InitTrans, LoopPlace );
sprintf( VvhName, "for_test.%s.%s.%ld", ScanFor->LABEL, VvhTopName, Number ); sprintf( VvhName, "for_test.%s.%s.%ld", ScanFor->LABEL, VvhTopName, Number );
TestTrans = VvhVpnAddTrans( VvhName ); TestTrans = VvhVpnAddTrans( VvhName );
@ -1593,8 +1586,8 @@ static void VvhVbhTreatFor( ScanFor )
TestPlace = VvhVpnAddPlace( VvhName ); TestPlace = VvhVpnAddPlace( VvhName );
TestPlace->TYPE = VPN_PLACE_FOR_TEST; TestPlace->TYPE = VPN_PLACE_FOR_TEST;
VpnArc = addvpnarcplace( VvhVpnFigure, LoopPlace, TestTrans ); /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, LoopPlace, TestTrans );
VpnArc = addvpnarctrans( VvhVpnFigure, TestTrans, TestPlace ); /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, TestTrans, TestPlace );
sprintf( VvhName, "for_true.%s.%s.%ld", ScanFor->LABEL, VvhTopName, Number ); sprintf( VvhName, "for_true.%s.%s.%ld", ScanFor->LABEL, VvhTopName, Number );
TrueTrans = VvhVpnAddTrans( VvhName ); TrueTrans = VvhVpnAddTrans( VvhName );
@ -1606,8 +1599,8 @@ static void VvhVbhTreatFor( ScanFor )
FalseTrans->TYPE = VPN_TRANS_GUARDED; FalseTrans->TYPE = VPN_TRANS_GUARDED;
FalseTrans->VEX_GUARD = optimvexnotexpr( VexCond ); FalseTrans->VEX_GUARD = optimvexnotexpr( VexCond );
VpnArc = addvpnarcplace( VvhVpnFigure, TestPlace, TrueTrans ); /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, TestPlace, TrueTrans );
VpnArc = addvpnarcplace( VvhVpnFigure, TestPlace, FalseTrans ); /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, TestPlace, FalseTrans );
sprintf( VvhName, "for_inc.%s.%s.%ld", ScanFor->LABEL, VvhTopName, Number ); sprintf( VvhName, "for_inc.%s.%s.%ld", ScanFor->LABEL, VvhTopName, Number );
IncPlace = VvhVpnAddPlace( VvhName ); IncPlace = VvhVpnAddPlace( VvhName );
@ -1632,8 +1625,8 @@ static void VvhVbhTreatFor( ScanFor )
VpnAction = addvpnactasg( VvhVpnFigure, IncTrans, VexVar, VexInc ); VpnAction = addvpnactasg( VvhVpnFigure, IncTrans, VexVar, VexInc );
addvpnline( VvhVpnFigure, &VpnAction->LINE, VvhCurrentLine ); addvpnline( VvhVpnFigure, &VpnAction->LINE, VvhCurrentLine );
VpnArc = addvpnarcplace( VvhVpnFigure, IncPlace , IncTrans ); /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, IncPlace , IncTrans );
VpnArc = addvpnarctrans( VvhVpnFigure, IncTrans , LoopPlace ); /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, IncTrans , LoopPlace );
OldBeginLoop = VvhBeginLoop; OldBeginLoop = VvhBeginLoop;
OldEndLoop = VvhEndLoop; OldEndLoop = VvhEndLoop;
@ -1651,10 +1644,10 @@ static void VvhVbhTreatFor( ScanFor )
if ( TrueTrans != (vpntrans_list *)0 ) 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 ); addvpnline( VvhVpnFigure, &EndPlace->LINE, VvhCurrentLine );
@ -1684,7 +1677,6 @@ static int VvhVbhTreatNext( ScanNext )
vpnplace_list *LoopPlace; vpnplace_list *LoopPlace;
vpntrans_list *TrueTrans; vpntrans_list *TrueTrans;
vpntrans_list *FalseTrans; vpntrans_list *FalseTrans;
vpnarc *VpnArc;
vexexpr *VexCond; vexexpr *VexCond;
long Number; long Number;
@ -1720,7 +1712,7 @@ static int VvhVbhTreatNext( ScanNext )
} }
} }
VpnArc = addvpnarctrans( VvhVpnFigure, VvhPrevTrans, BeginPlace ); /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, VvhPrevTrans, BeginPlace );
if ( VexCond != (vexexpr *)0 ) if ( VexCond != (vexexpr *)0 )
{ {
@ -1733,23 +1725,23 @@ static int VvhVbhTreatNext( ScanNext )
EndTrans = VvhVpnAddTrans( VvhName ); EndTrans = VvhVpnAddTrans( VvhName );
EndTrans->TYPE = VPN_TRANS_IMMEDIATE; EndTrans->TYPE = VPN_TRANS_IMMEDIATE;
VpnArc = addvpnarcplace( VvhVpnFigure, EndPlace, EndTrans ); /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, EndPlace, EndTrans );
sprintf( VvhName, "next_true.%s.%ld", VvhTopName, Number ); sprintf( VvhName, "next_true.%s.%ld", VvhTopName, Number );
TrueTrans = VvhVpnAddTrans( VvhName ); TrueTrans = VvhVpnAddTrans( VvhName );
TrueTrans->TYPE = VPN_TRANS_GUARDED; TrueTrans->TYPE = VPN_TRANS_GUARDED;
TrueTrans->VEX_GUARD = dupvexexpr( VexCond ); TrueTrans->VEX_GUARD = dupvexexpr( VexCond );
VpnArc = addvpnarcplace( VvhVpnFigure, BeginPlace, TrueTrans ); /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, BeginPlace, TrueTrans );
sprintf( VvhName, "next_false.%s.%ld", VvhTopName, Number ); sprintf( VvhName, "next_false.%s.%ld", VvhTopName, Number );
FalseTrans = VvhVpnAddTrans( VvhName ); FalseTrans = VvhVpnAddTrans( VvhName );
FalseTrans->TYPE = VPN_TRANS_GUARDED; FalseTrans->TYPE = VPN_TRANS_GUARDED;
FalseTrans->VEX_GUARD = optimvexnotexpr( VexCond ); FalseTrans->VEX_GUARD = optimvexnotexpr( VexCond );
VpnArc = addvpnarcplace( VvhVpnFigure, BeginPlace, FalseTrans ); /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, BeginPlace, FalseTrans );
VpnArc = addvpnarctrans( VvhVpnFigure, FalseTrans, EndPlace ); /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, FalseTrans, EndPlace );
VpnArc = addvpnarctrans( VvhVpnFigure, TrueTrans , LoopPlace ); /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, TrueTrans , LoopPlace );
VvhPrevTrans = EndTrans; VvhPrevTrans = EndTrans;
@ -1759,8 +1751,8 @@ static int VvhVbhTreatNext( ScanNext )
TrueTrans = VvhVpnAddTrans( VvhName ); TrueTrans = VvhVpnAddTrans( VvhName );
TrueTrans->TYPE = VPN_TRANS_IMMEDIATE; TrueTrans->TYPE = VPN_TRANS_IMMEDIATE;
VpnArc = addvpnarcplace( VvhVpnFigure, BeginPlace, TrueTrans ); /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, BeginPlace, TrueTrans );
VpnArc = addvpnarctrans( VvhVpnFigure, TrueTrans , LoopPlace ); /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, TrueTrans , LoopPlace );
VvhPrevTrans = (vpntrans_list *)0; VvhPrevTrans = (vpntrans_list *)0;
@ -1784,7 +1776,6 @@ static int VvhVbhTreatExit( ScanExit )
vpnplace_list *LoopPlace; vpnplace_list *LoopPlace;
vpntrans_list *TrueTrans; vpntrans_list *TrueTrans;
vpntrans_list *FalseTrans; vpntrans_list *FalseTrans;
vpnarc *VpnArc;
vexexpr *VexCond; vexexpr *VexCond;
long Number; long Number;
@ -1820,7 +1811,7 @@ static int VvhVbhTreatExit( ScanExit )
} }
} }
VpnArc = addvpnarctrans( VvhVpnFigure, VvhPrevTrans, BeginPlace ); /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, VvhPrevTrans, BeginPlace );
if ( VexCond != (vexexpr *)0 ) if ( VexCond != (vexexpr *)0 )
{ {
@ -1833,23 +1824,23 @@ static int VvhVbhTreatExit( ScanExit )
EndTrans = VvhVpnAddTrans( VvhName ); EndTrans = VvhVpnAddTrans( VvhName );
EndTrans->TYPE = VPN_TRANS_IMMEDIATE; EndTrans->TYPE = VPN_TRANS_IMMEDIATE;
VpnArc = addvpnarcplace( VvhVpnFigure, EndPlace, EndTrans ); /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, EndPlace, EndTrans );
sprintf( VvhName, "exit_true.%s.%ld", VvhTopName, Number ); sprintf( VvhName, "exit_true.%s.%ld", VvhTopName, Number );
TrueTrans = VvhVpnAddTrans( VvhName ); TrueTrans = VvhVpnAddTrans( VvhName );
TrueTrans->TYPE = VPN_TRANS_GUARDED; TrueTrans->TYPE = VPN_TRANS_GUARDED;
TrueTrans->VEX_GUARD = dupvexexpr( VexCond ); TrueTrans->VEX_GUARD = dupvexexpr( VexCond );
VpnArc = addvpnarcplace( VvhVpnFigure, BeginPlace, TrueTrans ); /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, BeginPlace, TrueTrans );
sprintf( VvhName, "exit_false.%s.%ld", VvhTopName, Number ); sprintf( VvhName, "exit_false.%s.%ld", VvhTopName, Number );
FalseTrans = VvhVpnAddTrans( VvhName ); FalseTrans = VvhVpnAddTrans( VvhName );
FalseTrans->TYPE = VPN_TRANS_GUARDED; FalseTrans->TYPE = VPN_TRANS_GUARDED;
FalseTrans->VEX_GUARD = optimvexnotexpr( VexCond ); FalseTrans->VEX_GUARD = optimvexnotexpr( VexCond );
VpnArc = addvpnarcplace( VvhVpnFigure, BeginPlace, FalseTrans ); /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, BeginPlace, FalseTrans );
VpnArc = addvpnarctrans( VvhVpnFigure, FalseTrans, EndPlace ); /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, FalseTrans, EndPlace );
VpnArc = addvpnarctrans( VvhVpnFigure, TrueTrans , LoopPlace ); /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, TrueTrans , LoopPlace );
VvhPrevTrans = EndTrans; VvhPrevTrans = EndTrans;
@ -1859,8 +1850,8 @@ static int VvhVbhTreatExit( ScanExit )
TrueTrans = VvhVpnAddTrans( VvhName ); TrueTrans = VvhVpnAddTrans( VvhName );
TrueTrans->TYPE = VPN_TRANS_IMMEDIATE; TrueTrans->TYPE = VPN_TRANS_IMMEDIATE;
VpnArc = addvpnarcplace( VvhVpnFigure, BeginPlace, TrueTrans ); /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, BeginPlace, TrueTrans );
VpnArc = addvpnarctrans( VvhVpnFigure, TrueTrans , LoopPlace ); /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, TrueTrans , LoopPlace );
VvhPrevTrans = (vpntrans_list *)0; VvhPrevTrans = (vpntrans_list *)0;
@ -1880,7 +1871,6 @@ static void VvhVbhTreatCall( ScanCall )
vpnplace_list *CallPlace; vpnplace_list *CallPlace;
vpntrans_list *CallTrans; vpntrans_list *CallTrans;
vpnact_list *VpnAction; vpnact_list *VpnAction;
vpnarc *VpnArc;
vexexpr *Expr; vexexpr *Expr;
long Number; long Number;
@ -1895,8 +1885,8 @@ static void VvhVbhTreatCall( ScanCall )
CallTrans = VvhVpnAddTrans( VvhName ); CallTrans = VvhVpnAddTrans( VvhName );
CallTrans->TYPE = VPN_TRANS_ACT_EXEC; CallTrans->TYPE = VPN_TRANS_ACT_EXEC;
VpnArc = addvpnarctrans( VvhVpnFigure, VvhPrevTrans, CallPlace ); /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, VvhPrevTrans, CallPlace );
VpnArc = addvpnarcplace( VvhVpnFigure, CallPlace , CallTrans ); /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, CallPlace , CallTrans );
VvhPrevTrans = CallTrans; VvhPrevTrans = CallTrans;
@ -1917,7 +1907,6 @@ static void VvhVbhTreatReturn( ScanReturn )
vpnplace_list *ReturnPlace; vpnplace_list *ReturnPlace;
vpntrans_list *ReturnTrans; vpntrans_list *ReturnTrans;
vpnact_list *VpnAction; vpnact_list *VpnAction;
vpnarc *VpnArc;
vexexpr *Expr; vexexpr *Expr;
long Number; long Number;
@ -1940,15 +1929,15 @@ static void VvhVbhTreatReturn( ScanReturn )
ReturnTrans = VvhVpnAddTrans( VvhName ); ReturnTrans = VvhVpnAddTrans( VvhName );
ReturnTrans->TYPE = VPN_TRANS_ACT_EXEC; ReturnTrans->TYPE = VPN_TRANS_ACT_EXEC;
VpnArc = addvpnarctrans( VvhVpnFigure, VvhPrevTrans, ReturnPlace ); /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, VvhPrevTrans, ReturnPlace );
VpnArc = addvpnarcplace( VvhVpnFigure, ReturnPlace , ReturnTrans ); /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, ReturnPlace , ReturnTrans );
VvhPrevTrans = ReturnTrans; VvhPrevTrans = ReturnTrans;
VpnAction = addvpnactreturn( VvhVpnFigure, VvhPrevTrans, Expr ); VpnAction = addvpnactreturn( VvhVpnFigure, VvhPrevTrans, Expr );
addvpnline( VvhVpnFigure, &VpnAction->LINE, VvhCurrentLine ); addvpnline( VvhVpnFigure, &VpnAction->LINE, VvhCurrentLine );
VpnArc = addvpnarctrans( VvhVpnFigure, VvhPrevTrans, VvhFirstPlace ); /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, VvhPrevTrans, VvhFirstPlace );
VvhPrevTrans = (vpntrans_list *)0; VvhPrevTrans = (vpntrans_list *)0;
} }
@ -2024,7 +2013,6 @@ static void VvhVbhTreatProcess()
vpnplace_list *WaitPlace; vpnplace_list *WaitPlace;
vpntrans_list *WaitTrans; vpntrans_list *WaitTrans;
vpndecl_list *VpnDeclar; vpndecl_list *VpnDeclar;
vpnarc *VpnArc;
ptype_list *ScanPType; ptype_list *ScanPType;
chain_list *ScanChain; chain_list *ScanChain;
vbpcs_list *ScanProc; vbpcs_list *ScanProc;
@ -2078,7 +2066,7 @@ static void VvhVbhTreatProcess()
VvhProcess->ELABO = BeginTrans; VvhProcess->ELABO = BeginTrans;
BeginPlace->TOKEN = 1; BeginPlace->TOKEN = 1;
VpnArc = addvpnarcplace( VvhVpnFigure, BeginPlace, BeginTrans ); /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, BeginPlace, BeginTrans );
for ( ScanPType = ScanProc->VARIABLE; for ( ScanPType = ScanProc->VARIABLE;
ScanPType != (ptype_list *)0; ScanPType != (ptype_list *)0;
@ -2129,10 +2117,10 @@ static void VvhVbhTreatProcess()
if ( VvhPrevTrans != (vpntrans_list *)0 ) 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; WaitTrans->TYPE = VPN_TRANS_INF_WAIT;
VvhPrevTrans = WaitTrans; VvhPrevTrans = WaitTrans;
@ -2142,7 +2130,7 @@ static void VvhVbhTreatProcess()
if ( VvhPrevTrans != (vpntrans_list *)0 ) if ( VvhPrevTrans != (vpntrans_list *)0 )
{ {
VpnArc = addvpnarctrans( VvhVpnFigure, VvhPrevTrans, BeginPlace ); /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, VvhPrevTrans, BeginPlace );
} }
VvhNumberProc++; VvhNumberProc++;
@ -2160,7 +2148,6 @@ static void VvhVbhTreatFunction()
vpnplace_list *BeginPlace; vpnplace_list *BeginPlace;
vpntrans_list *BeginTrans; vpntrans_list *BeginTrans;
vpndecl_list *VpnDeclar; vpndecl_list *VpnDeclar;
vpnarc *VpnArc;
ptype_list *ScanPType; ptype_list *ScanPType;
vbfun_list *ScanFunc; vbfun_list *ScanFunc;
vbarg_list *ScanArg; vbarg_list *ScanArg;
@ -2209,7 +2196,7 @@ static void VvhVbhTreatFunction()
VvhFunction->ELABO = BeginTrans; VvhFunction->ELABO = BeginTrans;
BeginPlace->TOKEN = 1; BeginPlace->TOKEN = 1;
VpnArc = addvpnarcplace( VvhVpnFigure, BeginPlace, BeginTrans ); /*VpnArc =*/ addvpnarcplace( VvhVpnFigure, BeginPlace, BeginTrans );
for ( ScanArg = ScanFunc->ARGUMENT; for ( ScanArg = ScanFunc->ARGUMENT;
ScanArg != (vbarg_list *)0; ScanArg != (vbarg_list *)0;
@ -2282,7 +2269,7 @@ static void VvhVbhTreatFunction()
if ( VvhPrevTrans != (vpntrans_list *)0 ) if ( VvhPrevTrans != (vpntrans_list *)0 )
{ {
VpnArc = addvpnarctrans( VvhVpnFigure, VvhPrevTrans, BeginPlace ); /*VpnArc =*/ addvpnarctrans( VvhVpnFigure, VvhPrevTrans, BeginPlace );
} }
VvhNumberFunc++; VvhNumberFunc++;

6
alliance/src/xfsm/src/XMV_map.c
View File

@ -221,14 +221,12 @@ void CallbackMapEvent ( MyWidget, Event, Args, Argc )
String *Args; String *Args;
int *Argc; int *Argc;
{ {
Display *EventDisplay;
char MouseEvent; char MouseEvent;
long X; long X;
long Y; long Y;
autbegin(); autbegin();
EventDisplay = Event->display;
MouseEvent = Args[ 0 ][ 0 ] - '0'; MouseEvent = Args[ 0 ][ 0 ] - '0';
X = Event->x; X = Event->x;
@ -305,12 +303,8 @@ void CallbackMapExpose( MyWidget, ClientData, CallData )
XtPointer ClientData; XtPointer ClientData;
XmDrawingAreaCallbackStruct *CallData; XmDrawingAreaCallbackStruct *CallData;
{ {
XExposeEvent *ExposeEvent;
autbegin(); autbegin();
ExposeEvent = (XExposeEvent *)CallData->event;
if ( XfsmFirstExpose ) if ( XfsmFirstExpose )
{ {
XfsmFirstExpose = XFSM_FALSE; XfsmFirstExpose = XFSM_FALSE;

3
alliance/src/xfsm/src/XMX_event.c
View File

@ -453,15 +453,12 @@ void CallbackEvent ( MyWidget, Event, Args, Argc )
String *Args; String *Args;
int *Argc; int *Argc;
{ {
Display *EventDisplay;
int MouseEvent; int MouseEvent;
Position OldUnitCursorX; Position OldUnitCursorX;
Position OldUnitCursorY; Position OldUnitCursorY;
autbegin(); autbegin();
EventDisplay = Event->display;
MouseEvent = atoi( Args[ 0 ] ); MouseEvent = atoi( Args[ 0 ] );
if ( MouseEvent == XFSM_LEAVE ) if ( MouseEvent == XFSM_LEAVE )

6
alliance/src/xsch/src/XMV_map.c
View File

@ -220,14 +220,12 @@ void CallbackMapEvent ( MyWidget, Event, Args, Argc )
String *Args; String *Args;
int *Argc; int *Argc;
{ {
Display *EventDisplay;
char MouseEvent; char MouseEvent;
long X; long X;
long Y; long Y;
autbegin(); autbegin();
EventDisplay = Event->display;
MouseEvent = Args[ 0 ][ 0 ] - '0'; MouseEvent = Args[ 0 ][ 0 ] - '0';
X = Event->x; X = Event->x;
@ -304,12 +302,8 @@ void CallbackMapExpose( MyWidget, ClientData, CallData )
XtPointer ClientData; XtPointer ClientData;
XmDrawingAreaCallbackStruct *CallData; XmDrawingAreaCallbackStruct *CallData;
{ {
XExposeEvent *ExposeEvent;
autbegin(); autbegin();
ExposeEvent = (XExposeEvent *)CallData->event;
if ( XschFirstExpose ) if ( XschFirstExpose )
{ {
XschFirstExpose = XSCH_FALSE; XschFirstExpose = XSCH_FALSE;

7
alliance/src/xsch/src/XMX_view.c
View File

@ -1817,7 +1817,6 @@ static void XschDrawOrAnd( X1r, Y1r, X2r, Y2r, Ycr, Obj )
long Ycr; long Ycr;
xschobj_list *Obj; xschobj_list *Obj;
{ {
long gs_y;
long gs_x; long gs_x;
long cs; long cs;
int i; int i;
@ -1829,7 +1828,7 @@ static void XschDrawOrAnd( X1r, Y1r, X2r, Y2r, Ycr, Obj )
long gas_x; long gas_x;
long Radius; long Radius;
long x, y; long x;
long yc; long yc;
long y1; long y1;
long DeltaX; long DeltaX;
@ -1854,11 +1853,11 @@ XDrawRectangle( XschGraphicDisplay,
n = Obj->ARG1; n = Obj->ARG1;
gs_x = ( 6 * DeltaX ) / 8; gs_x = ( 6 * DeltaX ) / 8;
gs_y = ( 7 * DeltaY ) / 8; //gs_y = ( 7 * DeltaY ) / 8;
cs = DeltaX / 8; cs = DeltaX / 8;
yc = XschGraphicDy - Ycr; yc = XschGraphicDy - Ycr;
y = XschGraphicDy - Ycr - gs_y/2; //y = XschGraphicDy - Ycr - gs_y/2;
x = X1r + cs; x = X1r + cs;
if ( Obj->ARG3 == 0 ) if ( Obj->ARG3 == 0 )