RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 02:32:36 +01:00
Code Issues Releases Wiki Activity

LV2: Fix thread notifications regression

Browse Source
This commit is contained in:
Elad 2024-11-12 13:31:26 +02:00
parent e9b24eba85
commit 72437b50b4
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rpcs3/Emu/Cell/lv2/lv2.cpp
View File

@ -1341,12 +1341,12 @@ bool lv2_obj::sleep(cpu_thread& cpu, const u64 timeout)
} }
else if (auto it = std::find(g_to_notify, std::end(g_to_notify), std::add_pointer_t<const void>{}); it != std::end(g_to_notify)) else if (auto it = std::find(g_to_notify, std::end(g_to_notify), std::add_pointer_t<const void>{}); it != std::end(g_to_notify))
{ {
*it = vm::reservation_notifier_notify(addr, true); *it++ = vm::reservation_notifier_notify(addr, true);
if (it < std::end(g_to_notify) - 1) if (it < std::end(g_to_notify))
{ {
// Null-terminate the list if it ends before last slot // Null-terminate the list if it ends before last slot
*(it + 1) = nullptr; *it = nullptr;
} }
} }
else else
@ -1394,12 +1394,12 @@ bool lv2_obj::awake(cpu_thread* thread, s32 prio)
} }
else if (auto it = std::find(g_to_notify, std::end(g_to_notify), std::add_pointer_t<const void>{}); it != std::end(g_to_notify)) else if (auto it = std::find(g_to_notify, std::end(g_to_notify), std::add_pointer_t<const void>{}); it != std::end(g_to_notify))
{ {
*it = vm::reservation_notifier_notify(addr, true); *it++ = vm::reservation_notifier_notify(addr, true);
if (it < std::end(g_to_notify) - 1) if (it < std::end(g_to_notify))
{ {
// Null-terminate the list if it ends before last slot // Null-terminate the list if it ends before last slot
*(it + 1) = nullptr; *it = nullptr;
} }
} }
else else
@ -1908,10 +1908,10 @@ void lv2_obj::schedule_all(u64 current_time)
} }
} }
if (it < std::end(g_to_notify) - 1) if (it < std::end(g_to_notify))
{ {
// Null-terminate the list if it ends before last slot // Null-terminate the list if it ends before last slot
*(it + 1) = nullptr; *it = nullptr;
} }
if (const u64 freq = s_yield_frequency) if (const u64 freq = s_yield_frequency)