Changeset eaace25 for src/libcfa/concurrency

Timestamp:

Jul 7, 2017, 12:26:31 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:

67f2170

Parents:

3873b5a1 (diff), 7c03d6d (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/libcfa/concurrency

Files:

• CtxSwitch-i386.S (modified) (1 diff)
• CtxSwitch-x86_64.S (modified) (3 diffs)
• invoke.h (modified) (1 diff)
• kernel.c (modified) (1 diff)

src/libcfa/concurrency/CtxSwitch-i386.S

@@ -98 +98 @@
         ret
 
-.text
-        .align 2
-.globl  CtxGet
-CtxGet:
-        movl %esp,SP_OFFSET(%eax)
-        movl %ebp,FP_OFFSET(%eax)
-
-        ret
-
 // Local Variables: //
 // compile-command: "make install" //

src/libcfa/concurrency/CtxSwitch-x86_64.S

@@ -1 @@
-//                               -*- Mode: Asm -*- 
+//                               -*- Mode: Asm -*-
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
@@ -18 +18 @@
 // Free Software  Foundation; either  version 2.1 of  the License, or  (at your
 // option) any later version.
-// 
+//
 // This library is distributed in the  hope that it will be useful, but WITHOUT
 // ANY  WARRANTY;  without even  the  implied  warranty  of MERCHANTABILITY  or
 // FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
 // for more details.
-// 
+//
 // You should  have received a  copy of the  GNU Lesser General  Public License
 // along  with this library.
-// 
+//
 
 // This context switch routine depends on the fact that the stack of a new
@@ -93 +93 @@
 .globl  CtxInvokeStub
 CtxInvokeStub:
-        movq %rbx, %rdi 
+        movq %rbx, %rdi
         jmp *%r12
-
-.text
-        .align 2
-.globl  CtxGet
-CtxGet:
-        movq %rsp,SP_OFFSET(%rdi)
-        movq %rbp,FP_OFFSET(%rdi)
-
-        ret
 
 // Local Variables: //

src/libcfa/concurrency/invoke.h

@@ -112 +112 @@
       extern void CtxInvokeStub( void );
       void CtxSwitch( void * from, void * to ) asm ("CtxSwitch");
-      void CtxGet( void * this ) asm ("CtxGet");
+
+      #if   defined( __x86_64__ )
+      #define CtxGet( ctx ) __asm__ ( \
+                  "movq %%rsp,%0\n"   \
+                  "movq %%rbp,%1\n"   \
+            : "=rm" (ctx.SP), "=rm" (ctx.FP) )
+      #elif defined( __i386__ )
+      #define CtxGet( ctx ) __asm__ ( \
+                  "movl %%esp,%0\n"   \
+                  "movl %%ebp,%1\n"   \
+            : "=rm" (ctx.SP), "=rm" (ctx.FP) )
+      #endif
 
 #endif //_INVOKE_PRIVATE_H_

src/libcfa/concurrency/kernel.c

@@ -75 +75 @@
 
 void ?{}( current_stack_info_t * this ) {
-        CtxGet( &this->ctx );
+        CtxGet( this->ctx );
         this->base = this->ctx.FP;
         this->storage = this->ctx.SP;