nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-12-23 04:41:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix GenerateClassToken

Browse source
This commit is contained in:
TuxSH 2018-11-06 17:33:03 +01:00 committed by Michael Scire
parent 65b20d0685
commit f72836d72c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mesosphere/include/mesosphere/core/KAutoObject.hpp
View file

@ -112,14 +112,14 @@ class KAutoObject {
* Multiple inheritance is not supported * Multiple inheritance is not supported
* (BaseToken & DerivedToken) == BaseToken * (BaseToken & DerivedToken) == BaseToken
* The token for KAutoObject is 0 * The token for KAutoObject is 0
* Not-final classes have a token of (1 << typeid) * Not-final classes have a token of (1 << (typeid - 1))
* Final derived classes have a unique token part of Seq[typeid - DerivedClassMin] | 0x100, * Final derived classes have a unique token part of Seq[typeid - DerivedClassMin] | 0x100,
where Seq is (in base 2) 11, 101, 110, 1001, 1010, and so on... where Seq is (in base 2) 11, 101, 110, 1001, 1010, and so on...
*/ */
if constexpr (std::is_same_v<T, KAutoObject>) { if constexpr (std::is_same_v<T, KAutoObject>) {
return 0; return 0;
} else if constexpr (!std::is_final_v<T>) { } else if constexpr (!std::is_final_v<T>) {
return (1 << (ushort)T::typeId) | GenerateClassToken<typename T::BaseClass>(); return (1 << ((ushort)T::typeId - 1)) | GenerateClassToken<typename T::BaseClass>();
} else { } else {
ushort off = (ushort)T::typeId - (ushort)TypeId::FinalClassesMin; ushort off = (ushort)T::typeId - (ushort)TypeId::FinalClassesMin;
return ((ushort)detail::A038444(off) << 9) | 0x100u | GenerateClassToken<typename T::BaseClass>(); return ((ushort)detail::A038444(off) << 9) | 0x100u | GenerateClassToken<typename T::BaseClass>();