mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-05-29 22:15:17 -04:00
Code Issues Projects Releases Packages Wiki Activity

kern: update scheduler for 13.0.0 change, fix some ctz/clz bugs

Browse source
This commit is contained in:
Michael Scire 2021-10-19 01:20:28 -07:00
parent 42b6c2dd95
commit f3b532070b
9 changed files with 22 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

13
libraries/libvapours/include/vapours/util/util_bitset.hpp
View file

@ -17,6 +17,7 @@
#pragma once
#include <vapours/common.hpp>
#include <vapours/assert.hpp>
#include <vapours/util/util_bitutil.hpp>
namespace ams::util {
@ -30,14 +31,10 @@ namespace ams::util {
static_assert(sizeof(Storage) <= sizeof(u64));
static constexpr size_t FlagsPerWord = BITSIZEOF(Storage);
static constexpr size_t NumWords = util::AlignUp(N, FlagsPerWord) / FlagsPerWord;
static constexpr ALWAYS_INLINE auto CountLeadingZeroImpl(Storage word) {
return __builtin_clzll(static_cast<unsigned long long>(word)) - (BITSIZEOF(unsigned long long) - FlagsPerWord);
}
static constexpr size_t NumWords = util::DivideUp(N, FlagsPerWord);
static constexpr ALWAYS_INLINE Storage GetBitMask(size_t bit) {
return Storage(1) << (FlagsPerWord - 1 - bit);
return static_cast<Storage>(1) << (FlagsPerWord - 1 - bit);
}
private:
Storage m_words[NumWords];
@ -55,7 +52,7 @@ namespace ams::util {
constexpr ALWAYS_INLINE size_t CountLeadingZero() const {
for (size_t i = 0; i < NumWords; i++) {
if (m_words[i]) {
return FlagsPerWord * i + CountLeadingZeroImpl(m_words[i]);
return FlagsPerWord * i + util::CountLeadingZeros<Storage>(m_words[i]);
}
}
return FlagsPerWord * NumWords;
@ -68,7 +65,7 @@ namespace ams::util {
word &= GetBitMask(n % FlagsPerWord) - 1;
}
if (word) {
return FlagsPerWord * i + CountLeadingZeroImpl(word);
return FlagsPerWord * i + util::CountLeadingZeros<Storage>(word);
}
}
return FlagsPerWord * NumWords;