Changeset 4a7d895 for src/tests


Ignore:
Timestamp:
Aug 20, 2016, 5:33:07 AM (9 years ago)
Author:
Aaron Moss <bruceiv@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc
Children:
80722d0
Parents:
7b1bfc5 (diff), 2037f82 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of plg2.cs.uwaterloo.ca:software/cfa/cfa-cc

Location:
src/tests
Files:
2 added
1 deleted
13 edited

Legend:

Unmodified
Added
Removed

  • src/tests/.expect/32/gccExtensions.txt

    r7b1bfc5 r4a7d895  
    1111    asm ( "nop" :  :  :  );
    1212    static int __y__i_2;
     13    static int *__z__Pi_2;
    1314    int __src__i_2;
    1415    int __dst__i_2;
    … …  
    1718    asm volatile ( "mov %1, %0\n\tadd $1, %0" : "=r" ( __dst__i_2 ) : "r" ( __src__i_2 ) :  );
    1819    asm ( "mov %1, %0\n\tadd $1, %0" : "=r" ( __dst__i_2 ), "=r" ( __src__i_2 ) : [ __src__i_2 ] "r" ( __dst__i_2 ) : "r0" );
     20    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 );
    1921    double _Complex __c1__Xd_2;
    2022    double _Complex __c2__Xd_2;
    … …  
    2224    const int __i2__Ci_2;
    2325    const int __i3__Ci_2;
     26    inline int __f1__Fi___2(){
     27    }
     28    inline int __f2__Fi___2(){
     29    }
     30    int __s1__i_2;
     31    int __s2__i_2;
     32    volatile int __v1__Vi_2;
     33    volatile int __v2__Vi_2;
     34    int __t1___2;
     35    int __t2___2;
    2436    __extension__ const int __ex__Ci_2;
    2537    struct S {
    … …  
    7284    ((void)(__extension__ __a__i_2=(__extension__ __b__i_2+__extension__ __c__i_2)));
    7385    ((void)(__extension__ __a__i_2=__extension__ (__extension__ __b__i_2+__extension__ __c__i_2)));
    74     inline int __f1__Fi___2(){
    75     }
    76     inline int __f2__Fi___2(){
    77     }
    78     int __s1__i_2;
    79     int __s2__i_2;
    80     int __t1___2;
    81     int __t2___2;
    82     volatile int __v1__Vi_2;
    83     volatile int __v2__Vi_2;
    8486    int __a1__i_2;
    8587    const int __a2__Ci_2;

  • src/tests/.expect/64/gccExtensions.txt

    r7b1bfc5 r4a7d895  
    1111    asm ( "nop" :  :  :  );
    1212    static int __y__i_2;
     13    static int *__z__Pi_2;
    1314    int __src__i_2;
    1415    int __dst__i_2;
    … …  
    2324    const int __i2__Ci_2;
    2425    const int __i3__Ci_2;
     26    inline int __f1__Fi___2(){
     27    }
     28    inline int __f2__Fi___2(){
     29    }
     30    int __s1__i_2;
     31    int __s2__i_2;
     32    volatile int __v1__Vi_2;
     33    volatile int __v2__Vi_2;
     34    int __t1___2;
     35    int __t2___2;
    2536    __extension__ const int __ex__Ci_2;
    2637    struct S {
    … …  
    7384    ((void)(__extension__ __a__i_2=(__extension__ __b__i_2+__extension__ __c__i_2)));
    7485    ((void)(__extension__ __a__i_2=__extension__ (__extension__ __b__i_2+__extension__ __c__i_2)));
    75     inline int __f1__Fi___2(){
    76     }
    77     inline int __f2__Fi___2(){
    78     }
    79     int __s1__i_2;
    80     int __s2__i_2;
    81     int __t1___2;
    82     int __t2___2;
    83     volatile int __v1__Vi_2;
    84     volatile int __v2__Vi_2;
    8586    int __a1__i_2;
    8687    const int __a2__Ci_2;

  • src/tests/.expect/declarationErrors.txt

    r7b1bfc5 r4a7d895  
    11CFA Version 1.0.0 (debug)
    2 Error: invalid combination of storage classes in declaration of x9: static static volatile const short int
     2Error: invalid combination of storage classes in declaration of x9: static volatile const short int
    33
    4 Error: invalid combination of storage classes in declaration of x18: static static const volatile instance of struct __anonymous0
     4Error: invalid combination of storage classes in declaration of x18: static const volatile instance of struct __anonymous0
    55  with members
    6     i: int
    76   with body
    87
    98
    10 Error: invalid combination of storage classes in declaration of x19: static static const volatile volatile instance of struct __anonymous1
     9Error: invalid combination of storage classes in declaration of x19: static const volatile volatile instance of struct __anonymous1
    1110  with members
    12     i: int
    1311   with body
    1412
    1513
    16 Error: invalid combination of storage classes in declaration of x28: static static volatile const instance of type Int
     14Error: invalid combination of storage classes in declaration of x28: static volatile const instance of type Int
    1715
    1816make: *** [declarationErrors] Error 1

  • src/tests/Makefile.am

    r7b1bfc5 r4a7d895  
    5353        ${CC} ${CFLAGS} -DERR2 ${<} -o ${@}
    5454
     55declarationSpecifier: declarationSpecifier.c
     56        ${CC} ${CFALGS} -CFA -XCFA -p ${<} -o ${@}
     57
    5558gccExtensions : gccExtensions.c
    5659        ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}

  • src/tests/Makefile.in

    r7b1bfc5 r4a7d895  
    661661        ${CC} ${CFLAGS} -DERR2 ${<} -o ${@}
    662662
     663declarationSpecifier: declarationSpecifier.c
     664        ${CC} ${CFALGS} -CFA -XCFA -p ${<} -o ${@}
     665
    663666gccExtensions : gccExtensions.c
    664667        ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}

  • src/tests/declarationErrors.c

    r7b1bfc5 r4a7d895  
    1 static short int volatile static const x9;              // duplicate static
    2 struct { int i; } const static volatile static x18;     // duplicate static
     1//
     2// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
     3//
     4// The contents of this file are covered under the licence agreement in the
     5// file "LICENCE" distributed with Cforall.
     6//
     7// declarationErrors.c --
     8//
     9// Author           : Peter A. Buhr
     10// Created On       : Wed Aug 17 08:23:43 2016
     11// Last Modified By : Peter A. Buhr
     12// Last Modified On : Wed Aug 17 08:27:15 2016
     13// Update Count     : 2
     14//
     15
     16const short static int volatile x4;
     17const static volatile short int x4;
     18static short int volatile static const x9;                              // duplicate static
     19struct { int i; } const static volatile static x18;             // duplicate static
    320struct { int i; } const static volatile static volatile x19; // duplicate static & volatile
    421typedef int Int;
    5 static Int volatile static const x28;                   // duplicate static
     22static Int volatile static const x28;                                   // duplicate static
     23
     24const static inline const volatile int f01();                   // duplicate const
     25volatile inline const volatile static int f02();                // duplicate volatile
     26const inline const volatile int static f03();                   // duplicate const
     27volatile inline static const volatile int f04();                // duplicate volatile
     28const static const inline volatile int f05();                   // duplicate const
     29volatile static const volatile inline int f06();                // duplicate volatile
     30const static const volatile int inline f07();                   // duplicate const
     31volatile static const int inline volatile f08();                // duplicate volatile
    632
    733//Dummy main
    … …  
    1036        return 0;
    1137}
     38
     39// Local Variables: //
     40// tab-width: 4 //
     41// compile-command: "cfa declarationErrors.c" //
     42// End: //

  • src/tests/declarationSpecifier.c

    r7b1bfc5 r4a7d895  
     1//
     2// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
     3//
     4// The contents of this file are covered under the licence agreement in the
     5// file "LICENCE" distributed with Cforall.
     6//
     7// declarationSpecifier.c --
     8//
     9// Author           : Peter A. Buhr
     10// Created On       : Wed Aug 17 08:21:04 2016
     11// Last Modified By : Peter A. Buhr
     12// Last Modified On : Wed Aug 17 08:24:33 2016
     13// Update Count     : 2
     14//
     15
    116typedef short int Int;
    2 
    317
    418const short int volatile x1;
    519static const short int volatile x2;
    620const static short int volatile x3;
    7 const short static int volatile x4;
    821const static volatile short int x4;
    922const short int static volatile x5;
    … …  
    1124const short volatile int static x7;
    1225short int volatile static const x8;
    13 static short int volatile static const x9;              // duplicate static
    1426
    1527const volatile struct { int i; } x10;
    … …  
    2133struct { int i; } const static volatile x16;
    2234struct { int i; } const volatile static x17;
    23 struct { int i; } const static volatile static x18;     // duplicate static
    24 struct { int i; } const static volatile static volatile x19; // duplicate static & volatile
    2535
    2636const Int volatile x20;
    … …  
    3242const volatile Int static x26;
    3343Int volatile static const x27;
    34 static Int volatile static const x28;                   // duplicate static
    3544
    3645const volatile struct { Int i; } x29;
    … …  
    4251struct { Int i; } const static volatile x35;
    4352struct { Int i; } const volatile static x36;
    44 
    45 
    46 const static inline const volatile int f01();           // duplicate const
    47 volatile inline const volatile static int f02();        // duplicate volatile
    48 const inline const volatile int static f03();           // duplicate const
    49 volatile inline static const volatile int f04();        // duplicate volatile
    50 const static const inline volatile int f05();           // duplicate const
    51 volatile static const volatile inline int f06();        // duplicate volatile
    52 const static const volatile int inline f07();           // duplicate const
    53 volatile static const int inline volatile f08();        // duplicate volatile
    5453
    5554static inline const volatile int f11();
    … …  
    9493        return 0;
    9594}
     95
     96// Local Variables: //
     97// tab-width: 4 //
     98// compile-command: "cfa declarationSpecifier.c" //
     99// End: //

  • src/tests/dtor-early-exit.c

    r7b1bfc5 r4a7d895  
     1//
     2// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
     3//
     4// The contents of this file are covered under the licence agreement in the
     5// file "LICENCE" distributed with Cforall.
     6//
     7// dtor-early-exit.c --
     8//
     9// Author           : Rob Schluntz
     10// Created On       : Wed Aug 17 08:26:25 2016
     11// Last Modified By : Peter A. Buhr
     12// Last Modified On : Wed Aug 17 08:29:37 2016
     13// Update Count     : 2
     14//
     15
    116#include <fstream>
    217#include <stdlib>
    … …  
    215230        h();
    216231}
     232
     233// Local Variables: //
     234// tab-width: 4 //
     235// compile-command: "cfa dtor-early-exit" //
     236// End: //

  • src/tests/functions.c

    r7b1bfc5 r4a7d895  
     1//
     2// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
     3//
     4// The contents of this file are covered under the licence agreement in the
     5// file "LICENCE" distributed with Cforall.
     6//
     7// functions.c --
     8//
     9// Author           : Peter A. Buhr
     10// Created On       : Wed Aug 17 08:39:58 2016
     11// Last Modified By : Peter A. Buhr
     12// Last Modified On : Wed Aug 17 08:40:52 2016
     13// Update Count     : 1
     14//
     15
    116// ANSI function definitions
    217
    … …  
    165180// Local Variables: //
    166181// tab-width: 4 //
     182// compile-command: "cfa functions.c" //
    167183// End: //

  • src/tests/gccExtensions.c

    r7b1bfc5 r4a7d895  
    11//
    2 // Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
     2// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
    33//
    44// The contents of this file are covered under the licence agreement in the
    … …  
    1010// Created On       : Sun Aug 14 17:28:17 2016
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Mon Aug 15 12:44:35 2016
    13 // Update Count     : 5
     12// Last Modified On : Wed Aug 17 09:26:50 2016
     13// Update Count     : 10
    1414//
    1515
    … …  
    1717
    1818int main(int argc, char const *argv[]) {
     19        // asm extensions
     20
    1921        asm( "nop" );
    2022        __asm( "nop" );
    … …  
    2224
    2325        static int y asm( "yy" );
    24 //      static * int z asm( "zz" );                                                     // CFA declaration
     26#ifdef __CFA__
     27        static * int z asm( "zz" );                                                     // CFA declaration
     28#endif // __CFA__
    2529
    2630        int src;
    … …  
    5256                           : L1, L2 );
    5357
     58        // alternative type/qualifer names
     59
    5460        __complex__ c1;
    5561        _Complex c2;
    … …  
    5864        __const int i2;
    5965        __const__ int i3;
     66
     67        __inline int f1() {}
     68        __inline__ int f2() {}
     69
     70        __signed s1;
     71        __signed s2;
     72
     73        __volatile int v1;
     74        __volatile__ int v2;
     75
     76        // symbol table attributes
     77
     78        __typeof(s1) t1;
     79        __typeof__(s1) t2;
     80
     81        // strange extension qualifier
    6082
    6183        __extension__ const int ex;
    … …  
    6991        __extension__ a = __extension__ ( __extension__ b + __extension__ c );
    7092
    71         __inline int f1() {}
    72         __inline__ int f2() {}
    73 
    74         __signed s1;
    75         __signed s2;
    76 
    77         __typeof(s1) t1;
    78         __typeof__(s1) t2;
    79 
    80         __volatile int v1;
    81         __volatile__ int v2;
     93        // attributes
    8294
    8395        __attribute__(()) int a1;

  • src/tests/identFuncDeclarator.c

    r7b1bfc5 r4a7d895  
     1//
     2// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
     3//
     4// The contents of this file are covered under the licence agreement in the
     5// file "LICENCE" distributed with Cforall.
     6//
     7// identFuncDeclarator.c --
     8//
     9// Author           : Peter A. Buhr
     10// Created On       : Wed Aug 17 08:36:34 2016
     11// Last Modified By : Peter A. Buhr
     12// Last Modified On : Wed Aug 17 08:37:06 2016
     13// Update Count     : 1
     14//
     15
    116int main() {
    217        int f1;
    … …  
    97112        int (* const(* const f81)(int))();
    98113}
     114
     115// Local Variables: //
     116// tab-width: 4 //
     117// compile-command: "cfa identFuncDeclarator.c" //
     118// End: //

  • src/tests/identParamDeclarator.c

    r7b1bfc5 r4a7d895  
     1//
     2// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
     3//
     4// The contents of this file are covered under the licence agreement in the
     5// file "LICENCE" distributed with Cforall.
     6//
     7// identParamDeclarator.c --
     8//
     9// Author           : Peter A. Buhr
     10// Created On       : Wed Aug 17 08:37:56 2016
     11// Last Modified By : Peter A. Buhr
     12// Last Modified On : Wed Aug 17 08:38:42 2016
     13// Update Count     : 1
     14//
     15
    116int fred(
    217        int f1,
    … …  
    147162        return 0;
    148163}
     164
     165// Local Variables: //
     166// tab-width: 4 //
     167// compile-command: "cfa identParamDeclarator.c" //
     168// End: //

  • src/tests/variableDeclarator.c

    r7b1bfc5 r4a7d895  
    1 //Variable declarations test
     1//
     2// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
     3//
     4// The contents of this file are covered under the licence agreement in the
     5// file "LICENCE" distributed with Cforall.
     6//
     7// variableDeclarator.c --
     8//
     9// Author           : Peter A. Buhr
     10// Created On       : Wed Aug 17 08:41:42 2016
     11// Last Modified By : Peter A. Buhr
     12// Last Modified On : Wed Aug 17 08:42:21 2016
     13// Update Count     : 1
     14//
     15
     16// Variable declarations test
    217int f1;
    318int (f2);
    … …  
    164179        return 0;
    165180}
     181
     182// Local Variables: //
     183// tab-width: 4 //
     184// compile-command: "cfa variableDeclarator.c" //
     185// End: //
Note: See TracChangeset for help on using the changeset viewer.