N-archive/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix SvcGetThreadId

Browse source
This commit is contained in:
gdkchan 2018-04-04 16:07:44 -03:00
parent 0ac4681fa0
commit e0c3d9c8df
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Ryujinx.Core/OsHle/Svc/SvcThread.cs
View file

@ -1,6 +1,8 @@
using ChocolArm64.State; using ChocolArm64.State;
using Ryujinx.Core.OsHle.Handles; using Ryujinx.Core.OsHle.Handles;
using static Ryujinx.Core.OsHle.ErrorCode;
namespace Ryujinx.Core.OsHle.Svc namespace Ryujinx.Core.OsHle.Svc
{ {
partial class SvcHandler partial class SvcHandler
@ -61,11 +63,11 @@ namespace Ryujinx.Core.OsHle.Svc
} }
private void SvcSleepThread(AThreadState ThreadState) private void SvcSleepThread(AThreadState ThreadState)
{ {
ulong NanoSecs = ThreadState.X0; ulong NanoSecs = ThreadState.X0;
KThread CurrThread = Process.GetThread(ThreadState.Tpidr); KThread CurrThread = Process.GetThread(ThreadState.Tpidr);
if (NanoSecs == 0) if (NanoSecs == 0)
{ {
Process.Scheduler.Yield(CurrThread); Process.Scheduler.Yield(CurrThread);
@ -117,7 +119,7 @@ namespace Ryujinx.Core.OsHle.Svc
private void SvcGetThreadId(AThreadState ThreadState) private void SvcGetThreadId(AThreadState ThreadState)
{ {
int Handle = (int)ThreadState.X0; int Handle = (int)ThreadState.X1;
KThread Thread = Process.HandleTable.GetData<KThread>(Handle); KThread Thread = Process.HandleTable.GetData<KThread>(Handle);
@ -126,8 +128,12 @@ namespace Ryujinx.Core.OsHle.Svc
ThreadState.X0 = 0; ThreadState.X0 = 0;
ThreadState.X1 = (ulong)Thread.ThreadId; ThreadState.X1 = (ulong)Thread.ThreadId;
} }
else
{
Logging.Warn($"Tried to GetThreadId on invalid thread handle 0x{Handle:x8}!");
//TODO: Error codes. ThreadState.X0 = MakeError(ErrorModule.Kernel, KernelErr.InvalidHandle);
}
} }
} }
} }