Changeset 7a560c1


Ignore:
Timestamp:
Feb 2, 2017, 4:06:26 PM (6 years ago)
Author:
Aaron Moss <a3moss@…>
Branches:
ADT, aaron-thesis, arm-eh, 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, resolv-new, with_gc
Children:
6215a5c, 7d6639d
Parents:
fa2de95 (diff), 99b75cab (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:
5 added
12 edited
1 moved

Legend:

Unmodified
Added
Removed

  • configure

    rfa2de95 r7a560c1  
    61846184
    61856185
    6186 ac_config_files="$ac_config_files Makefile src/driver/Makefile src/Makefile src/examples/Makefile src/tests/Makefile src/prelude/Makefile src/libcfa/Makefile"
     6186ac_config_files="$ac_config_files Makefile src/driver/Makefile src/Makefile src/benchmark/Makefile src/examples/Makefile src/tests/Makefile src/prelude/Makefile src/libcfa/Makefile"
    61876187
    61886188
    … …  
    69456945    "src/driver/Makefile") CONFIG_FILES="$CONFIG_FILES src/driver/Makefile" ;;
    69466946    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     6947    "src/benchmark/Makefile") CONFIG_FILES="$CONFIG_FILES src/benchmark/Makefile" ;;
    69476948    "src/examples/Makefile") CONFIG_FILES="$CONFIG_FILES src/examples/Makefile" ;;
    69486949    "src/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/tests/Makefile" ;;

  • configure.ac

    rfa2de95 r7a560c1  
    190190        src/driver/Makefile
    191191        src/Makefile
     192        src/benchmark/Makefile
    192193        src/examples/Makefile
    193194        src/tests/Makefile

  • src/ResolvExpr/Resolver.cc

    rfa2de95 r7a560c1  
    449449                        TypeSubstitution sub = makeGenericSubstitutuion( sit );
    450450                        StructDecl * st = sit->get_baseStruct();
     451                        if(st->get_members().empty()) return;
    451452                        // want to resolve each initializer to the members of the struct,
    452453                        // but if there are more initializers than members we should stop
    … …  
    458459                        TypeSubstitution sub = makeGenericSubstitutuion( uit );
    459460                        UnionDecl * un = uit->get_baseUnion();
     461                        if(un->get_members().empty()) return;
    460462                        // only resolve to the first member of a union
    461463                        resolveSingleAggrInit( *un->get_members().begin(), init, initEnd, sub );

  • src/benchmark/bench.c

    rfa2de95 r7a560c1  
    8787
    8888struct CoroutineDummy { coroutine c; };
    89 DECL_COROUTINE(CoroutineDummy)
     89DECL_COROUTINE(CoroutineDummy);
    9090void main(CoroutineDummy * this) {}
    9191
    … …  
    122122};
    123123
    124 DECL_COROUTINE(CoroutineResume)
     124DECL_COROUTINE(CoroutineResume);
    125125
    126126void ?{}(CoroutineResume* this, int N) {
    … …  
    151151
    152152struct ThreadDummy { thread t; };
    153 DECL_THREAD(ThreadDummy)
     153DECL_THREAD(ThreadDummy);
    154154void main(ThreadDummy * this) {}
    155155
    … …  
    183183};
    184184
    185 DECL_THREAD(ContextSwitch)
     185DECL_THREAD(ContextSwitch);
    186186
    187187void main(ContextSwitch * this) {   

  • src/libcfa/concurrency/CtxSwitch-x86_64.S

    rfa2de95 r7a560c1  
    4949        // Save volatile registers on the stack.
    5050
     51        subq   $8,%rsp
     52        stmxcsr 0(%rsp)         // 4 bytes
     53        fnstcw  4(%rsp)         // 2 bytes
    5154        pushq %r15
    5255        pushq %r14
    … …  
    7275        popq %r14
    7376        popq %r15
     77        fldcw   4(%rsp)
     78        ldmxcsr 0(%rsp)
     79        addq $8,%rsp
    7480
    7581        // Return to thread.

  • src/libcfa/concurrency/coroutines

    rfa2de95 r7a560c1  
    3030};
    3131
    32 #define DECL_COROUTINE(X) static inline coroutine* get_coroutine(X* this) { return &this->c; } void main(X* this);
     32#define DECL_COROUTINE(X) static inline coroutine* get_coroutine(X* this) { return &this->c; } void main(X* this)
    3333
    3434//-----------------------------------------------------------------------------
    … …  
    110110}
    111111
     112static inline void resume(coroutine * dst) {
     113        coroutine * src = this_coroutine();             // optimization
     114
     115      // not resuming self ?
     116        if ( src != dst ) {
     117                assertf( dst->notHalted ,
     118                        "Attempt by coroutine %.256s (%p) to resume terminated coroutine %.256s (%p).\n"
     119                        "Possible cause is terminated coroutine's main routine has already returned.",
     120                        src->name, src, dst->name, dst );
     121
     122            // set last resumer
     123                dst->last = src;
     124        } // if
     125
     126      // always done for performance testing
     127        CoroutineCtxSwitch( src, dst );
     128}
     129
    112130#endif //COROUTINES_H
    113131

  • src/libcfa/concurrency/invoke.c

    rfa2de95 r7a560c1  
    109109      struct FakeStack {
    110110            void *fixedRegisters[5];                    // fixed registers rbx, r12, r13, r14, r15
    111             void *rturn;                                        // where to go on return from uSwitch
     111            uint32_t mxcr;                                  // SSE Status and Control bits (control bits are preserved across function calls)
     112            uint16_t fcw;                                   // X97 FPU control word (preserved across function calls)
     113            void *rturn;                                      // where to go on return from uSwitch
    112114            void *dummyReturn;                          // NULL return address to provide proper alignment
    113115      };
    … …  
    120122      ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fixedRegisters[0] = this;
    121123      ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fixedRegisters[1] = invoke;
     124      ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->mxcr = 0x1F80; //Vol. 2A 3-520
     125      ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fcw = 0x037F;  //Vol. 1 8-7
    122126#else
    123127      #error Only __i386__ and __x86_64__ is supported for threads in cfa

  • src/libcfa/concurrency/kernel.c

    rfa2de95 r7a560c1  
    4343};
    4444
    45 DECL_COROUTINE(processorCtx_t)
     45DECL_COROUTINE(processorCtx_t);
    4646
    4747#define KERNEL_STORAGE(T,X) static char X##_storage[sizeof(T)]

  • src/libcfa/concurrency/threads

    rfa2de95 r7a560c1  
    3232};
    3333
    34 #define DECL_THREAD(X) thread* get_thread(X* this) { return &this->t; } void main(X* this);
     34#define DECL_THREAD(X) thread* get_thread(X* this) { return &this->t; } void main(X* this)
    3535
    3636forall( dtype T | is_thread(T) )

  • src/libcfa/containers/vector

    rfa2de95 r7a560c1  
    118118}
    119119
    120 forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
    121 static inline const T* cbegin(const vector(T, allocator_t)* this)
    122 {
    123         return data(&this->storage);
    124 }
     120// forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
     121// static inline const T* cbegin(const vector(T, allocator_t)* this)
     122// {
     123//      return data(&this->storage);
     124// }
    125125
    126126forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
    … …  
    130130}
    131131
    132 forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
    133 static inline const T* cend(const vector(T, allocator_t)* this)
    134 {
    135         return data(&this->storage) + this->size;
    136 }
     132// forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
     133// static inline const T* cend(const vector(T, allocator_t)* this)
     134// {
     135//      return data(&this->storage) + this->size;
     136// }
    137137
    138138//------------------------------------------------------------------------------

  • src/prelude/Makefile.am

    rfa2de95 r7a560c1  
    2929# create forward declarations for gcc builtins
    3030builtins.cf : builtins.c
    31         ${AM_V_GEN}if [ -e $< ] ; then \
    32                 @BACKEND_CC@ -E -P $^ | sed -e "/targetm/s/.*//" -e "/_Decimal/s/.*//" -e "s/void (const char \*)0();//" -e "s/\"//g" -e "s/\(__builtin_\) /\1/" > $@ ; \
    33         fi
     31        ${AM_V_GEN}@BACKEND_CC@ -E -P $^ | sed -f prototypes.sed > $@
    3432
    3533builtins.c : builtins.def prototypes.awk
    36         ${AM_V_GEN}if [ -e $< ] ; then \
    37                 @BACKEND_CC@ -E prototypes.c | awk -f prototypes.awk > $@ ; \
    38         fi
     34        ${AM_V_GEN}@BACKEND_CC@ -E prototypes.c | awk -f prototypes.awk > $@
    3935
    4036builtins.def :

  • src/prelude/Makefile.in

    rfa2de95 r7a560c1  
    425425# create forward declarations for gcc builtins
    426426builtins.cf : builtins.c
    427         ${AM_V_GEN}if [ -e $< ] ; then \
    428                 @BACKEND_CC@ -E -P $^ | sed -e "/targetm/s/.*//" -e "/_Decimal/s/.*//" -e "s/void (const char \*)0();//" -e "s/\"//g" -e "s/\(__builtin_\) /\1/" > $@ ; \
    429         fi
     427        ${AM_V_GEN}@BACKEND_CC@ -E -P $^ | sed -f prototypes.sed > $@
    430428
    431429builtins.c : builtins.def prototypes.awk
    432         ${AM_V_GEN}if [ -e $< ] ; then \
    433                 @BACKEND_CC@ -E prototypes.c | awk -f prototypes.awk > $@ ; \
    434         fi
     430        ${AM_V_GEN}@BACKEND_CC@ -E prototypes.c | awk -f prototypes.awk > $@
    435431
    436432builtins.def :

  • src/tests/thread.c

    rfa2de95 r7a560c1  
    77struct Second { thread t; simple_lock* lock; };
    88
    9 DECL_THREAD(First)
    10 DECL_THREAD(Second)
     9DECL_THREAD(First);
     10DECL_THREAD(Second);
    1111
    1212void ?{}( First * this, simple_lock* lock ) { this->lock = lock; }
Note: See TracChangeset for help on using the changeset viewer.