Subject: [Boost-commit] svn:boost r84673 - in branches/release: boost/context boost/context/detail libs/context/src/asm
From: oliver.kowalke_at_[hidden]
Date: 2013-06-07 11:38:10
Author: olli
Date: 2013-06-07 11:38:10 EDT (Fri, 07 Jun 2013)
New Revision: 84673
URL: http://svn.boost.org/trac/boost/changeset/84673
Log:
context: merge from trunk
Properties modified:
branches/release/boost/context/ (props changed)
Text files modified:
branches/release/boost/context/detail/fcontext_i386_win.hpp | 4 +++-
branches/release/boost/context/detail/fcontext_x86_64_win.hpp | 4 +++-
branches/release/libs/context/src/asm/make_i386_ms_pe_masm.asm | 2 +-
branches/release/libs/context/src/asm/make_i386_sysv_elf_gas.S | 2 +-
4 files changed, 8 insertions(+), 4 deletions(-)
Modified: branches/release/boost/context/detail/fcontext_i386_win.hpp
==============================================================================
--- branches/release/boost/context/detail/fcontext_i386_win.hpp Fri Jun 7 10:19:55 2013 (r84672)
+++ branches/release/boost/context/detail/fcontext_i386_win.hpp 2013-06-07 11:38:10 EDT (Fri, 07 Jun 2013) (r84673)
@@ -61,13 +61,15 @@
void * fc_excpt_lst;
void * fc_local_storage;
fp_t fc_fp;
+ boost::uint32_t fc_dealloc;
fcontext_t() :
fc_greg(),
fc_stack(),
fc_excpt_lst( 0),
fc_local_storage( 0),
- fc_fp()
+ fc_fp(),
+ fc_dealloc( 0)
{}
};
Modified: branches/release/boost/context/detail/fcontext_x86_64_win.hpp
==============================================================================
--- branches/release/boost/context/detail/fcontext_x86_64_win.hpp Fri Jun 7 10:19:55 2013 (r84672)
+++ branches/release/boost/context/detail/fcontext_x86_64_win.hpp 2013-06-07 11:38:10 EDT (Fri, 07 Jun 2013) (r84673)
@@ -51,12 +51,14 @@
stack_t fc_stack;
void * fc_local_storage;
boost::uint64_t fc_fp[24];
+ boost::uint64_t fc_dealloc;
fcontext_t() :
fc_greg(),
fc_stack(),
fc_local_storage( 0),
- fc_fp()
+ fc_fp(),
+ fc_dealloc()
{}
};
Modified: branches/release/libs/context/src/asm/make_i386_ms_pe_masm.asm
==============================================================================
--- branches/release/libs/context/src/asm/make_i386_ms_pe_masm.asm Fri Jun 7 10:19:55 2013 (r84672)
+++ branches/release/libs/context/src/asm/make_i386_ms_pe_masm.asm 2013-06-07 11:38:10 EDT (Fri, 07 Jun 2013) (r84673)
@@ -75,7 +75,7 @@
stmxcsr [eax+02ch] ; save MMX control word
fnstcw [eax+030h] ; save x87 control word
- lea edx, [eax-01ch] ; reserve space for last frame and seh on context stack, (ESP - 0x4) % 16 == 0
+ lea edx, [eax-024h] ; reserve space for last frame and seh on context stack, (ESP - 0x4) % 16 == 0
mov [eax+010h], edx ; save address in EDX as stack pointer for context function
mov ecx, finish ; abs address of finish
Modified: branches/release/libs/context/src/asm/make_i386_sysv_elf_gas.S
==============================================================================
--- branches/release/libs/context/src/asm/make_i386_sysv_elf_gas.S Fri Jun 7 10:19:55 2013 (r84672)
+++ branches/release/libs/context/src/asm/make_i386_sysv_elf_gas.S 2013-06-07 11:38:10 EDT (Fri, 07 Jun 2013) (r84673)
@@ -53,7 +53,7 @@
stmxcsr 0x20(%eax) /* save MMX control and status word */
fnstcw 0x24(%eax) /* save x87 control word */
- leal -0x8(%eax), %edx /* reserve space for the last frame on context stack; (ESP - 0x4) % 16 == 0 */
+ leal -0x14(%eax), %edx /* reserve space for the last frame on context stack; (ESP - 0x4) % 16 == 0 */
movl %edx, 0x10(%eax) /* save address in EDX as stack pointer for context function */
call 1f