- this->uc_.uc_stack.ss_sp = sg_makecontext_stack_addr(this->stack_);
- this->uc_.uc_stack.ss_size = sg_makecontext_stack_size(smx_context_usable_stack_size);
-#if PTH_STACKGROWTH == -1
- ASAN_ONLY(this->asan_stack_ = static_cast<char*>(this->stack_) + smx_context_usable_stack_size);
-#else
- ASAN_ONLY(this->asan_stack_ = this->stack_);
-#endif
- UContext::make_ctx(&this->uc_, UContext::smx_ctx_sysv_wrapper, this);
- } else {
- if (process != nullptr && get_maestro() == nullptr)
- set_maestro(this);
- }
-
-#if SIMGRID_HAVE_MC
- if (MC_is_active() && has_code()) {
- MC_register_stack_area(this->stack_, process, &(this->uc_), smx_context_usable_stack_size);
- }
-#endif
-}
-
-UContext::~UContext() = default;
-
-// The name of this function is currently hardcoded in the code (as string).
-// Do not change it without fixing those references as well.
-void UContext::smx_ctx_sysv_wrapper(int i1, int i2)
-{
- // Rebuild the Context* pointer from the integers:
- int ctx_addr[CTX_ADDR_LEN] = {i1, i2};
- simgrid::kernel::context::UContext* context;
- memcpy(&context, ctx_addr, sizeof context);
-
- ASAN_FINISH_SWITCH(nullptr, &context->asan_ctx_->asan_stack_, &context->asan_ctx_->asan_stack_size_);
- try {
- (*context)();
- } catch (simgrid::kernel::context::Context::StopRequest const&) {
- XBT_DEBUG("Caught a StopRequest");
- } catch (simgrid::Exception const& e) {
- XBT_INFO("Actor killed by an uncatched exception %s", simgrid::xbt::demangle(typeid(e).name()).get());
- throw;
+ this->uc_.uc_stack.ss_sp = sg_makecontext_stack_addr(get_stack());
+ this->uc_.uc_stack.ss_size = sg_makecontext_stack_size(actor->get_stacksize());
+ // Makecontext expects integer arguments; we want to pass a pointer.
+ // This context address is decomposed into a series of integers, which are passed as arguments to makecontext.
+
+ int ctx_addr[CTX_ADDR_LEN]{};
+ UContext* arg = this;
+ memcpy(ctx_addr, &arg, sizeof arg);
+ makecontext(&this->uc_, (void (*)())sysv_ctx_wrapper, 2, ctx_addr[0], ctx_addr[1]);