Changeset 164d036

Timestamp:

Dec 8, 2016, 5:53:25 PM (8 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, resolv-new, with_gc

Children:

6a16806

Parents:

9def87a (diff), b58a5772 (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:

• Jenkinsfile (modified) (1 diff)
• src/ResolvExpr/CommonType.cc (modified) (2 diffs)
• src/ResolvExpr/Unify.cc (modified) (1 diff)
• src/ResolvExpr/Unify.h (modified) (1 diff)
• src/libcfa/concurrency/CtxSwitch-i686.S (added)
• src/libcfa/concurrency/CtxSwitch-x86_64.S (modified) (1 diff)
• src/libcfa/concurrency/invoke.c (modified) (3 diffs)
• src/libcfa/concurrency/invoke.h (modified) (1 diff)
• src/libcfa/concurrency/threads.c (modified) (5 diffs)
• src/libcfa/prelude.cf (modified) (1 diff)

Jenkinsfile

@@ -168 +168 @@
                                 architectureFlag = '' 
                                 if (buildArchitecture == '64-bit') {
-                                        architectureFlag = '--host=x86_64 CXXFLAGS="-m64" CFAFLAGS="-m64"' 
+                                        architectureFlag = '--host=x86_64 CXXFLAGS="-m64 -O2" CFAFLAGS="-m64"' 
                                 } else if (buildArchitecture == '32-bit'){
-                                        architectureFlag = '--host=i386 CXXFLAGS="-m32" CFAFLAGS="-m32"'
+                                        architectureFlag = '--host=i386 CXXFLAGS="-m32 -O2" CFAFLAGS="-m32"'
                                 } else {
                                         architectureFlag = 'ERROR'

src/ResolvExpr/CommonType.cc

@@ -42 +42 @@
                 virtual void visit( OneType *oneType );
 
+                void getCommonWithVoidPointer( PointerType* voidPointer, PointerType* otherPointer );
                 template< typename RefType > void handleRefType( RefType *inst, Type *other );
 
@@ -145 +146 @@
         }
 
+        void CommonType::getCommonWithVoidPointer( PointerType* voidPointer, PointerType* otherPointer ) {
+                if ( TypeInstType* var = dynamic_cast< TypeInstType* >( otherPointer->get_base() ) ) {
+                        OpenVarSet::const_iterator entry = openVars.find( var->get_name() );
+                        if ( entry != openVars.end() ) {
+                                AssertionSet need, have;
+                                WidenMode widen( widenFirst, widenSecond );
+                                if ( entry != openVars.end() && ! bindVar(var, voidPointer->get_base(), entry->second, env, need, have, openVars, widen, indexer ) ) return;
+                        }
+                }
+                result = voidPointer->clone();
+                result->get_qualifiers() += otherPointer->get_qualifiers();
+        }
+        
         void CommonType::visit( PointerType *pointerType ) {
                 if ( PointerType *otherPointer = dynamic_cast< PointerType* >( type2 ) ) {
                         if ( widenFirst && dynamic_cast< VoidType* >( otherPointer->get_base() ) && ! isFtype(pointerType->get_base(), indexer) ) {
-                                result = otherPointer->clone();
-                                result->get_qualifiers() += pointerType->get_qualifiers();
+                                getCommonWithVoidPointer( otherPointer, pointerType );
                         } else if ( widenSecond && dynamic_cast< VoidType* >( pointerType->get_base() ) && ! isFtype(otherPointer->get_base(), indexer) ) {
-                                result = pointerType->clone();
-                                result->get_qualifiers() += otherPointer->get_qualifiers();
+                                getCommonWithVoidPointer( pointerType, otherPointer );
                         } else if ( ( pointerType->get_base()->get_qualifiers() >= otherPointer->get_base()->get_qualifiers() || widenFirst )
                                            && ( pointerType->get_base()->get_qualifiers() <= otherPointer->get_base()->get_qualifiers() || widenSecond ) ) {

src/ResolvExpr/Unify.cc

@@ -31 +31 @@
 
 namespace ResolvExpr {
-        struct WidenMode {
-                WidenMode( bool widenFirst, bool widenSecond ): widenFirst( widenFirst ), widenSecond( widenSecond ) {}
-                WidenMode &operator|=( const WidenMode &other ) { widenFirst |= other.widenFirst; widenSecond |= other.widenSecond; return *this; }
-                WidenMode &operator&=( const WidenMode &other ) { widenFirst &= other.widenFirst; widenSecond &= other.widenSecond; return *this; }
-                WidenMode operator|( const WidenMode &other ) { WidenMode newWM( *this ); newWM |= other; return newWM; }
-                WidenMode operator&( const WidenMode &other ) { WidenMode newWM( *this ); newWM &= other; return newWM; }
-                operator bool() { return widenFirst && widenSecond; }
-
-                bool widenFirst : 1, widenSecond : 1;
-        };
 
         class Unify : public Visitor {

src/ResolvExpr/Unify.h

@@ -27 +27 @@
 
 namespace ResolvExpr {
+        struct WidenMode {
+                WidenMode( bool widenFirst, bool widenSecond ): widenFirst( widenFirst ), widenSecond( widenSecond ) {}
+                WidenMode &operator|=( const WidenMode &other ) { widenFirst |= other.widenFirst; widenSecond |= other.widenSecond; return *this; }
+                WidenMode &operator&=( const WidenMode &other ) { widenFirst &= other.widenFirst; widenSecond &= other.widenSecond; return *this; }
+                WidenMode operator|( const WidenMode &other ) { WidenMode newWM( *this ); newWM |= other; return newWM; }
+                WidenMode operator&( const WidenMode &other ) { WidenMode newWM( *this ); newWM &= other; return newWM; }
+                operator bool() { return widenFirst && widenSecond; }
+
+                bool widenFirst : 1, widenSecond : 1;
+        };
+        
+        bool bindVar( TypeInstType *typeInst, Type *other, TypeDecl::Kind kind, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer );
         bool unify( Type *type1, Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, OpenVarSet &openVars, const SymTab::Indexer &indexer );
         bool unify( Type *type1, Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, OpenVarSet &openVars, const SymTab::Indexer &indexer, Type *&commonType );

src/libcfa/concurrency/CtxSwitch-x86_64.S

@@ -79 +79 @@
 .text
         .align 2
-.globl  coInvokeStub
-coInvokeStub:
+.globl  CtxInvokeStub
+CtxInvokeStub:
         movq %rbx, %rdi 
         jmp *%r12

src/libcfa/concurrency/invoke.c

@@ -15 +15 @@
 extern void __suspend__F___1(void);
 
-void invokeCoroutine(
+void CtxInvokeCoroutine(
       void (*main)(void *), 
       struct coroutine *(*get_coroutine)(void *), 
@@ -34 +34 @@
 
 
-void startCoroutine(
+void CtxStart(
       void (*main)(void *), 
       struct coroutine *(*get_coroutine)(void *), 
@@ -73 +73 @@
 
       ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->dummyReturn = NULL;
-      ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->rturn = coInvokeStub;
+      ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->rturn = CtxInvokeStub;
       ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fixedRegisters[0] = this;
       ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fixedRegisters[1] = invoke;

src/libcfa/concurrency/invoke.h

@@ -45 +45 @@
 
       // assembler routines that performs the context switch
-      extern void coInvokeStub( void );
+      extern void CtxInvokeStub( void );
       void CtxSwitch( void *from, void *to ) asm ("CtxSwitch");
 

src/libcfa/concurrency/threads.c

@@ -44 +44 @@
 }
 
-void ctxSwitchDirect(coroutine* src, coroutine* dst);
+void corCxtSw(coroutine* src, coroutine* dst);
 void create_stack( coStack_t* this, unsigned int storageSize ); // used by all constructors
 
 extern "C" {
       forall(dtype T | is_coroutine(T))
-      void invokeCoroutine(T* this);
+      void CtxInvokeCoroutine(T* this);
 
       forall(dtype T | is_coroutine(T))
-      void startCoroutine(T* this, void (*invoke)(T*));
+      void CtxStart(T* this, void (*invoke)(T*));
 }
 
@@ -100 +100 @@
                 src->name, src, src->last->name, src->last );
 
-        ctxSwitchDirect( src, src->last );
+        corCxtSw( src, src->last );
 }
 
@@ -108 +108 @@
         coroutine* dst = get_coroutine(cor);
 
-        if( ((intptr_t)dst->stack.base) == 0 ) {
+        if( dst->stack.base == NULL ) {
                 create_stack(&dst->stack, dst->stack.size);
-                startCoroutine(cor, invokeCoroutine);
+                CtxStart(cor, CtxInvokeCoroutine);
         }
 
@@ -120 +120 @@
                 dst->last = src;                                        // set last resumer
         } // if
-        ctxSwitchDirect( src, dst );                            // always done for performance testing
+        corCxtSw( src, dst );                           // always done for performance testing
 }
 
@@ -132 +132 @@
 }
 
-void ctxSwitchDirect(coroutine* src, coroutine* dst) {
+void corCxtSw(coroutine* src, coroutine* dst) {
         // THREAD_GETMEM( This )->disableInterrupts();
 

src/libcfa/prelude.cf

@@ -273 +273 @@
 forall( ftype FT ) signed int ?!=?( FT *, FT * );
 
-forall( dtype DT ) signed int ?==?( const volatile DT   *, const volatile void * );
-forall( dtype DT ) signed int ?==?( const volatile void *, const volatile DT * );
-forall( dtype DT ) signed int ?!=?( const volatile DT   *, const volatile void * );
-forall( dtype DT ) signed int ?!=?( const volatile void *, const volatile DT * );
+// forall( dtype DT ) signed int ?==?( const volatile DT   *, const volatile void * );
+// forall( dtype DT ) signed int ?==?( const volatile void *, const volatile DT * );
+// forall( dtype DT ) signed int ?!=?( const volatile DT   *, const volatile void * );
+// forall( dtype DT ) signed int ?!=?( const volatile void *, const volatile DT * );
 
 // forall( dtype DT ) signed int ?==?( const volatile DT *, forall( dtype DT2 )const DT2 * );