rpl/src/instructions_p4.c - diff

Return to instructions_p4.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_p4.c between versions 1.20 and 1.43

version 1.20, 2011/06/20 17:54:19	version 1.43, 2012/12/19 09:58:26
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.0.prerelease.1	RPL/2 (R) version 4.1.12
Copyright (C) 1989-2011 Dr. BERTRAND Joël	Copyright (C) 1989-2012 Dr. BERTRAND Joël

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

Line 254 instruction_prst(struct_processus *s_eta	Line 254 instruction_prst(struct_processus *s_eta
}	}
}	}

	routine_recursive = 2;
impression_pile(s_etat_processus, (*s_etat_processus).l_base_pile,	impression_pile(s_etat_processus, (*s_etat_processus).l_base_pile,
'E', 1);	'E', 1);
	routine_recursive = 0;
return;	return;
}	}

Line 333 instruction_prstc(struct_processus *s_et	Line 335 instruction_prstc(struct_processus *s_et
}	}
}	}

	routine_recursive = 2;
impression_pile(s_etat_processus, (*s_etat_processus).l_base_pile,	impression_pile(s_etat_processus, (*s_etat_processus).l_base_pile,
'C', 1);	'C', 1);
	routine_recursive = 0;
return;	return;
}	}

Line 421 instruction_prvar(struct_processus *s_et	Line 425 instruction_prvar(struct_processus *s_et
}	}
else	else
{	{
if (pthread_mutex_lock(&(((s_etat_processus)
.s_liste_variables_partagees).mutex)) != 0)
{
(*s_etat_processus).erreur_systeme = d_es_processus;
return;
}

if (recherche_variable_partagee(s_etat_processus,	if (recherche_variable_partagee(s_etat_processus,
((s_etat_processus).pointeur_variable_courante).nom,	((s_etat_processus).pointeur_variable_courante).nom,
((s_etat_processus).pointeur_variable_courante)	((s_etat_processus).pointeur_variable_courante)
.variable_partagee, ((s_etat_processus)	.variable_partagee, ((s_etat_processus)
.pointeur_variable_courante).origine) == d_faux)	.pointeur_variable_courante).origine) == NULL)
{	{
if (pthread_mutex_unlock(&(((s_etat_processus)
.s_liste_variables_partagees).mutex)) != 0)
{
(*s_etat_processus).erreur_systeme = d_es_processus;
return;
}

(*s_etat_processus).erreur_systeme = d_es;	(*s_etat_processus).erreur_systeme = d_es;
(*s_etat_processus).erreur_execution = d_ex_variable_non_definie;	(*s_etat_processus).erreur_execution = d_ex_variable_non_definie;

Line 449 instruction_prvar(struct_processus *s_et	Line 439 instruction_prvar(struct_processus *s_et
}	}

formateur_tex(s_etat_processus, ((s_etat_processus)	formateur_tex(s_etat_processus, ((s_etat_processus)
.s_liste_variables_partagees).table	.pointeur_variable_partagee_courante).objet, 'N');
[((s_etat_processus).s_liste_variables_partagees)
.position_variable].objet, 'N');

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 482 instruction_prvar(struct_processus *s_et	Line 470 instruction_prvar(struct_processus *s_et
void	void
instruction_prusr(struct_processus *s_etat_processus)	instruction_prusr(struct_processus *s_etat_processus)
{	{
	int i;
	int nb_variables;

struct_objet s_objet;	struct_objet s_objet;

	struct_tableau_variables *tableau;

(*s_etat_processus).erreur_execution = d_ex;	(*s_etat_processus).erreur_execution = d_ex;

if ((*s_etat_processus).affichage_arguments == 'Y')	if ((*s_etat_processus).affichage_arguments == 'Y')
Line 517 instruction_prusr(struct_processus *s_et	Line 510 instruction_prusr(struct_processus *s_et
}	}
}	}

	nb_variables = nombre_variables(s_etat_processus);

	if ((tableau = malloc(nb_variables * sizeof(struct_tableau_variables)))
	== NULL)
	{
	liberation_mutexes_arbre_variables_partagees(s_etat_processus,
	((s_etat_processus).s_arbre_variables_partagees));
	(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
	return;
	}

	liste_variables(s_etat_processus, tableau);

s_objet.type = CHN;	s_objet.type = CHN;

/*	for(i = 0; i < nb_variables; i++)
for(i = 0; i < (*s_etat_processus).nombre_variables; i++)
{	{
if ((s_objet.objet = malloc((strlen((*s_etat_processus)	if ((s_objet.objet = malloc((strlen(tableau[i].nom) + 64)
.s_liste_variables[i].nom) + 64) * sizeof(unsigned char)))	* sizeof(unsigned char))) == NULL)
== NULL)
{	{
	free(tableau);

(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;	(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
return;	return;
}	}

sprintf((unsigned char *) s_objet.objet, "\\noindent %s [%lu]\n",	sprintf((unsigned char *) s_objet.objet, "\\\\noindent %s [%lu]\n",
(*s_etat_processus).s_liste_variables[i].nom,	tableau[i].nom, tableau[i].niveau);
(*s_etat_processus).s_liste_variables[i].niveau);

formateur_tex(s_etat_processus, &s_objet, 'N');	formateur_tex(s_etat_processus, &s_objet, 'N');
free(s_objet.objet);	free(s_objet.objet);
}	}
*/

	free(tableau);
return;	return;
}	}

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.20
changed lines
	Added in v.1.43