Changeset 63bde81 for tests

Timestamp:

Jul 19, 2021, 4:03:19 PM (4 years ago)

Author:

caparsons <caparson@…>

Branches:

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

Children:

f9b68d6

Parents:

12a1013 (diff), fcaa1e4 (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/polymorphism.txt (modified) (1 diff)
• polymorphism.cfa (modified) (2 diffs)
• unified_locking/mutex_test.hfa (modified) (2 diffs)

tests/.expect/polymorphism.txt

@@ -1 +1 @@
 123 456 456
 5 5
+=== checkPlan9offsets
+static:
+  offset of inner double: 8
+  offset of inner float:  16
+dynamic:
+  offset of inner double: 8
+  offset of inner float:  16

tests/polymorphism.cfa

@@ -54 +54 @@
         b.i = s.i;
         return b.j;
+}
+
+void checkPlan9offsets() {
+
+        forall( T )
+        struct thing {
+                T q;                // variable-sized padding
+                inline double;
+                inline float;
+        };
+
+        #define SHOW_OFFSETS \
+                double & x_inner_double = x; \
+                float  & x_inner_float  = x; \
+                printf("  offset of inner double: %ld\n", ((char *) & x_inner_double) - ((char *) & x) ); \
+                printf("  offset of inner float:  %ld\n", ((char *) & x_inner_float ) - ((char *) & x) );
+
+        void showStatic( thing(int) & x ) {
+                printf("static:\n");
+                SHOW_OFFSETS
+        }
+
+        forall( T )
+        void showDynamic( thing(T) & x ) {
+                printf("dynamic:\n");
+                SHOW_OFFSETS
+        }
+
+        #undef SHOW_OFFSETS
+
+        printf("=== checkPlan9offsets\n");
+        thing(int) x;
+        showStatic(x);
+        showDynamic(x);
 }
 
@@ -114 +148 @@
                 assertf(ret == u.f2, "union operation fails in polymorphic context.");
         }
+
+        checkPlan9offsets();
 }
 

tests/unified_locking/mutex_test.hfa

@@ -8 +8 @@
 struct MutexObj {
         LOCK l;
-        $thread * id;
+        thread$ * id;
         uint32_t sum;
 };
@@ -22 +22 @@
 
 uint32_t cs() {
-        $thread * me = active_thread();
+        thread$ * me = active_thread();
         uint32_t value;
         lock(mo.l);