--- rpl/src/rplexternals.h 2010/04/07 13:45:10 1.6 +++ rpl/src/rplexternals.h 2013/03/28 16:15:09 1.46 @@ -1,7 +1,7 @@ /* ================================================================================ - RPL/2 (R) version 4.0.14 - Copyright (C) 1989-2010 Dr. BERTRAND Joël + RPL/2 (R) version 4.1.13 + Copyright (C) 1989-2013 Dr. BERTRAND Joël This file is part of RPL/2. @@ -39,9 +39,10 @@ ================================================================================ */ -#define allocation(a) allocation((*rpl_arguments).s_etat_processus, a) -#define copie_objet(a, b) copie_objet((*rpl_arguments).s_etat_processus, a, b) -#define liberation(a) liberation((*rpl_arguments).s_etat_processus, a) +#define allocation(a) librpl_allocation((*rpl_arguments).s_etat_processus, a) +#define copie_objet(a, b) librpl_copie_objet( \ + (*rpl_arguments).s_etat_processus, a, b) +#define liberation(a) librpl_liberation((*rpl_arguments).s_etat_processus, a) /* -------------------------------------------------------------------------------- @@ -55,7 +56,7 @@ #define declareComplex(complex) complex16 complex #define declareDaisyChain(daisyChain) struct_liste_chainee *daisyChain = NULL -#define getDaisyChainFromList(list, daisyChain) { \ +#define getDaisyChainFromList(list, daisyChain) do { \ typeof(list) __list = list; \ daisyChain = NULL; \ ifIsList(__list) { daisyChain = (*__list).objet; } \ @@ -69,6 +70,7 @@ #define replaceElementIntoDaisyChain(daisyChain, element) \ do { typeof(daisyChain) __daisyChain = daisyChain; \ if (__daisyChain == NULL) executionError("Nullified daisy chain"); \ + freeObject((*__daisyChain).donnee); \ (*__daisyChain).donnee = element; } while(0) #define nextElementOfDaisyChain(daisyChain) \ @@ -77,7 +79,7 @@ (__daisyChain == NULL) ? NULL : (*__daisyChain).suivant; }) #define null NULL -#define nullify(ptr) { ptr = NULL; } while(0) +#define nullify(ptr) do { ptr = NULL; } while(0) #define nullified(ptr) ((ptr) == NULL) #define postIncr(x) (x++) @@ -103,26 +105,42 @@ #define logical int #define string char * #define integer int +#define object struct_objet * #define declareStructure typedef struct { #define declareUnion typedef union { #define as(name) } name; +#define __RPL__ struct_rpl_arguments rpl_arguments + #define target(a) (*a) #define address(a) (&a) #define beginGroup { #define endGroup } -#define beginMacro beginGroup +#define beginMacro do beginGroup #define endMacro endGroup while(0) #define stopRequest test_arret((*rpl_arguments).s_etat_processus) /* -------------------------------------------------------------------------------- + Signaux +--------------------------------------------------------------------------------*/ + +#define blockSignals \ + { sigset_t set, oldset; sigfillset(&set); \ + pthread_sigmask(SIG_BLOCK, &set, &oldset); +#define unblockSignals \ + pthread_sigmask(SIG_SETMASK, &oldset, NULL); } + +/* +-------------------------------------------------------------------------------- Constructeurs -------------------------------------------------------------------------------- */ +#define DISABLE_SET_BUT_NOT_USED_WARNING(a) if (&a != ((&a) + 1)); + #define HEADER \ int __constante; \ logical1 __evaluation; \ @@ -138,7 +156,13 @@ (*rpl_arguments).instruction_valide = 'Y'; \ (*rpl_arguments).erreur = 0; \ __constante = 0; \ - __evaluation = d_faux; + __evaluation = d_faux; \ + DISABLE_SET_BUT_NOT_USED_WARNING(__evaluation); \ + DISABLE_SET_BUT_NOT_USED_WARNING(__type); \ + DISABLE_SET_BUT_NOT_USED_WARNING(__indice_bit); \ + DISABLE_SET_BUT_NOT_USED_WARNING(__indice_bloc); \ + DISABLE_SET_BUT_NOT_USED_WARNING(__taille_bloc); \ + DISABLE_SET_BUT_NOT_USED_WARNING(__masque); #define FUNCTION \ if (__validation_instruction == d_vrai) return; \ @@ -166,13 +190,55 @@ /* -------------------------------------------------------------------------------- + Destruction d'un objet +-------------------------------------------------------------------------------- +*/ + +#define freeObject(object) \ + do { \ + if (object == NULL) \ + systemError("Nullified object"); \ + liberation(object); \ + object = NULL; \ + } while(0) + +/* +-------------------------------------------------------------------------------- + Copie d'un objet +-------------------------------------------------------------------------------- +*/ + +#define dupObject(object) \ + do { if (copie_objet(object, 'P') != object) \ + systemError("Memory allocation error"); } while(0) + +/* +-------------------------------------------------------------------------------- + Déclaration des fonctions internes +-------------------------------------------------------------------------------- +*/ + +#define declareInternalFunction(name, ...) \ + __internal_##name(struct_rpl_arguments *rpl_arguments, __VA_ARGS__) { + +#define endInternalFunction } + +#define useInternalFunction(name, ...) \ + __internal_##name(struct_rpl_arguments *rpl_arguments, __VA_ARGS__) + +#define callInternalFunction(name, ...) \ + __internal_##name(rpl_arguments, __VA_ARGS__) + +/* +-------------------------------------------------------------------------------- Déclaration des fonctions externes -------------------------------------------------------------------------------- */ #define declareExternalFunction(name) \ void __external_##name(struct_rpl_arguments *rpl_arguments) { \ - char __function_name[] = "__external_"#name; + char __function_name[] = "__external_"#name; \ + __static_rpl_arguments = (*rpl_arguments); #define useExternalFunction(function) \ void __external_##function(struct_rpl_arguments *rpl_arguments) @@ -183,6 +249,7 @@ #define __onClosing void __runOnClosing(struct_rpl_arguments *rpl_arguments) #define declareSubroutine(when) __##when { \ char __function_name[] = #when; \ + __static_rpl_arguments = (*rpl_arguments); \ HEADER \ declareHelpString(""); \ numberOfArguments(0); \ @@ -193,12 +260,19 @@ #define logger(...) do { syslog(LOG_NOTICE, __VA_ARGS__); } while(0) #define exportExternalFunctions(...) \ - char **__external_symbols(unsigned long *nb_symbols) { \ + char **__external_symbols(unsigned long *nb_symbols, \ + const char *version) { \ char arguments[] = #__VA_ARGS__; \ char **tableau; \ char *ptr1, *ptr2; \ int drapeau; \ unsigned long i; \ + if (strcmp(version, _d_version_rpl) != 0) \ + { \ + notice(stdout, "Versions mismatch : library %s, expected %s\n", \ + _d_version_rpl, version); \ + (*nb_symbols) = -1; return(NULL); \ + } \ (*nb_symbols) = 0; ptr1 = arguments; drapeau = 0; \ while((*ptr1) != 0) \ { \ @@ -236,7 +310,7 @@ #define endExternalFunction return; } -#define callExternalFunction(function) { \ +#define callExternalFunction(function) do { \ __taille_bloc = sizeof(t_8_bits) * 8; \ __indice_bloc = (35 - 1) / __taille_bloc; \ __indice_bit = (35 - 1) % __taille_bloc; \ @@ -263,7 +337,7 @@ -------------------------------------------------------------------------------- */ -#define declareHelpString(h) { \ +#define declareHelpString(h) do { \ __presence_aide = d_vrai; \ if ((*rpl_arguments).affichage_arguments == 'Y') \ { \ @@ -271,12 +345,12 @@ return; \ } } while(0) -#define declareSymbolicConstant { \ +#define declareSymbolicConstant do { \ numberOfArguments(0); \ (*rpl_arguments).constante_symbolique = 'Y'; \ __constante++; } while(0) -#define numberOfArguments(n) { \ +#define numberOfArguments(n) do { \ __presence_validation = d_vrai; \ if ((*rpl_arguments).test_instruction == 'Y') \ { \ @@ -328,24 +402,33 @@ -------------------------------------------------------------------------------- */ -#define returnOnError(...) { \ +#define returnOnError(...) do { \ if ((*rpl_arguments).erreur != 0) \ { \ __VA_ARGS__; \ return; \ } } while(0) -#define systemError(message) { \ +#define systemError(message) do { \ (*rpl_arguments).erreur = __LINE__; \ (*rpl_arguments).type_erreur = 'S'; \ (*rpl_arguments).message_erreur = (unsigned char *) message; \ return; } while(0) -#define executionError(message) { \ +#define executionError(message) do { \ (*rpl_arguments).erreur = __LINE__; \ (*rpl_arguments).type_erreur = 'E'; \ (*rpl_arguments).message_erreur = (unsigned char *) message; } while(0) +#define onSystemError(...) do { \ + if ((*rpl_arguments).erreur != 0) \ + { \ + __VA_ARGS__; \ + blockSignals; \ + kill(getpid(), SIGTERM); \ + unblockSignals; \ + } } while(0) + #define onError(...) \ do { if (((*rpl_arguments).type_erreur == 'E') && \ ((*rpl_arguments).erreur != 0)) { __VA_ARGS__; \ @@ -361,13 +444,13 @@ -------------------------------------------------------------------------------- */ -#define pushOnStack(object) { \ +#define pushOnStack(object) do { \ if (((*rpl_arguments).l_base_pile = \ empilement_pile_operationnelle(rpl_arguments, object)) == NULL) \ systemError("Memory allocation error"); \ if ((*object).nombre_occurrences == 1) object = NULL; } while(0) -#define pullFromStack(object, ...) { \ +#define pullFromStack(object, ...) do { \ (*rpl_arguments).l_base_pile = \ depilement_pile_operationnelle(rpl_arguments, &object); \ if (object == NULL) \ @@ -415,7 +498,7 @@ // Constantes symboliques -#define createSymbolicConstant(object, type, value) { \ +#define createSymbolicConstant(object, type, value) do { \ if ((strcmp(#type, "integer") != 0) && (strcmp(#type, "real") != 0)) \ systemError("Type not allowed for symbolic constant"); \ __taille_bloc = sizeof(t_8_bits) * 8; \ @@ -451,7 +534,7 @@ } \ __constante--; } while(0) -#define createSymbolicComplexConstant(object, rp, ip) { \ +#define createSymbolicComplexConstant(object, rp, ip) do { \ __taille_bloc = sizeof(t_8_bits) * 8; \ __indice_bloc = (35 - 1) / __taille_bloc; \ __indice_bit = (35 - 1) % __taille_bloc; \ @@ -479,7 +562,7 @@ // Integer -#define setInteger(object, value) { \ +#define setInteger(object, value) do { \ ifIsInteger(object) \ { \ if ((*object).nombre_occurrences > 1) \ @@ -500,12 +583,12 @@ #define ifIsInteger(object) if (isInteger(object)) #define elseIfIsInteger(object) } else ifIsInteger(object) -#define getInteger(object, value) { \ +#define getInteger(object, value) do { \ value = 0; \ ifIsInteger(object) value = (*((integer8 *) (*object).objet)); \ else executionError("Type mismatch error"); } while(0) -#define createIntegerObject(object) { \ +#define createIntegerObject(object) do { \ if (object != NULL) \ systemError("Reallocated object"); \ if ((object = allocation(INT)) == NULL) \ @@ -514,7 +597,7 @@ // Real -#define setReal(object, value) { \ +#define setReal(object, value) do { \ ifIsReal(object) \ { \ if ((*object).nombre_occurrences > 1) \ @@ -535,12 +618,12 @@ #define ifIsReal(object) if (isReal(object)) #define elseIfIsReal(object) } else ifIsReal(object) -#define getReal(object, value) { \ +#define getReal(object, value) do { \ value = 0; \ ifIsReal(object) value = (*((real8 *) (*object).objet)); \ else executionError("Type mismatch error"); } while(0) -#define createRealObject(object) { \ +#define createRealObject(object) do { \ if (object != NULL) \ systemError("Reallocated object"); \ if ((object = allocation(REL)) == NULL) \ @@ -549,7 +632,7 @@ // Complex -#define setComplex(object, rp, ip) { \ +#define setComplex(object, rp, ip) do { \ typeof(rp) __rp = rp; \ typeof(ip) __ip = ip; \ ifIsComplex(object) \ @@ -567,7 +650,7 @@ } \ else executionError("Type mismatch error"); } while(0) -#define setRealPartOfComplex(object, value) { \ +#define setRealPartOfComplex(object, value) do { \ if ((*object).nombre_occurrences > 1) \ { \ struct_objet *__tmp_object; \ @@ -580,7 +663,7 @@ value; \ else executionError("Type mismatch error"); } while(0) -#define setImaginaryPartOfComplex(object, value) { \ +#define setImaginaryPartOfComplex(object, value) do { \ if ((*object).nombre_occurrences > 1) \ { \ struct_objet *__tmp_object; \ @@ -604,13 +687,13 @@ #define ifIsComplex(object) if (isComplex(object)) #define elseIfIsComplex(object) } else ifIsComplex(object) -#define getComplex(object, value) { \ +#define getComplex(object, value) do { \ value.partie_reelle = 0; \ value.partie_imaginaire = 0; \ ifIsComplex(object) value = (*((complex16 *) (*object).objet)); \ else systemError("Not a complex"); } while(0) -#define createComplexObject(object) { \ +#define createComplexObject(object) do { \ if (object != NULL) \ systemError("Reallocated object"); \ if ((object = allocation(CPL)) == NULL) \ @@ -619,7 +702,7 @@ // Generalized vectors -#define createVectorObject(object, size, otype, structure, cat) { \ +#define createVectorObject(object, size, otype, structure, cat) do { \ integer8 i; \ if (object != NULL) \ systemError("Reallocated object"); \ @@ -652,7 +735,7 @@ // Integer vector -#define setIntegerIntoVector(object, value, position) { \ +#define setIntegerIntoVector(object, value, position) do { \ typeof(position) __position = position; \ ifIsIntegerVector(object) \ { \ @@ -680,7 +763,7 @@ #define ifIsIntegerVector(object) if (isIntegerVector(object)) #define elseIfIsIntegerVector(object) } else ifIsIntegerVector(object) -#define getIntegerFromVector(object, value, position) { \ +#define getIntegerFromVector(object, value, position) do { \ typeof(position) __position = position; \ value = 0; \ ifIsIntegerVector(object) \ @@ -700,7 +783,7 @@ // Real vector -#define setRealIntoVector(object, value, position) { \ +#define setRealIntoVector(object, value, position) do { \ typeof(position) __position = position; \ ifIsRealVector(object) \ { \ @@ -728,7 +811,7 @@ #define ifIsRealVector(object) if (isRealVector(object)) #define elseIfIsRealVector(object) } else ifIsRealVector(object) -#define getRealFromVector(object, value, position) { \ +#define getRealFromVector(object, value, position) do { \ typeof(position) __position = position; \ value = 0; \ ifIsRealVector(object) \ @@ -757,7 +840,7 @@ // Binary integer -#define setBinaryInteger(object, value) { \ +#define setBinaryInteger(object, value) do { \ ifIsBinaryInteger(object) \ { \ if ((*object).nombre_occurrences > 1) \ @@ -778,12 +861,12 @@ #define ifIsBinaryInteger(object) if (isBinaryInteger(object)) #define elseIfIsBinaryInteger(object) } else ifIsBinaryInteger(object) -#define getBinaryInteger(object, value) { \ +#define getBinaryInteger(object, value) do { \ value = 0; \ ifIsBinaryInteger(object) value = (*((integer8 *) (*object).objet)); \ else executionError("Type mismatch error"); } while(0) -#define createBinaryIntegerObject(object) { \ +#define createBinaryIntegerObject(object) do { \ if (object != NULL) \ systemError("Reallocated object"); \ if ((object = allocation(BIN)) == NULL) \ @@ -798,7 +881,7 @@ #define ifIsName(object) if (isName(object)) #define elseIfIsName(object) } else if (isName(object)) -#define setName(object, value) { \ +#define setName(object, value) do { \ ifIsName(object) \ { \ if ((*object).nombre_occurrences > 1) \ @@ -819,7 +902,7 @@ } \ else executionError("Type mistmatch error"); } while(0) -#define createNameObject(object) { \ +#define createNameObject(object) do { \ if (object != NULL) \ systemError("Reallocated object"); \ if ((object = allocation(NOM)) == NULL) \ @@ -838,7 +921,7 @@ #define ifIsString(object) if (isString(object)) #define elseIfIsString(object) else if (isString(objet)) -#define setString(object, string) { \ +#define setString(object, string) do { \ ifIsString(object) \ { \ if ((*object).nombre_occurrences > 1) \ @@ -857,12 +940,12 @@ } \ else executionError("Type mistmatch error"); } while(0) -#define getString(object, string) { \ +#define getString(object, string) do { \ string = NULL; \ ifIsString(object) string = (char *) (*object).objet; \ else executionError("Type mismatch error"); } while(0) -#define createStringObject(object) { \ +#define createStringObject(object) do { \ if (object != NULL) \ systemError("Reallocated object"); \ if ((object = allocation(CHN)) == NULL) \ @@ -879,14 +962,14 @@ #define ifIsList(object) if (isList(object)) #define elseIfIsList(object) else if (isList(object)) -#define createListObject(object) { \ +#define createListObject(object) do { \ if (object != NULL) \ systemError("Reallocated object"); \ if ((object = allocation(LST)) == NULL) \ systemError("Memory allocation error"); \ (*object).objet = NULL; } while(0) -#define addObjectToList(list, object) { \ +#define addObjectToList(list, object) do { \ ifIsList(list) \ { \ struct_objet *__tmp_object; \ @@ -919,7 +1002,7 @@ } \ else executionError("Type mistmatch error"); } while(0) -#define insertObjectIntoList(list, object) { \ +#define insertObjectIntoList(list, object) do { \ ifIsList(list) \ { \ struct_objet *__tmp_object; \ @@ -949,7 +1032,7 @@ } \ else executionError("Type mistmatch error"); } while(0) -#define removeObjectFromList(list, object) \ +#define removeObjectFromList(list, object) do { \ ifIsList(list) \ { \ if ((*object).objet == NULL) \ @@ -973,7 +1056,7 @@ #define getListFromList(list, position1, position2, object) -#define listLength(list, length) { \ +#define listLength(list, length) do { \ if (list == NULL) executionError("Nullified object"); \ if ((*list).type != LST) \ executionError("Type mistmatch error"); \ @@ -988,31 +1071,6 @@ } \ } } while(0) - -/* --------------------------------------------------------------------------------- - Destruction d'un objet --------------------------------------------------------------------------------- -*/ - -#define freeObject(object) \ - { \ - if (object == NULL) \ - systemError("Nullified object"); \ - liberation(object); \ - object = NULL; \ - } while(0) - -/* --------------------------------------------------------------------------------- - Copie d'un objet --------------------------------------------------------------------------------- -*/ - -#define dupObject(object) \ - { if (copie_objet(object, 'P') != object) \ - systemError("Memory allocation error"); } while(0) - /* -------------------------------------------------------------------------------- Allocation mémoire @@ -1029,11 +1087,20 @@ /* -------------------------------------------------------------------------------- + Récupération des interruptions et des signaux +-------------------------------------------------------------------------------- +*/ + +#define pollSignalsAndInterrupts() \ + do { scrutation_injection((*rpl_arguments).s_etat_processus); } while(0) + +/* +-------------------------------------------------------------------------------- Exécution d'une fonction intrinsèque -------------------------------------------------------------------------------- */ -#define intrinsic(function) { \ +#define intrinsic(function) do { \ int __status; \ __status = wrapper_instruction_intrinseque( \ instruction_##function, rpl_arguments); \ @@ -1043,4 +1110,8 @@ #endif +static struct_rpl_arguments __static_rpl_arguments; +#define __RPL__ struct_rpl_arguments *rpl_arguments; \ + rpl_arguments = &__static_rpl_arguments; + // vim: ts=4