Changeset 28564382

Timestamp:

Jun 24, 2019, 6:05:10 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

08065aa4

Parents:

64dc36e (diff), 3e2f5e3 (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

Files:

• libcfa/src/bits/containers.hfa (modified) (4 diffs)
• libcfa/src/concurrency/coroutine.cfa (modified) (1 diff)
• libcfa/src/concurrency/invoke.h (modified) (1 diff)
• src/main.cc (modified) (1 diff)

libcfa/src/bits/containers.hfa

@@ -78 +78 @@
 //-----------------------------------------------------------------------------
 #ifdef __cforall
-        forall(dtype TYPE | is_node(TYPE))
+        forall(dtype TYPE)
         #define T TYPE
 #else
@@ -95 +95 @@
 
 #ifdef __cforall
-        forall(dtype T | is_node(T))
+        forall(dtype T)
         static inline void ?{}( __stack(T) & this ) {
                 (this.top){ NULL };
@@ -122 +122 @@
 //-----------------------------------------------------------------------------
 #ifdef __cforall
-        forall(dtype TYPE | is_node(TYPE))
+        forall(dtype TYPE)
         #define T TYPE
 #else
@@ -141 +141 @@
 #ifdef __cforall
 
-        forall(dtype T | is_node(T))
+        forall(dtype T)
         static inline void ?{}( __queue(T) & this ) with( this ) {
                 head{ NULL };

libcfa/src/concurrency/coroutine.cfa

@@ -98 +98 @@
 
 void ^?{}(coroutine_desc& this) {
-        if(this.state != Halted && this.state != Start) {
+        if(this.state != Halted && this.state != Start && this.state != Primed) {
                 coroutine_desc * src = TL_GET( this_thread )->curr_cor;
                 coroutine_desc * dst = &this;

libcfa/src/concurrency/invoke.h

@@ -46 +46 @@
         #ifdef __cforall
         extern "Cforall" {
-                static inline struct thread_desc             *& get_next( struct thread_desc             & this );
-                static inline struct __condition_criterion_t *& get_next( struct __condition_criterion_t & this );
-
                 extern thread_local struct KernelThreadData {
                         struct thread_desc    * volatile this_thread;

src/main.cc

@@ -454 +454 @@
         const char * descript;
 } printopts[] = {
-        { "altexpr", expraltp, true, "alternatives for expressions" },
-        { "ascodegen", codegenp, true, "as codegen rather than AST" },
-        { "ast", astp, true, "AST after parsing" },
-        { "astdecl", validp, true, "AST after declaration validation pass" },
-        { "asterr", errorp, true, "AST on error" },
-        { "astexpr", exprp, true, "AST after expression analysis" },
-        { "astgen", genericsp, true, "AST after instantiate generics" },
-        { "box", bboxp, true, "before box step" },
-        { "ctordtor", ctorinitp, true, "after ctor/dtor are replaced" },
-        { "codegen", bcodegenp, true, "before code generation" },
+        { "ascodegen", codegenp, true, "print AST as codegen rather than AST" },
+        { "asterr", errorp, true, "print AST on error" },
         { "declstats", declstatsp, true, "code property statistics" },
         { "parse", yydebug, true, "yacc (parsing) debug information" },
         { "pretty", prettycodegenp, true, "prettyprint for ascodegen flag" },
-        { "resolver", bresolvep, true, "before resolver step" },
         { "rproto", resolvprotop, true, "resolver-proto instance" },
-        { "rsteps", resolvep, true, "resolver steps" },
-        { "symevt", symtabp, true, "symbol table events" },
-        { "tree", parsep, true, "parse tree" },
-        { "tuple", tuplep, true, "after tuple expansion" },
+        { "rsteps", resolvep, true, "print resolver steps" },
+        { "tree", parsep, true, "print parse tree" },
+        // code dumps
+        { "ast", astp, true, "print AST after parsing" },
+        { "symevt", symtabp, true, "print AST after symbol table events" },
+        { "altexpr", expraltp, true, "print alternatives for expressions" },
+        { "astdecl", validp, true, "print AST after declaration validation pass" },
+        { "resolver", bresolvep, true, "print AST before resolver step" },
+        { "astexpr", exprp, true, "print AST after expression analysis" },
+        { "ctordtor", ctorinitp, true, "print AST after ctor/dtor are replaced" },
+        { "tuple", tuplep, true, "print AST after tuple expansion" },
+        { "astgen", genericsp, true, "print AST after instantiate generics" },
+        { "box", bboxp, true, "print AST before box step" },
+        { "codegen", bcodegenp, true, "print AST before code generation" },
 };
 enum { printoptsSize = sizeof( printopts ) / sizeof( printopts[0] ) };