Changeset d5f4613 for libcfa/src/concurrency

Timestamp:

Aug 31, 2020, 11:42:30 AM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

207c7330

Parents:

42a2970 (diff), 369ffdf (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:

libcfa/src/concurrency

Files:

• CtxSwitch-arm64.S (modified) (3 diffs)
• kernel.cfa (modified) (3 diffs)
• preemption.cfa (modified) (2 diffs)

libcfa/src/concurrency/CtxSwitch-arm64.S

@@ -2 +2 @@
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 // 
-// CtxSwitch-arm.S -- 
+// CtxSwitch-arm64.S -- 
 // 
 // Author           : Peter A. Buhr
 // Created On       : Sun Aug 16 07:50:13 2020
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug 20 18:43:51 2020
-// Update Count     : 24
+// Last Modified On : Wed Aug 26 16:24:59 2020
+// Update Count     : 25
 // 
 
@@ -26 +26 @@
 #define SAVE            20 * 8
 
-        .file "CtxSwitch-arm.S"
+        .file "CtxSwitch-arm64.S"
         .text
         .align 2
         .global __cfactx_switch
-        .type __cfactx_switch, @function
+        .type __cfactx_switch, %function
 __cfactx_switch:
 
@@ -91 +91 @@
         .align 2
         .global __cfactx_invoke_stub
-        .type __cfactx_invoke_stub, @function
+        .type __cfactx_invoke_stub, %function
 __cfactx_invoke_stub:
         mov x0, x19                                                     // load main as parameter 0

libcfa/src/concurrency/kernel.cfa

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Aug 14 15:23:00 2020
-// Update Count     : 69
+// Last Modified On : Mon Aug 31 07:08:20 2020
+// Update Count     : 71
 //
 
@@ -74 +74 @@
                 )
 
-#elif defined( __ARM_ARCH )
+#elif defined( __arm__ )
+        #define __x87_store
+        #define __x87_load
+
+#elif defined( __aarch64__ )
         #define __x87_store              \
                 uint32_t __fpcntl[2];    \
@@ -93 +97 @@
 
 #else
-        #error unknown hardware architecture
+        #error unsupported hardware architecture
 #endif
 

libcfa/src/concurrency/preemption.cfa

@@ -10 +10 @@
 // Created On       : Mon Jun 5 14:20:42 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Aug 21 13:45:32 2020
-// Update Count     : 52
+// Last Modified On : Wed Aug 26 16:46:03 2020
+// Update Count     : 53
 //
 
@@ -56 +56 @@
 #elif defined( __x86_64 )
 #define CFA_REG_IP gregs[REG_RIP]
-#elif defined( __ARM_ARCH )
+#elif defined( __arm__ )
+#define CFA_REG_IP arm_pc
+#elif defined( __aarch64__ )
 #define CFA_REG_IP pc
 #else
-#error unknown hardware architecture
+#error unsupported hardware architecture
 #endif