Changeset b3976bf for tests

Timestamp:

Aug 12, 2019, 11:05:36 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

dee1f89

Parents:

cc4218f (diff), 4f5a8a2 (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 plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

tests

Files:

• .expect/gccExtensions.x64.txt (modified) (1 diff)
• .expect/gccExtensions.x86.txt (modified) (1 diff)
• Makefile.in (modified) (2 diffs)
• gccExtensions.cfa (modified) (3 diffs)
• pybin/settings.py (modified) (1 diff)

tests/.expect/gccExtensions.x64.txt

@@ -291 +291 @@
     signed int _X2m2A0A0i_2[((unsigned long int )10)][((unsigned long int )10)];
     signed int _X2m3A0A0i_2[((unsigned long int )10)][((unsigned long int )10)];
-    {
-        ((void)(_X12_retval_maini_1=0) /* ?{} */);
-    }
-
-    return _X12_retval_maini_1;
+    void _X4f128Fv_n__2(__int128 _X1in_2);
+    void _X4f128Fv_o__2(unsigned __int128 __anonymous_object0);
+    __int128 _X6i128_0n_2;
+    {
+        ((void)_X4f128Fv_n__2(_X6i128_0n_2));
+    }
+
+    unsigned __int128 _X6i128_1o_2;
+    {
+        ((void)_X4f128Fv_o__2(_X6i128_1o_2));
+    }
+
+    __int128 _X6i128_2n_2;
+    {
+        ((void)_X4f128Fv_n__2(_X6i128_2n_2));
+    }
+
+    unsigned __int128 _X6i128_3o_2;
+    {
+        ((void)_X4f128Fv_o__2(_X6i128_3o_2));
+    }
+
     {
         ((void)(_X12_retval_maini_1=0) /* ?{} */);

tests/.expect/gccExtensions.x86.txt

@@ -296 +296 @@
 
     return _X12_retval_maini_1;
-    {
-        ((void)(_X12_retval_maini_1=0) /* ?{} */);
-    }
-
-    return _X12_retval_maini_1;
 }
 static inline int invoke_main(int argc, char* argv[], char* envp[]) { (void)argc; (void)argv; (void)envp; return _X4mainFi_iPPKc__1((signed int )argc, (const char **)argv); }

tests/Makefile.in

@@ -235 +235 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
+DEMANGLER = @DEMANGLER@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -260 +261 @@
 LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
 LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
+LIBDEMANGLE = @LIBDEMANGLE@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@

tests/gccExtensions.cfa

@@ -10 +10 @@
 // Created On       : Sun Aug 14 17:28:17 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov  6 17:54:20 2018
-// Update Count     : 11
+// Last Modified On : Mon Aug  5 18:04:37 2019
+// Update Count     : 28
 // 
 
@@ -50 +50 @@
 
   L1: L2:
-        asm goto ( "frob %%r5, %1; jc %l[L1]; mov (%2), %%r5"
-                           : /* No outputs. */
-                           : "r"(src), "r"(&dst)
-                           : "r5", "memory"
-                           : L1, L2 );
+        asm goto ( "frob %%r5, %1; jc %l[L1]; mov (%2), %%r5"
+                           : /* No outputs. */
+                           : "r"(src), "r"(&dst)
+                           : "r5", "memory"
+                           : L1, L2 );
 
         // alternative type/qualifer names
@@ -110 +110 @@
         struct __attribute(()) s4 { int i; } x2, y2 __attribute(());
 
-        int m1 [10] __attribute(());
-        int m2 [10][10] __attribute(());
+        int m1[10] __attribute(());
+        int m2[10][10] __attribute(());
         int __attribute(()) m3 [10][10];
 //      int ( __attribute(()) m4 [10] )[10];
 
-        return 0;
+        // int128
+
+#if defined( __SIZEOF_INT128__ )
+        void f128( __int128 i );
+        void f128( __uint128_t );
+
+        __int128 i128_0;
+        f128( i128_0 );
+        unsigned __int128 i128_1;
+        f128( i128_1 );
+        __int128_t i128_2;
+        f128( i128_2 );
+        __uint128_t i128_3;
+        f128( i128_3 );
+#endif
 }
 

tests/pybin/settings.py

@@ -19 +19 @@
 class Architecture:
         KnownArchitectures = {
-                'x64'                   : 'x64',
-                'x86-64'                : 'x64',
-                'x86_64'                : 'x64',
-                'aarch64'               : 'x64',
-                'x86'                   : 'x86',
+                'x64'           : 'x64',
+                'x86-64'        : 'x64',
+                'x86_64'        : 'x64',
+                'x86'           : 'x86',
+                'aarch64'       : 'arm',
                 'i386'          : 'x86',
                 'i486'          : 'x86',
                 'i686'          : 'x86',
                 'Intel 80386'   : 'x86',
-                'arm'                   : 'arm',
-                'ARM'                   : 'arm',
+                'arm'           : 'arm',
+                'ARM'           : 'arm',
         }