diff options
author | Liam <byteslice@airmail.cc> | 2022-07-02 18:33:49 +0200 |
---|---|---|
committer | Liam <byteslice@airmail.cc> | 2022-07-02 18:33:49 +0200 |
commit | ed0319cfed2c99e6366aaf725d96bb28a9332e4d (patch) | |
tree | 1598e6d320005e0d177106e28ebc6728234f1f24 /src/common/fiber.cpp | |
parent | Merge pull request #7454 from FernandoS27/new-core-timing (diff) | |
download | yuzu-ed0319cfed2c99e6366aaf725d96bb28a9332e4d.tar yuzu-ed0319cfed2c99e6366aaf725d96bb28a9332e4d.tar.gz yuzu-ed0319cfed2c99e6366aaf725d96bb28a9332e4d.tar.bz2 yuzu-ed0319cfed2c99e6366aaf725d96bb28a9332e4d.tar.lz yuzu-ed0319cfed2c99e6366aaf725d96bb28a9332e4d.tar.xz yuzu-ed0319cfed2c99e6366aaf725d96bb28a9332e4d.tar.zst yuzu-ed0319cfed2c99e6366aaf725d96bb28a9332e4d.zip |
Diffstat (limited to '')
-rw-r--r-- | src/common/fiber.cpp | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/src/common/fiber.cpp b/src/common/fiber.cpp index f9aeb692a..bc92b360b 100644 --- a/src/common/fiber.cpp +++ b/src/common/fiber.cpp @@ -20,10 +20,8 @@ struct Fiber::FiberImpl { VirtualBuffer<u8> rewind_stack; std::mutex guard; - std::function<void(void*)> entry_point; - std::function<void(void*)> rewind_point; - void* rewind_parameter{}; - void* start_parameter{}; + std::function<void()> entry_point; + std::function<void()> rewind_point; std::shared_ptr<Fiber> previous_fiber; bool is_thread_fiber{}; bool released{}; @@ -34,13 +32,8 @@ struct Fiber::FiberImpl { boost::context::detail::fcontext_t rewind_context{}; }; -void Fiber::SetStartParameter(void* new_parameter) { - impl->start_parameter = new_parameter; -} - -void Fiber::SetRewindPoint(std::function<void(void*)>&& rewind_func, void* rewind_param) { +void Fiber::SetRewindPoint(std::function<void()>&& rewind_func) { impl->rewind_point = std::move(rewind_func); - impl->rewind_parameter = rewind_param; } void Fiber::Start(boost::context::detail::transfer_t& transfer) { @@ -48,7 +41,7 @@ void Fiber::Start(boost::context::detail::transfer_t& transfer) { impl->previous_fiber->impl->context = transfer.fctx; impl->previous_fiber->impl->guard.unlock(); impl->previous_fiber.reset(); - impl->entry_point(impl->start_parameter); + impl->entry_point(); UNREACHABLE(); } @@ -59,7 +52,7 @@ void Fiber::OnRewind([[maybe_unused]] boost::context::detail::transfer_t& transf u8* tmp = impl->stack_limit; impl->stack_limit = impl->rewind_stack_limit; impl->rewind_stack_limit = tmp; - impl->rewind_point(impl->rewind_parameter); + impl->rewind_point(); UNREACHABLE(); } @@ -73,10 +66,8 @@ void Fiber::RewindStartFunc(boost::context::detail::transfer_t transfer) { fiber->OnRewind(transfer); } -Fiber::Fiber(std::function<void(void*)>&& entry_point_func, void* start_parameter) - : impl{std::make_unique<FiberImpl>()} { +Fiber::Fiber(std::function<void()>&& entry_point_func) : impl{std::make_unique<FiberImpl>()} { impl->entry_point = std::move(entry_point_func); - impl->start_parameter = start_parameter; impl->stack_limit = impl->stack.data(); impl->rewind_stack_limit = impl->rewind_stack.data(); u8* stack_base = impl->stack_limit + default_stack_size; |