Changeset 2856438


Ignore:
Timestamp:
Jun 24, 2019, 6:05:10 PM (2 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
arm-eh, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr
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:
4 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/bits/containers.hfa

    r64dc36e r2856438  
    7878//-----------------------------------------------------------------------------
    7979#ifdef __cforall
    80         forall(dtype TYPE | is_node(TYPE))
     80        forall(dtype TYPE)
    8181        #define T TYPE
    8282#else
     
    9595
    9696#ifdef __cforall
    97         forall(dtype T | is_node(T))
     97        forall(dtype T)
    9898        static inline void ?{}( __stack(T) & this ) {
    9999                (this.top){ NULL };
     
    122122//-----------------------------------------------------------------------------
    123123#ifdef __cforall
    124         forall(dtype TYPE | is_node(TYPE))
     124        forall(dtype TYPE)
    125125        #define T TYPE
    126126#else
     
    141141#ifdef __cforall
    142142
    143         forall(dtype T | is_node(T))
     143        forall(dtype T)
    144144        static inline void ?{}( __queue(T) & this ) with( this ) {
    145145                head{ NULL };
  • libcfa/src/concurrency/coroutine.cfa

    r64dc36e r2856438  
    9898
    9999void ^?{}(coroutine_desc& this) {
    100         if(this.state != Halted && this.state != Start) {
     100        if(this.state != Halted && this.state != Start && this.state != Primed) {
    101101                coroutine_desc * src = TL_GET( this_thread )->curr_cor;
    102102                coroutine_desc * dst = &this;
  • libcfa/src/concurrency/invoke.h

    r64dc36e r2856438  
    4646        #ifdef __cforall
    4747        extern "Cforall" {
    48                 static inline struct thread_desc             *& get_next( struct thread_desc             & this );
    49                 static inline struct __condition_criterion_t *& get_next( struct __condition_criterion_t & this );
    50 
    5148                extern thread_local struct KernelThreadData {
    5249                        struct thread_desc    * volatile this_thread;
  • src/main.cc

    r64dc36e r2856438  
    454454        const char * descript;
    455455} printopts[] = {
    456         { "altexpr", expraltp, true, "alternatives for expressions" },
    457         { "ascodegen", codegenp, true, "as codegen rather than AST" },
    458         { "ast", astp, true, "AST after parsing" },
    459         { "astdecl", validp, true, "AST after declaration validation pass" },
    460         { "asterr", errorp, true, "AST on error" },
    461         { "astexpr", exprp, true, "AST after expression analysis" },
    462         { "astgen", genericsp, true, "AST after instantiate generics" },
    463         { "box", bboxp, true, "before box step" },
    464         { "ctordtor", ctorinitp, true, "after ctor/dtor are replaced" },
    465         { "codegen", bcodegenp, true, "before code generation" },
     456        { "ascodegen", codegenp, true, "print AST as codegen rather than AST" },
     457        { "asterr", errorp, true, "print AST on error" },
    466458        { "declstats", declstatsp, true, "code property statistics" },
    467459        { "parse", yydebug, true, "yacc (parsing) debug information" },
    468460        { "pretty", prettycodegenp, true, "prettyprint for ascodegen flag" },
    469         { "resolver", bresolvep, true, "before resolver step" },
    470461        { "rproto", resolvprotop, true, "resolver-proto instance" },
    471         { "rsteps", resolvep, true, "resolver steps" },
    472         { "symevt", symtabp, true, "symbol table events" },
    473         { "tree", parsep, true, "parse tree" },
    474         { "tuple", tuplep, true, "after tuple expansion" },
     462        { "rsteps", resolvep, true, "print resolver steps" },
     463        { "tree", parsep, true, "print parse tree" },
     464        // code dumps
     465        { "ast", astp, true, "print AST after parsing" },
     466        { "symevt", symtabp, true, "print AST after symbol table events" },
     467        { "altexpr", expraltp, true, "print alternatives for expressions" },
     468        { "astdecl", validp, true, "print AST after declaration validation pass" },
     469        { "resolver", bresolvep, true, "print AST before resolver step" },
     470        { "astexpr", exprp, true, "print AST after expression analysis" },
     471        { "ctordtor", ctorinitp, true, "print AST after ctor/dtor are replaced" },
     472        { "tuple", tuplep, true, "print AST after tuple expansion" },
     473        { "astgen", genericsp, true, "print AST after instantiate generics" },
     474        { "box", bboxp, true, "print AST before box step" },
     475        { "codegen", bcodegenp, true, "print AST before code generation" },
    475476};
    476477enum { printoptsSize = sizeof( printopts ) / sizeof( printopts[0] ) };
Note: See TracChangeset for help on using the changeset viewer.