Changeset 6e0f4bd

Timestamp:

Jan 25, 2018, 1:00:12 PM (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, resolv-new, with_gc

Children:

dbe9b08

Parents:

f7d6bb0 (diff), b6ec245 (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:

• ResolvExpr/CurrentObject.cc (modified) (3 diffs)
• libcfa/bits/locks.h (modified) (4 diffs)
• libcfa/concurrency/CtxSwitch-armv7l.S (added)
• libcfa/concurrency/invoke.c (modified) (2 diffs)
• libcfa/concurrency/invoke.h (modified) (2 diffs)
• libcfa/concurrency/kernel.c (modified) (2 diffs)
• libcfa/concurrency/preemption.c (modified) (4 diffs)
• tests/.expect/vector.txt (modified) (1 diff)

src/ResolvExpr/CurrentObject.cc

@@ -62 +62 @@
                 virtual ~MemberIterator() {}
 
+                /// walks the current object using the given designators as a guide
                 virtual void setPosition( std::list< Expression * > & designators ) = 0;
+
+                /// retrieve the list of possible Type/Designaton pairs for the current position in the currect object
                 virtual std::list<InitAlternative> operator*() const = 0;
+
+                /// true if the iterator is not currently at the end
                 virtual operator bool() const = 0;
+
+                /// moves the iterator by one member in the current object
                 virtual MemberIterator & bigStep() = 0;
+
+                /// moves the iterator by one member in the current subobject
                 virtual MemberIterator & smallStep() = 0;
+
+                /// the type of the current object
                 virtual Type * getType() = 0;
+
+                /// the type of the current subobject
                 virtual Type * getNext() = 0;
 
+                /// printing for debug
                 virtual void print( std::ostream & out, Indenter indent ) const = 0;
 
+                /// helper for operator*; aggregates must add designator to each init alternative, but
+                /// adding designators in operator* creates duplicates.
                 virtual std::list<InitAlternative> first() const = 0; // should be protected
         };
@@ -354 +370 @@
                                 }
                         }
-                        // if ( curMember == std::next( decl->get_members().begin(), 1 ) ) { // xxx - this never triggers because curMember is incremented immediately on construction
-                        if ( atbegin ) { // xxx - this never triggers because curMember is incremented immediately on construction
+                        if ( atbegin ) {
                                 // xxx - what about case of empty struct??
                                 // only add self if at the very beginning of the structure
@@ -389 +404 @@
                         return *this;
                 }
-                virtual std::list<InitAlternative> first() const { return std::list<InitAlternative>{}; }
         };
 

src/libcfa/bits/locks.h

@@ -9 +9 @@
 // Author           : Thierry Delisle
 // Created On       : Tue Oct 31 15:14:38 2017
-// Last Modified By : --
-// Last Modified On : --
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Dec  8 16:02:22 2017
+// Update Count     : 1
 //
 
@@ -24 +24 @@
 #elif defined( __i386 ) || defined( __x86_64 )
         #define Pause() __asm__ __volatile__ ( "pause" : : : )
+#elif defined( __ARM_ARCH )
+        #define Pause() __asm__ __volatile__ ( "nop" : : : )
 #else
         #error unsupported architecture
 #endif
 
-#if defined( __i386 ) || defined( __x86_64 )
+#if defined( __i386 ) || defined( __x86_64 ) || defined( __ARM_ARCH )
         // Intel recommendation
         #define __ALIGN__ __attribute__(( aligned (128) ))
@@ -37 +39 @@
 #endif
 
-#if defined( __x86_64 )
+#if __SIZEOF_SIZE_T__ == 8
         #define __lock_test_and_test_and_set( lock ) (lock) == 0 && __sync_lock_test_and_set_8( &(lock), 1 ) == 0
         #define __lock_release( lock ) __sync_lock_release_8( &(lock) );
-#elif defined( __i386 )
+#elif __SIZEOF_SIZE_T__ == 4
         #define __lock_test_and_test_and_set( lock ) (lock) == 0 && __sync_lock_test_and_set_4( &(lock), 1 ) == 0
         #define __lock_release( lock ) __sync_lock_release_4( &(lock) );
@@ -48 +50 @@
 
 struct __spinlock_t {
-        __ALIGN__ volatile uintptr_t lock;
+        __ALIGN__ volatile size_t lock;
         #ifdef __CFA_DEBUG__
                 const char * prev_name;

src/libcfa/concurrency/invoke.c

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 21 22:28:33 2017
-// Update Count     : 1
+// Last Modified On : Tue Jan 23 14:04:56 2018
+// Update Count     : 2
 //
 
@@ -133 +133 @@
         ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->mxcr = 0x1F80; //Vol. 2A 3-520
         ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fcw = 0x037F;  //Vol. 1 8-7
+
+#elif defined( __ARM_ARCH )
+
+        struct FakeStack {
+                float fpRegs[16];                       // floating point registers
+                void *intRegs[9];                       // integer/pointer registers
+                void *arg[2];                           // placeholder for this pointer
+        };
+
+        ((struct machine_context_t *)stack->context)->SP = (char *)stack->base - sizeof( struct FakeStack );
+        ((struct machine_context_t *)stack->context)->FP = NULL;
+
+        struct FakeStack *fs = (struct FakeStack *)((struct machine_context_t *)stack->context)->SP;
+
+        fs->intRegs[8] = CtxInvokeStub;
+        fs->arg[0] = this;
+        fs->arg[1] = invoke;
 #else
         #error Only __i386__ and __x86_64__ is supported for threads in cfa

src/libcfa/concurrency/invoke.h

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 21 22:28:56 2017
-// Update Count     : 1
+// Last Modified On : Tue Jan 23 14:55:46 2018
+// Update Count     : 3
 //
 
@@ -209 +209 @@
                         "movl %%ebp,%1\n"   \
                 : "=rm" (ctx.SP), "=rm" (ctx.FP) )
+        #elif defined( __ARM_ARCH )
+        #define CtxGet( ctx ) __asm__ ( \
+                        "mov %0,%%sp\n"   \
+                        "mov %1,%%r11\n"   \
+                : "=rm" (ctx.SP), "=rm" (ctx.FP) )
         #endif
 

src/libcfa/concurrency/kernel.c

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 21 22:33:18 2017
-// Update Count     : 2
+// Last Modified On : Fri Dec  8 16:23:33 2017
+// Update Count     : 3
 //
 
 //C Includes
 #include <stddef.h>
+#define ftype `ftype`
 extern "C" {
 #include <stdio.h>
@@ -23 +24 @@
 #include <unistd.h>
 }
+#undef ftype
 
 //CFA Includes

src/libcfa/concurrency/preemption.c

@@ -10 +10 @@
 // Created On       : Mon Jun 5 14:20:42 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 21 22:36:05 2017
-// Update Count     : 2
+// Last Modified On : Tue Jan 23 17:59:30 2018
+// Update Count     : 7
 //
 
 #include "preemption.h"
 
+#define ftype `ftype`
 extern "C" {
 #include <errno.h>
@@ -26 +27 @@
 #include <unistd.h>
 }
-
+#undef ftype
 
 #ifdef __USE_STREAM__
@@ -60 +61 @@
 
 // Machine specific register name
-#ifdef __x86_64__
+#if   defined(__x86_64__)
 #define CFA_REG_IP REG_RIP
-#else
+#elif defined(__i386__)
 #define CFA_REG_IP REG_EIP
+#elif defined(__ARM_ARCH__)
+#define CFA_REG_IP REG_R15
 #endif
 
@@ -296 +299 @@
 // Receives SIGUSR1 signal and causes the current thread to yield
 void sigHandler_ctxSwitch( __CFA_SIGPARMS__ ) {
+#if defined( __ARM_ARCH )
+        __cfaabi_dbg_debug_do( last_interrupt = (void *)(cxt->uc_mcontext.arm_pc); )
+#else
         __cfaabi_dbg_debug_do( last_interrupt = (void *)(cxt->uc_mcontext.gregs[CFA_REG_IP]); )
-
-        // Check if it is safe to preempt here
+#endif
+
+                // Check if it is safe to preempt here
         if( !preemption_ready() ) { return; }
 

src/tests/.expect/vector.txt

@@ -1 @@
-/usr/bin/ld: cannot open output file vector: Is a directory
-collect2: error: ld returned 1 exit status
+0
+1
+2
+3
+0