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.51 and 1.65

version 1.51, 2013/02/26 19:56:14	version 1.65, 2014/07/24 14:38:43
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.12	RPL/2 (R) version 4.1.19
Copyright (C) 1989-2013 Dr. BERTRAND Joël	Copyright (C) 1989-2014 Dr. BERTRAND Joël

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

Line 53 instruction_fleche(struct_processus *s_e	Line 53 instruction_fleche(struct_processus *s_e
logical1 fin_scrutation;	logical1 fin_scrutation;
logical1 presence_expression_algebrique;	logical1 presence_expression_algebrique;

	pthread_mutexattr_t attributs_mutex;

union_position_variable position_variable;	union_position_variable position_variable;

unsigned char instruction_valide;	unsigned char instruction_valide;
unsigned char *tampon;	unsigned char *tampon;
unsigned char test_instruction;	unsigned char test_instruction;

unsigned long i;	integer8 i;
unsigned long nombre_variables;	integer8 nombre_variables;

void (*fonction)();	void (*fonction)();

Line 187 instruction_fleche(struct_processus *s_e	Line 189 instruction_fleche(struct_processus *s_e

if ((*s_etat_processus).instruction_valide == 'N')	if ((*s_etat_processus).instruction_valide == 'N')
{	{
	(*s_etat_processus).type_en_cours = NON;
recherche_type(s_etat_processus);	recherche_type(s_etat_processus);

if ((*s_etat_processus).erreur_execution != d_ex)	if ((*s_etat_processus).erreur_execution != d_ex)
Line 339 instruction_fleche(struct_processus *s_e	Line 342 instruction_fleche(struct_processus *s_e
{	{
if ((*s_etat_processus).langue == 'F')	if ((*s_etat_processus).langue == 'F')
{	{
printf("[%d] Nombre de variables de niveau %lu : %lu\n",	printf("[%d] Nombre de variables de niveau %lld : %lld\n",
(int) getpid(),	(int) getpid(),
(*s_etat_processus).niveau_courant, nombre_variables);	(*s_etat_processus).niveau_courant, nombre_variables);
}	}
else	else
{	{
printf("[%d] Number of level %lu variables : %lu\n",	printf("[%d] Number of level %lld variables : %lld\n",
(int) getpid(),	(int) getpid(),
(*s_etat_processus).niveau_courant, nombre_variables);	(*s_etat_processus).niveau_courant, nombre_variables);
}	}
Line 593 instruction_fleche(struct_processus *s_e	Line 596 instruction_fleche(struct_processus *s_e
}	}
else	else
{	{
// Variable partagee à créer	// Variable partagée à créer

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

if ((s_variable_partagee.nom = malloc((strlen(s_variable.nom)	if ((s_variable_partagee.nom = malloc((strlen(s_variable.nom)
+ 1) * sizeof(unsigned char))) == NULL)	+ 1) * sizeof(unsigned char))) == NULL)
{	{
if (pthread_mutex_unlock(&(((s_etat_processus)
.pointeur_variable_partagee_courante).mutex)) != 0)
{
(*s_etat_processus).erreur_systeme = d_es_processus;
return;
}

(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
d_es_allocation_memoire;	d_es_allocation_memoire;
return;	return;
Line 647 instruction_fleche(struct_processus *s_e	Line 643 instruction_fleche(struct_processus *s_e
(*s_etat_processus).objet_courant;	(*s_etat_processus).objet_courant;
}	}

	// Création du mutex

	pthread_mutexattr_init(&attributs_mutex);
	pthread_mutexattr_settype(&attributs_mutex,
	PTHREAD_MUTEX_RECURSIVE);
	pthread_mutex_init(&(s_variable_partagee.mutex),
	&attributs_mutex);
	pthread_mutexattr_destroy(&attributs_mutex);

s_variable_partagee.objet = (*l_emplacement_valeurs).donnee;	s_variable_partagee.objet = (*l_emplacement_valeurs).donnee;
(*l_emplacement_valeurs).donnee = NULL;	(*l_emplacement_valeurs).donnee = NULL;

Line 762 instruction_fleche_list(struct_processus	Line 767 instruction_fleche_list(struct_processus

struct_objet *s_objet;	struct_objet *s_objet;

signed long i;	integer8 i;
signed long nombre_elements;	integer8 nombre_elements;

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

Line 838 instruction_fleche_list(struct_processus	Line 843 instruction_fleche_list(struct_processus
return;	return;
}	}

if ((unsigned long) nombre_elements >=	if (nombre_elements >= (*s_etat_processus).hauteur_pile_operationnelle)
(*s_etat_processus).hauteur_pile_operationnelle)
{	{
(*s_etat_processus).erreur_execution = d_ex_manque_argument;	(*s_etat_processus).erreur_execution = d_ex_manque_argument;
return;	return;
Line 1005 instruction_for(struct_processus *s_etat	Line 1009 instruction_for(struct_processus *s_etat
return;	return;
}	}

if (((*s_objet_2).type != INT) &&	if (((s_objet_2).type != INT) && ((s_objet_2).type != REL))
((*s_objet_2).type != REL))
{	{
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 1015 instruction_for(struct_processus *s_etat	Line 1018 instruction_for(struct_processus *s_etat
return;	return;
}	}

tampon = (*s_etat_processus).instruction_courante;
test_instruction = (*s_etat_processus).test_instruction;
instruction_valide = (*s_etat_processus).instruction_valide;
(*s_etat_processus).test_instruction = 'Y';

empilement_pile_systeme(s_etat_processus);	empilement_pile_systeme(s_etat_processus);

if ((*s_etat_processus).erreur_systeme != d_es)	if ((*s_etat_processus).erreur_systeme != d_es)
Line 1029 instruction_for(struct_processus *s_etat	Line 1027 instruction_for(struct_processus *s_etat

if ((*s_etat_processus).mode_execution_programme == 'Y')	if ((*s_etat_processus).mode_execution_programme == 'Y')
{	{
	tampon = (*s_etat_processus).instruction_courante;
	test_instruction = (*s_etat_processus).test_instruction;
	instruction_valide = (*s_etat_processus).instruction_valide;
	(*s_etat_processus).test_instruction = 'Y';

if (recherche_instruction_suivante(s_etat_processus) == d_erreur)	if (recherche_instruction_suivante(s_etat_processus) == d_erreur)
{	{
return;	return;
Line 1043 instruction_for(struct_processus *s_etat	Line 1046 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;
	(*s_etat_processus).instruction_valide = instruction_valide;
	(*s_etat_processus).test_instruction = test_instruction;

depilement_pile_systeme(s_etat_processus);	depilement_pile_systeme(s_etat_processus);

Line 1050 instruction_for(struct_processus *s_etat	Line 1055 instruction_for(struct_processus *s_etat
return;	return;
}	}

	(*s_etat_processus).type_en_cours = NON;
recherche_type(s_etat_processus);	recherche_type(s_etat_processus);

free((*s_etat_processus).instruction_courante);	free((*s_etat_processus).instruction_courante);
(*s_etat_processus).instruction_courante = tampon;	(*s_etat_processus).instruction_courante = tampon;
	(*s_etat_processus).instruction_valide = instruction_valide;
	(*s_etat_processus).test_instruction = test_instruction;

if ((*s_etat_processus).erreur_execution != d_ex)	if ((*s_etat_processus).erreur_execution != d_ex)
{	{
Line 1145 instruction_for(struct_processus *s_etat	Line 1153 instruction_for(struct_processus *s_etat

liberation(s_etat_processus, s_objet_3);	liberation(s_etat_processus, s_objet_3);

(*s_etat_processus).test_instruction = test_instruction;
(*s_etat_processus).instruction_valide = instruction_valide;

((s_etat_processus).l_base_pile_systeme).limite_indice_boucle = s_objet_1;	((s_etat_processus).l_base_pile_systeme).limite_indice_boucle = s_objet_1;

if ((*s_etat_processus).mode_execution_programme == 'Y')	if ((*s_etat_processus).mode_execution_programme == 'Y')
Line 1844 instruction_fact(struct_processus *s_eta	Line 1849 instruction_fact(struct_processus *s_eta
for (i = 1; i <= (((integer8 ) (*s_objet_argument).objet));	for (i = 1; i <= (((integer8 ) (*s_objet_argument).objet));
i++)	i++)
{	{
produit *= i;	produit *= (real8) i;
}	}

if ((s_objet_resultat = allocation(s_etat_processus, REL))	if ((s_objet_resultat = allocation(s_etat_processus, REL))
Line 2168 instruction_floor(struct_processus *s_et	Line 2173 instruction_floor(struct_processus *s_et
return;	return;
}	}

(((integer8 ) (*s_objet_resultat).objet)) =	(((integer8 ) (*s_objet_resultat).objet)) = (integer8)
floor((((real8 ) (*s_objet_argument).objet)));	floor((((real8 ) (*s_objet_argument).objet)));

if (!((((((integer8 ) (*s_objet_resultat).objet)) <	if (!((((((integer8 ) (*s_objet_resultat).objet)) <
Line 2800 instruction_fix(struct_processus *s_etat	Line 2805 instruction_fix(struct_processus *s_etat
return;	return;
}	}

(((logical8 ) (*s_objet).objet)) =	(((logical8 ) (*s_objet).objet)) = (logical8)
(((integer8 ) (*s_objet_argument).objet));	(((integer8 ) (*s_objet_argument).objet));

i43 = test_cfsf(s_etat_processus, 43);	i43 = test_cfsf(s_etat_processus, 43);
Line 2838 instruction_fix(struct_processus *s_etat	Line 2843 instruction_fix(struct_processus *s_etat
{	{
if (valeur_binaire[i] == '0')	if (valeur_binaire[i] == '0')
{	{
cf(s_etat_processus, j++);	cf(s_etat_processus, (unsigned char) j++);
}	}
else	else
{	{
sf(s_etat_processus, j++);	sf(s_etat_processus, (unsigned char) j++);
}	}
}	}

for(; j <= 56; cf(s_etat_processus, j++));	for(; j <= 56; cf(s_etat_processus, (unsigned char) j++));

sf(s_etat_processus, 49);	sf(s_etat_processus, 49);
cf(s_etat_processus, 50);	cf(s_etat_processus, 50);

CVSweb interface <joel.bertrand@systella.fr>

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