Changeset e1056381 for tests

Timestamp:

Apr 7, 2020, 3:41:37 PM (2 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

arm-eh, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr

Children:

b72bc043

Parents:

ed12051 (diff), dccd1b0 (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/alloc.txt (modified) (1 diff)
• .expect/bitmanip.x64.txt (deleted)
• .expect/bitmanip.x86.txt (deleted)
• .expect/bitmanip1.x64.txt (added)
• .expect/bitmanip2.x64.txt (added)
• alloc.cfa (modified) (3 diffs)
• bitmanip.cfa (deleted)
• bitmanip1.cfa (added)
• bitmanip2.cfa (added)
• exceptions/.expect/interact.txt (modified) (1 diff)
• exceptions/.expect/resume.txt (modified) (1 diff)
• exceptions/.expect/terminate.txt (modified) (1 diff)
• exceptions/interact.cfa (modified) (2 diffs)
• exceptions/resume.cfa (modified) (1 diff)
• exceptions/terminate.cfa (modified) (1 diff)

tests/.expect/alloc.txt

@@ -35 +35 @@
 CFA realloc array alloc, fill
 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede 
-CFA realloc array alloc, 5
-0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede 0xdededede 
-CFA realloc array alloc, 5
-0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 
-CFA realloc array alloc, 5
-0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 
 
 C   memalign 42 42.5

tests/alloc.cfa

@@ -10 +10 @@
 // Created On       : Wed Feb  3 07:56:22 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Apr  1 10:58:35 2020
-// Update Count     : 424
+// Last Modified On : Mon Apr  6 21:08:23 2020
+// Update Count     : 428
 //
 
@@ -151 +151 @@
         ip = alloc_set( ip, 3 * dim, fill );                            // CFA realloc array alloc, fill
         printf( "CFA realloc array alloc, fill\n" );
-        for ( i; 3 * dim ) { printf( "%#x ", ip[i] );; }
-        printf( "\n" );
-        // do not free
-
-        ip = alloc_set( ip, 3 * dim, 5 );                                       // CFA realloc array alloc, 5
+        for ( i; 3 * dim ) { printf( "%#x ", ip[i] ); }
+        printf( "\n" );
+        // do not free
+#if 0 // FIX ME
+        ip = alloc_set( ip, 5 * dim, 5 );                                       // CFA realloc array alloc, 5
         printf( "CFA realloc array alloc, 5\n" );
-        for ( i; 3 * dim ) { printf( "%#x ", ip[i] ); }
+        for ( i; 5 * dim ) { printf( "%#x ", ip[i] ); }
         printf( "\n" );
         // do not free
@@ -167 +167 @@
         // do not free
 
-        ip = alloc_set( ip, 3 * dim, 5 );                                       // CFA realloc array alloc, 5
+        ip = alloc_set( ip, 5 * dim, 5 );                                       // CFA realloc array alloc, 5
         printf( "CFA realloc array alloc, 5\n" );
-        for ( i; 3 * dim ) { printf( "%#x ", ip[i] );; }
-        printf( "\n" );
-        free( ip );
-
+        for ( i; 5 * dim ) { printf( "%#x ", ip[i] ); }
+        printf( "\n" );
+#endif // 0
+        free( ip );
 
         // resize, non-array types

tests/exceptions/.expect/interact.txt

@@ -14 +14 @@
 resumption catch, will terminate
 inner termination catch
+
+throwing resume moon
+resumption moon catch, will terminate
+termination catch
+throwing resume star
+resumption star catch

tests/exceptions/.expect/resume.txt

@@ -25 +25 @@
 caught second exception
 recaught first exception
+
+inner catch
+inner catch
+outer catch

tests/exceptions/.expect/terminate.txt

@@ -24 +24 @@
 caught second exception
 recaught first exception
+
+inner catch
+outer catch

tests/exceptions/interact.cfa

@@ -86 +86 @@
                 printf("outer terminate catch (error)\n");
         }
-#if 0
         printf("\n");
 
@@ -111 +110 @@
                 printf("outermost catch (error)\n");
         }
-#endif
 }

tests/exceptions/resume.cfa

@@ -99 +99 @@
                 printf("caught second exception (bad location)\n");
         }
+        printf("\n");
+
+        // Check successive operations.
+        try {
+                try {
+                        THROW_RESUME(&(zen){});
+                        THROW_RESUME(&(zen){});
+                } catchResume (zen *) {
+                        printf("inner catch\n");
+                }
+                THROW_RESUME(&(zen){});
+        } catchResume (zen *) {
+                printf("outer catch\n");
+        }
 }

tests/exceptions/terminate.cfa

@@ -99 +99 @@
                 printf("caught second exception (bad location)\n");
         }
+        printf("\n");
+
+        // Check successive operations.
+        try {
+                try {
+                        THROW(&(zen){});
+                        THROW(&(zen){});
+                } catch (zen *) {
+                        printf("inner catch\n");
+                }
+                THROW(&(zen){});
+        } catch (zen *) {
+                printf("outer catch\n");
+        }
 }