[Boost-commit] svn:boost r77436 - trunk/libs/context/src/asm

Subject: [Boost-commit] svn:boost r77436 - trunk/libs/context/src/asm
From: oliver.kowalke_at_[hidden]
Date: 2012-03-20 14:28:30

Author: olli
Date: 2012-03-20 14:28:29 EDT (Tue, 20 Mar 2012)
New Revision: 77436
URL: http://svn.boost.org/trac/boost/changeset/77436

Log:
context: asm for ppc corrected

Text files modified: 
   trunk/libs/context/src/asm/fcontext_ppc32_sysv_elf_gas.S |     4 ----                                    
   trunk/libs/context/src/asm/fcontext_ppc64_sysv_elf_gas.S |     8 ++++----                                
   2 files changed, 4 insertions(+), 8 deletions(-)

Modified: trunk/libs/context/src/asm/fcontext_ppc32_sysv_elf_gas.S
==============================================================================
--- trunk/libs/context/src/asm/fcontext_ppc32_sysv_elf_gas.S	(original)
+++ trunk/libs/context/src/asm/fcontext_ppc32_sysv_elf_gas.S	2012-03-20 14:28:29 EDT (Tue, 20 Mar 2012)
@@ -64,11 +64,7 @@
  *  |sbase|slimt|                                               |  *
  *  -------------------------------------------------------------  *
  *  -------------------------------------------------------------  *
-<<<<<<< HEAD
- *  |  63 |                                                     |  *
-=======
  *  |  64 |                                                     |  *
->>>>>>> desc of fcontext_t layout for PPC modified
  *  -------------------------------------------------------------  *
  *  | 256 |                                                     |  *
  *  -------------------------------------------------------------  *

Modified: trunk/libs/context/src/asm/fcontext_ppc64_sysv_elf_gas.S
==============================================================================
--- trunk/libs/context/src/asm/fcontext_ppc64_sysv_elf_gas.S	(original)
+++ trunk/libs/context/src/asm/fcontext_ppc64_sysv_elf_gas.S	2012-03-20 14:28:29 EDT (Tue, 20 Mar 2012)
@@ -158,8 +158,8 @@
     ld      %r27,  112(%r4)     # restore R27
     ld      %r28,  120(%r4)     # restore R28
     ld      %r29,  128(%r4)     # restore R29
-    ld      %r40,  136(%r4)     # restore r40
-    ld      %r41,  144(%r4)     # restore r41
+    ld      %r30,  136(%r4)     # restore r30
+    ld      %r31,  144(%r4)     # restore r31
     ld      %r1,   152(%r4)     # restore SP
 
     ld      %r0,   160(%r4)     # load CR
@@ -266,8 +266,8 @@
     ld      %r27,  112(%r4)     # restore R27
     ld      %r28,  120(%r4)     # restore R28
     ld      %r29,  128(%r4)     # restore R29
-    ld      %r40,  136(%r4)     # restore r40
-    ld      %r41,  144(%r4)     # restore r41
+    ld      %r30,  136(%r4)     # restore r30
+    ld      %r31,  144(%r4)     # restore r31
     ld      %r1,   152(%r4)     # restore SP
 
     ld      %r0,   160(%r4)     # load CR