rpl/src/instructions_f1.c - diff

Return to instructions_f1.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_f1.c between versions 1.26 and 1.51

version 1.26, 2011/06/21 15:26:31	version 1.51, 2013/02/26 19:56:14
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.0.prerelease.2	RPL/2 (R) version 4.1.12
Copyright (C) 1989-2011 Dr. BERTRAND Joël	Copyright (C) 1989-2013 Dr. BERTRAND Joël

This file is part of RPL/2.	This file is part of RPL/2.

Line 457 instruction_fleche(struct_processus *s_e	Line 457 instruction_fleche(struct_processus *s_e
if (recherche_variable_statique(s_etat_processus, s_variable.nom,	if (recherche_variable_statique(s_etat_processus, s_variable.nom,
position_variable,	position_variable,
((*s_etat_processus).mode_execution_programme == 'Y')	((*s_etat_processus).mode_execution_programme == 'Y')
? 'P' : 'E') == d_vrai)	? 'P' : 'E') != NULL)
{	{
// Variable statique à utiliser	// Variable statique à utiliser

Line 470 instruction_fleche(struct_processus *s_e	Line 470 instruction_fleche(struct_processus *s_e
s_variable.origine = 'E';	s_variable.origine = 'E';
}	}

s_variable.objet = (*s_etat_processus)	s_variable.objet = ((s_etat_processus)
.s_liste_variables_statiques[(*s_etat_processus)	.pointeur_variable_statique_courante).objet;
.position_variable_statique_courante].objet;	((s_etat_processus).pointeur_variable_statique_courante)
(*s_etat_processus).s_liste_variables_statiques	.objet = NULL;
[(*s_etat_processus)
.position_variable_statique_courante].objet = NULL;
}	}
else	else
{	{
Line 551 instruction_fleche(struct_processus *s_e	Line 549 instruction_fleche(struct_processus *s_e
(*s_etat_processus).objet_courant;	(*s_etat_processus).objet_courant;
}	}

if (pthread_mutex_lock(&(((s_etat_processus)	if (pthread_mutex_lock(&mutex_creation_variable_partagee) != 0)
.s_liste_variables_partagees).mutex)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 561 instruction_fleche(struct_processus *s_e	Line 558 instruction_fleche(struct_processus *s_e
if (recherche_variable_partagee(s_etat_processus, s_variable.nom,	if (recherche_variable_partagee(s_etat_processus, s_variable.nom,
position_variable,	position_variable,
((*s_etat_processus).mode_execution_programme == 'Y')	((*s_etat_processus).mode_execution_programme == 'Y')
? 'P' : 'E') == d_vrai)	? 'P' : 'E') != NULL)
{	{
// Variable partagée à utiliser	// Variable partagée à utiliser

	if (pthread_mutex_unlock(&mutex_creation_variable_partagee)
	!= 0)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}

if (pthread_mutex_unlock(&(((s_etat_processus)	if (pthread_mutex_unlock(&(((s_etat_processus)
.s_liste_variables_partagees).mutex)) != 0)	.pointeur_variable_partagee_courante).mutex)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 589 instruction_fleche(struct_processus *s_e	Line 593 instruction_fleche(struct_processus *s_e
}	}
else	else
{	{
// Variable partagée à utiliser
// Variable partagee à créer	// Variable partagee à créer

(*s_etat_processus).erreur_systeme = d_es;	(*s_etat_processus).erreur_systeme = d_es;
Line 598 instruction_fleche(struct_processus *s_e	Line 601 instruction_fleche(struct_processus *s_e
+ 1) * sizeof(unsigned char))) == NULL)	+ 1) * sizeof(unsigned char))) == NULL)
{	{
if (pthread_mutex_unlock(&(((s_etat_processus)	if (pthread_mutex_unlock(&(((s_etat_processus)
.s_liste_variables_partagees).mutex)) != 0)	.pointeur_variable_partagee_courante).mutex)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 650 instruction_fleche(struct_processus *s_e	Line 653 instruction_fleche(struct_processus *s_e
if (creation_variable_partagee(s_etat_processus,	if (creation_variable_partagee(s_etat_processus,
&s_variable_partagee) == d_erreur)	&s_variable_partagee) == d_erreur)
{	{
if (pthread_mutex_unlock(&(((s_etat_processus)
.s_liste_variables_partagees).mutex)) != 0)
{
(*s_etat_processus).erreur_systeme = d_es_processus;
return;
}

return;	return;
}	}

if (pthread_mutex_unlock(&(((s_etat_processus)	s_variable.objet = NULL;
.s_liste_variables_partagees).mutex)) != 0)
	if (pthread_mutex_unlock(&mutex_creation_variable_partagee)
	!= 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
}	}

s_variable.objet = NULL;
}	}
}	}
else	else
Line 735 instruction_fleche(struct_processus *s_e	Line 731 instruction_fleche(struct_processus *s_e

(*s_etat_processus).niveau_courant--;	(*s_etat_processus).niveau_courant--;

if (retrait_variable_par_niveau(s_etat_processus) == d_erreur)	if (retrait_variables_par_niveau(s_etat_processus) == d_erreur)
{	{
return;	return;
}	}
Line 984 instruction_for(struct_processus *s_etat	Line 980 instruction_for(struct_processus *s_etat
}	}
}	}

empilement_pile_systeme(s_etat_processus);

if (depilement(s_etat_processus, &((*s_etat_processus).l_base_pile),	if (depilement(s_etat_processus, &((*s_etat_processus).l_base_pile),
&s_objet_1) == d_erreur)	&s_objet_1) == d_erreur)
{	{
Line 1026 instruction_for(struct_processus *s_etat	Line 1020 instruction_for(struct_processus *s_etat
instruction_valide = (*s_etat_processus).instruction_valide;	instruction_valide = (*s_etat_processus).instruction_valide;
(*s_etat_processus).test_instruction = 'Y';	(*s_etat_processus).test_instruction = 'Y';

	empilement_pile_systeme(s_etat_processus);

	if ((*s_etat_processus).erreur_systeme != d_es)
	{
	return;
	}

if ((*s_etat_processus).mode_execution_programme == 'Y')	if ((*s_etat_processus).mode_execution_programme == 'Y')
{	{
if (recherche_instruction_suivante(s_etat_processus) == d_erreur)	if (recherche_instruction_suivante(s_etat_processus) == d_erreur)
Line 1043 instruction_for(struct_processus *s_etat	Line 1044 instruction_for(struct_processus *s_etat
free((*s_etat_processus).instruction_courante);	free((*s_etat_processus).instruction_courante);
(*s_etat_processus).instruction_courante = tampon;	(*s_etat_processus).instruction_courante = tampon;

	depilement_pile_systeme(s_etat_processus);

(*s_etat_processus).erreur_execution = d_ex_nom_reserve;	(*s_etat_processus).erreur_execution = d_ex_nom_reserve;
return;	return;
}	}
Line 1057 instruction_for(struct_processus *s_etat	Line 1060 instruction_for(struct_processus *s_etat
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);

	depilement_pile_systeme(s_etat_processus);
return;	return;
}	}

Line 1066 instruction_for(struct_processus *s_etat	Line 1070 instruction_for(struct_processus *s_etat
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);

	depilement_pile_systeme(s_etat_processus);

(*s_etat_processus).erreur_execution = d_ex_manque_argument;	(*s_etat_processus).erreur_execution = d_ex_manque_argument;
return;	return;
}	}
Line 1077 instruction_for(struct_processus *s_etat	Line 1083 instruction_for(struct_processus *s_etat
{	{
if ((*s_etat_processus).expression_courante == NULL)	if ((*s_etat_processus).expression_courante == NULL)
{	{
	depilement_pile_systeme(s_etat_processus);
(*s_etat_processus).erreur_execution = d_ex_manque_argument;	(*s_etat_processus).erreur_execution = d_ex_manque_argument;
return;	return;
}	}
Line 1101 instruction_for(struct_processus *s_etat	Line 1108 instruction_for(struct_processus *s_etat
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);

	depilement_pile_systeme(s_etat_processus);

(*s_etat_processus).erreur_execution = d_ex_erreur_traitement_boucle;	(*s_etat_processus).erreur_execution = d_ex_erreur_traitement_boucle;
return;	return;
}	}
Line 1109 instruction_for(struct_processus *s_etat	Line 1118 instruction_for(struct_processus *s_etat
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);

	depilement_pile_systeme(s_etat_processus);

(*s_etat_processus).erreur_execution = d_ex_erreur_traitement_boucle;	(*s_etat_processus).erreur_execution = d_ex_erreur_traitement_boucle;
return;	return;
}	}

CVSweb interface <joel.bertrand@systella.fr>

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