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.1.1.1 and 1.12

version 1.1.1.1, 2010/01/26 15:22:45	version 1.12, 2010/06/17 11:00:23
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.0.9	RPL/2 (R) version 4.0.16
Copyright (C) 1989-2010 Dr. BERTRAND Joël	Copyright (C) 1989-2010 Dr. BERTRAND Joël

This file is part of RPL/2.	This file is part of RPL/2.
Line 1275 instruction_same(struct_processus *s_eta	Line 1275 instruction_same(struct_processus *s_eta
printf(" 1: %s\n", d_RPN);	printf(" 1: %s\n", d_RPN);
printf("-> 1: %s\n", d_RPN);	printf("-> 1: %s\n", d_RPN);

	printf(" 2: %s\n", d_PRC);
	printf(" 1: %s\n", d_PRC);
	printf("-> 1: %s\n", d_INT);

return;	return;
}	}
else if ((*s_etat_processus).test_instruction == 'Y')	else if ((*s_etat_processus).test_instruction == 'Y')
Line 2578 instruction_start(struct_processus *s_et	Line 2582 instruction_start(struct_processus *s_et
return;	return;
}	}

if (((*s_objet_1).type != INT) &&	if (((s_objet_1).type != INT) && ((s_objet_1).type != REL))
((*s_objet_1).type != REL))
{	{
liberation(s_etat_processus, s_objet_1);	liberation(s_etat_processus, s_objet_1);

Line 2596 instruction_start(struct_processus *s_et	Line 2599 instruction_start(struct_processus *s_et
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 3831 instruction_syseval(struct_processus *s_	Line 3833 instruction_syseval(struct_processus *s_
longueur_ecriture = strlen((unsigned char *)	longueur_ecriture = strlen((unsigned char *)
((l_element_courant).donnee).objet);	((l_element_courant).donnee).objet);

	# ifndef SEMAPHORES_NOMMES
if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)	if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
	# else
	if (sem_post((*s_etat_processus).semaphore_fork) != 0)
	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 3842 instruction_syseval(struct_processus *s_	Line 3848 instruction_syseval(struct_processus *s_
((l_element_courant).donnee).objet,	((l_element_courant).donnee).objet,
longueur_ecriture) != longueur_ecriture)	longueur_ecriture) != longueur_ecriture)
{	{
	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus)	while(sem_wait(&((*s_etat_processus)
.semaphore_fork)) == -1)	.semaphore_fork)) == -1)
	# else
	while(sem_wait((*s_etat_processus)
	.semaphore_fork) == -1)
	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{
Line 3859 instruction_syseval(struct_processus *s_	Line 3870 instruction_syseval(struct_processus *s_
return;	return;
}	}

	# ifndef SEMAPHORES_NOMMES
if (sem_post(&((*s_etat_processus)	if (sem_post(&((*s_etat_processus)
.semaphore_fork)) != 0)	.semaphore_fork)) != 0)
	# else
	if (sem_post((*s_etat_processus)
	.semaphore_fork) != 0)
	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 3870 instruction_syseval(struct_processus *s_	Line 3886 instruction_syseval(struct_processus *s_
while(write_atomic(s_etat_processus,	while(write_atomic(s_etat_processus,
pipes_entree[1], "\n", 1) != 1)	pipes_entree[1], "\n", 1) != 1)
{	{
	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus)	while(sem_wait(&((*s_etat_processus)
.semaphore_fork)) == -1)	.semaphore_fork)) == -1)
	# else
	while(sem_wait((*s_etat_processus)
	.semaphore_fork) == -1)
	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{
Line 3887 instruction_syseval(struct_processus *s_	Line 3908 instruction_syseval(struct_processus *s_
return;	return;
}	}

	# ifndef SEMAPHORES_NOMMES
if (sem_post(&((*s_etat_processus)	if (sem_post(&((*s_etat_processus)
.semaphore_fork)) != 0)	.semaphore_fork)) != 0)
	# else
	if (sem_post((*s_etat_processus)
	.semaphore_fork) != 0)
	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
}	}
}	}

while(sem_wait(&((*s_etat_processus).semaphore_fork))	# ifndef SEMAPHORES_NOMMES
== -1)	while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{
Line 3926 instruction_syseval(struct_processus *s_	Line 3955 instruction_syseval(struct_processus *s_
* Récupération de la valeur de retour du processus détaché	* Récupération de la valeur de retour du processus détaché
*/	*/

if (sem_post(&((*s_etat_processus).semaphore_fork))	# ifndef SEMAPHORES_NOMMES
!= 0)	if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
	# else
	if (sem_post((*s_etat_processus).semaphore_fork) != 0)
	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 3935 instruction_syseval(struct_processus *s_	Line 3967 instruction_syseval(struct_processus *s_

if (waitpid(pid, &status, 0) == -1)	if (waitpid(pid, &status, 0) == -1)
{	{
	# ifndef SEMAPHORES_NOMMES
if (sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)	if (sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
	# else
	if (sem_wait((*s_etat_processus).semaphore_fork) == -1)
	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{
Line 3948 instruction_syseval(struct_processus *s_	Line 3984 instruction_syseval(struct_processus *s_
return;	return;
}	}

	# ifndef SEMAPHORES_NOMMES
if (sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)	if (sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
	# else
	if (sem_wait((*s_etat_processus).semaphore_fork) == -1)
	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{
Line 3969 instruction_syseval(struct_processus *s_	Line 4009 instruction_syseval(struct_processus *s_
return;	return;
}	}

	# ifndef SEMAPHORES_NOMMES
if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)	if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
}	}
	# else
	if (sem_post((*s_etat_processus).semaphore_fork) != 0)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}
	# endif

while((ios = read_atomic(s_etat_processus,	while((ios = read_atomic(s_etat_processus,
pipes_sortie[0], &(tampon[pointeur]),	pipes_sortie[0], &(tampon[pointeur]),
longueur_lecture)) > 0)	longueur_lecture)) > 0)
{	{
	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)	while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{
Line 4001 instruction_syseval(struct_processus *s_	Line 4053 instruction_syseval(struct_processus *s_
return;	return;
}	}

	# ifndef SEMAPHORES_NOMMES
if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)	if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
	# else
	if (sem_post((*s_etat_processus).semaphore_fork) != 0)
	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
}	}
}	}

	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)	while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{
Line 4156 instruction_syseval(struct_processus *s_	Line 4216 instruction_syseval(struct_processus *s_
return;	return;
}	}

	# ifndef SEMAPHORES_NOMMES
if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)	if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
	# else
	if (sem_post((*s_etat_processus).semaphore_fork) != 0)
	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 4173 instruction_syseval(struct_processus *s_	Line 4237 instruction_syseval(struct_processus *s_
&((*s_etat_processus).l_base_pile), s_objet_resultat)	&((*s_etat_processus).l_base_pile), s_objet_resultat)
== d_erreur)	== d_erreur)
{	{
	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)	while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{
Line 4192 instruction_syseval(struct_processus *s_	Line 4260 instruction_syseval(struct_processus *s_
return;	return;
}	}

	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)	while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{
Line 4378 instruction_sign(struct_processus *s_eta	Line 4450 instruction_sign(struct_processus *s_eta
return;	return;
}	}

f77absc_((struct_complexe16 ) (s_objet_argument).objet, &norme);	if (((((struct_complexe16 ) (*s_objet_argument).objet)).partie_reelle
f77divisioncr_((struct_complexe16 ) (s_objet_argument).objet,	!= 0) \|\| ((((struct_complexe16 ) (*s_objet_argument).objet))
&norme, (struct_complexe16 ) (s_objet_resultat).objet);	.partie_imaginaire != 0))
	{
	f77absc_((struct_complexe16 ) (s_objet_argument).objet, &norme);
	f77divisioncr_((struct_complexe16 ) (s_objet_argument).objet,
	&norme, (struct_complexe16 ) (s_objet_resultat).objet);
	}
	else
	{
	(((struct_complexe16 ) (*s_objet_argument).objet))
	.partie_reelle = 0;
	(((struct_complexe16 ) (*s_objet_argument).objet))
	.partie_imaginaire = 0;
	}
}	}

/*	/*

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.1.1.1
changed lines
	Added in v.1.12