rpl/src/instructions_s1.c - diff

Return to instructions_s1.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_s1.c between versions 1.26 and 1.27

version 1.26, 2011/04/21 16:00:59	version 1.27, 2011/06/10 11:35:13
Line 2773 instruction_step(struct_processus *s_eta	Line 2773 instruction_step(struct_processus *s_eta
return;	return;
}	}

if (((s_etat_processus).s_liste_variables[(s_etat_processus)	if (((s_etat_processus).pointeur_variable_courante)
.position_variable_courante]).variable_verrouillee == d_vrai)	.variable_verrouillee == d_vrai)
{	{
liberation(s_etat_processus, s_objet);	liberation(s_etat_processus, s_objet);

Line 2782 instruction_step(struct_processus *s_eta	Line 2782 instruction_step(struct_processus *s_eta
return;	return;
}	}

if (((s_etat_processus).s_liste_variables[(s_etat_processus)	if (((s_etat_processus).pointeur_variable_courante).objet == NULL)
.position_variable_courante]).objet == NULL)
{	{
liberation(s_etat_processus, s_objet);	liberation(s_etat_processus, s_objet);

Line 2792 instruction_step(struct_processus *s_eta	Line 2791 instruction_step(struct_processus *s_eta
}	}

((s_etat_processus).l_base_pile_systeme).indice_boucle =	((s_etat_processus).l_base_pile_systeme).indice_boucle =
((s_etat_processus).s_liste_variables[(s_etat_processus)	((s_etat_processus).pointeur_variable_courante).objet;
.position_variable_courante]).objet;
}	}

/*	/*
Line 2834 instruction_step(struct_processus *s_eta	Line 2832 instruction_step(struct_processus *s_eta
*/	*/

((s_etat_processus).l_base_pile_systeme).indice_boucle = NULL;	((s_etat_processus).l_base_pile_systeme).indice_boucle = NULL;
((s_etat_processus).s_liste_variables[(s_etat_processus)	((s_etat_processus).pointeur_variable_courante).objet = s_objet;
.position_variable_courante]).objet = s_objet;
}	}
else	else
{	{
Line 3210 instruction_sto(struct_processus *s_etat	Line 3207 instruction_sto(struct_processus *s_etat
* La variable est accessible.	* La variable est accessible.
*/	*/

if ((s_etat_processus).s_liste_variables[(s_etat_processus)	if (((s_etat_processus).pointeur_variable_courante)
.position_variable_courante].variable_verrouillee == d_vrai)	.variable_verrouillee == d_vrai)
{	{
liberation(s_etat_processus, s_objet_1);	liberation(s_etat_processus, s_objet_1);
liberation(s_etat_processus, s_objet_2);	liberation(s_etat_processus, s_objet_2);
Line 3220 instruction_sto(struct_processus *s_etat	Line 3217 instruction_sto(struct_processus *s_etat
return;	return;
}	}

if ((s_etat_processus).s_liste_variables[(s_etat_processus)	if (((s_etat_processus).pointeur_variable_courante).objet == NULL)
.position_variable_courante].objet == NULL)
{	{
if (pthread_mutex_lock(&(((s_etat_processus)	if (pthread_mutex_lock(&(((s_etat_processus)
.s_liste_variables_partagees).mutex)) != 0)	.s_liste_variables_partagees).mutex)) != 0)
Line 3231 instruction_sto(struct_processus *s_etat	Line 3227 instruction_sto(struct_processus *s_etat
}	}

if (recherche_variable_partagee(s_etat_processus,	if (recherche_variable_partagee(s_etat_processus,
(s_etat_processus).s_liste_variables[(s_etat_processus)	((s_etat_processus).pointeur_variable_courante).nom,
.position_variable_courante].nom,	((s_etat_processus).pointeur_variable_courante)
(s_etat_processus).s_liste_variables[(s_etat_processus)	.variable_partagee, ((s_etat_processus)
.position_variable_courante].variable_partagee,	.pointeur_variable_courante).origine) == d_faux)
(s_etat_processus).s_liste_variables[(s_etat_processus)
.position_variable_courante].origine) == d_faux)
{	{
if (pthread_mutex_unlock(&(((s_etat_processus)	if (pthread_mutex_unlock(&(((s_etat_processus)
.s_liste_variables_partagees).mutex)) != 0)	.s_liste_variables_partagees).mutex)) != 0)
Line 3308 instruction_sto(struct_processus *s_etat	Line 3302 instruction_sto(struct_processus *s_etat
{	{
if ((*s_etat_processus).autorisation_nom_implicite == 'N')	if ((*s_etat_processus).autorisation_nom_implicite == 'N')
{	{
if ((s_etat_processus).s_liste_variables[(s_etat_processus)	if (((s_etat_processus).pointeur_variable_courante)
.position_variable_courante].niveau == 1)	.niveau == 1)
{	{
liberation(s_etat_processus, s_objet_1);	liberation(s_etat_processus, s_objet_1);
liberation(s_etat_processus, s_objet_2);	liberation(s_etat_processus, s_objet_2);
Line 3321 instruction_sto(struct_processus *s_etat	Line 3315 instruction_sto(struct_processus *s_etat
}	}

liberation(s_etat_processus,	liberation(s_etat_processus,
(s_etat_processus).s_liste_variables[(s_etat_processus)	((s_etat_processus).pointeur_variable_courante).objet);
.position_variable_courante].objet);	((s_etat_processus).pointeur_variable_courante).objet =
	s_objet_2;
(s_etat_processus).s_liste_variables[(s_etat_processus)
.position_variable_courante].objet = s_objet_2;
}	}
}	}
else	else

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.26
changed lines
	Added in v.1.27