X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0f5e8daaa6e9f74521068aa75837200bcd182ea6..d90a41491cfb04188c4469729fa60d01ec0ff693:/src/xbt/win32_ucontext.c

diff --git a/src/xbt/win32_ucontext.c b/src/xbt/win32_ucontext.c
index cbbe8eb40a..b6d5caf9fb 100644
--- a/src/xbt/win32_ucontext.c
+++ b/src/xbt/win32_ucontext.c
@@ -15,79 +15,88 @@
  *      Lesser General Public License for more details.
  *
  *      You should have received a copy of the GNU Lesser General Public
- *      License along with QueueUserAPCEx in the file COPYING.LIB;
+ *      License along with SimGrid in the file LICENSE-LGPL-2.1;
  *      if not, write to the Free Software Foundation, Inc.,
  *      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */  
     
 #include "win32_ucontext.h"
+
 int getcontext(ucontext_t * ucp) 
-{
-  
int ret;
-  

+{
+  int ret;
+  
       /* Retrieve the full machine context */ 
-      ucp->uc_mcontext.ContextFlags = CONTEXT_FULL;
-  
ret = GetThreadContext(GetCurrentThread(), &ucp->uc_mcontext);
-  
return (ret == 0) ? -1 : 0;
-
}
-
-

int setcontext(const ucontext_t * ucp) 
-{
-  
int ret;
-  

+      ucp->uc_mcontext.ContextFlags = CONTEXT_FULL | CONTEXT_DEBUG_REGISTERS;
+  ret = GetThreadContext(GetCurrentThread(), &ucp->uc_mcontext);
+  return (ret == 0) ? -1 : 0;
+}
+
+int setcontext(const ucontext_t * ucp) 
+{
+  int ret;
+  
       /* Restore the full machine context (already set) */ 
-      ret = SetThreadContext(GetCurrentThread(), &ucp->uc_mcontext);
-  
return (ret == 0) ? -1 : 0;
-
}
-
-

int makecontext(ucontext_t * ucp, void (*func) (), int argc, ...) 
-{
-  
int i;
-  
va_list ap;
-  
char *sp;
-  

-      /* Stack grows down */ 
-      sp = (char *) (size_t) ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size;
-  

+      ret = SetThreadContext(GetCurrentThread(), &ucp->uc_mcontext);
+  return (ret == 0) ? -1 : 0;
+}
+
+int makecontext(ucontext_t * ucp, void (*func) (), int argc, ...) 
+{
+  int i;
+  va_list ap;
+  char *sp;
+
+   /* Stack grows down */
+      sp = (char *) (size_t) ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size;
+  
       /* Reserve stack space for the arguments (maximum possible: argc*(8 bytes per argument)) */ 
-      sp -= argc * 8;
-  
if (sp < (char *) ucp->uc_stack.ss_sp) {
-    

+      sp -= argc * sizeof(void*);
+  if (sp < (char *) ucp->uc_stack.ss_sp) {
+    
         /* errno = ENOMEM; */ 
-        return -1;
-  
}
-  

-      /* Set the instruction and the stack pointer */ 
-      ucp->uc_mcontext.Eip = (unsigned long) func;
-  
ucp->uc_mcontext.Esp = (unsigned long) sp - 4;
-  

+        return -1;
+  }
+  
+      /* Set the instruction and the stack pointer */
+  #ifdef _I_X86_
+  ucp->uc_mcontext.Eip = (DWORD) func;
+  ucp->uc_mcontext.Esp = (DWORD) sp - sizeof(void*);
+  #endif
+  #ifdef _IA64_
+  #  error "_IA64_"
+  #endif
+  #ifdef _AMD64_
+  ucp->uc_mcontext.Rip = (DWORD64) func;
+  ucp->uc_mcontext.Rsp = (DWORD64) sp - sizeof(void*);
+  #endif
+
       /* Save/Restore the full machine context */ 
-      ucp->uc_mcontext.ContextFlags = CONTEXT_FULL;
-  

+      ucp->uc_mcontext.ContextFlags = CONTEXT_FULL | CONTEXT_DEBUG_REGISTERS;
+  
       /* Copy the arguments */ 
-      va_start(ap, argc);
-  
for (i = 0; i < argc; i++) {
-    
memcpy(sp, ap, 8);
-    
ap += 8;
-    
sp += 8;
-  
}
-  
va_end(ap);
-  
return 0;
-
}
-
-

int swapcontext(ucontext_t * oucp, const ucontext_t * ucp) 
-{
-  
int ret;
-  
if ((oucp == NULL) || (ucp == NULL)) {
-    

+      va_start(ap, argc);
+  for (i = 0; i < argc; i++) {
+    memcpy(sp, ap, sizeof(void*));
+    ap += sizeof(void*);
+    sp += sizeof(void*);
+  }
+  va_end(ap);
+  return 0;
+}
+
+int swapcontext(ucontext_t * oucp, const ucontext_t * ucp) 
+{
+  int ret;
+  if ((oucp == NULL) || (ucp == NULL)) {
+    
         /*errno = EINVAL; */ 
-        return -1;
-  
}
-  
ret = getcontext(oucp);
-  
if (ret == 0) {
-    
ret = setcontext(ucp);
-  
}
-  
return ret;
-
}
-
-


+        return -1;
+  }
+  ret = getcontext(oucp);
+  if (ret == 0) {
+    ret = setcontext(ucp);
+  }
+  return ret;
+}
+