X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/20facf82f92baf2401e73847b694eea761622a4c..f07101941f4397554a6cee4fbaf3286137865064:/src/xbt/win32_ucontext.c?ds=sidebyside

diff --git a/src/xbt/win32_ucontext.c b/src/xbt/win32_ucontext.c
index 5d49317e1a..757eb43a70 100644
--- a/src/xbt/win32_ucontext.c
+++ b/src/xbt/win32_ucontext.c
@@ -23,71 +23,79 @@
 #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;
-
}
+  ret = GetThreadContext(GetCurrentThread(), &ucp->uc_mcontext);
+  return (ret == 0) ? -1 : 0;
+}
 
-

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

+  int ret;
+  
       /* Restore the full machine context (already set) */ 
       ret = SetThreadContext(GetCurrentThread(), &ucp->uc_mcontext);
-  
return (ret == 0) ? -1 : 0;
-
}
+  return (ret == 0) ? -1 : 0;
+}
 
-

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

+  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) {
-    

+  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;
-  

+  }
+  
+      /* Set the instruction and the stack pointer */
+  #ifdef I_X86_
+  ucp->uc_mcontext.Eip = (unsigned long) func;
+  ucp->uc_mcontext.Esp = (unsigned long) sp - 4;
+  #endif
+  #ifdef _IA64_
+  #  error "_IA64_"
+  #endif
+  #ifdef _AMD64_
+  ucp->uc_mcontext.Rip = (unsigned long long) func;
+  ucp->uc_mcontext.Rsp = (unsigned long long) sp - 8;
+  #endif
+
       /* Save/Restore the full machine context */ 
       ucp->uc_mcontext.ContextFlags = CONTEXT_FULL;
-  

+  
       /* 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;
-
}
+  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 swapcontext(ucontext_t * oucp, const ucontext_t * ucp) 
 {
-  
int ret;
-  
if ((oucp == NULL) || (ucp == NULL)) {
-    

+  int ret;
+  if ((oucp == NULL) || (ucp == NULL)) {
+    
         /*errno = EINVAL; */ 
         return -1;
-  
}
-  
ret = getcontext(oucp);
-  
if (ret == 0) {
-    
ret = setcontext(ucp);
-  
}
-  
return ret;
-
}
+  }
+  ret = getcontext(oucp);
+  if (ret == 0) {
+    ret = setcontext(ucp);
+  }
+  return ret;
+}
 
-