Changeset 61323a7 for src

Timestamp:

Apr 19, 2018, 10:36:18 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

2ae16219

Parents:

6d2aa7ed (diff), 3265399 (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:

src

Files:

• Parser/parser.yy (modified) (6 diffs)
• tests/concurrent/preempt.c (modified) (2 diffs)
• tests/preempt_longrun/preempt.c (added)

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar 28 17:52:24 2018
-// Update Count     : 3130
+// Last Modified On : Tue Apr 17 17:10:30 2018
+// Update Count     : 3144
 //
 
@@ -391 +391 @@
 %precedence '('
 
-%locations                      // support location tracking for error messages
+%locations                                                                                              // support location tracking for error messages
 
 %start translation_unit                                                                 // parse-tree root
@@ -1708 +1708 @@
         | LONG
                 { $$ = DeclarationNode::newLength( DeclarationNode::Long ); }
-        | ZERO_T
-                { $$ = DeclarationNode::newBuiltinType( DeclarationNode::Zero ); }
-        | ONE_T
-                { $$ = DeclarationNode::newBuiltinType( DeclarationNode::One ); }
         | VALIST                                                                                        // GCC, __builtin_va_list
                 { $$ = DeclarationNode::newBuiltinType( DeclarationNode::Valist ); }
@@ -1731 +1727 @@
 basic_type_specifier:
         direct_type
+                // Cannot have type modifiers, e.g., short, long, etc.
         | type_qualifier_list_opt indirect_type type_qualifier_list_opt
                 { $$ = $2->addQualifiers( $1 )->addQualifiers( $3 ); }
@@ -1736 +1733 @@
 
 direct_type:
-                // A semantic check is necessary for conflicting type qualifiers.
         basic_type_name
         | type_qualifier_list basic_type_name
@@ -1755 +1751 @@
         | ATTR_TYPEGENname '(' comma_expression ')'                     // CFA: e.g., @type(a+b) y;
                 { $$ = DeclarationNode::newAttr( $1, $3 ); }
+        | ZERO_T                                                                                        // CFA
+                { $$ = DeclarationNode::newBuiltinType( DeclarationNode::Zero ); }
+        | ONE_T                                                                                         // CFA
+                { $$ = DeclarationNode::newBuiltinType( DeclarationNode::One ); }
         ;
 

src/tests/concurrent/preempt.c

@@ -11 +11 @@
 }
 
+#ifdef LONG_TEST
+static const unsigned long N = 30_000ul;
+#else
+static const unsigned long N = 500ul;
+#endif
+
 static volatile int counter = 0;
 
@@ -22 +28 @@
 
 void main(worker_t & this) {
-        while(counter < 1000) {
+        while(counter < N) {
                 if( (counter % 7) == this.value ) {
                         int next = __atomic_add_fetch_4(&counter, 1, __ATOMIC_SEQ_CST);