Subject: [Boost-commit] svn:boost r80571 - in branches/release/boost/context: . detail
From: oliver.kowalke_at_[hidden]
Date: 2012-09-18 04:34:34
Author: olli
Date: 2012-09-18 04:34:31 EDT (Tue, 18 Sep 2012)
New Revision: 80571
URL: http://svn.boost.org/trac/boost/changeset/80571
Log:
context: merge from 80553 (headers
Added:
branches/release/boost/context/guarded_stack_allocator.hpp
- copied, changed from r80507, /trunk/boost/context/guarded_stack_allocator.hpp
branches/release/boost/context/simple_stack_allocator.hpp
- copied, changed from r80507, /trunk/boost/context/simple_stack_allocator.hpp
branches/release/boost/context/utils.hpp
- copied, changed from r80507, /trunk/boost/context/utils.hpp
Removed:
branches/release/boost/context/stack_allocator.hpp
branches/release/boost/context/stack_utils.hpp
Properties modified:
branches/release/boost/context/ (props changed)
Text files modified:
branches/release/boost/context/all.hpp | 11 ++++++-----
branches/release/boost/context/detail/config.hpp | 6 +++---
branches/release/boost/context/detail/fcontext_arm.hpp | 16 +++++++++-------
branches/release/boost/context/detail/fcontext_i386.hpp | 27 +++++++++------------------
branches/release/boost/context/detail/fcontext_i386_win.hpp | 15 +++++++++------
branches/release/boost/context/detail/fcontext_mips.hpp | 18 ++++++++++--------
branches/release/boost/context/detail/fcontext_ppc.hpp | 16 +++++++++-------
branches/release/boost/context/detail/fcontext_x86_64.hpp | 16 +++++++++-------
branches/release/boost/context/detail/fcontext_x86_64_win.hpp | 16 +++++++++-------
branches/release/boost/context/fcontext.hpp | 10 +++++-----
branches/release/boost/context/guarded_stack_allocator.hpp | 8 ++++----
branches/release/boost/context/simple_stack_allocator.hpp | 8 ++++----
branches/release/boost/context/utils.hpp | 8 ++++----
13 files changed, 90 insertions(+), 85 deletions(-)
Modified: branches/release/boost/context/all.hpp
==============================================================================
--- branches/release/boost/context/all.hpp (original)
+++ branches/release/boost/context/all.hpp 2012-09-18 04:34:31 EDT (Tue, 18 Sep 2012)
@@ -4,11 +4,12 @@
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_CTX_ALL_H
-#define BOOST_CTX_ALL_H
+#ifndef BOOST_CONTEXT_ALL_H
+#define BOOST_CONTEXT_ALL_H
#include <boost/context/fcontext.hpp>
-#include <boost/context/stack_allocator.hpp>
-#include <boost/context/stack_utils.hpp>
+#include <boost/context/guarded_stack_allocator.hpp>
+#include <boost/context/simple_stack_allocator.hpp>
+#include <boost/context/utils.hpp>
-#endif // BOOST_CTX_ALL_H
+#endif // BOOST_CONTEXT_ALL_H
Modified: branches/release/boost/context/detail/config.hpp
==============================================================================
--- branches/release/boost/context/detail/config.hpp (original)
+++ branches/release/boost/context/detail/config.hpp 2012-09-18 04:34:31 EDT (Tue, 18 Sep 2012)
@@ -4,8 +4,8 @@
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_CTX_DETAIL_CONFIG_H
-#define BOOST_CTX_DETAIL_CONFIG_H
+#ifndef BOOST_CONTEXT_DETAIL_CONFIG_H
+#define BOOST_CONTEXT_DETAIL_CONFIG_H
#include <boost/config.hpp>
#include <boost/detail/workaround.hpp>
@@ -39,4 +39,4 @@
# include <boost/config/auto_link.hpp>
#endif
-#endif // BOOST_CTX_DETAIL_CONFIG_H
+#endif // BOOST_CONTEXT_DETAIL_CONFIG_H
Modified: branches/release/boost/context/detail/fcontext_arm.hpp
==============================================================================
--- branches/release/boost/context/detail/fcontext_arm.hpp (original)
+++ branches/release/boost/context/detail/fcontext_arm.hpp 2012-09-18 04:34:31 EDT (Tue, 18 Sep 2012)
@@ -4,8 +4,10 @@
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_CTX_DETAIL_FCONTEXT_ARM_H
-#define BOOST_CTX_DETAIL_FCONTEXT_ARM_H
+#ifndef BOOST_CONTEXT_DETAIL_FCONTEXT_ARM_H
+#define BOOST_CONTEXT_DETAIL_FCONTEXT_ARM_H
+
+#include <cstddef>
#include <boost/config.hpp>
#include <boost/cstdint.hpp>
@@ -17,7 +19,7 @@
#endif
namespace boost {
-namespace ctx {
+namespace context {
extern "C" {
@@ -25,11 +27,11 @@
struct stack_t
{
- void * base;
- void * limit;
+ void * sp;
+ std::size_t size;
stack_t() :
- base( 0), limit( 0)
+ sp( 0), size( 0)
{}
};
@@ -63,4 +65,4 @@
# include BOOST_ABI_SUFFIX
#endif
-#endif // BOOST_CTX_DETAIL_FCONTEXT_ARM_H
+#endif // BOOST_CONTEXT_DETAIL_FCONTEXT_ARM_H
Modified: branches/release/boost/context/detail/fcontext_i386.hpp
==============================================================================
--- branches/release/boost/context/detail/fcontext_i386.hpp (original)
+++ branches/release/boost/context/detail/fcontext_i386.hpp 2012-09-18 04:34:31 EDT (Tue, 18 Sep 2012)
@@ -4,8 +4,8 @@
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_CTX_DETAIL_FCONTEXT_I386H
-#define BOOST_CTX_DETAIL_FCONTEXT_I386H
+#ifndef BOOST_CONTEXT_DETAIL_FCONTEXT_I386H
+#define BOOST_CONTEXT_DETAIL_FCONTEXT_I386H
#include <cstddef>
@@ -19,7 +19,7 @@
#endif
namespace boost {
-namespace ctx {
+namespace context {
extern "C" {
@@ -27,20 +27,11 @@
struct stack_t
{
- void * base;
- void * limit;
+ void * sp;
+ std::size_t size;
stack_t() :
- base( 0), limit( 0)
- {}
-};
-
-struct fp_t
-{
- boost::uint32_t fc_freg[2];
-
- fp_t() :
- fc_freg()
+ sp( 0), size( 0)
{}
};
@@ -48,12 +39,12 @@
{
boost::uint32_t fc_greg[6];
stack_t fc_stack;
- fp_t fc_fp;
+ boost::uint32_t fc_freg[2];
fcontext_t() :
fc_greg(),
fc_stack(),
- fc_fp()
+ fc_freg()
{}
};
@@ -65,4 +56,4 @@
# include BOOST_ABI_SUFFIX
#endif
-#endif // BOOST_CTX_DETAIL_FCONTEXT_I386_H
+#endif // BOOST_CONTEXT_DETAIL_FCONTEXT_I386_H
Modified: branches/release/boost/context/detail/fcontext_i386_win.hpp
==============================================================================
--- branches/release/boost/context/detail/fcontext_i386_win.hpp (original)
+++ branches/release/boost/context/detail/fcontext_i386_win.hpp 2012-09-18 04:34:31 EDT (Tue, 18 Sep 2012)
@@ -4,13 +4,15 @@
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_CTX_DETAIL_FCONTEXT_I386H
-#define BOOST_CTX_DETAIL_FCONTEXT_I386H
+#ifndef BOOST_CONTEXT_DETAIL_FCONTEXT_I386H
+#define BOOST_CONTEXT_DETAIL_FCONTEXT_I386H
#if defined(_MSC_VER) && (_MSC_VER >= 1020)
# pragma once
#endif
+#include <cstddef>
+
#include <boost/config.hpp>
#include <boost/cstdint.hpp>
@@ -26,7 +28,7 @@
#endif
namespace boost {
-namespace ctx {
+namespace context {
extern "C" {
@@ -34,11 +36,12 @@
struct stack_t
{
- void * base;
+ void * sp;
+ std::size_t size;
void * limit;
stack_t() :
- base( 0), limit( 0)
+ sp( 0), size( 0), limit( 0)
{}
};
@@ -80,4 +83,4 @@
#pragma warning(pop)
#endif
-#endif // BOOST_CTX_DETAIL_FCONTEXT_I386_H
+#endif // BOOST_CONTEXT_DETAIL_FCONTEXT_I386_H
Modified: branches/release/boost/context/detail/fcontext_mips.hpp
==============================================================================
--- branches/release/boost/context/detail/fcontext_mips.hpp (original)
+++ branches/release/boost/context/detail/fcontext_mips.hpp 2012-09-18 04:34:31 EDT (Tue, 18 Sep 2012)
@@ -4,8 +4,10 @@
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_CTX_DETAIL_FCONTEXT_MIPS_H
-#define BOOST_CTX_DETAIL_FCONTEXT_MIPS_H
+#ifndef BOOST_CONTEXT_DETAIL_FCONTEXT_MIPS_H
+#define BOOST_CONTEXT_DETAIL_FCONTEXT_MIPS_H
+
+#include <cstddef>
#include <boost/config.hpp>
#include <boost/cstdint.hpp>
@@ -17,7 +19,7 @@
#endif
namespace boost {
-namespace ctx {
+namespace context {
extern "C" {
@@ -27,11 +29,11 @@
struct stack_t
{
- void * base;
- void * limit;
+ void * sp;
+ std::size_t size;
stack_t() :
- base( 0), limit( 0)
+ sp( 0), size( 0)
{}
};
@@ -46,7 +48,7 @@
struct fcontext_t
{
- boost::uint64_t fc_greg[13];
+ boost::uint32_t fc_greg[12];
stack_t fc_stack;
fp_t fc_fp;
@@ -65,4 +67,4 @@
# include BOOST_ABI_SUFFIX
#endif
-#endif // BOOST_CTX_DETAIL_FCONTEXT_MIPS_H
+#endif // BOOST_CONTEXT_DETAIL_FCONTEXT_MIPS_H
Modified: branches/release/boost/context/detail/fcontext_ppc.hpp
==============================================================================
--- branches/release/boost/context/detail/fcontext_ppc.hpp (original)
+++ branches/release/boost/context/detail/fcontext_ppc.hpp 2012-09-18 04:34:31 EDT (Tue, 18 Sep 2012)
@@ -4,8 +4,10 @@
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_CTX_DETAIL_FCONTEXT_PPC_H
-#define BOOST_CTX_DETAIL_FCONTEXT_PPC_H
+#ifndef BOOST_CONTEXT_DETAIL_FCONTEXT_PPC_H
+#define BOOST_CONTEXT_DETAIL_FCONTEXT_PPC_H
+
+#include <cstddef>
#include <boost/config.hpp>
#include <boost/cstdint.hpp>
@@ -17,7 +19,7 @@
#endif
namespace boost {
-namespace ctx {
+namespace context {
extern "C" {
@@ -25,11 +27,11 @@
struct stack_t
{
- void * base;
- void * limit;
+ void * sp;
+ std::size_t size;
stack_t() :
- base( 0), limit( 0)
+ sp( 0), size( 0)
{}
};
@@ -67,4 +69,4 @@
# include BOOST_ABI_SUFFIX
#endif
-#endif // BOOST_CTX_DETAIL_FCONTEXT_PPC_H
+#endif // BOOST_CONTEXT_DETAIL_FCONTEXT_PPC_H
Modified: branches/release/boost/context/detail/fcontext_x86_64.hpp
==============================================================================
--- branches/release/boost/context/detail/fcontext_x86_64.hpp (original)
+++ branches/release/boost/context/detail/fcontext_x86_64.hpp 2012-09-18 04:34:31 EDT (Tue, 18 Sep 2012)
@@ -4,8 +4,10 @@
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_CTX_DETAIL_FCONTEXT_X86_64_H
-#define BOOST_CTX_DETAIL_FCONTEXT_X86_64_H
+#ifndef BOOST_CONTEXT_DETAIL_FCONTEXT_X86_64_H
+#define BOOST_CONTEXT_DETAIL_FCONTEXT_X86_64_H
+
+#include <cstddef>
#include <boost/config.hpp>
#include <boost/cstdint.hpp>
@@ -17,7 +19,7 @@
#endif
namespace boost {
-namespace ctx {
+namespace context {
extern "C" {
@@ -25,11 +27,11 @@
struct stack_t
{
- void * base;
- void * limit;
+ void * sp;
+ std::size_t size;
stack_t() :
- base( 0), limit( 0)
+ sp( 0), size( 0)
{}
};
@@ -63,4 +65,4 @@
# include BOOST_ABI_SUFFIX
#endif
-#endif // BOOST_CTX_DETAIL_FCONTEXT_X86_64_H
+#endif // BOOST_CONTEXT_DETAIL_FCONTEXT_X86_64_H
Modified: branches/release/boost/context/detail/fcontext_x86_64_win.hpp
==============================================================================
--- branches/release/boost/context/detail/fcontext_x86_64_win.hpp (original)
+++ branches/release/boost/context/detail/fcontext_x86_64_win.hpp 2012-09-18 04:34:31 EDT (Tue, 18 Sep 2012)
@@ -4,14 +4,15 @@
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_CTX_DETAIL_FCONTEXT_X86_64_H
-#define BOOST_CTX_DETAIL_FCONTEXT_X86_64_H
+#ifndef BOOST_CONTEXT_DETAIL_FCONTEXT_X86_64_H
+#define BOOST_CONTEXT_DETAIL_FCONTEXT_X86_64_H
#if defined(_MSC_VER) && (_MSC_VER >= 1020)
# pragma once
#endif
-#include <boost/assert.hpp>
+#include <cstddef>
+
#include <boost/config.hpp>
#include <boost/cstdint.hpp>
@@ -27,7 +28,7 @@
#endif
namespace boost {
-namespace ctx {
+namespace context {
extern "C" {
@@ -35,11 +36,12 @@
struct stack_t
{
- void * base;
+ void * sp;
+ std::size_t size;
void * limit;
stack_t() :
- base( 0), limit( 0)
+ sp( 0), size( 0), limit( 0)
{}
};
@@ -87,4 +89,4 @@
#pragma warning(pop)
#endif
-#endif // BOOST_CTX_DETAIL_FCONTEXT_X86_64_H
+#endif // BOOST_CONTEXT_DETAIL_FCONTEXT_X86_64_H
Modified: branches/release/boost/context/fcontext.hpp
==============================================================================
--- branches/release/boost/context/fcontext.hpp (original)
+++ branches/release/boost/context/fcontext.hpp 2012-09-18 04:34:31 EDT (Tue, 18 Sep 2012)
@@ -4,8 +4,8 @@
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_CTX_FCONTEXT_H
-#define BOOST_CTX_FCONTEXT_H
+#ifndef BOOST_CONTEXT_FCONTEXT_H
+#define BOOST_CONTEXT_FCONTEXT_H
#if defined(__PGI)
#include <stdint.h>
@@ -60,7 +60,7 @@
#endif
namespace boost {
-namespace ctx {
+namespace context {
namespace detail {
extern "C" BOOST_CONTEXT_DECL void * BOOST_CONTEXT_CALLDECL align_stack( void * vp);
@@ -70,7 +70,7 @@
extern "C" BOOST_CONTEXT_DECL
intptr_t BOOST_CONTEXT_CALLDECL jump_fcontext( fcontext_t * ofc, fcontext_t const* nfc, intptr_t vp, bool preserve_fpu = true);
extern "C" BOOST_CONTEXT_DECL
-void BOOST_CONTEXT_CALLDECL make_fcontext( fcontext_t * fc, void (* fn)( intptr_t) );
+fcontext_t * BOOST_CONTEXT_CALLDECL make_fcontext( void * sp, std::size_t size, void (* fn)( intptr_t) );
}}
@@ -78,5 +78,5 @@
# include BOOST_ABI_SUFFIX
#endif
-#endif // BOOST_CTX_FCONTEXT_H
+#endif // BOOST_CONTEXT_FCONTEXT_H
Copied: branches/release/boost/context/guarded_stack_allocator.hpp (from r80507, /trunk/boost/context/guarded_stack_allocator.hpp)
==============================================================================
--- /trunk/boost/context/guarded_stack_allocator.hpp (original)
+++ branches/release/boost/context/guarded_stack_allocator.hpp 2012-09-18 04:34:31 EDT (Tue, 18 Sep 2012)
@@ -4,8 +4,8 @@
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_CTX_GUARDED_STACK_ALLOCATOR_H
-#define BOOST_CTX_GUARDED_STACK_ALLOCATOR_H
+#ifndef BOOST_CONTEXT_GUARDED_STACK_ALLOCATOR_H
+#define BOOST_CONTEXT_GUARDED_STACK_ALLOCATOR_H
#include <boost/config.hpp>
@@ -26,7 +26,7 @@
#endif
namespace boost {
-namespace ctx {
+namespace context {
class BOOST_CONTEXT_DECL guarded_stack_allocator
{
@@ -52,4 +52,4 @@
//#endif
-#endif // BOOST_CTX_GUARDED_STACK_ALLOCATOR_H
+#endif // BOOST_CONTEXT_GUARDED_STACK_ALLOCATOR_H
Copied: branches/release/boost/context/simple_stack_allocator.hpp (from r80507, /trunk/boost/context/simple_stack_allocator.hpp)
==============================================================================
--- /trunk/boost/context/simple_stack_allocator.hpp (original)
+++ branches/release/boost/context/simple_stack_allocator.hpp 2012-09-18 04:34:31 EDT (Tue, 18 Sep 2012)
@@ -4,8 +4,8 @@
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_CTX_SIMPLE_STACK_ALLOCATOR_H
-#define BOOST_CTX_SIMPLE_STACK_ALLOCATOR_H
+#ifndef BOOST_CONTEXT_SIMPLE_STACK_ALLOCATOR_H
+#define BOOST_CONTEXT_SIMPLE_STACK_ALLOCATOR_H
#include <cstddef>
#include <cstdlib>
@@ -21,7 +21,7 @@
#endif
namespace boost {
-namespace ctx {
+namespace context {
template< std::size_t Max, std::size_t Default, std::size_t Min >
class simple_stack_allocator
@@ -64,4 +64,4 @@
# include BOOST_ABI_SUFFIX
#endif
-#endif // BOOST_CTX_SIMPLE_STACK_ALLOCATOR_H
+#endif // BOOST_CONTEXT_SIMPLE_STACK_ALLOCATOR_H
Deleted: branches/release/boost/context/stack_allocator.hpp
==============================================================================
--- branches/release/boost/context/stack_allocator.hpp 2012-09-18 04:34:31 EDT (Tue, 18 Sep 2012)
+++ (empty file)
@@ -1,37 +0,0 @@
-
-// Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_CTX_STACK_ALLOCATOR_H
-#define BOOST_CTX_STACK_ALLOCATOR_H
-
-#include <cstddef>
-
-#include <boost/config.hpp>
-
-#include <boost/context/detail/config.hpp>
-
-#ifdef BOOST_HAS_ABI_HEADERS
-# include BOOST_ABI_PREFIX
-#endif
-
-namespace boost {
-namespace ctx {
-
-class BOOST_CONTEXT_DECL stack_allocator
-{
-public:
- void * allocate( std::size_t) const;
-
- void deallocate( void *, std::size_t) const;
-};
-
-}}
-
-#ifdef BOOST_HAS_ABI_HEADERS
-# include BOOST_ABI_SUFFIX
-#endif
-
-#endif // BOOST_CTX_STACK_ALLOCATOR_H
Deleted: branches/release/boost/context/stack_utils.hpp
==============================================================================
--- branches/release/boost/context/stack_utils.hpp 2012-09-18 04:34:31 EDT (Tue, 18 Sep 2012)
+++ (empty file)
@@ -1,41 +0,0 @@
-
-// Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_CTX_STACK_UTILS_H
-#define BOOST_CTX_STACK_UTILS_H
-
-#include <cstddef>
-
-#include <boost/config.hpp>
-
-#include <boost/context/detail/config.hpp>
-
-#ifdef BOOST_HAS_ABI_HEADERS
-# include BOOST_ABI_PREFIX
-#endif
-
-namespace boost {
-namespace ctx {
-
-BOOST_CONTEXT_DECL std::size_t default_stacksize();
-
-BOOST_CONTEXT_DECL std::size_t minimum_stacksize();
-
-BOOST_CONTEXT_DECL std::size_t maximum_stacksize();
-
-BOOST_CONTEXT_DECL std::size_t pagesize();
-
-BOOST_CONTEXT_DECL std::size_t page_count( std::size_t stacksize);
-
-BOOST_CONTEXT_DECL bool is_stack_unbound();
-
-}}
-
-#ifdef BOOST_HAS_ABI_HEADERS
-# include BOOST_ABI_SUFFIX
-#endif
-
-#endif // BOOST_CTX_STACK_UTILS_H
Copied: branches/release/boost/context/utils.hpp (from r80507, /trunk/boost/context/utils.hpp)
==============================================================================
--- /trunk/boost/context/utils.hpp (original)
+++ branches/release/boost/context/utils.hpp 2012-09-18 04:34:31 EDT (Tue, 18 Sep 2012)
@@ -4,8 +4,8 @@
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_CTX_UTILS_H
-#define BOOST_CTX_UTILS_H
+#ifndef BOOST_CONTEXT_UTILS_H
+#define BOOST_CONTEXT_UTILS_H
#include <boost/config.hpp>
@@ -26,7 +26,7 @@
#endif
namespace boost {
-namespace ctx {
+namespace context {
BOOST_CONTEXT_DECL std::size_t pagesize();
@@ -38,4 +38,4 @@
//#endif
-#endif // BOOST_CTX_UTILS_H
+#endif // BOOST_CONTEXT_UTILS_H