Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #316 from yuriks/thread-handle

Browse source 
Kernel: Implement support for current thread pseudo-handle
This commit is contained in:
bunnei 2014-12-20 16:36:01 -05:00
commit 2e5869c939
3 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/core/hle/kernel/kernel.h
View file

@ -14,6 +14,10 @@ typedef s32 Result;
namespace Kernel {
// From kernel.h. Declarations duplicated here to avoid a circular header dependency.
class Thread;
Thread* GetCurrentThread();
enum KernelHandle {
CurrentThread = 0xFFFF8000,
CurrentProcess = 0xFFFF8001,
@ -81,6 +85,10 @@ public:
template <class T>
T* Get(Handle handle) {
if (handle == CurrentThread) {
return reinterpret_cast<T*>(GetCurrentThread());
}
if (handle < HANDLE_OFFSET || handle >= HANDLE_OFFSET + MAX_COUNT || !occupied[handle - HANDLE_OFFSET]) {
if (handle != 0) {
LOG_ERROR(Kernel, "Bad object handle %08x", handle);
@ -99,6 +107,10 @@ public:
// ONLY use this when you know the handle is valid.
template <class T>
T *GetFast(Handle handle) {
if (handle == CurrentThread) {
return reinterpret_cast<T*>(GetCurrentThread());
}
const Handle realHandle = handle - HANDLE_OFFSET;
_dbg_assert_(Kernel, realHandle >= 0 && realHandle < MAX_COUNT && occupied[realHandle]);
return static_cast<T*>(pool[realHandle]);