--- rpl/src/instructions_e1.c 2011/04/21 16:00:56 1.19 +++ rpl/src/instructions_e1.c 2014/07/17 08:07:20 1.50 @@ -1,7 +1,7 @@ /* ================================================================================ - RPL/2 (R) version 4.1.0.prerelease.0 - Copyright (C) 1989-2011 Dr. BERTRAND Joël + RPL/2 (R) version 4.1.19 + Copyright (C) 1989-2014 Dr. BERTRAND Joël This file is part of RPL/2. @@ -229,6 +229,10 @@ instruction_end(struct_processus *s_etat printf(" (expression 2)]\n"); printf(" END\n\n"); + printf(" CRITICAL\n"); + printf(" (expression)\n"); + printf(" END\n\n"); + printf(" DO\n"); printf(" (expression)\n"); printf(" UNTIL\n"); @@ -264,6 +268,12 @@ instruction_end(struct_processus *s_etat return; } + if ((*s_etat_processus).l_base_pile_systeme == NULL) + { + (*s_etat_processus).erreur_systeme = d_es_processus; + return; + } + if (((*(*s_etat_processus).l_base_pile_systeme).type_cloture == 'I') || ((*(*s_etat_processus).l_base_pile_systeme).type_cloture == 'J')) { @@ -416,7 +426,24 @@ instruction_end(struct_processus *s_etat return; } } - else + else if ((*(*s_etat_processus).l_base_pile_systeme).type_cloture == 'Q') + { + depilement_pile_systeme(s_etat_processus); + + if ((*s_etat_processus).erreur_systeme != d_es) + { + return; + } + + if (pthread_mutex_unlock(&mutex_sections_critiques) != 0) + { + (*s_etat_processus).erreur_systeme = d_es_processus; + return; + } + + (*s_etat_processus).sections_critiques--; + } + else { (*s_etat_processus).erreur_systeme = d_es_end_incoherent; } @@ -448,7 +475,7 @@ instruction_else(struct_processus *s_eta unsigned char *instruction_majuscule; unsigned char *tampon; - unsigned long niveau; + integer8 niveau; void (*fonction)(); @@ -529,8 +556,9 @@ instruction_else(struct_processus *s_eta { if (strcmp(instruction_majuscule, "END") == 0) { - (*s_etat_processus).position_courante -= (strlen( - instruction_majuscule) + 1); + (*s_etat_processus).position_courante -= + (((integer8) strlen( + instruction_majuscule)) + 1); drapeau_fin = d_vrai; } else @@ -727,7 +755,7 @@ instruction_elseif(struct_processus *s_e unsigned char *instruction_majuscule; unsigned char *tampon; - unsigned long niveau; + integer8 niveau; void (*fonction)(); @@ -819,8 +847,9 @@ instruction_elseif(struct_processus *s_e { if (strcmp(instruction_majuscule, "END") == 0) { - (*s_etat_processus).position_courante -= (strlen( - instruction_majuscule) + 1); + (*s_etat_processus).position_courante -= + (((integer8) strlen( + instruction_majuscule)) + 1); drapeau_fin = d_vrai; } else @@ -1168,7 +1197,7 @@ instruction_eng(struct_processus *s_etat return; } - (*((logical8 *) (*s_objet).objet)) = + (*((logical8 *) (*s_objet).objet)) = (logical8) (*((integer8 *) (*s_objet_argument).objet)); i43 = test_cfsf(s_etat_processus, 43); @@ -1206,15 +1235,15 @@ instruction_eng(struct_processus *s_etat { if (valeur_binaire[i] == '0') { - cf(s_etat_processus, j++); + cf(s_etat_processus, (unsigned char) j++); } 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, 50);