[Boost-commit] svn:boost r81686 - in branches/release/libs/context: . src/asm

Subject: [Boost-commit] svn:boost r81686 - in branches/release/libs/context: . src/asm
From: oliver.kowalke_at_[hidden]
Date: 2012-12-03 03:25:30

Author: olli
Date: 2012-12-03 03:25:29 EST (Mon, 03 Dec 2012)
New Revision: 81686
URL: http://svn.boost.org/trac/boost/changeset/81686

Log:
context: bugfix for 64bit Mac OS X

Properties modified: 
   branches/release/libs/context/   (props changed)
   branches/release/libs/context/src/asm/   (props changed)
Text files modified: 
   branches/release/libs/context/src/asm/make_x86_64_sysv_macho_gas.S |     7 ++++---                                 
   1 files changed, 4 insertions(+), 3 deletions(-)

Modified: branches/release/libs/context/src/asm/make_x86_64_sysv_macho_gas.S
==============================================================================
--- branches/release/libs/context/src/asm/make_x86_64_sysv_macho_gas.S	(original)
+++ branches/release/libs/context/src/asm/make_x86_64_sysv_macho_gas.S	2012-12-03 03:25:29 EST (Mon, 03 Dec 2012)
@@ -42,11 +42,12 @@
 .globl _make_fcontext
 .align 8
 _make_fcontext:
-    leaq   -0x58(%rdi),     %r8        /* reserve space for fcontext_t at top of context stack */
+    leaq   -0x58(%rdi),     %rax        /* reserve space for fcontext_t at top of context stack */
 
     /* shift address in RAX to lower 16 byte boundary */
     /* == pointer to fcontext_t and address of context stack */
-    andq   $-16,            %rax
+    movabs  $-16,           %r8
+    andq    %r8,            %rax
 
     movq   %rdi,            0x40(%rax) /* save address of stack pointer (base) in fcontext_t */
     movq   %rsi,            0x48(%rax) /* save stack size in fcontext_t */
@@ -68,4 +69,4 @@
     /* RSP points to same address as RSP on entry of context function + 0x8 */
     xorq    %rdi,           %rdi       /* exit code is zero */
     call   __exit                      /* exit application */
-    hlt
+