Skip to content

Add support for the e2k architecture in the ucontext implementation #333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
arrowd wants to merge 2 commits into
base: develop
Choose a base branch
from
+71 −3
Open

Add support for the e2k architecture in the ucontext implementation #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d675b3
Teach CMake about Elbrus2000 architecture
arrowd May 26, 2026
a50cadc
Add support for the e2k architecture in the ucontext implementation
May 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ unset(_default_abi)

## Arch-and-model

set(_all_archs arm arm64 loongarch64 mips32 mips64 ppc32 ppc64 riscv64 s390x i386 x86_64 combined)
set(_all_archs arm arm64 e2k loongarch64 mips32 mips64 ppc32 ppc64 riscv64 s390x i386 x86_64 combined)

# Try at start to auto determine arch from CMake.
if(CMAKE_SYSTEM_PROCESSOR IN_LIST _all_archs)
Expand All @@ -69,6 +69,8 @@ else()
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" OR
CMAKE_SYSTEM_PROCESSOR MATCHES "^[Aa][Rr][Mm]") # armv8
set(_default_arch arm64)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^[Ee]2[Kk]")
set(_default_arch e2k)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
set(_default_arch mips64)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc64)")
Expand All @@ -78,7 +80,7 @@ else()
endif()
endif()

set(BOOST_CONTEXT_ARCHITECTURE "${_default_arch}" CACHE STRING "Boost.Context architecture (arm, arm64, loongarch64, mips32, mips64, ppc32, ppc64, riscv64, s390x, i386, x86_64, combined)")
set(BOOST_CONTEXT_ARCHITECTURE "${_default_arch}" CACHE STRING "Boost.Context architecture (arm, arm64, e2k, loongarch64, mips32, mips64, ppc32, ppc64, riscv64, s390x, i386, x86_64, combined)")
set_property(CACHE BOOST_CONTEXT_ARCHITECTURE PROPERTY STRINGS ${_all_archs})

unset(_all_archs)
Expand Down Expand Up @@ -123,7 +125,11 @@ unset(_default_ext)

## Implementation

set(_default_impl fcontext)
if(BOOST_CONTEXT_ARCHITECTURE STREQUAL e2k)
set(_default_impl ucontext)
else()
set(_default_impl fcontext)
endif()

set(BOOST_CONTEXT_IMPLEMENTATION "${_default_impl}" CACHE STRING "Boost.Context implementation (fcontext, ucontext, winfib)")
set_property(CACHE BOOST_CONTEXT_IMPLEMENTATION PROPERTY STRINGS fcontext ucontext winfib)
Expand Down
31 changes: 31 additions & 0 deletions include/boost/context/continuation_ucontext.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,11 @@ struct BOOST_CONTEXT_DECL activation_record {
}

virtual ~activation_record() {
#ifdef __e2k__
// On the e2k arch makecontext() is a real syscall that allocates memory
// so ucontext_t objects should be freed
::freecontext_e2k( & uctx);
#endif
}

activation_record( activation_record const&) = delete;
Expand Down Expand Up @@ -312,8 +317,21 @@ static activation_record * create_context1( StackAlloc && salloc, Fn && fn) {
std::uint32_t((integer >> 32) & 0xFFFFFFFF),
std::uint32_t(integer));
#else
#ifndef __e2k__
::makecontext(&record->uctx, (void (*)()) & entry_func<capture_t>, 1,
record);
#else
// On the e2k arch makecontext() allocates memory and thus may fail due to OOM
// We have to check for the returning value
int mc_ret = ::makecontext_e2k(&record->uctx, (void (*)()) & entry_func<capture_t>,
1, record);
if (BOOST_UNLIKELY(mc_ret < 0)) {
record->~capture_t();
salloc.deallocate( sctx);
throw std::system_error(std::error_code(errno, std::system_category()),
"makecontext_e2k() failed");
}
#endif // __e2k__
#endif
#if defined(BOOST_USE_ASAN)
record->stack_bottom = record->uctx.uc_stack.ss_sp;
Expand Down Expand Up @@ -355,8 +373,21 @@ static activation_record * create_context2( preallocated palloc, StackAlloc && s
std::uint32_t((integer >> 32) & 0xFFFFFFFF),
std::uint32_t(integer));
#else
#ifndef __e2k__
::makecontext(&record->uctx, (void (*)()) & entry_func<capture_t>, 1,
record);
#else
// On the e2k arch makecontext() allocates memory and thus may fail due to OOM
// We have to check for the returning value
int mc_ret = ::makecontext_e2k(&record->uctx, (void (*)()) & entry_func<capture_t>,
1, record);
if (BOOST_UNLIKELY(mc_ret < 0)) {
record->~capture_t();
salloc.deallocate( palloc.sctx);
throw std::system_error(std::error_code(errno, std::system_category()),
"makecontext_e2k() failed");
}
#endif // __e2k__
#endif
#if defined(BOOST_USE_ASAN)
record->stack_bottom = record->uctx.uc_stack.ss_sp;
Expand Down
31 changes: 31 additions & 0 deletions include/boost/context/fiber_ucontext.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,11 @@ struct BOOST_CONTEXT_DECL fiber_activation_record {
}

virtual ~fiber_activation_record() {
#ifdef __e2k__
// On the e2k arch makecontext() is a real syscall that allocates memory
// so ucontext_t objects should be freed
::freecontext_e2k( & uctx);
#endif
#if defined(BOOST_USE_TSAN)
if (destroy_tsan_fiber)
__tsan_destroy_fiber(tsan_fiber);
Expand Down Expand Up @@ -342,8 +347,21 @@ static fiber_activation_record * create_fiber1( StackAlloc && salloc, Fn && fn)
std::uint32_t((integer >> 32) & 0xFFFFFFFF),
std::uint32_t(integer));
#else
#ifndef __e2k__
::makecontext(&record->uctx, (void (*)()) & fiber_entry_func<capture_t>, 1,
record);
#else
// On the e2k arch makecontext() allocates memory and thus may fail due to OOM
// We have to check for the returning value
int mc_ret = ::makecontext_e2k(&record->uctx, (void (*)()) & fiber_entry_func<capture_t>,
1, record);
if (BOOST_UNLIKELY(mc_ret < 0)) {
record->~capture_t();
salloc.deallocate( sctx);
throw std::system_error(std::error_code(errno, std::system_category()),
"makecontext_e2k() failed");
}
#endif // __e2k__
#endif
#if defined(BOOST_USE_ASAN)
record->stack_bottom = record->uctx.uc_stack.ss_sp;
Expand Down Expand Up @@ -393,8 +411,21 @@ static fiber_activation_record * create_fiber2( preallocated palloc, StackAlloc
std::uint32_t((integer >> 32) & 0xFFFFFFFF),
std::uint32_t(integer));
#else
#ifndef __e2k__
::makecontext(&record->uctx, (void (*)()) & fiber_entry_func<capture_t>, 1,
record);
#else
// On the e2k arch makecontext() allocates memory and thus may fail due to OOM
// We have to check for the returning value
int mc_ret = ::makecontext_e2k(&record->uctx, (void (*)()) & fiber_entry_func<capture_t>,
1, record);
if (BOOST_UNLIKELY(mc_ret < 0)) {
record->~capture_t();
salloc.deallocate( palloc.sctx);
throw std::system_error(std::error_code(errno, std::system_category()),
"makecontext_e2k() failed");
}
#endif // __e2k__
#endif
#if defined(BOOST_USE_ASAN)
record->stack_bottom = record->uctx.uc_stack.ss_sp;
Expand Down