Index: src/tests/.expect/64/KRfunctions.txt =================================================================== --- src/tests/.expect/64/KRfunctions.txt (revision 3f8dd01362faf0f98d59ad95a39521b5ccefbad9) +++ src/tests/.expect/64/KRfunctions.txt (revision a54840b150210fdedf1bf84dc118deea22554dba) @@ -1,19 +1,19 @@ -__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(long unsigned int __size); +__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned long int __size); __attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr); __attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void); -__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern int atexit(void (*__func)(void)); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(int __status); -extern int printf(const char *__restrict __format, ...); -int __f0__Fi_iPCii__1(int __a__i_1, const int *__b__PCi_1, int __c__i_1){ - __attribute__ ((unused)) int ___retval_f0__i_1; +__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern signed int atexit(void (*__func)(void)); +__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(signed int __status); +extern signed int printf(const char *__restrict __format, ...); +signed int __f0__Fi_iPCii__1(signed int __a__i_1, const signed int *__b__PCi_1, signed int __c__i_1){ + __attribute__ ((unused)) signed int ___retval_f0__i_1; } -int __f1__Fi_PiiPi__1(int *__a__Pi_1, __attribute__ ((unused)) int __b__i_1, int *__c__Pi_1){ - __attribute__ ((unused)) int ___retval_f1__i_1; +signed int __f1__Fi_PiiPi__1(signed int *__a__Pi_1, __attribute__ ((unused)) signed int __b__i_1, signed int *__c__Pi_1){ + __attribute__ ((unused)) signed int ___retval_f1__i_1; } -int __f2__Fi_iPiPi__1(int __a__i_1, int *__b__Pi_1, int *__c__Pi_1){ - __attribute__ ((unused)) int ___retval_f2__i_1; +signed int __f2__Fi_iPiPi__1(signed int __a__i_1, signed int *__b__Pi_1, signed int *__c__Pi_1){ + __attribute__ ((unused)) signed int ___retval_f2__i_1; } struct S { - int __i__i_1; + signed int __i__i_1; }; static inline void ___constructor__F_R2sS_autogen___1(struct S *___dst__R2sS_1); @@ -36,63 +36,63 @@ return ((struct S )___ret__2sS_1); } -static inline void ___constructor__F_R2sSi_autogen___1(struct S *___dst__R2sS_1, int __i__i_1){ +static inline void ___constructor__F_R2sSi_autogen___1(struct S *___dst__R2sS_1, signed int __i__i_1){ ((void)((*___dst__R2sS_1).__i__i_1=__i__i_1) /* ?{} */); } -int __f3__Fi_2sS2sSPi__1(struct S __a__2sS_1, struct S __b__2sS_1, int *__c__Pi_1){ - __attribute__ ((unused)) int ___retval_f3__i_1; +signed int __f3__Fi_2sS2sSPi__1(struct S __a__2sS_1, struct S __b__2sS_1, signed int *__c__Pi_1){ + __attribute__ ((unused)) signed int ___retval_f3__i_1; struct S __s__2sS_2; } -int __f4__Fi_iPiPi__1(int __a__i_1, int *__b__Pi_1, int *__c__Pi_1){ - __attribute__ ((unused)) int ___retval_f4__i_1; +signed int __f4__Fi_iPiPi__1(signed int __a__i_1, signed int *__b__Pi_1, signed int *__c__Pi_1){ + __attribute__ ((unused)) signed int ___retval_f4__i_1; } -int __f5__Fi_iPiPi__1(int __a__i_1, int *__b__Pi_1, int *__c__Pi_1){ - __attribute__ ((unused)) int ___retval_f5__i_1; +signed int __f5__Fi_iPiPi__1(signed int __a__i_1, signed int *__b__Pi_1, signed int *__c__Pi_1){ + __attribute__ ((unused)) signed int ___retval_f5__i_1; } -int (*__f6__FPFi_i__iPiPi__1(int __a__i_1, int *__b__Pi_1, int *__c__Pi_1))(int __anonymous_object0){ - __attribute__ ((unused)) int (*___retval_f6__PFi_i__1)(int __anonymous_object1); +signed int (*__f6__FPFi_i__iPiPi__1(signed int __a__i_1, signed int *__b__Pi_1, signed int *__c__Pi_1))(signed int __anonymous_object0){ + __attribute__ ((unused)) signed int (*___retval_f6__PFi_i__1)(signed int __anonymous_object1); } -int (*__f7__FPFi_ii__iPiPi__1(int __a__i_1, int *__b__Pi_1, int *__c__Pi_1))(int __a__i_1, int __b__i_1){ - __attribute__ ((unused)) int (*___retval_f7__PFi_ii__1)(int __a__i_1, int __b__i_1); +signed int (*__f7__FPFi_ii__iPiPi__1(signed int __a__i_1, signed int *__b__Pi_1, signed int *__c__Pi_1))(signed int __a__i_1, signed int __b__i_1){ + __attribute__ ((unused)) signed int (*___retval_f7__PFi_ii__1)(signed int __a__i_1, signed int __b__i_1); } -int *__f8__FPi_iPiPi__1(int __a__i_1, int *__b__Pi_1, int *__c__Pi_1){ - __attribute__ ((unused)) int *___retval_f8__Pi_1; +signed int *__f8__FPi_iPiPi__1(signed int __a__i_1, signed int *__b__Pi_1, signed int *__c__Pi_1){ + __attribute__ ((unused)) signed int *___retval_f8__Pi_1; } -int *const __f9__FCPi_PiiPi__1(int *__a__Pi_1, int __b__i_1, int *__c__Pi_1){ - __attribute__ ((unused)) int *const ___retval_f9__CPi_1; +signed int *const __f9__FCPi_PiiPi__1(signed int *__a__Pi_1, signed int __b__i_1, signed int *__c__Pi_1){ + __attribute__ ((unused)) signed int *const ___retval_f9__CPi_1; } -int *(*__f10__FPFPi_ii__iPiPid__1(int __a__i_1, int *__b__Pi_1, int *__c__Pi_1, double __y__d_1))(int __x__i_1, int __y__i_1){ - __attribute__ ((unused)) int *(*___retval_f10__PFPi_ii__1)(int __x__i_1, int __y__i_1); - int *__x__FPi_ii__2(int __anonymous_object2, int __anonymous_object3); +signed int *(*__f10__FPFPi_ii__iPiPid__1(signed int __a__i_1, signed int *__b__Pi_1, signed int *__c__Pi_1, double __y__d_1))(signed int __x__i_1, signed int __y__i_1){ + __attribute__ ((unused)) signed int *(*___retval_f10__PFPi_ii__1)(signed int __x__i_1, signed int __y__i_1); + signed int *__x__FPi_ii__2(signed int __anonymous_object2, signed int __anonymous_object3); ((void)(___retval_f10__PFPi_ii__1=__x__FPi_ii__2) /* ?{} */); - return ((int *(*)(int __x__i_1, int __y__i_1))___retval_f10__PFPi_ii__1); + return ((signed int *(*)(signed int __x__i_1, signed int __y__i_1))___retval_f10__PFPi_ii__1); } -int (*__f11__FPA0i_iPiPi__1(int __a__i_1, int *__b__Pi_1, int *__c__Pi_1))[]{ - __attribute__ ((unused)) int (*___retval_f11__PA0i_1)[]; +signed int (*__f11__FPA0i_iPiPi__1(signed int __a__i_1, signed int *__b__Pi_1, signed int *__c__Pi_1))[]{ + __attribute__ ((unused)) signed int (*___retval_f11__PA0i_1)[]; } -int (*__f12__FPA0A0i_iPiPi__1(int __a__i_1, int *__b__Pi_1, int *__c__Pi_1))[][((long unsigned int )10)]{ - __attribute__ ((unused)) int (*___retval_f12__PA0A0i_1)[][((long unsigned int )10)]; +signed int (*__f12__FPA0A0i_iPiPi__1(signed int __a__i_1, signed int *__b__Pi_1, signed int *__c__Pi_1))[][((unsigned long int )10)]{ + __attribute__ ((unused)) signed int (*___retval_f12__PA0A0i_1)[][((unsigned long int )10)]; } -int (*__f13__FPA0A0i_iPiPi__1(int __a__i_1, int *__b__Pi_1, int *__c__Pi_1))[][((long unsigned int )10)]{ - __attribute__ ((unused)) int (*___retval_f13__PA0A0i_1)[][((long unsigned int )10)]; +signed int (*__f13__FPA0A0i_iPiPi__1(signed int __a__i_1, signed int *__b__Pi_1, signed int *__c__Pi_1))[][((unsigned long int )10)]{ + __attribute__ ((unused)) signed int (*___retval_f13__PA0A0i_1)[][((unsigned long int )10)]; } -int (*__f14__FPA0A0i_iPiPi__1(int __a__i_1, int *__b__Pi_1, int *__c__Pi_1))[][((long unsigned int )10)]{ - __attribute__ ((unused)) int (*___retval_f14__PA0A0i_1)[][((long unsigned int )10)]; +signed int (*__f14__FPA0A0i_iPiPi__1(signed int __a__i_1, signed int *__b__Pi_1, signed int *__c__Pi_1))[][((unsigned long int )10)]{ + __attribute__ ((unused)) signed int (*___retval_f14__PA0A0i_1)[][((unsigned long int )10)]; } -int __f15__Fi_iii__1(int __a__i_1, int __b__i_1, int __c__i_1){ - __attribute__ ((unused)) int ___retval_f15__i_1; +signed int __f15__Fi_iii__1(signed int __a__i_1, signed int __b__i_1, signed int __c__i_1){ + __attribute__ ((unused)) signed int ___retval_f15__i_1; } -const int __fred__FCi___1(){ - __attribute__ ((unused)) const int ___retval_fred__Ci_1; - int *(*__x__PFPi_ii__2)(int __anonymous_object4, int __anonymous_object5); - int __a__i_2; - int __b__i_2; - int *(*_tmp_cp_ret0)(int __x__i_1, int __y__i_1); +const signed int __fred__FCi___1(){ + __attribute__ ((unused)) const signed int ___retval_fred__Ci_1; + signed int *(*__x__PFPi_ii__2)(signed int __anonymous_object4, signed int __anonymous_object5); + signed int __a__i_2; + signed int __b__i_2; + signed int *(*_tmp_cp_ret0)(signed int __x__i_1, signed int __y__i_1); ((void)(__x__PFPi_ii__2=(((void)(_tmp_cp_ret0=__f10__FPFPi_ii__iPiPid__1(3, (&__a__i_2), (&__b__i_2), 3.5))) , _tmp_cp_ret0))); ((void)(_tmp_cp_ret0) /* ^?{} */); - const int __f1__FCi_iPiPi__2(int __a__i_2, int *__b__Pi_2, int *__c__Pi_2){ - __attribute__ ((unused)) const int ___retval_f1__Ci_2; + const signed int __f1__FCi_iPiPi__2(signed int __a__i_2, signed int *__b__Pi_2, signed int *__c__Pi_2){ + __attribute__ ((unused)) const signed int ___retval_f1__Ci_2; } - const int __f2__FCi_iii__2(int __a__i_2, int __b__i_2, int __c__i_2){ - __attribute__ ((unused)) const int ___retval_f2__Ci_2; + const signed int __f2__FCi_iii__2(signed int __a__i_2, signed int __b__i_2, signed int __c__i_2){ + __attribute__ ((unused)) const signed int ___retval_f2__Ci_2; } } Index: src/tests/.expect/64/attributes.txt =================================================================== --- src/tests/.expect/64/attributes.txt (revision 3f8dd01362faf0f98d59ad95a39521b5ccefbad9) +++ src/tests/.expect/64/attributes.txt (revision a54840b150210fdedf1bf84dc118deea22554dba) @@ -1,10 +1,10 @@ -__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(long unsigned int __size); +__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned long int __size); __attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr); __attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void); -__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern int atexit(void (*__func)(void)); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(int __status); -extern int printf(const char *__restrict __format, ...); -int __la__Fi___1(){ - __attribute__ ((unused)) int ___retval_la__i_1; +__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern signed int atexit(void (*__func)(void)); +__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(signed int __status); +extern signed int printf(const char *__restrict __format, ...); +signed int __la__Fi___1(){ + __attribute__ ((unused)) signed int ___retval_la__i_1; L: __attribute__ ((unused)) ((void)1); } @@ -54,14 +54,14 @@ __attribute__ ((unused)) struct __anonymous3; struct Fdl { - __attribute__ ((unused)) int __f1__i_1; - __attribute__ ((unused)) int __f2__i_1; - __attribute__ ((unused,unused)) int __f3__i_1; - __attribute__ ((unused)) int __f4__i_1; - __attribute__ ((unused,unused)) int __f5__i_1; - __attribute__ ((used,packed)) int __f6__i_1; - __attribute__ ((used,unused,unused)) int __f7__i_1; - __attribute__ ((used,used,unused)) int __f8__i_1; - __attribute__ ((unused)) int __anonymous_object0; - __attribute__ ((unused,unused)) int *__f9__Pi_1; + __attribute__ ((unused)) signed int __f1__i_1; + __attribute__ ((unused)) signed int __f2__i_1; + __attribute__ ((unused,unused)) signed int __f3__i_1; + __attribute__ ((unused)) signed int __f4__i_1; + __attribute__ ((unused,unused)) signed int __f5__i_1; + __attribute__ ((used,packed)) signed int __f6__i_1; + __attribute__ ((used,unused,unused)) signed int __f7__i_1; + __attribute__ ((used,used,unused)) signed int __f8__i_1; + __attribute__ ((unused)) signed int __anonymous_object0; + __attribute__ ((unused,unused)) signed int *__f9__Pi_1; }; static inline void ___constructor__F_R4sFdl_autogen___1(struct Fdl *___dst__R4sFdl_1); @@ -116,5 +116,5 @@ return ((struct Fdl )___ret__4sFdl_1); } -static inline void ___constructor__F_R4sFdli_autogen___1(struct Fdl *___dst__R4sFdl_1, int __f1__i_1){ +static inline void ___constructor__F_R4sFdli_autogen___1(struct Fdl *___dst__R4sFdl_1, signed int __f1__i_1){ ((void)((*___dst__R4sFdl_1).__f1__i_1=__f1__i_1) /* ?{} */); ((void)((*___dst__R4sFdl_1).__f2__i_1) /* ?{} */); @@ -127,5 +127,5 @@ ((void)((*___dst__R4sFdl_1).__f9__Pi_1) /* ?{} */); } -static inline void ___constructor__F_R4sFdlii_autogen___1(struct Fdl *___dst__R4sFdl_1, int __f1__i_1, int __f2__i_1){ +static inline void ___constructor__F_R4sFdlii_autogen___1(struct Fdl *___dst__R4sFdl_1, signed int __f1__i_1, signed int __f2__i_1){ ((void)((*___dst__R4sFdl_1).__f1__i_1=__f1__i_1) /* ?{} */); ((void)((*___dst__R4sFdl_1).__f2__i_1=__f2__i_1) /* ?{} */); @@ -138,5 +138,5 @@ ((void)((*___dst__R4sFdl_1).__f9__Pi_1) /* ?{} */); } -static inline void ___constructor__F_R4sFdliii_autogen___1(struct Fdl *___dst__R4sFdl_1, int __f1__i_1, int __f2__i_1, int __f3__i_1){ +static inline void ___constructor__F_R4sFdliii_autogen___1(struct Fdl *___dst__R4sFdl_1, signed int __f1__i_1, signed int __f2__i_1, signed int __f3__i_1){ ((void)((*___dst__R4sFdl_1).__f1__i_1=__f1__i_1) /* ?{} */); ((void)((*___dst__R4sFdl_1).__f2__i_1=__f2__i_1) /* ?{} */); @@ -149,27 +149,27 @@ ((void)((*___dst__R4sFdl_1).__f9__Pi_1) /* ?{} */); } -static inline void ___constructor__F_R4sFdliiii_autogen___1(struct Fdl *___dst__R4sFdl_1, int __f1__i_1, int __f2__i_1, int __f3__i_1, int __f4__i_1){ - ((void)((*___dst__R4sFdl_1).__f1__i_1=__f1__i_1) /* ?{} */); - ((void)((*___dst__R4sFdl_1).__f2__i_1=__f2__i_1) /* ?{} */); - ((void)((*___dst__R4sFdl_1).__f3__i_1=__f3__i_1) /* ?{} */); - ((void)((*___dst__R4sFdl_1).__f4__i_1=__f4__i_1) /* ?{} */); - ((void)((*___dst__R4sFdl_1).__f5__i_1) /* ?{} */); - ((void)((*___dst__R4sFdl_1).__f6__i_1) /* ?{} */); - ((void)((*___dst__R4sFdl_1).__f7__i_1) /* ?{} */); - ((void)((*___dst__R4sFdl_1).__f8__i_1) /* ?{} */); - ((void)((*___dst__R4sFdl_1).__f9__Pi_1) /* ?{} */); -} -static inline void ___constructor__F_R4sFdliiiii_autogen___1(struct Fdl *___dst__R4sFdl_1, int __f1__i_1, int __f2__i_1, int __f3__i_1, int __f4__i_1, int __f5__i_1){ - ((void)((*___dst__R4sFdl_1).__f1__i_1=__f1__i_1) /* ?{} */); - ((void)((*___dst__R4sFdl_1).__f2__i_1=__f2__i_1) /* ?{} */); - ((void)((*___dst__R4sFdl_1).__f3__i_1=__f3__i_1) /* ?{} */); - ((void)((*___dst__R4sFdl_1).__f4__i_1=__f4__i_1) /* ?{} */); - ((void)((*___dst__R4sFdl_1).__f5__i_1=__f5__i_1) /* ?{} */); - ((void)((*___dst__R4sFdl_1).__f6__i_1) /* ?{} */); - ((void)((*___dst__R4sFdl_1).__f7__i_1) /* ?{} */); - ((void)((*___dst__R4sFdl_1).__f8__i_1) /* ?{} */); - ((void)((*___dst__R4sFdl_1).__f9__Pi_1) /* ?{} */); -} -static inline void ___constructor__F_R4sFdliiiiii_autogen___1(struct Fdl *___dst__R4sFdl_1, int __f1__i_1, int __f2__i_1, int __f3__i_1, int __f4__i_1, int __f5__i_1, int __f6__i_1){ +static inline void ___constructor__F_R4sFdliiii_autogen___1(struct Fdl *___dst__R4sFdl_1, signed int __f1__i_1, signed int __f2__i_1, signed int __f3__i_1, signed int __f4__i_1){ + ((void)((*___dst__R4sFdl_1).__f1__i_1=__f1__i_1) /* ?{} */); + ((void)((*___dst__R4sFdl_1).__f2__i_1=__f2__i_1) /* ?{} */); + ((void)((*___dst__R4sFdl_1).__f3__i_1=__f3__i_1) /* ?{} */); + ((void)((*___dst__R4sFdl_1).__f4__i_1=__f4__i_1) /* ?{} */); + ((void)((*___dst__R4sFdl_1).__f5__i_1) /* ?{} */); + ((void)((*___dst__R4sFdl_1).__f6__i_1) /* ?{} */); + ((void)((*___dst__R4sFdl_1).__f7__i_1) /* ?{} */); + ((void)((*___dst__R4sFdl_1).__f8__i_1) /* ?{} */); + ((void)((*___dst__R4sFdl_1).__f9__Pi_1) /* ?{} */); +} +static inline void ___constructor__F_R4sFdliiiii_autogen___1(struct Fdl *___dst__R4sFdl_1, signed int __f1__i_1, signed int __f2__i_1, signed int __f3__i_1, signed int __f4__i_1, signed int __f5__i_1){ + ((void)((*___dst__R4sFdl_1).__f1__i_1=__f1__i_1) /* ?{} */); + ((void)((*___dst__R4sFdl_1).__f2__i_1=__f2__i_1) /* ?{} */); + ((void)((*___dst__R4sFdl_1).__f3__i_1=__f3__i_1) /* ?{} */); + ((void)((*___dst__R4sFdl_1).__f4__i_1=__f4__i_1) /* ?{} */); + ((void)((*___dst__R4sFdl_1).__f5__i_1=__f5__i_1) /* ?{} */); + ((void)((*___dst__R4sFdl_1).__f6__i_1) /* ?{} */); + ((void)((*___dst__R4sFdl_1).__f7__i_1) /* ?{} */); + ((void)((*___dst__R4sFdl_1).__f8__i_1) /* ?{} */); + ((void)((*___dst__R4sFdl_1).__f9__Pi_1) /* ?{} */); +} +static inline void ___constructor__F_R4sFdliiiiii_autogen___1(struct Fdl *___dst__R4sFdl_1, signed int __f1__i_1, signed int __f2__i_1, signed int __f3__i_1, signed int __f4__i_1, signed int __f5__i_1, signed int __f6__i_1){ ((void)((*___dst__R4sFdl_1).__f1__i_1=__f1__i_1) /* ?{} */); ((void)((*___dst__R4sFdl_1).__f2__i_1=__f2__i_1) /* ?{} */); @@ -182,5 +182,5 @@ ((void)((*___dst__R4sFdl_1).__f9__Pi_1) /* ?{} */); } -static inline void ___constructor__F_R4sFdliiiiiii_autogen___1(struct Fdl *___dst__R4sFdl_1, int __f1__i_1, int __f2__i_1, int __f3__i_1, int __f4__i_1, int __f5__i_1, int __f6__i_1, int __f7__i_1){ +static inline void ___constructor__F_R4sFdliiiiiii_autogen___1(struct Fdl *___dst__R4sFdl_1, signed int __f1__i_1, signed int __f2__i_1, signed int __f3__i_1, signed int __f4__i_1, signed int __f5__i_1, signed int __f6__i_1, signed int __f7__i_1){ ((void)((*___dst__R4sFdl_1).__f1__i_1=__f1__i_1) /* ?{} */); ((void)((*___dst__R4sFdl_1).__f2__i_1=__f2__i_1) /* ?{} */); @@ -193,5 +193,5 @@ ((void)((*___dst__R4sFdl_1).__f9__Pi_1) /* ?{} */); } -static inline void ___constructor__F_R4sFdliiiiiiii_autogen___1(struct Fdl *___dst__R4sFdl_1, int __f1__i_1, int __f2__i_1, int __f3__i_1, int __f4__i_1, int __f5__i_1, int __f6__i_1, int __f7__i_1, int __f8__i_1){ +static inline void ___constructor__F_R4sFdliiiiiiii_autogen___1(struct Fdl *___dst__R4sFdl_1, signed int __f1__i_1, signed int __f2__i_1, signed int __f3__i_1, signed int __f4__i_1, signed int __f5__i_1, signed int __f6__i_1, signed int __f7__i_1, signed int __f8__i_1){ ((void)((*___dst__R4sFdl_1).__f1__i_1=__f1__i_1) /* ?{} */); ((void)((*___dst__R4sFdl_1).__f2__i_1=__f2__i_1) /* ?{} */); @@ -204,5 +204,5 @@ ((void)((*___dst__R4sFdl_1).__f9__Pi_1) /* ?{} */); } -static inline void ___constructor__F_R4sFdliiiiiiiiPi_autogen___1(struct Fdl *___dst__R4sFdl_1, int __f1__i_1, int __f2__i_1, int __f3__i_1, int __f4__i_1, int __f5__i_1, int __f6__i_1, int __f7__i_1, int __f8__i_1, int *__f9__Pi_1){ +static inline void ___constructor__F_R4sFdliiiiiiiiPi_autogen___1(struct Fdl *___dst__R4sFdl_1, signed int __f1__i_1, signed int __f2__i_1, signed int __f3__i_1, signed int __f4__i_1, signed int __f5__i_1, signed int __f6__i_1, signed int __f7__i_1, signed int __f8__i_1, signed int *__f9__Pi_1){ ((void)((*___dst__R4sFdl_1).__f1__i_1=__f1__i_1) /* ?{} */); ((void)((*___dst__R4sFdl_1).__f2__i_1=__f2__i_1) /* ?{} */); @@ -215,76 +215,76 @@ ((void)((*___dst__R4sFdl_1).__f9__Pi_1=__f9__Pi_1) /* ?{} */); } -__attribute__ ((unused)) int __f__Fi___1() asm ( "xyz" ); -__attribute__ ((used,used)) const int __vd1__Ci_1; -__attribute__ ((used,unused)) const int __vd2__Ci_1; -__attribute__ ((used,used,used,used)) const int *__vd3__PCi_1; -__attribute__ ((used,used,unused,used,unused)) const int *__vd4__PCi_1; -__attribute__ ((used,used,used)) const int __vd5__A0Ci_1[((long unsigned int )5)]; -__attribute__ ((used,used,unused,used)) const int __vd6__A0Ci_1[((long unsigned int )5)]; -__attribute__ ((used,used,used,used)) const int (*__vd7__PFCi___1)(); -__attribute__ ((used,used,unused,used,used)) const int (*__vd8__PFCi___1)(); -__attribute__ ((unused,used)) int __f1__Fi___1(); -__attribute__ ((unused)) int __f1__Fi___1(){ - __attribute__ ((unused)) int ___retval_f1__i_1; -} -__attribute__ ((unused,unused,unused,used)) int **const __f2__FCPPi___1(); -__attribute__ ((unused,unused,unused)) int **const __f2__FCPPi___1(){ - __attribute__ ((unused)) int **const ___retval_f2__CPPi_1; -} -__attribute__ ((unused,used,unused)) int (*__f3__FPA0i_i__1(int __anonymous_object1))[]; -__attribute__ ((unused,unused)) int (*__f3__FPA0i_i__1(int __p__i_1))[]{ - __attribute__ ((unused)) int (*___retval_f3__PA0i_1)[]; -} -__attribute__ ((unused,used,unused)) int (*__f4__FPFi_i____1())(int __anonymous_object2); -__attribute__ ((unused,unused)) int (*__f4__FPFi_i____1())(int __anonymous_object3){ - __attribute__ ((unused)) int (*___retval_f4__PFi_i__1)(int __anonymous_object4); -} -int __vtr__Fi___1(){ - __attribute__ ((unused)) int ___retval_vtr__i_1; - __attribute__ ((unused,unused,used)) int __t1__i_2; - __attribute__ ((unused,unused,unused,unused,unused)) int **__t2__PPi_2; - __attribute__ ((unused,unused,unused)) int __t3__A0i_2[((long unsigned int )5)]; - __attribute__ ((unused,unused,unused,unused,unused)) int **__t4__A0PPi_2[((long unsigned int )5)]; - __attribute__ ((unused,unused,unused)) int __t5__Fi___2(); - __attribute__ ((unused,unused,unused,unused)) int *__t6__FPi___2(); -} -int __ipd1__Fi_ii__1(__attribute__ ((unused,unused,unused)) int __p__i_1, __attribute__ ((unused,unused,unused)) int __q__i_1); -int __ipd1__Fi_ii__1(__attribute__ ((unused,unused,unused)) int __p__i_1, __attribute__ ((unused,unused,unused)) int __q__i_1){ - __attribute__ ((unused)) int ___retval_ipd1__i_1; -} -int __ipd2__Fi_PiPi__1(__attribute__ ((unused,unused,unused,unused)) int *__p__Pi_1, __attribute__ ((unused,unused,unused)) int *__q__Pi_1); -int __ipd2__Fi_PiPi__1(__attribute__ ((unused,unused,unused,unused)) int *__p__Pi_1, __attribute__ ((unused,unused,unused)) int *__q__Pi_1){ - __attribute__ ((unused)) int ___retval_ipd2__i_1; -} -int __ipd3__Fi_PiPi__1(__attribute__ ((unused,unused,unused)) int *__p__Pi_1, __attribute__ ((unused,unused,unused)) int *__q__Pi_1); -int __ipd3__Fi_PiPi__1(__attribute__ ((unused,unused,unused)) int *__p__Pi_1, __attribute__ ((unused,unused,unused)) int *__q__Pi_1){ - __attribute__ ((unused)) int ___retval_ipd3__i_1; -} -int __ipd4__Fi_PFi__PFi____1(__attribute__ ((unused,unused,unused)) int (*__p__PFi___1)(), __attribute__ ((unused,unused,unused)) int (*__q__PFi___1)()); -int __ipd4__Fi_PFi__PFi____1(__attribute__ ((unused,unused,unused)) int (*__p__PFi___1)(), __attribute__ ((unused,unused,unused)) int (*__q__PFi___1)()){ - __attribute__ ((unused)) int ___retval_ipd4__i_1; -} -int __tpr1__Fi_i__1(__attribute__ ((unused,unused,unused)) int __Foo__i_1); -int __tpr2__Fi_PPi__1(__attribute__ ((unused,unused,unused,unused,unused,unused)) int **__Foo__PPi_1); -int __tpr3__Fi_Pi__1(__attribute__ ((unused,unused,unused)) int *__Foo__Pi_1); -int __tpr4__Fi_PFi_Pi___1(__attribute__ ((unused,unused)) int (*__anonymous_object5)(__attribute__ ((unused,unused)) int __anonymous_object6[((long unsigned int )5)])); -int __tpr5__Fi_PFi____1(__attribute__ ((unused,unused,unused)) int (*__Foo__PFi___1)()); -int __tpr6__Fi_PFi____1(__attribute__ ((unused,unused,unused)) int (*__Foo__PFi___1)()); -int __tpr7__Fi_PFi_PFi_i____1(__attribute__ ((unused,unused)) int (*__anonymous_object7)(__attribute__ ((unused)) int (*__anonymous_object8)(__attribute__ ((unused,unused)) int __anonymous_object9))); -int __ad__Fi___1(){ - __attribute__ ((unused)) int ___retval_ad__i_1; - __attribute__ ((used,unused)) int __ad1__i_2; - __attribute__ ((unused,unused,unused)) int *__ad2__Pi_2; - __attribute__ ((unused,unused,unused)) int __ad3__A0i_2[((long unsigned int )5)]; - __attribute__ ((unused,unused,unused,unused,unused)) int (*__ad4__PA0i_2)[((long unsigned int )10)]; - __attribute__ ((unused,unused,unused,unused,used)) int __ad5__i_2; - __attribute__ ((unused,unused,unused,unused,unused)) int __ad6__Fi___2(); - ((void)sizeof(__attribute__ ((unused,unused)) int )); - ((void)sizeof(__attribute__ ((unused,unused,unused,unused)) int **)); - ((void)sizeof(__attribute__ ((unused,unused,unused)) int [5])); - ((void)sizeof(__attribute__ ((unused,unused,unused)) int (*)[10])); - ((void)sizeof(__attribute__ ((unused,unused,unused)) int ())); +__attribute__ ((unused)) signed int __f__Fi___1() asm ( "xyz" ); +__attribute__ ((used,used)) const signed int __vd1__Ci_1; +__attribute__ ((used,unused)) const signed int __vd2__Ci_1; +__attribute__ ((used,used,used,used)) const signed int *__vd3__PCi_1; +__attribute__ ((used,used,unused,used,unused)) const signed int *__vd4__PCi_1; +__attribute__ ((used,used,used)) const signed int __vd5__A0Ci_1[((unsigned long int )5)]; +__attribute__ ((used,used,unused,used)) const signed int __vd6__A0Ci_1[((unsigned long int )5)]; +__attribute__ ((used,used,used,used)) const signed int (*__vd7__PFCi___1)(); +__attribute__ ((used,used,unused,used,used)) const signed int (*__vd8__PFCi___1)(); +__attribute__ ((unused,used)) signed int __f1__Fi___1(); +__attribute__ ((unused)) signed int __f1__Fi___1(){ + __attribute__ ((unused)) signed int ___retval_f1__i_1; +} +__attribute__ ((unused,unused,unused,used)) signed int **const __f2__FCPPi___1(); +__attribute__ ((unused,unused,unused)) signed int **const __f2__FCPPi___1(){ + __attribute__ ((unused)) signed int **const ___retval_f2__CPPi_1; +} +__attribute__ ((unused,used,unused)) signed int (*__f3__FPA0i_i__1(signed int __anonymous_object1))[]; +__attribute__ ((unused,unused)) signed int (*__f3__FPA0i_i__1(signed int __p__i_1))[]{ + __attribute__ ((unused)) signed int (*___retval_f3__PA0i_1)[]; +} +__attribute__ ((unused,used,unused)) signed int (*__f4__FPFi_i____1())(signed int __anonymous_object2); +__attribute__ ((unused,unused)) signed int (*__f4__FPFi_i____1())(signed int __anonymous_object3){ + __attribute__ ((unused)) signed int (*___retval_f4__PFi_i__1)(signed int __anonymous_object4); +} +signed int __vtr__Fi___1(){ + __attribute__ ((unused)) signed int ___retval_vtr__i_1; + __attribute__ ((unused,unused,used)) signed int __t1__i_2; + __attribute__ ((unused,unused,unused,unused,unused)) signed int **__t2__PPi_2; + __attribute__ ((unused,unused,unused)) signed int __t3__A0i_2[((unsigned long int )5)]; + __attribute__ ((unused,unused,unused,unused,unused)) signed int **__t4__A0PPi_2[((unsigned long int )5)]; + __attribute__ ((unused,unused,unused)) signed int __t5__Fi___2(); + __attribute__ ((unused,unused,unused,unused)) signed int *__t6__FPi___2(); +} +signed int __ipd1__Fi_ii__1(__attribute__ ((unused,unused,unused)) signed int __p__i_1, __attribute__ ((unused,unused,unused)) signed int __q__i_1); +signed int __ipd1__Fi_ii__1(__attribute__ ((unused,unused,unused)) signed int __p__i_1, __attribute__ ((unused,unused,unused)) signed int __q__i_1){ + __attribute__ ((unused)) signed int ___retval_ipd1__i_1; +} +signed int __ipd2__Fi_PiPi__1(__attribute__ ((unused,unused,unused,unused)) signed int *__p__Pi_1, __attribute__ ((unused,unused,unused)) signed int *__q__Pi_1); +signed int __ipd2__Fi_PiPi__1(__attribute__ ((unused,unused,unused,unused)) signed int *__p__Pi_1, __attribute__ ((unused,unused,unused)) signed int *__q__Pi_1){ + __attribute__ ((unused)) signed int ___retval_ipd2__i_1; +} +signed int __ipd3__Fi_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *__p__Pi_1, __attribute__ ((unused,unused,unused)) signed int *__q__Pi_1); +signed int __ipd3__Fi_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *__p__Pi_1, __attribute__ ((unused,unused,unused)) signed int *__q__Pi_1){ + __attribute__ ((unused)) signed int ___retval_ipd3__i_1; +} +signed int __ipd4__Fi_PFi__PFi____1(__attribute__ ((unused,unused,unused)) signed int (*__p__PFi___1)(), __attribute__ ((unused,unused,unused)) signed int (*__q__PFi___1)()); +signed int __ipd4__Fi_PFi__PFi____1(__attribute__ ((unused,unused,unused)) signed int (*__p__PFi___1)(), __attribute__ ((unused,unused,unused)) signed int (*__q__PFi___1)()){ + __attribute__ ((unused)) signed int ___retval_ipd4__i_1; +} +signed int __tpr1__Fi_i__1(__attribute__ ((unused,unused,unused)) signed int __Foo__i_1); +signed int __tpr2__Fi_PPi__1(__attribute__ ((unused,unused,unused,unused,unused,unused)) signed int **__Foo__PPi_1); +signed int __tpr3__Fi_Pi__1(__attribute__ ((unused,unused,unused)) signed int *__Foo__Pi_1); +signed int __tpr4__Fi_PFi_Pi___1(__attribute__ ((unused,unused)) signed int (*__anonymous_object5)(__attribute__ ((unused,unused)) signed int __anonymous_object6[((unsigned long int )5)])); +signed int __tpr5__Fi_PFi____1(__attribute__ ((unused,unused,unused)) signed int (*__Foo__PFi___1)()); +signed int __tpr6__Fi_PFi____1(__attribute__ ((unused,unused,unused)) signed int (*__Foo__PFi___1)()); +signed int __tpr7__Fi_PFi_PFi_i____1(__attribute__ ((unused,unused)) signed int (*__anonymous_object7)(__attribute__ ((unused)) signed int (*__anonymous_object8)(__attribute__ ((unused,unused)) signed int __anonymous_object9))); +signed int __ad__Fi___1(){ + __attribute__ ((unused)) signed int ___retval_ad__i_1; + __attribute__ ((used,unused)) signed int __ad1__i_2; + __attribute__ ((unused,unused,unused)) signed int *__ad2__Pi_2; + __attribute__ ((unused,unused,unused)) signed int __ad3__A0i_2[((unsigned long int )5)]; + __attribute__ ((unused,unused,unused,unused,unused)) signed int (*__ad4__PA0i_2)[((unsigned long int )10)]; + __attribute__ ((unused,unused,unused,unused,used)) signed int __ad5__i_2; + __attribute__ ((unused,unused,unused,unused,unused)) signed int __ad6__Fi___2(); + ((void)sizeof(__attribute__ ((unused,unused)) signed int )); + ((void)sizeof(__attribute__ ((unused,unused,unused,unused)) signed int **)); + ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int [5])); + ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int (*)[10])); + ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int ())); __attribute__ ((unused)) struct __anonymous4 { - int __i__i_2; + signed int __i__i_2; }; inline void ___constructor__F_R13s__anonymous4_autogen___2(struct __anonymous4 *___dst__R13s__anonymous4_2){ @@ -303,5 +303,5 @@ return ((struct __anonymous4 )___ret__13s__anonymous4_2); } - inline void ___constructor__F_R13s__anonymous4i_autogen___2(struct __anonymous4 *___dst__R13s__anonymous4_2, int __i__i_2){ + inline void ___constructor__F_R13s__anonymous4i_autogen___2(struct __anonymous4 *___dst__R13s__anonymous4_2, signed int __i__i_2){ ((void)((*___dst__R13s__anonymous4_2).__i__i_2=__i__i_2) /* ?{} */); } @@ -324,16 +324,16 @@ ((void)sizeof(enum __anonymous5 )); } -int __apd1__Fi_PiPi__1(__attribute__ ((unused,unused,unused)) int *__anonymous_object10, __attribute__ ((unused,unused,unused)) int *__anonymous_object11); -int __apd2__Fi_PPiPPi__1(__attribute__ ((unused,unused,unused,unused)) int **__anonymous_object12, __attribute__ ((unused,unused,unused,unused)) int **__anonymous_object13); -int __apd3__Fi_PiPi__1(__attribute__ ((unused,unused,unused)) int *__anonymous_object14, __attribute__ ((unused,unused,unused)) int *__anonymous_object15); -int __apd4__Fi_PFi__PFi____1(__attribute__ ((unused,unused,unused)) int (*__anonymous_object16)(), __attribute__ ((unused,unused,unused)) int (*__anonymous_object17)()); -int __apd5__Fi_PFi_i_PFi_i___1(__attribute__ ((unused,unused,unused)) int (*__anonymous_object18)(__attribute__ ((unused)) int __anonymous_object19), __attribute__ ((unused,unused,unused)) int (*__anonymous_object20)(__attribute__ ((unused)) int __anonymous_object21)); -int __apd6__Fi_PFi__PFi____1(__attribute__ ((unused,unused,unused)) int (*__anonymous_object22)(), __attribute__ ((unused,unused,unused)) int (*__anonymous_object23)()); -int __apd7__Fi_PFi_i_PFi_i___1(__attribute__ ((unused,unused,unused)) int (*__anonymous_object24)(__attribute__ ((unused)) int __anonymous_object25), __attribute__ ((unused,unused,unused)) int (*__anonymous_object26)(__attribute__ ((unused)) int __anonymous_object27)); +signed int __apd1__Fi_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *__anonymous_object10, __attribute__ ((unused,unused,unused)) signed int *__anonymous_object11); +signed int __apd2__Fi_PPiPPi__1(__attribute__ ((unused,unused,unused,unused)) signed int **__anonymous_object12, __attribute__ ((unused,unused,unused,unused)) signed int **__anonymous_object13); +signed int __apd3__Fi_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *__anonymous_object14, __attribute__ ((unused,unused,unused)) signed int *__anonymous_object15); +signed int __apd4__Fi_PFi__PFi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object16)(), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object17)()); +signed int __apd5__Fi_PFi_i_PFi_i___1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object18)(__attribute__ ((unused)) signed int __anonymous_object19), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object20)(__attribute__ ((unused)) signed int __anonymous_object21)); +signed int __apd6__Fi_PFi__PFi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object22)(), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object23)()); +signed int __apd7__Fi_PFi_i_PFi_i___1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object24)(__attribute__ ((unused)) signed int __anonymous_object25), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object26)(__attribute__ ((unused)) signed int __anonymous_object27)); struct Vad { - __attribute__ ((unused)) int __anonymous_object28; - __attribute__ ((unused,unused)) int *__anonymous_object29; - __attribute__ ((unused,unused)) int __anonymous_object30[((long unsigned int )10)]; - __attribute__ ((unused,unused)) int (*__anonymous_object31)(); + __attribute__ ((unused)) signed int __anonymous_object28; + __attribute__ ((unused,unused)) signed int *__anonymous_object29; + __attribute__ ((unused,unused)) signed int __anonymous_object30[((unsigned long int )10)]; + __attribute__ ((unused,unused)) signed int (*__anonymous_object31)(); }; static inline void ___constructor__F_R4sVad_autogen___1(struct Vad *___dst__R4sVad_1); Index: src/tests/.expect/64/declarationSpecifier.txt =================================================================== --- src/tests/.expect/64/declarationSpecifier.txt (revision 3f8dd01362faf0f98d59ad95a39521b5ccefbad9) +++ src/tests/.expect/64/declarationSpecifier.txt (revision a54840b150210fdedf1bf84dc118deea22554dba) @@ -1,18 +1,18 @@ -__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(long unsigned int __size); +__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned long int __size); __attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr); __attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void); -__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern int atexit(void (*__func)(void)); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(int __status); -extern int printf(const char *__restrict __format, ...); -volatile const short __x1__CVs_1; -static volatile const short __x2__CVs_1; -static volatile const short __x3__CVs_1; -static volatile const short __x4__CVs_1; -static volatile const short __x5__CVs_1; -static volatile const short __x6__CVs_1; -static volatile const short __x7__CVs_1; -static volatile const short __x8__CVs_1; +__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern signed int atexit(void (*__func)(void)); +__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(signed int __status); +extern signed int printf(const char *__restrict __format, ...); +volatile const signed short int __x1__CVs_1; +static volatile const signed short int __x2__CVs_1; +static volatile const signed short int __x3__CVs_1; +static volatile const signed short int __x4__CVs_1; +static volatile const signed short int __x5__CVs_1; +static volatile const signed short int __x6__CVs_1; +static volatile const signed short int __x7__CVs_1; +static volatile const signed short int __x8__CVs_1; struct __anonymous0 { - int __i__i_1; + signed int __i__i_1; }; static inline void ___constructor__F_R13s__anonymous0_autogen___1(struct __anonymous0 *___dst__R13s__anonymous0_1); @@ -35,10 +35,10 @@ return ((struct __anonymous0 )___ret__13s__anonymous0_1); } -static inline void ___constructor__F_R13s__anonymous0i_autogen___1(struct __anonymous0 *___dst__R13s__anonymous0_1, int __i__i_1){ +static inline void ___constructor__F_R13s__anonymous0i_autogen___1(struct __anonymous0 *___dst__R13s__anonymous0_1, signed int __i__i_1){ ((void)((*___dst__R13s__anonymous0_1).__i__i_1=__i__i_1) /* ?{} */); } volatile const struct __anonymous0 __x10__CV13s__anonymous0_1; struct __anonymous1 { - int __i__i_1; + signed int __i__i_1; }; static inline void ___constructor__F_R13s__anonymous1_autogen___1(struct __anonymous1 *___dst__R13s__anonymous1_1); @@ -61,10 +61,10 @@ return ((struct __anonymous1 )___ret__13s__anonymous1_1); } -static inline void ___constructor__F_R13s__anonymous1i_autogen___1(struct __anonymous1 *___dst__R13s__anonymous1_1, int __i__i_1){ +static inline void ___constructor__F_R13s__anonymous1i_autogen___1(struct __anonymous1 *___dst__R13s__anonymous1_1, signed int __i__i_1){ ((void)((*___dst__R13s__anonymous1_1).__i__i_1=__i__i_1) /* ?{} */); } volatile const struct __anonymous1 __x11__CV13s__anonymous1_1; struct __anonymous2 { - int __i__i_1; + signed int __i__i_1; }; static inline void ___constructor__F_R13s__anonymous2_autogen___1(struct __anonymous2 *___dst__R13s__anonymous2_1); @@ -87,10 +87,10 @@ return ((struct __anonymous2 )___ret__13s__anonymous2_1); } -static inline void ___constructor__F_R13s__anonymous2i_autogen___1(struct __anonymous2 *___dst__R13s__anonymous2_1, int __i__i_1){ +static inline void ___constructor__F_R13s__anonymous2i_autogen___1(struct __anonymous2 *___dst__R13s__anonymous2_1, signed int __i__i_1){ ((void)((*___dst__R13s__anonymous2_1).__i__i_1=__i__i_1) /* ?{} */); } volatile const struct __anonymous2 __x12__CV13s__anonymous2_1; struct __anonymous3 { - int __i__i_1; + signed int __i__i_1; }; static inline void ___constructor__F_R13s__anonymous3_autogen___1(struct __anonymous3 *___dst__R13s__anonymous3_1); @@ -113,10 +113,10 @@ return ((struct __anonymous3 )___ret__13s__anonymous3_1); } -static inline void ___constructor__F_R13s__anonymous3i_autogen___1(struct __anonymous3 *___dst__R13s__anonymous3_1, int __i__i_1){ +static inline void ___constructor__F_R13s__anonymous3i_autogen___1(struct __anonymous3 *___dst__R13s__anonymous3_1, signed int __i__i_1){ ((void)((*___dst__R13s__anonymous3_1).__i__i_1=__i__i_1) /* ?{} */); } static volatile const struct __anonymous3 __x13__CV13s__anonymous3_1; struct __anonymous4 { - int __i__i_1; + signed int __i__i_1; }; static inline void ___constructor__F_R13s__anonymous4_autogen___1(struct __anonymous4 *___dst__R13s__anonymous4_1); @@ -139,10 +139,10 @@ return ((struct __anonymous4 )___ret__13s__anonymous4_1); } -static inline void ___constructor__F_R13s__anonymous4i_autogen___1(struct __anonymous4 *___dst__R13s__anonymous4_1, int __i__i_1){ +static inline void ___constructor__F_R13s__anonymous4i_autogen___1(struct __anonymous4 *___dst__R13s__anonymous4_1, signed int __i__i_1){ ((void)((*___dst__R13s__anonymous4_1).__i__i_1=__i__i_1) /* ?{} */); } static volatile const struct __anonymous4 __x14__CV13s__anonymous4_1; struct __anonymous5 { - int __i__i_1; + signed int __i__i_1; }; static inline void ___constructor__F_R13s__anonymous5_autogen___1(struct __anonymous5 *___dst__R13s__anonymous5_1); @@ -165,10 +165,10 @@ return ((struct __anonymous5 )___ret__13s__anonymous5_1); } -static inline void ___constructor__F_R13s__anonymous5i_autogen___1(struct __anonymous5 *___dst__R13s__anonymous5_1, int __i__i_1){ +static inline void ___constructor__F_R13s__anonymous5i_autogen___1(struct __anonymous5 *___dst__R13s__anonymous5_1, signed int __i__i_1){ ((void)((*___dst__R13s__anonymous5_1).__i__i_1=__i__i_1) /* ?{} */); } static volatile const struct __anonymous5 __x15__CV13s__anonymous5_1; struct __anonymous6 { - int __i__i_1; + signed int __i__i_1; }; static inline void ___constructor__F_R13s__anonymous6_autogen___1(struct __anonymous6 *___dst__R13s__anonymous6_1); @@ -191,10 +191,10 @@ return ((struct __anonymous6 )___ret__13s__anonymous6_1); } -static inline void ___constructor__F_R13s__anonymous6i_autogen___1(struct __anonymous6 *___dst__R13s__anonymous6_1, int __i__i_1){ +static inline void ___constructor__F_R13s__anonymous6i_autogen___1(struct __anonymous6 *___dst__R13s__anonymous6_1, signed int __i__i_1){ ((void)((*___dst__R13s__anonymous6_1).__i__i_1=__i__i_1) /* ?{} */); } static volatile const struct __anonymous6 __x16__CV13s__anonymous6_1; struct __anonymous7 { - int __i__i_1; + signed int __i__i_1; }; static inline void ___constructor__F_R13s__anonymous7_autogen___1(struct __anonymous7 *___dst__R13s__anonymous7_1); @@ -217,18 +217,18 @@ return ((struct __anonymous7 )___ret__13s__anonymous7_1); } -static inline void ___constructor__F_R13s__anonymous7i_autogen___1(struct __anonymous7 *___dst__R13s__anonymous7_1, int __i__i_1){ +static inline void ___constructor__F_R13s__anonymous7i_autogen___1(struct __anonymous7 *___dst__R13s__anonymous7_1, signed int __i__i_1){ ((void)((*___dst__R13s__anonymous7_1).__i__i_1=__i__i_1) /* ?{} */); } static volatile const struct __anonymous7 __x17__CV13s__anonymous7_1; -volatile const short __x20__CVs_1; -static volatile const short __x21__CVs_1; -static volatile const short __x22__CVs_1; -static volatile const short __x23__CVs_1; -static volatile const short __x24__CVs_1; -static volatile const short __x25__CVs_1; -static volatile const short __x26__CVs_1; -static volatile const short __x27__CVs_1; +volatile const signed short int __x20__CVs_1; +static volatile const signed short int __x21__CVs_1; +static volatile const signed short int __x22__CVs_1; +static volatile const signed short int __x23__CVs_1; +static volatile const signed short int __x24__CVs_1; +static volatile const signed short int __x25__CVs_1; +static volatile const signed short int __x26__CVs_1; +static volatile const signed short int __x27__CVs_1; struct __anonymous8 { - short __i__s_1; + signed short int __i__s_1; }; static inline void ___constructor__F_R13s__anonymous8_autogen___1(struct __anonymous8 *___dst__R13s__anonymous8_1); @@ -251,10 +251,10 @@ return ((struct __anonymous8 )___ret__13s__anonymous8_1); } -static inline void ___constructor__F_R13s__anonymous8s_autogen___1(struct __anonymous8 *___dst__R13s__anonymous8_1, short __i__s_1){ +static inline void ___constructor__F_R13s__anonymous8s_autogen___1(struct __anonymous8 *___dst__R13s__anonymous8_1, signed short int __i__s_1){ ((void)((*___dst__R13s__anonymous8_1).__i__s_1=__i__s_1) /* ?{} */); } volatile const struct __anonymous8 __x29__CV13s__anonymous8_1; struct __anonymous9 { - short __i__s_1; + signed short int __i__s_1; }; static inline void ___constructor__F_R13s__anonymous9_autogen___1(struct __anonymous9 *___dst__R13s__anonymous9_1); @@ -277,10 +277,10 @@ return ((struct __anonymous9 )___ret__13s__anonymous9_1); } -static inline void ___constructor__F_R13s__anonymous9s_autogen___1(struct __anonymous9 *___dst__R13s__anonymous9_1, short __i__s_1){ +static inline void ___constructor__F_R13s__anonymous9s_autogen___1(struct __anonymous9 *___dst__R13s__anonymous9_1, signed short int __i__s_1){ ((void)((*___dst__R13s__anonymous9_1).__i__s_1=__i__s_1) /* ?{} */); } volatile const struct __anonymous9 __x30__CV13s__anonymous9_1; struct __anonymous10 { - short __i__s_1; + signed short int __i__s_1; }; static inline void ___constructor__F_R14s__anonymous10_autogen___1(struct __anonymous10 *___dst__R14s__anonymous10_1); @@ -303,10 +303,10 @@ return ((struct __anonymous10 )___ret__14s__anonymous10_1); } -static inline void ___constructor__F_R14s__anonymous10s_autogen___1(struct __anonymous10 *___dst__R14s__anonymous10_1, short __i__s_1){ +static inline void ___constructor__F_R14s__anonymous10s_autogen___1(struct __anonymous10 *___dst__R14s__anonymous10_1, signed short int __i__s_1){ ((void)((*___dst__R14s__anonymous10_1).__i__s_1=__i__s_1) /* ?{} */); } volatile const struct __anonymous10 __x31__CV14s__anonymous10_1; struct __anonymous11 { - short __i__s_1; + signed short int __i__s_1; }; static inline void ___constructor__F_R14s__anonymous11_autogen___1(struct __anonymous11 *___dst__R14s__anonymous11_1); @@ -329,10 +329,10 @@ return ((struct __anonymous11 )___ret__14s__anonymous11_1); } -static inline void ___constructor__F_R14s__anonymous11s_autogen___1(struct __anonymous11 *___dst__R14s__anonymous11_1, short __i__s_1){ +static inline void ___constructor__F_R14s__anonymous11s_autogen___1(struct __anonymous11 *___dst__R14s__anonymous11_1, signed short int __i__s_1){ ((void)((*___dst__R14s__anonymous11_1).__i__s_1=__i__s_1) /* ?{} */); } static volatile const struct __anonymous11 __x32__CV14s__anonymous11_1; struct __anonymous12 { - short __i__s_1; + signed short int __i__s_1; }; static inline void ___constructor__F_R14s__anonymous12_autogen___1(struct __anonymous12 *___dst__R14s__anonymous12_1); @@ -355,10 +355,10 @@ return ((struct __anonymous12 )___ret__14s__anonymous12_1); } -static inline void ___constructor__F_R14s__anonymous12s_autogen___1(struct __anonymous12 *___dst__R14s__anonymous12_1, short __i__s_1){ +static inline void ___constructor__F_R14s__anonymous12s_autogen___1(struct __anonymous12 *___dst__R14s__anonymous12_1, signed short int __i__s_1){ ((void)((*___dst__R14s__anonymous12_1).__i__s_1=__i__s_1) /* ?{} */); } static volatile const struct __anonymous12 __x33__CV14s__anonymous12_1; struct __anonymous13 { - short __i__s_1; + signed short int __i__s_1; }; static inline void ___constructor__F_R14s__anonymous13_autogen___1(struct __anonymous13 *___dst__R14s__anonymous13_1); @@ -381,10 +381,10 @@ return ((struct __anonymous13 )___ret__14s__anonymous13_1); } -static inline void ___constructor__F_R14s__anonymous13s_autogen___1(struct __anonymous13 *___dst__R14s__anonymous13_1, short __i__s_1){ +static inline void ___constructor__F_R14s__anonymous13s_autogen___1(struct __anonymous13 *___dst__R14s__anonymous13_1, signed short int __i__s_1){ ((void)((*___dst__R14s__anonymous13_1).__i__s_1=__i__s_1) /* ?{} */); } static volatile const struct __anonymous13 __x34__CV14s__anonymous13_1; struct __anonymous14 { - short __i__s_1; + signed short int __i__s_1; }; static inline void ___constructor__F_R14s__anonymous14_autogen___1(struct __anonymous14 *___dst__R14s__anonymous14_1); @@ -407,10 +407,10 @@ return ((struct __anonymous14 )___ret__14s__anonymous14_1); } -static inline void ___constructor__F_R14s__anonymous14s_autogen___1(struct __anonymous14 *___dst__R14s__anonymous14_1, short __i__s_1){ +static inline void ___constructor__F_R14s__anonymous14s_autogen___1(struct __anonymous14 *___dst__R14s__anonymous14_1, signed short int __i__s_1){ ((void)((*___dst__R14s__anonymous14_1).__i__s_1=__i__s_1) /* ?{} */); } static volatile const struct __anonymous14 __x35__CV14s__anonymous14_1; struct __anonymous15 { - short __i__s_1; + signed short int __i__s_1; }; static inline void ___constructor__F_R14s__anonymous15_autogen___1(struct __anonymous15 *___dst__R14s__anonymous15_1); @@ -433,26 +433,26 @@ return ((struct __anonymous15 )___ret__14s__anonymous15_1); } -static inline void ___constructor__F_R14s__anonymous15s_autogen___1(struct __anonymous15 *___dst__R14s__anonymous15_1, short __i__s_1){ +static inline void ___constructor__F_R14s__anonymous15s_autogen___1(struct __anonymous15 *___dst__R14s__anonymous15_1, signed short int __i__s_1){ ((void)((*___dst__R14s__anonymous15_1).__i__s_1=__i__s_1) /* ?{} */); } static volatile const struct __anonymous15 __x36__CV14s__anonymous15_1; -static inline volatile const int __f11__FCVi___1(); -static inline volatile const int __f12__FCVi___1(); -static inline volatile const int __f13__FCVi___1(); -static inline volatile const int __f14__FCVi___1(); -static inline volatile const int __f15__FCVi___1(); -static inline volatile const int __f16__FCVi___1(); -static inline volatile const int __f17__FCVi___1(); -static inline volatile const int __f18__FCVi___1(); -static inline volatile const short __f21__FCVs___1(); -static inline volatile const short __f22__FCVs___1(); -static inline volatile const short __f23__FCVs___1(); -static inline volatile const short __f24__FCVs___1(); -static inline volatile const short __f25__FCVs___1(); -static inline volatile const short __f26__FCVs___1(); -static inline volatile const short __f27__FCVs___1(); -static inline volatile const short __f28__FCVs___1(); +static inline volatile const signed int __f11__FCVi___1(); +static inline volatile const signed int __f12__FCVi___1(); +static inline volatile const signed int __f13__FCVi___1(); +static inline volatile const signed int __f14__FCVi___1(); +static inline volatile const signed int __f15__FCVi___1(); +static inline volatile const signed int __f16__FCVi___1(); +static inline volatile const signed int __f17__FCVi___1(); +static inline volatile const signed int __f18__FCVi___1(); +static inline volatile const signed short int __f21__FCVs___1(); +static inline volatile const signed short int __f22__FCVs___1(); +static inline volatile const signed short int __f23__FCVs___1(); +static inline volatile const signed short int __f24__FCVs___1(); +static inline volatile const signed short int __f25__FCVs___1(); +static inline volatile const signed short int __f26__FCVs___1(); +static inline volatile const signed short int __f27__FCVs___1(); +static inline volatile const signed short int __f28__FCVs___1(); struct __anonymous16 { - int __i__i_1; + signed int __i__i_1; }; static inline void ___constructor__F_R14s__anonymous16_autogen___1(struct __anonymous16 *___dst__R14s__anonymous16_1); @@ -475,10 +475,10 @@ return ((struct __anonymous16 )___ret__14s__anonymous16_1); } -static inline void ___constructor__F_R14s__anonymous16i_autogen___1(struct __anonymous16 *___dst__R14s__anonymous16_1, int __i__i_1){ +static inline void ___constructor__F_R14s__anonymous16i_autogen___1(struct __anonymous16 *___dst__R14s__anonymous16_1, signed int __i__i_1){ ((void)((*___dst__R14s__anonymous16_1).__i__i_1=__i__i_1) /* ?{} */); } static inline volatile const struct __anonymous16 __f31__FCV14s__anonymous16___1(); struct __anonymous17 { - int __i__i_1; + signed int __i__i_1; }; static inline void ___constructor__F_R14s__anonymous17_autogen___1(struct __anonymous17 *___dst__R14s__anonymous17_1); @@ -501,10 +501,10 @@ return ((struct __anonymous17 )___ret__14s__anonymous17_1); } -static inline void ___constructor__F_R14s__anonymous17i_autogen___1(struct __anonymous17 *___dst__R14s__anonymous17_1, int __i__i_1){ +static inline void ___constructor__F_R14s__anonymous17i_autogen___1(struct __anonymous17 *___dst__R14s__anonymous17_1, signed int __i__i_1){ ((void)((*___dst__R14s__anonymous17_1).__i__i_1=__i__i_1) /* ?{} */); } static inline volatile const struct __anonymous17 __f32__FCV14s__anonymous17___1(); struct __anonymous18 { - int __i__i_1; + signed int __i__i_1; }; static inline void ___constructor__F_R14s__anonymous18_autogen___1(struct __anonymous18 *___dst__R14s__anonymous18_1); @@ -527,10 +527,10 @@ return ((struct __anonymous18 )___ret__14s__anonymous18_1); } -static inline void ___constructor__F_R14s__anonymous18i_autogen___1(struct __anonymous18 *___dst__R14s__anonymous18_1, int __i__i_1){ +static inline void ___constructor__F_R14s__anonymous18i_autogen___1(struct __anonymous18 *___dst__R14s__anonymous18_1, signed int __i__i_1){ ((void)((*___dst__R14s__anonymous18_1).__i__i_1=__i__i_1) /* ?{} */); } static inline volatile const struct __anonymous18 __f33__FCV14s__anonymous18___1(); struct __anonymous19 { - int __i__i_1; + signed int __i__i_1; }; static inline void ___constructor__F_R14s__anonymous19_autogen___1(struct __anonymous19 *___dst__R14s__anonymous19_1); @@ -553,10 +553,10 @@ return ((struct __anonymous19 )___ret__14s__anonymous19_1); } -static inline void ___constructor__F_R14s__anonymous19i_autogen___1(struct __anonymous19 *___dst__R14s__anonymous19_1, int __i__i_1){ +static inline void ___constructor__F_R14s__anonymous19i_autogen___1(struct __anonymous19 *___dst__R14s__anonymous19_1, signed int __i__i_1){ ((void)((*___dst__R14s__anonymous19_1).__i__i_1=__i__i_1) /* ?{} */); } static inline volatile const struct __anonymous19 __f34__FCV14s__anonymous19___1(); struct __anonymous20 { - int __i__i_1; + signed int __i__i_1; }; static inline void ___constructor__F_R14s__anonymous20_autogen___1(struct __anonymous20 *___dst__R14s__anonymous20_1); @@ -579,10 +579,10 @@ return ((struct __anonymous20 )___ret__14s__anonymous20_1); } -static inline void ___constructor__F_R14s__anonymous20i_autogen___1(struct __anonymous20 *___dst__R14s__anonymous20_1, int __i__i_1){ +static inline void ___constructor__F_R14s__anonymous20i_autogen___1(struct __anonymous20 *___dst__R14s__anonymous20_1, signed int __i__i_1){ ((void)((*___dst__R14s__anonymous20_1).__i__i_1=__i__i_1) /* ?{} */); } static inline volatile const struct __anonymous20 __f35__FCV14s__anonymous20___1(); struct __anonymous21 { - int __i__i_1; + signed int __i__i_1; }; static inline void ___constructor__F_R14s__anonymous21_autogen___1(struct __anonymous21 *___dst__R14s__anonymous21_1); @@ -605,10 +605,10 @@ return ((struct __anonymous21 )___ret__14s__anonymous21_1); } -static inline void ___constructor__F_R14s__anonymous21i_autogen___1(struct __anonymous21 *___dst__R14s__anonymous21_1, int __i__i_1){ +static inline void ___constructor__F_R14s__anonymous21i_autogen___1(struct __anonymous21 *___dst__R14s__anonymous21_1, signed int __i__i_1){ ((void)((*___dst__R14s__anonymous21_1).__i__i_1=__i__i_1) /* ?{} */); } static inline volatile const struct __anonymous21 __f36__FCV14s__anonymous21___1(); struct __anonymous22 { - int __i__i_1; + signed int __i__i_1; }; static inline void ___constructor__F_R14s__anonymous22_autogen___1(struct __anonymous22 *___dst__R14s__anonymous22_1); @@ -631,10 +631,10 @@ return ((struct __anonymous22 )___ret__14s__anonymous22_1); } -static inline void ___constructor__F_R14s__anonymous22i_autogen___1(struct __anonymous22 *___dst__R14s__anonymous22_1, int __i__i_1){ +static inline void ___constructor__F_R14s__anonymous22i_autogen___1(struct __anonymous22 *___dst__R14s__anonymous22_1, signed int __i__i_1){ ((void)((*___dst__R14s__anonymous22_1).__i__i_1=__i__i_1) /* ?{} */); } static inline volatile const struct __anonymous22 __f37__FCV14s__anonymous22___1(); struct __anonymous23 { - int __i__i_1; + signed int __i__i_1; }; static inline void ___constructor__F_R14s__anonymous23_autogen___1(struct __anonymous23 *___dst__R14s__anonymous23_1); @@ -657,36 +657,36 @@ return ((struct __anonymous23 )___ret__14s__anonymous23_1); } -static inline void ___constructor__F_R14s__anonymous23i_autogen___1(struct __anonymous23 *___dst__R14s__anonymous23_1, int __i__i_1){ +static inline void ___constructor__F_R14s__anonymous23i_autogen___1(struct __anonymous23 *___dst__R14s__anonymous23_1, signed int __i__i_1){ ((void)((*___dst__R14s__anonymous23_1).__i__i_1=__i__i_1) /* ?{} */); } static inline volatile const struct __anonymous23 __f38__FCV14s__anonymous23___1(); -static inline volatile const short __f41__FCVs___1(); -static inline volatile const short __f42__FCVs___1(); -static inline volatile const short __f43__FCVs___1(); -static inline volatile const short __f44__FCVs___1(); -static inline volatile const short __f45__FCVs___1(); -static inline volatile const short __f46__FCVs___1(); -static inline volatile const short __f47__FCVs___1(); -static inline volatile const short __f48__FCVs___1(); -int __main__Fi_iPPCc__1(int __argc__i_1, const char **__argv__PPCc_1){ - __attribute__ ((unused)) int ___retval_main__i_1; - ((void)(___retval_main__i_1=((int )0)) /* ?{} */); - return ((int )___retval_main__i_1); +static inline volatile const signed short int __f41__FCVs___1(); +static inline volatile const signed short int __f42__FCVs___1(); +static inline volatile const signed short int __f43__FCVs___1(); +static inline volatile const signed short int __f44__FCVs___1(); +static inline volatile const signed short int __f45__FCVs___1(); +static inline volatile const signed short int __f46__FCVs___1(); +static inline volatile const signed short int __f47__FCVs___1(); +static inline volatile const signed short int __f48__FCVs___1(); +signed int __main__Fi_iPPCc__1(signed int __argc__i_1, const char **__argv__PPCc_1){ + __attribute__ ((unused)) signed int ___retval_main__i_1; + ((void)(___retval_main__i_1=((signed int )0)) /* ?{} */); + return ((signed int )___retval_main__i_1); ((void)(___retval_main__i_1=0) /* ?{} */); - return ((int )___retval_main__i_1); + return ((signed int )___retval_main__i_1); } static inline int invoke_main(int argc, char* argv[], char* envp[]) { (void)argc; (void)argv; (void)envp; return __main__Fi_iPPCc__1(argc, argv); } -__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(long unsigned int __size); +__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned long int __size); __attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr); __attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void); -__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern int atexit(void (*__func)(void)); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(int __status); -extern int printf(const char *__restrict __format, ...); -static inline int invoke_main(int argc, char **argv, char **envp); -int main(int __argc__i_1, char **__argv__PPc_1, char **__envp__PPc_1){ - __attribute__ ((unused)) int ___retval_main__i_1; - int _tmp_cp_ret0; +__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern signed int atexit(void (*__func)(void)); +__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(signed int __status); +extern signed int printf(const char *__restrict __format, ...); +static inline signed int invoke_main(signed int argc, char **argv, char **envp); +signed int main(signed int __argc__i_1, char **__argv__PPc_1, char **__envp__PPc_1){ + __attribute__ ((unused)) signed int ___retval_main__i_1; + signed int _tmp_cp_ret0; ((void)(___retval_main__i_1=(((void)(_tmp_cp_ret0=invoke_main(__argc__i_1, __argv__PPc_1, __envp__PPc_1))) , _tmp_cp_ret0)) /* ?{} */); ((void)(_tmp_cp_ret0) /* ^?{} */); - return ((int )___retval_main__i_1); -} + return ((signed int )___retval_main__i_1); +} Index: src/tests/.expect/64/extension.txt =================================================================== --- src/tests/.expect/64/extension.txt (revision 3f8dd01362faf0f98d59ad95a39521b5ccefbad9) +++ src/tests/.expect/64/extension.txt (revision a54840b150210fdedf1bf84dc118deea22554dba) @@ -1,15 +1,15 @@ -__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(long unsigned int __size); +__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned long int __size); __attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr); __attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void); -__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern int atexit(void (*__func)(void)); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(int __status); -extern int printf(const char *__restrict __format, ...); -__extension__ int __a__i_1; -__extension__ int __b__i_1; -__extension__ int __c__i_1; +__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern signed int atexit(void (*__func)(void)); +__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(signed int __status); +extern signed int printf(const char *__restrict __format, ...); +__extension__ signed int __a__i_1; +__extension__ signed int __b__i_1; +__extension__ signed int __c__i_1; __extension__ struct S { - __extension__ int __a__i_1; - __extension__ int __b__i_1; - __extension__ int __c__i_1; + __extension__ signed int __a__i_1; + __extension__ signed int __b__i_1; + __extension__ signed int __c__i_1; }; static inline void ___constructor__F_R2sS_autogen___1(struct S *___dst__R2sS_1); @@ -40,15 +40,15 @@ return ((struct S )___ret__2sS_1); } -static inline void ___constructor__F_R2sSi_autogen___1(struct S *___dst__R2sS_1, int __a__i_1){ +static inline void ___constructor__F_R2sSi_autogen___1(struct S *___dst__R2sS_1, signed int __a__i_1){ ((void)((*___dst__R2sS_1).__a__i_1=__a__i_1) /* ?{} */); ((void)((*___dst__R2sS_1).__b__i_1) /* ?{} */); ((void)((*___dst__R2sS_1).__c__i_1) /* ?{} */); } -static inline void ___constructor__F_R2sSii_autogen___1(struct S *___dst__R2sS_1, int __a__i_1, int __b__i_1){ +static inline void ___constructor__F_R2sSii_autogen___1(struct S *___dst__R2sS_1, signed int __a__i_1, signed int __b__i_1){ ((void)((*___dst__R2sS_1).__a__i_1=__a__i_1) /* ?{} */); ((void)((*___dst__R2sS_1).__b__i_1=__b__i_1) /* ?{} */); ((void)((*___dst__R2sS_1).__c__i_1) /* ?{} */); } -static inline void ___constructor__F_R2sSiii_autogen___1(struct S *___dst__R2sS_1, int __a__i_1, int __b__i_1, int __c__i_1){ +static inline void ___constructor__F_R2sSiii_autogen___1(struct S *___dst__R2sS_1, signed int __a__i_1, signed int __b__i_1, signed int __c__i_1){ ((void)((*___dst__R2sS_1).__a__i_1=__a__i_1) /* ?{} */); ((void)((*___dst__R2sS_1).__b__i_1=__b__i_1) /* ?{} */); @@ -56,7 +56,7 @@ } __extension__ union U { - __extension__ int __a__i_1; - __extension__ int __b__i_1; - __extension__ int __c__i_1; + __extension__ signed int __a__i_1; + __extension__ signed int __b__i_1; + __extension__ signed int __c__i_1; }; static inline void ___constructor__F_R2uU_autogen___1(__attribute__ ((unused)) union U *___dst__R2uU_1){ @@ -73,6 +73,6 @@ return ((union U )___ret__2uU_1); } -static inline void ___constructor__F_R2uUi_autogen___1(__attribute__ ((unused)) union U *___dst__R2uU_1, int __src__i_1){ - ((void)__builtin_memcpy(((void *)___dst__R2uU_1), ((const void *)(&__src__i_1)), sizeof(int ))); +static inline void ___constructor__F_R2uUi_autogen___1(__attribute__ ((unused)) union U *___dst__R2uU_1, signed int __src__i_1){ + ((void)__builtin_memcpy(((void *)___dst__R2uU_1), ((const void *)(&__src__i_1)), sizeof(signed int ))); } __extension__ enum E { @@ -81,35 +81,35 @@ __B__C2eE_1, }; -__extension__ int __f__Fi___1(); -__extension__ int i; -__extension__ int j; -__extension__ int __fred__Fi_i__1(int __p__i_1){ - __attribute__ ((unused)) int ___retval_fred__i_1; +__extension__ signed int __f__Fi___1(); +__extension__ signed int i; +__extension__ signed int j; +__extension__ signed int __fred__Fi_i__1(signed int __p__i_1){ + __attribute__ ((unused)) signed int ___retval_fred__i_1; __extension__ struct S { - __extension__ int __a__i_2; - __extension__ int __b__i_2; - __extension__ int __c__i_2; - __extension__ int *__x__Pi_2; - __extension__ int *__y__Pi_2; - __extension__ int *__z__Pi_2; + __extension__ signed int __a__i_2; + __extension__ signed int __b__i_2; + __extension__ signed int __c__i_2; + __extension__ signed int *__x__Pi_2; + __extension__ signed int *__y__Pi_2; + __extension__ signed int *__z__Pi_2; }; - int __i__i_2 = ((int )(__extension__ __a__i_1+__extension__ 3)); + signed int __i__i_2 = ((signed int )(__extension__ __a__i_1+__extension__ 3)); ((void)__extension__ 3); ((void)__extension__ __a__i_1); - __extension__ int __a__i_2; - __extension__ int __b__i_2; - __extension__ int __c__i_2; + __extension__ signed int __a__i_2; + __extension__ signed int __b__i_2; + __extension__ signed int __c__i_2; ((void)(__extension__ __a__i_2=(__extension__ __b__i_2+__extension__ __c__i_2))); - int _tmp_cp_ret0; + signed int _tmp_cp_ret0; ((void)(((void)(_tmp_cp_ret0=__extension__ __fred__Fi_i__1(3))) , _tmp_cp_ret0)); ((void)(_tmp_cp_ret0) /* ^?{} */); - __extension__ int __mary__Fi_i__2(int __p__i_2){ - __attribute__ ((unused)) int ___retval_mary__i_2; + __extension__ signed int __mary__Fi_i__2(signed int __p__i_2){ + __attribute__ ((unused)) signed int ___retval_mary__i_2; } ((void)__extension__ sizeof(3)); - ((void)__extension__ (((int )(3!=((int )0))) || ((int )(4!=((int )0))))); + ((void)__extension__ (((signed int )(3!=((signed int )0))) || ((signed int )(4!=((signed int )0))))); ((void)__extension__ __alignof__(__extension__ __a__i_2)); - ((void)(((int )(__extension__ __a__i_2!=((int )0))) || ((int )((((int )(__extension__ __b__i_2!=((int )0))) && ((int )(__extension__ __c__i_2!=((int )0))))!=((int )0))))); - ((void)(((int )((__extension__ __a__i_2>__extension__ __b__i_2)!=((int )0))) ? __extension__ __c__i_2 : __extension__ __c__i_2)); + ((void)(((signed int )(__extension__ __a__i_2!=((signed int )0))) || ((signed int )((((signed int )(__extension__ __b__i_2!=((signed int )0))) && ((signed int )(__extension__ __c__i_2!=((signed int )0))))!=((signed int )0))))); + ((void)(((signed int )((__extension__ __a__i_2>__extension__ __b__i_2)!=((signed int )0))) ? __extension__ __c__i_2 : __extension__ __c__i_2)); ((void)(__extension__ __a__i_2=__extension__ (__extension__ __b__i_2+__extension__ __c__i_2))); ((void)(((void)(((void)__extension__ __a__i_2) , __extension__ __b__i_2)) , __extension__ __c__i_2)); Index: src/tests/.expect/64/gccExtensions.txt =================================================================== --- src/tests/.expect/64/gccExtensions.txt (revision 3f8dd01362faf0f98d59ad95a39521b5ccefbad9) +++ src/tests/.expect/64/gccExtensions.txt (revision a54840b150210fdedf1bf84dc118deea22554dba) @@ -1,45 +1,45 @@ -__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(long unsigned int __size); +__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned long int __size); __attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr); __attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void); -__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern int atexit(void (*__func)(void)); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(int __status); -extern int printf(const char *__restrict __format, ...); -extern int __x__i_1 asm ( "xx" ); -int __main__Fi_iPPCc__1(int __argc__i_1, const char **__argv__PPCc_1){ - __attribute__ ((unused)) int ___retval_main__i_1; +__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern signed int atexit(void (*__func)(void)); +__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(signed int __status); +extern signed int printf(const char *__restrict __format, ...); +extern signed int __x__i_1 asm ( "xx" ); +signed int __main__Fi_iPPCc__1(signed int __argc__i_1, const char **__argv__PPCc_1){ + __attribute__ ((unused)) signed int ___retval_main__i_1; asm ( "nop" : : : ); asm ( "nop" : : : ); asm ( "nop" : : : ); - static int __y__i_2 asm ( "yy" ); - static int *__z__Pi_2 asm ( "zz" ); - int __src__i_2; - int __dst__i_2; - asm volatile ( "mov %1, %0\n\tadd $1, %0" : : : ); - asm volatile ( "mov %1, %0\n\tadd $1, %0" : "=r" ( __dst__i_2 ) : : ); - asm volatile ( "mov %1, %0\n\tadd $1, %0" : "=r" ( __dst__i_2 ) : "r" ( __src__i_2 ) : ); - asm ( "mov %1, %0\n\tadd $1, %0" : "=r" ( __dst__i_2 ), "=r" ( __src__i_2 ) : [ __src__i_2 ] "r" ( __dst__i_2 ) : "r0" ); + static signed int __y__i_2 asm ( "yy" ); + static signed int *__z__Pi_2 asm ( "zz" ); + signed int __src__i_2; + signed int __dst__i_2; + asm volatile ( "mov %1, %0\n\t" "add $1, %0" : : : ); + asm volatile ( "mov %1, %0\n\t" "add $1, %0" : "=" "r" ( __dst__i_2 ) : : ); + asm volatile ( "mov %1, %0\n\t" "add $1, %0" : "=r" ( __dst__i_2 ) : "r" ( __src__i_2 ) : ); + asm ( "mov %1, %0\n\t" "add $1, %0" : "=r" ( __dst__i_2 ), "=r" ( __src__i_2 ) : [ __src__i_2 ] "r" ( __dst__i_2 ) : "r0" ); L2: L1: asm goto ( "frob %%r5, %1; jc %l[L1]; mov (%2), %%r5" : : "r" ( __src__i_2 ), "r" ( (&__dst__i_2) ) : "r5", "memory" : L1, L2 ); double _Complex __c1__Xd_2; double _Complex __c2__Xd_2; - const int __i1__Ci_2; - const int __i2__Ci_2; - const int __i3__Ci_2; - inline int __f1__Fi___2(){ - __attribute__ ((unused)) int ___retval_f1__i_2; + const signed int __i1__Ci_2; + const signed int __i2__Ci_2; + const signed int __i3__Ci_2; + inline signed int __f1__Fi___2(){ + __attribute__ ((unused)) signed int ___retval_f1__i_2; } - inline int __f2__Fi___2(){ - __attribute__ ((unused)) int ___retval_f2__i_2; + inline signed int __f2__Fi___2(){ + __attribute__ ((unused)) signed int ___retval_f2__i_2; } - int __s1__i_2; - int __s2__i_2; - volatile int __v1__Vi_2; - volatile int __v2__Vi_2; - int __t1___2; - int __t2___2; - __extension__ const int __ex__Ci_2; + signed int __s1__i_2; + signed int __s2__i_2; + volatile signed int __v1__Vi_2; + volatile signed int __v2__Vi_2; + signed int __t1___2; + signed int __t2___2; + __extension__ const signed int __ex__Ci_2; struct S { - __extension__ int __a__i_2; - __extension__ int __b__i_2; - __extension__ int __c__i_2; + __extension__ signed int __a__i_2; + __extension__ signed int __b__i_2; + __extension__ signed int __c__i_2; }; inline void ___constructor__F_R2sS_autogen___2(struct S *___dst__R2sS_2){ @@ -66,38 +66,38 @@ return ((struct S )___ret__2sS_2); } - inline void ___constructor__F_R2sSi_autogen___2(struct S *___dst__R2sS_2, int __a__i_2){ + inline void ___constructor__F_R2sSi_autogen___2(struct S *___dst__R2sS_2, signed int __a__i_2){ ((void)((*___dst__R2sS_2).__a__i_2=__a__i_2) /* ?{} */); ((void)((*___dst__R2sS_2).__b__i_2) /* ?{} */); ((void)((*___dst__R2sS_2).__c__i_2) /* ?{} */); } - inline void ___constructor__F_R2sSii_autogen___2(struct S *___dst__R2sS_2, int __a__i_2, int __b__i_2){ + inline void ___constructor__F_R2sSii_autogen___2(struct S *___dst__R2sS_2, signed int __a__i_2, signed int __b__i_2){ ((void)((*___dst__R2sS_2).__a__i_2=__a__i_2) /* ?{} */); ((void)((*___dst__R2sS_2).__b__i_2=__b__i_2) /* ?{} */); ((void)((*___dst__R2sS_2).__c__i_2) /* ?{} */); } - inline void ___constructor__F_R2sSiii_autogen___2(struct S *___dst__R2sS_2, int __a__i_2, int __b__i_2, int __c__i_2){ + inline void ___constructor__F_R2sSiii_autogen___2(struct S *___dst__R2sS_2, signed int __a__i_2, signed int __b__i_2, signed int __c__i_2){ ((void)((*___dst__R2sS_2).__a__i_2=__a__i_2) /* ?{} */); ((void)((*___dst__R2sS_2).__b__i_2=__b__i_2) /* ?{} */); ((void)((*___dst__R2sS_2).__c__i_2=__c__i_2) /* ?{} */); } - int __i__i_2 = ((int )__extension__ 3); - __extension__ int __a__i_2; - __extension__ int __b__i_2; - __extension__ int __c__i_2; + signed int __i__i_2 = ((signed int )__extension__ 3); + __extension__ signed int __a__i_2; + __extension__ signed int __b__i_2; + __extension__ signed int __c__i_2; ((void)(((void)(((void)__extension__ __a__i_2) , __extension__ __b__i_2)) , __extension__ __c__i_2)); ((void)(__extension__ __a__i_2=(__extension__ __b__i_2+__extension__ __c__i_2))); ((void)(__extension__ __a__i_2=__extension__ (__extension__ __b__i_2+__extension__ __c__i_2))); - int __a1__i_2; - const int __a2__Ci_2; - static const int __a3__Ci_2; - static const int __a4__Ci_2; - static const int __a5__Ci_2; - static const int __a6__Ci_2; - static const int __a7__Ci_2; - int *__p1__Pi_2; - int *__p2__Pi_2; + signed int __a1__i_2; + const signed int __a2__Ci_2; + static const signed int __a3__Ci_2; + static const signed int __a4__Ci_2; + static const signed int __a5__Ci_2; + static const signed int __a6__Ci_2; + static const signed int __a7__Ci_2; + signed int *__p1__Pi_2; + signed int *__p2__Pi_2; struct s1; struct s2 { - int __i__i_2; + signed int __i__i_2; }; inline void ___constructor__F_R3ss2_autogen___2(struct s2 *___dst__R3ss2_2){ @@ -116,9 +116,9 @@ return ((struct s2 )___ret__3ss2_2); } - inline void ___constructor__F_R3ss2i_autogen___2(struct s2 *___dst__R3ss2_2, int __i__i_2){ + inline void ___constructor__F_R3ss2i_autogen___2(struct s2 *___dst__R3ss2_2, signed int __i__i_2){ ((void)((*___dst__R3ss2_2).__i__i_2=__i__i_2) /* ?{} */); } struct s3 { - int __i__i_2; + signed int __i__i_2; }; inline void ___constructor__F_R3ss3_autogen___2(struct s3 *___dst__R3ss3_2){ @@ -137,5 +137,5 @@ return ((struct s3 )___ret__3ss3_2); } - inline void ___constructor__F_R3ss3i_autogen___2(struct s3 *___dst__R3ss3_2, int __i__i_2){ + inline void ___constructor__F_R3ss3i_autogen___2(struct s3 *___dst__R3ss3_2, signed int __i__i_2){ ((void)((*___dst__R3ss3_2).__i__i_2=__i__i_2) /* ?{} */); } @@ -143,5 +143,5 @@ struct s3 __y1__3ss3_2; struct s4 { - int __i__i_2; + signed int __i__i_2; }; inline void ___constructor__F_R3ss4_autogen___2(struct s4 *___dst__R3ss4_2){ @@ -160,30 +160,30 @@ return ((struct s4 )___ret__3ss4_2); } - inline void ___constructor__F_R3ss4i_autogen___2(struct s4 *___dst__R3ss4_2, int __i__i_2){ + inline void ___constructor__F_R3ss4i_autogen___2(struct s4 *___dst__R3ss4_2, signed int __i__i_2){ ((void)((*___dst__R3ss4_2).__i__i_2=__i__i_2) /* ?{} */); } struct s4 __x2__3ss4_2; struct s4 __y2__3ss4_2; - int __m1__A0i_2[((long unsigned int )10)]; - int __m2__A0A0i_2[((long unsigned int )10)][((long unsigned int )10)]; - int __m3__A0A0i_2[((long unsigned int )10)][((long unsigned int )10)]; - ((void)(___retval_main__i_1=((int )0)) /* ?{} */); - return ((int )___retval_main__i_1); + signed int __m1__A0i_2[((unsigned long int )10)]; + signed int __m2__A0A0i_2[((unsigned long int )10)][((unsigned long int )10)]; + signed int __m3__A0A0i_2[((unsigned long int )10)][((unsigned long int )10)]; + ((void)(___retval_main__i_1=((signed int )0)) /* ?{} */); + return ((signed int )___retval_main__i_1); ((void)(___retval_main__i_1=0) /* ?{} */); - return ((int )___retval_main__i_1); + return ((signed int )___retval_main__i_1); } static inline int invoke_main(int argc, char* argv[], char* envp[]) { (void)argc; (void)argv; (void)envp; return __main__Fi_iPPCc__1(argc, argv); } -__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(long unsigned int __size); +__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned long int __size); __attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr); __attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void); -__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern int atexit(void (*__func)(void)); -__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(int __status); -extern int printf(const char *__restrict __format, ...); -static inline int invoke_main(int argc, char **argv, char **envp); -int main(int __argc__i_1, char **__argv__PPc_1, char **__envp__PPc_1){ - __attribute__ ((unused)) int ___retval_main__i_1; - int _tmp_cp_ret0; +__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern signed int atexit(void (*__func)(void)); +__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(signed int __status); +extern signed int printf(const char *__restrict __format, ...); +static inline signed int invoke_main(signed int argc, char **argv, char **envp); +signed int main(signed int __argc__i_1, char **__argv__PPc_1, char **__envp__PPc_1){ + __attribute__ ((unused)) signed int ___retval_main__i_1; + signed int _tmp_cp_ret0; ((void)(___retval_main__i_1=(((void)(_tmp_cp_ret0=invoke_main(__argc__i_1, __argv__PPc_1, __envp__PPc_1))) , _tmp_cp_ret0)) /* ?{} */); ((void)(_tmp_cp_ret0) /* ^?{} */); - return ((int )___retval_main__i_1); + return ((signed int )___retval_main__i_1); }