Changeset 3d5701e for libcfa/src/concurrency/CtxSwitch-x86_64.S

Timestamp:

Feb 25, 2020, 1:17:33 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, stuck-waitfor-destruct

Children:

7dc2e015

Parents:

9fb8f01 (diff), dd9e1ca (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:

resolve conflict

File:

• libcfa/src/concurrency/CtxSwitch-x86_64.S (modified) (3 diffs)

libcfa/src/concurrency/CtxSwitch-x86_64.S

@@ -44 +44 @@
         .text
         .align 2
-        .globl CtxSwitch
-        .type  CtxSwitch, @function
-CtxSwitch:
+        .globl __cfactx_switch
+        .type  __cfactx_switch, @function
+__cfactx_switch:
 
         // Save volatile registers on the stack.
@@ -77 +77 @@
 
         ret
-        .size  CtxSwitch, .-CtxSwitch
+        .size  __cfactx_switch, .-__cfactx_switch
 
 //-----------------------------------------------------------------------------
@@ -83 +83 @@
         .text
         .align 2
-        .globl CtxInvokeStub
-        .type    CtxInvokeStub, @function
-CtxInvokeStub:
+        .globl __cfactx_invoke_stub
+        .type    __cfactx_invoke_stub, @function
+__cfactx_invoke_stub:
         movq %rbx, %rdi
-        jmp *%r12
-        .size  CtxInvokeStub, .-CtxInvokeStub
+        movq %r12, %rsi
+        jmp *%r13
+        .size  __cfactx_invoke_stub, .-__cfactx_invoke_stub
 
 // Local Variables: //