nintendo-emulators/eden
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden.git synced 2025-10-05 15:52:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

[common] fix extraneous error wrt. priority queues (#2598)

Browse Source 
This fixes an error that is reproducible (seemingly everywhere?) but on Linux. BitSet<> PR did not yield errors at the time of testing and this issue only cropped up after merge.

Signed-off-by: lizzie <lizzie@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2598
Co-authored-by: lizzie <lizzie@eden-emu.dev>
Co-committed-by: lizzie <lizzie@eden-emu.dev>
This commit is contained in:
lizzie
2025-09-27 14:51:37 +02:00
committed by crueter
parent 020ad29a8c
commit ba20e5c2f5
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/core/hle/kernel/k_priority_queue.h
View File

@@ -12,6 +12,7 @@
#include <concepts>
#include <cstddef>
#include "common/alignment.h"
#include "common/assert.h"
#include "common/common_types.h"
#include "common/concepts.h"
@@ -196,7 +197,12 @@ public:
constexpr Member* GetFront(s32 core) const {
ASSERT(IsValidCore(core));
const s32 priority = s32((~m_available_priorities[core]).count());
const s32 priority = s32([](auto const& e) {
for (size_t i = 0; i < e.size(); ++i)
if (e[i])
return i;
return e.size();
}(m_available_priorities[core]));
if (priority <= LowestPriority) {
return m_queues[priority].GetFront(core);
} else {
@@ -215,19 +221,22 @@ public:
}
}
template<size_t N>
constexpr size_t GetNextSet(std::bitset<N> const& bit, size_t n) const {
for (size_t i = n + 1; i < bit.size(); i++)
if (bit[i])
return i;
return bit.size();
}
constexpr Member* GetNext(s32 core, const Member* member) const {
ASSERT(IsValidCore(core));
Member* next = member->GetPriorityQueueEntry(core).GetNext();
if (next == nullptr) {
s32 priority = member->GetPriority() + 1;
do {
if (m_available_priorities[core][priority]) {
next = m_queues[priority].GetFront(core);
break;
}
++priority;
} while (priority <= LowestPriority && priority < s32(m_available_priorities[core].size()));
s32 priority = s32(GetNextSet(m_available_priorities[core], member->GetPriority()));
if (priority <= LowestPriority)
next = m_queues[priority].GetFront(core);
}
return next;
}