Changeset 04e6f93 for libcfa/src/concurrency/CtxSwitch-arm.S

Timestamp:

Feb 27, 2020, 4:04:25 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

a037f85

Parents:

41efd33 (diff), 930b504 (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

File:

• libcfa/src/concurrency/CtxSwitch-arm.S (modified) (2 diffs)

libcfa/src/concurrency/CtxSwitch-arm.S

@@ -13 +13 @@
         .text
         .align  2
-        .global CtxSwitch
-        .type   CtxSwitch, %function
+        .global __cfactx_switch
+        .type   __cfactx_switch, %function
 
-CtxSwitch:
+__cfactx_switch:
         @ save callee-saved registers: r4-r8, r10, r11, r13(sp) (plus r9 depending on platform specification)
         @ I've seen reference to 31 registers on 64-bit, if this is the case, more need to be saved
@@ -52 +52 @@
         mov r15, r14
         #endif // R9_SPECIAL
-        
+
         .text
         .align  2
-        .global CtxInvokeStub
-        .type   CtxInvokeStub, %function
+        .global __cfactx_invoke_stub
+        .type   __cfactx_invoke_stub, %function
 
-CtxInvokeStub:
+__cfactx_invoke_stub:
         ldmfd r13!, {r0-r1}
         mov r15, r1