mirror of
https://git.ryujinx.app/ryubing/ryujinx.git
synced 2025-06-29 04:26:24 +02:00
gdb: Show thread names
Reference: d8a37b4b71/libraries/libstratosphere/source/osdbg/impl/osdbg_thread_type.os.horizon.hpp
This commit is contained in:
parent
9552cafaaa
commit
92d8f0eb1c
2 changed files with 151 additions and 6 deletions
|
@ -5,9 +5,11 @@ using Ryujinx.HLE.HOS.Kernel.Common;
|
|||
using Ryujinx.HLE.HOS.Kernel.Process;
|
||||
using Ryujinx.HLE.HOS.Kernel.SupervisorCall;
|
||||
using Ryujinx.Horizon.Common;
|
||||
using Ryujinx.Memory;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Numerics;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
|
||||
namespace Ryujinx.HLE.HOS.Kernel.Threading
|
||||
|
@ -17,6 +19,23 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
|
|||
private const int TlsUserDisableCountOffset = 0x100;
|
||||
private const int TlsUserInterruptFlagOffset = 0x102;
|
||||
|
||||
// Tls -> ThreadType
|
||||
private const int TlsThreadTypeOffsetAArch64 = 0x1F8;
|
||||
private const int TlsThreadTypeOffsetAArch32 = 0x1FC;
|
||||
|
||||
// Tls -> ThreadType -> Version
|
||||
private const int TlsThreadTypeVersionOffsetAArch64 = 0x46;
|
||||
private const int TlsThreadTypeVersionOffsetAArch32 = 0x26;
|
||||
|
||||
// Tls -> ThreadType (Version 0) -> ThreadNamePointer
|
||||
private const int TlsThreadTypeVersion0ThreadNamePointerOffsetAArch64 = 0x1A8;
|
||||
private const int TlsThreadTypeVersion0ThreadNamePointerOffsetAArch32 = 0xE8;
|
||||
|
||||
// Tls -> ThreadType (Version 1) -> ThreadNamePointer
|
||||
private const int TlsThreadTypeThreadNamePointerOffsetAArch64 = 0x1A0;
|
||||
private const int TlsThreadTypeThreadNamePointerOffsetAArch32 = 0xE4;
|
||||
|
||||
|
||||
public const int MaxWaitSyncObjects = 64;
|
||||
|
||||
private ManualResetEvent _schedulerWaitEvent;
|
||||
|
@ -1439,5 +1458,81 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
|
|||
{
|
||||
Owner.CpuMemory.Write<ushort>(_tlsAddress + TlsUserInterruptFlagOffset, 0);
|
||||
}
|
||||
|
||||
public string GetThreadName()
|
||||
{
|
||||
try
|
||||
{
|
||||
ulong threadNamePtr = 0;
|
||||
if (Context.IsAarch32)
|
||||
{
|
||||
uint threadTypePtr32 = Owner.CpuMemory.Read<uint>(_tlsAddress + TlsThreadTypeOffsetAArch32);
|
||||
if (threadTypePtr32 == 0)
|
||||
{
|
||||
return "";
|
||||
}
|
||||
|
||||
ushort version = Owner.CpuMemory.Read<ushort>(threadTypePtr32 + TlsThreadTypeVersionOffsetAArch32);
|
||||
switch (version)
|
||||
{
|
||||
case 0x0000:
|
||||
case 0xFFFF:
|
||||
threadNamePtr = Owner.CpuMemory.Read<uint>(threadTypePtr32 + TlsThreadTypeVersion0ThreadNamePointerOffsetAArch32);
|
||||
break;
|
||||
case 0x0001:
|
||||
threadNamePtr = Owner.CpuMemory.Read<uint>(threadTypePtr32 + TlsThreadTypeThreadNamePointerOffsetAArch32);
|
||||
break;
|
||||
default:
|
||||
Logger.Warning?.Print(LogClass.Kernel, $"Unknown ThreadType struct version: {version}");
|
||||
break;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
ulong threadTypePtr64 = Owner.CpuMemory.Read<ulong>(_tlsAddress + TlsThreadTypeOffsetAArch64);
|
||||
if (threadTypePtr64 == 0)
|
||||
{
|
||||
return "";
|
||||
}
|
||||
|
||||
ushort version = Owner.CpuMemory.Read<ushort>(threadTypePtr64 + TlsThreadTypeVersionOffsetAArch64);
|
||||
switch (version)
|
||||
{
|
||||
case 0x0000:
|
||||
case 0xFFFF:
|
||||
threadNamePtr = Owner.CpuMemory.Read<ulong>(threadTypePtr64 + TlsThreadTypeVersion0ThreadNamePointerOffsetAArch64);
|
||||
break;
|
||||
case 0x0001:
|
||||
threadNamePtr = Owner.CpuMemory.Read<ulong>(threadTypePtr64 + TlsThreadTypeThreadNamePointerOffsetAArch64);
|
||||
break;
|
||||
default:
|
||||
Logger.Warning?.Print(LogClass.Kernel, $"Unknown ThreadType struct version: {version}");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (threadNamePtr == 0)
|
||||
{
|
||||
return "";
|
||||
}
|
||||
|
||||
List<byte> nameBytes = new();
|
||||
for (int i = 0; i < 0x20; i++)
|
||||
{
|
||||
byte b = Owner.CpuMemory.Read<byte>(threadNamePtr + (ulong)i);
|
||||
if (b == 0)
|
||||
{
|
||||
break;
|
||||
}
|
||||
nameBytes.Add(b);
|
||||
}
|
||||
return Encoding.UTF8.GetString(nameBytes.ToArray());
|
||||
|
||||
} catch (InvalidMemoryRegionException)
|
||||
{
|
||||
Logger.Warning?.Print(LogClass.Kernel, "Failed to get thread name.");
|
||||
return "";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue