Skip to content

os: fix ThreadType size for newer sdk versions #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Pistonight wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −1
Open

os: fix ThreadType size for newer sdk versions #81

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion include/nn/os/os_ThreadTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@ struct ThreadType {
ThreadFunction _threadFunction;
FiberType* _currentFiber;
FiberType* _initialFiber;
// may be inaccurate: SDK 4.4.0 has the field while 7.3.2 and 20.5.6 does not
#if NN_SDK_VER >= NN_MAKE_VER(5, 0, 0)
uint32_t _lockHistory;
#endif
uintptr_t _tlsValueArray[32];
char _threadNameBuffer[32];
const char* _namePointer;
Expand All @@ -47,9 +50,13 @@ struct ThreadType {
detail::InternalThreadHandle _handle;
};
#ifdef SWITCH
#if NN_SDK_VER >= NN_MAKE_VER(5, 0, 0) // see _lockHistory above
static_assert(sizeof(ThreadType) == 0x1B8, "Wrong size");
#else
static_assert(sizeof(ThreadType) == 0x1C0, "Wrong size");
#endif
#endif

} // namespace os

} // namespace nn
} // namespace nn
Loading