mirror of
https://github.com/shadps4-emu/shadPS4.git
synced 2025-05-14 08:12:16 +00:00
The way to Unity, pt.1 (#1659)
This commit is contained in:
parent
2380f2f9c9
commit
98f0cb65d7
8 changed files with 564 additions and 29 deletions
|
@ -5,8 +5,11 @@
|
||||||
|
|
||||||
#include "ntapi.h"
|
#include "ntapi.h"
|
||||||
|
|
||||||
|
NtClose_t NtClose = nullptr;
|
||||||
NtDelayExecution_t NtDelayExecution = nullptr;
|
NtDelayExecution_t NtDelayExecution = nullptr;
|
||||||
NtSetInformationFile_t NtSetInformationFile = nullptr;
|
NtSetInformationFile_t NtSetInformationFile = nullptr;
|
||||||
|
NtCreateThread_t NtCreateThread = nullptr;
|
||||||
|
NtTerminateThread_t NtTerminateThread = nullptr;
|
||||||
|
|
||||||
namespace Common::NtApi {
|
namespace Common::NtApi {
|
||||||
|
|
||||||
|
@ -14,9 +17,12 @@ void Initialize() {
|
||||||
HMODULE nt_handle = GetModuleHandleA("ntdll.dll");
|
HMODULE nt_handle = GetModuleHandleA("ntdll.dll");
|
||||||
|
|
||||||
// http://stackoverflow.com/a/31411628/4725495
|
// http://stackoverflow.com/a/31411628/4725495
|
||||||
|
NtClose = (NtClose_t)GetProcAddress(nt_handle, "NtClose");
|
||||||
NtDelayExecution = (NtDelayExecution_t)GetProcAddress(nt_handle, "NtDelayExecution");
|
NtDelayExecution = (NtDelayExecution_t)GetProcAddress(nt_handle, "NtDelayExecution");
|
||||||
NtSetInformationFile =
|
NtSetInformationFile =
|
||||||
(NtSetInformationFile_t)GetProcAddress(nt_handle, "NtSetInformationFile");
|
(NtSetInformationFile_t)GetProcAddress(nt_handle, "NtSetInformationFile");
|
||||||
|
NtCreateThread = (NtCreateThread_t)GetProcAddress(nt_handle, "NtCreateThread");
|
||||||
|
NtTerminateThread = (NtTerminateThread_t)GetProcAddress(nt_handle, "NtTerminateThread");
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace Common::NtApi
|
} // namespace Common::NtApi
|
||||||
|
|
|
@ -108,14 +108,427 @@ typedef struct _FILE_DISPOSITION_INFORMATION {
|
||||||
BOOLEAN DeleteFile;
|
BOOLEAN DeleteFile;
|
||||||
} FILE_DISPOSITION_INFORMATION, *PFILE_DISPOSITION_INFORMATION;
|
} FILE_DISPOSITION_INFORMATION, *PFILE_DISPOSITION_INFORMATION;
|
||||||
|
|
||||||
typedef u32(__stdcall* NtDelayExecution_t)(BOOL Alertable, PLARGE_INTEGER DelayInterval);
|
typedef struct _UNICODE_STRING {
|
||||||
|
USHORT Length;
|
||||||
|
USHORT MaximumLength;
|
||||||
|
PWCH Buffer;
|
||||||
|
} UNICODE_STRING, *PUNICODE_STRING;
|
||||||
|
|
||||||
typedef u32(__stdcall* NtSetInformationFile_t)(HANDLE FileHandle, PIO_STATUS_BLOCK IoStatusBlock,
|
typedef const UNICODE_STRING* PCUNICODE_STRING;
|
||||||
|
|
||||||
|
typedef struct _OBJECT_ATTRIBUTES {
|
||||||
|
ULONG Length;
|
||||||
|
HANDLE RootDirectory;
|
||||||
|
PCUNICODE_STRING ObjectName;
|
||||||
|
ULONG Attributes;
|
||||||
|
PVOID SecurityDescriptor; // PSECURITY_DESCRIPTOR;
|
||||||
|
PVOID SecurityQualityOfService; // PSECURITY_QUALITY_OF_SERVICE
|
||||||
|
} OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES;
|
||||||
|
|
||||||
|
typedef const OBJECT_ATTRIBUTES* PCOBJECT_ATTRIBUTES;
|
||||||
|
|
||||||
|
typedef struct _CLIENT_ID {
|
||||||
|
HANDLE UniqueProcess;
|
||||||
|
HANDLE UniqueThread;
|
||||||
|
} CLIENT_ID, *PCLIENT_ID;
|
||||||
|
|
||||||
|
typedef struct _INITIAL_TEB {
|
||||||
|
struct {
|
||||||
|
PVOID OldStackBase;
|
||||||
|
PVOID OldStackLimit;
|
||||||
|
} OldInitialTeb;
|
||||||
|
PVOID StackBase;
|
||||||
|
PVOID StackLimit;
|
||||||
|
PVOID StackAllocationBase;
|
||||||
|
} INITIAL_TEB, *PINITIAL_TEB;
|
||||||
|
|
||||||
|
typedef struct _PEB_LDR_DATA {
|
||||||
|
ULONG Length;
|
||||||
|
BOOLEAN Initialized;
|
||||||
|
PVOID SsHandle;
|
||||||
|
LIST_ENTRY InLoadOrderModuleList;
|
||||||
|
LIST_ENTRY InMemoryOrderModuleList;
|
||||||
|
LIST_ENTRY InInitializationOrderModuleList;
|
||||||
|
PVOID EntryInProgress;
|
||||||
|
BOOLEAN ShutdownInProgress;
|
||||||
|
HANDLE ShutdownThreadId;
|
||||||
|
} PEB_LDR_DATA, *PPEB_LDR_DATA;
|
||||||
|
|
||||||
|
typedef struct _CURDIR {
|
||||||
|
UNICODE_STRING DosPath;
|
||||||
|
PVOID Handle;
|
||||||
|
} CURDIR, *PCURDIR;
|
||||||
|
|
||||||
|
typedef struct RTL_DRIVE_LETTER_CURDIR {
|
||||||
|
USHORT Flags;
|
||||||
|
USHORT Length;
|
||||||
|
ULONG TimeStamp;
|
||||||
|
UNICODE_STRING DosPath;
|
||||||
|
} RTL_DRIVE_LETTER_CURDIR, *PRTL_DRIVE_LETTER_CURDIR;
|
||||||
|
|
||||||
|
typedef struct _RTL_USER_PROCESS_PARAMETERS {
|
||||||
|
ULONG AllocationSize;
|
||||||
|
ULONG Size;
|
||||||
|
ULONG Flags;
|
||||||
|
ULONG DebugFlags;
|
||||||
|
HANDLE ConsoleHandle;
|
||||||
|
ULONG ConsoleFlags;
|
||||||
|
HANDLE hStdInput;
|
||||||
|
HANDLE hStdOutput;
|
||||||
|
HANDLE hStdError;
|
||||||
|
CURDIR CurrentDirectory;
|
||||||
|
UNICODE_STRING DllPath;
|
||||||
|
UNICODE_STRING ImagePathName;
|
||||||
|
UNICODE_STRING CommandLine;
|
||||||
|
PWSTR Environment;
|
||||||
|
ULONG dwX;
|
||||||
|
ULONG dwY;
|
||||||
|
ULONG dwXSize;
|
||||||
|
ULONG dwYSize;
|
||||||
|
ULONG dwXCountChars;
|
||||||
|
ULONG dwYCountChars;
|
||||||
|
ULONG dwFillAttribute;
|
||||||
|
ULONG dwFlags;
|
||||||
|
ULONG wShowWindow;
|
||||||
|
UNICODE_STRING WindowTitle;
|
||||||
|
UNICODE_STRING Desktop;
|
||||||
|
UNICODE_STRING ShellInfo;
|
||||||
|
UNICODE_STRING RuntimeInfo;
|
||||||
|
RTL_DRIVE_LETTER_CURDIR DLCurrentDirectory[0x20];
|
||||||
|
ULONG_PTR EnvironmentSize;
|
||||||
|
ULONG_PTR EnvironmentVersion;
|
||||||
|
PVOID PackageDependencyData;
|
||||||
|
ULONG ProcessGroupId;
|
||||||
|
ULONG LoaderThreads;
|
||||||
|
} RTL_USER_PROCESS_PARAMETERS, *PRTL_USER_PROCESS_PARAMETERS;
|
||||||
|
|
||||||
|
typedef struct tagRTL_BITMAP {
|
||||||
|
ULONG SizeOfBitMap;
|
||||||
|
PULONG Buffer;
|
||||||
|
} RTL_BITMAP, *PRTL_BITMAP;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
UINT next;
|
||||||
|
UINT id;
|
||||||
|
ULONGLONG addr;
|
||||||
|
ULONGLONG size;
|
||||||
|
UINT args[4];
|
||||||
|
} CROSS_PROCESS_WORK_ENTRY;
|
||||||
|
|
||||||
|
typedef union {
|
||||||
|
struct {
|
||||||
|
UINT first;
|
||||||
|
UINT counter;
|
||||||
|
};
|
||||||
|
volatile LONGLONG hdr;
|
||||||
|
} CROSS_PROCESS_WORK_HDR;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
CROSS_PROCESS_WORK_HDR free_list;
|
||||||
|
CROSS_PROCESS_WORK_HDR work_list;
|
||||||
|
ULONGLONG unknown[4];
|
||||||
|
CROSS_PROCESS_WORK_ENTRY entries[1];
|
||||||
|
} CROSS_PROCESS_WORK_LIST;
|
||||||
|
|
||||||
|
typedef struct _CHPEV2_PROCESS_INFO {
|
||||||
|
ULONG Wow64ExecuteFlags; /* 000 */
|
||||||
|
USHORT NativeMachineType; /* 004 */
|
||||||
|
USHORT EmulatedMachineType; /* 006 */
|
||||||
|
HANDLE SectionHandle; /* 008 */
|
||||||
|
CROSS_PROCESS_WORK_LIST* CrossProcessWorkList; /* 010 */
|
||||||
|
void* unknown; /* 018 */
|
||||||
|
} CHPEV2_PROCESS_INFO, *PCHPEV2_PROCESS_INFO;
|
||||||
|
|
||||||
|
typedef u64(__stdcall* KERNEL_CALLBACK_PROC)(void*, ULONG);
|
||||||
|
|
||||||
|
typedef struct _PEB { /* win32/win64 */
|
||||||
|
BOOLEAN InheritedAddressSpace; /* 000/000 */
|
||||||
|
BOOLEAN ReadImageFileExecOptions; /* 001/001 */
|
||||||
|
BOOLEAN BeingDebugged; /* 002/002 */
|
||||||
|
UCHAR ImageUsedLargePages : 1; /* 003/003 */
|
||||||
|
UCHAR IsProtectedProcess : 1;
|
||||||
|
UCHAR IsImageDynamicallyRelocated : 1;
|
||||||
|
UCHAR SkipPatchingUser32Forwarders : 1;
|
||||||
|
UCHAR IsPackagedProcess : 1;
|
||||||
|
UCHAR IsAppContainer : 1;
|
||||||
|
UCHAR IsProtectedProcessLight : 1;
|
||||||
|
UCHAR IsLongPathAwareProcess : 1;
|
||||||
|
HANDLE Mutant; /* 004/008 */
|
||||||
|
HMODULE ImageBaseAddress; /* 008/010 */
|
||||||
|
PPEB_LDR_DATA LdrData; /* 00c/018 */
|
||||||
|
RTL_USER_PROCESS_PARAMETERS* ProcessParameters; /* 010/020 */
|
||||||
|
PVOID SubSystemData; /* 014/028 */
|
||||||
|
HANDLE ProcessHeap; /* 018/030 */
|
||||||
|
PRTL_CRITICAL_SECTION FastPebLock; /* 01c/038 */
|
||||||
|
PVOID AtlThunkSListPtr; /* 020/040 */
|
||||||
|
PVOID IFEOKey; /* 024/048 */
|
||||||
|
ULONG ProcessInJob : 1; /* 028/050 */
|
||||||
|
ULONG ProcessInitializing : 1;
|
||||||
|
ULONG ProcessUsingVEH : 1;
|
||||||
|
ULONG ProcessUsingVCH : 1;
|
||||||
|
ULONG ProcessUsingFTH : 1;
|
||||||
|
ULONG ProcessPreviouslyThrottled : 1;
|
||||||
|
ULONG ProcessCurrentlyThrottled : 1;
|
||||||
|
ULONG ProcessImagesHotPatched : 1;
|
||||||
|
ULONG ReservedBits0 : 24;
|
||||||
|
KERNEL_CALLBACK_PROC* KernelCallbackTable; /* 02c/058 */
|
||||||
|
ULONG Reserved; /* 030/060 */
|
||||||
|
ULONG AtlThunkSListPtr32; /* 034/064 */
|
||||||
|
PVOID ApiSetMap; /* 038/068 */
|
||||||
|
ULONG TlsExpansionCounter; /* 03c/070 */
|
||||||
|
PRTL_BITMAP TlsBitmap; /* 040/078 */
|
||||||
|
ULONG TlsBitmapBits[2]; /* 044/080 */
|
||||||
|
PVOID ReadOnlySharedMemoryBase; /* 04c/088 */
|
||||||
|
PVOID SharedData; /* 050/090 */
|
||||||
|
PVOID* ReadOnlyStaticServerData; /* 054/098 */
|
||||||
|
PVOID AnsiCodePageData; /* 058/0a0 */
|
||||||
|
PVOID OemCodePageData; /* 05c/0a8 */
|
||||||
|
PVOID UnicodeCaseTableData; /* 060/0b0 */
|
||||||
|
ULONG NumberOfProcessors; /* 064/0b8 */
|
||||||
|
ULONG NtGlobalFlag; /* 068/0bc */
|
||||||
|
LARGE_INTEGER CriticalSectionTimeout; /* 070/0c0 */
|
||||||
|
SIZE_T HeapSegmentReserve; /* 078/0c8 */
|
||||||
|
SIZE_T HeapSegmentCommit; /* 07c/0d0 */
|
||||||
|
SIZE_T HeapDeCommitTotalFreeThreshold; /* 080/0d8 */
|
||||||
|
SIZE_T HeapDeCommitFreeBlockThreshold; /* 084/0e0 */
|
||||||
|
ULONG NumberOfHeaps; /* 088/0e8 */
|
||||||
|
ULONG MaximumNumberOfHeaps; /* 08c/0ec */
|
||||||
|
PVOID* ProcessHeaps; /* 090/0f0 */
|
||||||
|
PVOID GdiSharedHandleTable; /* 094/0f8 */
|
||||||
|
PVOID ProcessStarterHelper; /* 098/100 */
|
||||||
|
PVOID GdiDCAttributeList; /* 09c/108 */
|
||||||
|
PVOID LoaderLock; /* 0a0/110 */
|
||||||
|
ULONG OSMajorVersion; /* 0a4/118 */
|
||||||
|
ULONG OSMinorVersion; /* 0a8/11c */
|
||||||
|
ULONG OSBuildNumber; /* 0ac/120 */
|
||||||
|
ULONG OSPlatformId; /* 0b0/124 */
|
||||||
|
ULONG ImageSubSystem; /* 0b4/128 */
|
||||||
|
ULONG ImageSubSystemMajorVersion; /* 0b8/12c */
|
||||||
|
ULONG ImageSubSystemMinorVersion; /* 0bc/130 */
|
||||||
|
KAFFINITY ActiveProcessAffinityMask; /* 0c0/138 */
|
||||||
|
#ifdef _WIN64
|
||||||
|
ULONG GdiHandleBuffer[60]; /* /140 */
|
||||||
|
#else
|
||||||
|
ULONG GdiHandleBuffer[34]; /* 0c4/ */
|
||||||
|
#endif
|
||||||
|
PVOID PostProcessInitRoutine; /* 14c/230 */
|
||||||
|
PRTL_BITMAP TlsExpansionBitmap; /* 150/238 */
|
||||||
|
ULONG TlsExpansionBitmapBits[32]; /* 154/240 */
|
||||||
|
ULONG SessionId; /* 1d4/2c0 */
|
||||||
|
ULARGE_INTEGER AppCompatFlags; /* 1d8/2c8 */
|
||||||
|
ULARGE_INTEGER AppCompatFlagsUser; /* 1e0/2d0 */
|
||||||
|
PVOID ShimData; /* 1e8/2d8 */
|
||||||
|
PVOID AppCompatInfo; /* 1ec/2e0 */
|
||||||
|
UNICODE_STRING CSDVersion; /* 1f0/2e8 */
|
||||||
|
PVOID ActivationContextData; /* 1f8/2f8 */
|
||||||
|
PVOID ProcessAssemblyStorageMap; /* 1fc/300 */
|
||||||
|
PVOID SystemDefaultActivationData; /* 200/308 */
|
||||||
|
PVOID SystemAssemblyStorageMap; /* 204/310 */
|
||||||
|
SIZE_T MinimumStackCommit; /* 208/318 */
|
||||||
|
PVOID* FlsCallback; /* 20c/320 */
|
||||||
|
LIST_ENTRY FlsListHead; /* 210/328 */
|
||||||
|
union {
|
||||||
|
PRTL_BITMAP FlsBitmap; /* 218/338 */
|
||||||
|
#ifdef _WIN64
|
||||||
|
CHPEV2_PROCESS_INFO* ChpeV2ProcessInfo; /* /338 */
|
||||||
|
#endif
|
||||||
|
};
|
||||||
|
ULONG FlsBitmapBits[4]; /* 21c/340 */
|
||||||
|
ULONG FlsHighIndex; /* 22c/350 */
|
||||||
|
PVOID WerRegistrationData; /* 230/358 */
|
||||||
|
PVOID WerShipAssertPtr; /* 234/360 */
|
||||||
|
PVOID EcCodeBitMap; /* 238/368 */
|
||||||
|
PVOID pImageHeaderHash; /* 23c/370 */
|
||||||
|
ULONG HeapTracingEnabled : 1; /* 240/378 */
|
||||||
|
ULONG CritSecTracingEnabled : 1;
|
||||||
|
ULONG LibLoaderTracingEnabled : 1;
|
||||||
|
ULONG SpareTracingBits : 29;
|
||||||
|
ULONGLONG CsrServerReadOnlySharedMemoryBase; /* 248/380 */
|
||||||
|
ULONG TppWorkerpListLock; /* 250/388 */
|
||||||
|
LIST_ENTRY TppWorkerpList; /* 254/390 */
|
||||||
|
PVOID WaitOnAddressHashTable[0x80]; /* 25c/3a0 */
|
||||||
|
PVOID TelemetryCoverageHeader; /* 45c/7a0 */
|
||||||
|
ULONG CloudFileFlags; /* 460/7a8 */
|
||||||
|
ULONG CloudFileDiagFlags; /* 464/7ac */
|
||||||
|
CHAR PlaceholderCompatibilityMode; /* 468/7b0 */
|
||||||
|
CHAR PlaceholderCompatibilityModeReserved[7]; /* 469/7b1 */
|
||||||
|
PVOID LeapSecondData; /* 470/7b8 */
|
||||||
|
ULONG LeapSecondFlags; /* 474/7c0 */
|
||||||
|
ULONG NtGlobalFlag2; /* 478/7c4 */
|
||||||
|
} PEB, *PPEB;
|
||||||
|
|
||||||
|
typedef struct _RTL_ACTIVATION_CONTEXT_STACK_FRAME {
|
||||||
|
struct _RTL_ACTIVATION_CONTEXT_STACK_FRAME* Previous;
|
||||||
|
struct _ACTIVATION_CONTEXT* ActivationContext;
|
||||||
|
ULONG Flags;
|
||||||
|
} RTL_ACTIVATION_CONTEXT_STACK_FRAME, *PRTL_ACTIVATION_CONTEXT_STACK_FRAME;
|
||||||
|
|
||||||
|
typedef struct _ACTIVATION_CONTEXT_STACK {
|
||||||
|
RTL_ACTIVATION_CONTEXT_STACK_FRAME* ActiveFrame;
|
||||||
|
LIST_ENTRY FrameListCache;
|
||||||
|
ULONG Flags;
|
||||||
|
ULONG NextCookieSequenceNumber;
|
||||||
|
ULONG_PTR StackId;
|
||||||
|
} ACTIVATION_CONTEXT_STACK, *PACTIVATION_CONTEXT_STACK;
|
||||||
|
|
||||||
|
typedef struct _GDI_TEB_BATCH {
|
||||||
|
ULONG Offset;
|
||||||
|
HANDLE HDC;
|
||||||
|
ULONG Buffer[0x136];
|
||||||
|
} GDI_TEB_BATCH;
|
||||||
|
|
||||||
|
typedef struct _TEB_ACTIVE_FRAME_CONTEXT {
|
||||||
|
ULONG Flags;
|
||||||
|
const char* FrameName;
|
||||||
|
} TEB_ACTIVE_FRAME_CONTEXT, *PTEB_ACTIVE_FRAME_CONTEXT;
|
||||||
|
|
||||||
|
typedef struct _TEB_ACTIVE_FRAME {
|
||||||
|
ULONG Flags;
|
||||||
|
struct _TEB_ACTIVE_FRAME* Previous;
|
||||||
|
TEB_ACTIVE_FRAME_CONTEXT* Context;
|
||||||
|
} TEB_ACTIVE_FRAME, *PTEB_ACTIVE_FRAME;
|
||||||
|
|
||||||
|
typedef struct _TEB { /* win32/win64 */
|
||||||
|
NT_TIB Tib; /* 000/0000 */
|
||||||
|
PVOID EnvironmentPointer; /* 01c/0038 */
|
||||||
|
CLIENT_ID ClientId; /* 020/0040 */
|
||||||
|
PVOID ActiveRpcHandle; /* 028/0050 */
|
||||||
|
PVOID ThreadLocalStoragePointer; /* 02c/0058 */
|
||||||
|
PPEB Peb; /* 030/0060 */
|
||||||
|
ULONG LastErrorValue; /* 034/0068 */
|
||||||
|
ULONG CountOfOwnedCriticalSections; /* 038/006c */
|
||||||
|
PVOID CsrClientThread; /* 03c/0070 */
|
||||||
|
PVOID Win32ThreadInfo; /* 040/0078 */
|
||||||
|
ULONG User32Reserved[26]; /* 044/0080 */
|
||||||
|
ULONG UserReserved[5]; /* 0ac/00e8 */
|
||||||
|
PVOID WOW32Reserved; /* 0c0/0100 */
|
||||||
|
ULONG CurrentLocale; /* 0c4/0108 */
|
||||||
|
ULONG FpSoftwareStatusRegister; /* 0c8/010c */
|
||||||
|
PVOID ReservedForDebuggerInstrumentation[16]; /* 0cc/0110 */
|
||||||
|
#ifdef _WIN64
|
||||||
|
PVOID SystemReserved1[30]; /* /0190 */
|
||||||
|
#else
|
||||||
|
PVOID SystemReserved1[26]; /* 10c/ used for krnl386 private data in Wine */
|
||||||
|
#endif
|
||||||
|
char PlaceholderCompatibilityMode; /* 174/0280 */
|
||||||
|
BOOLEAN PlaceholderHydrationAlwaysExplicit; /* 175/0281 */
|
||||||
|
char PlaceholderReserved[10]; /* 176/0282 */
|
||||||
|
DWORD ProxiedProcessId; /* 180/028c */
|
||||||
|
ACTIVATION_CONTEXT_STACK ActivationContextStack; /* 184/0290 */
|
||||||
|
UCHAR WorkingOnBehalfOfTicket[8]; /* 19c/02b8 */
|
||||||
|
LONG ExceptionCode; /* 1a4/02c0 */
|
||||||
|
ACTIVATION_CONTEXT_STACK* ActivationContextStackPointer; /* 1a8/02c8 */
|
||||||
|
ULONG_PTR InstrumentationCallbackSp; /* 1ac/02d0 */
|
||||||
|
ULONG_PTR InstrumentationCallbackPreviousPc; /* 1b0/02d8 */
|
||||||
|
ULONG_PTR InstrumentationCallbackPreviousSp; /* 1b4/02e0 */
|
||||||
|
#ifdef _WIN64
|
||||||
|
ULONG TxFsContext; /* /02e8 */
|
||||||
|
BOOLEAN InstrumentationCallbackDisabled; /* /02ec */
|
||||||
|
BOOLEAN UnalignedLoadStoreExceptions; /* /02ed */
|
||||||
|
#else
|
||||||
|
BOOLEAN InstrumentationCallbackDisabled; /* 1b8/ */
|
||||||
|
BYTE SpareBytes1[23]; /* 1b9/ */
|
||||||
|
ULONG TxFsContext; /* 1d0/ */
|
||||||
|
#endif
|
||||||
|
GDI_TEB_BATCH GdiTebBatch; /* 1d4/02f0 used for ntdll private data in Wine */
|
||||||
|
CLIENT_ID RealClientId; /* 6b4/07d8 */
|
||||||
|
HANDLE GdiCachedProcessHandle; /* 6bc/07e8 */
|
||||||
|
ULONG GdiClientPID; /* 6c0/07f0 */
|
||||||
|
ULONG GdiClientTID; /* 6c4/07f4 */
|
||||||
|
PVOID GdiThreadLocaleInfo; /* 6c8/07f8 */
|
||||||
|
ULONG_PTR Win32ClientInfo[62]; /* 6cc/0800 used for user32 private data in Wine */
|
||||||
|
PVOID glDispatchTable[233]; /* 7c4/09f0 */
|
||||||
|
PVOID glReserved1[29]; /* b68/1138 */
|
||||||
|
PVOID glReserved2; /* bdc/1220 */
|
||||||
|
PVOID glSectionInfo; /* be0/1228 */
|
||||||
|
PVOID glSection; /* be4/1230 */
|
||||||
|
PVOID glTable; /* be8/1238 */
|
||||||
|
PVOID glCurrentRC; /* bec/1240 */
|
||||||
|
PVOID glContext; /* bf0/1248 */
|
||||||
|
ULONG LastStatusValue; /* bf4/1250 */
|
||||||
|
UNICODE_STRING StaticUnicodeString; /* bf8/1258 */
|
||||||
|
WCHAR StaticUnicodeBuffer[261]; /* c00/1268 */
|
||||||
|
PVOID DeallocationStack; /* e0c/1478 */
|
||||||
|
PVOID TlsSlots[64]; /* e10/1480 */
|
||||||
|
LIST_ENTRY TlsLinks; /* f10/1680 */
|
||||||
|
PVOID Vdm; /* f18/1690 */
|
||||||
|
PVOID ReservedForNtRpc; /* f1c/1698 */
|
||||||
|
PVOID DbgSsReserved[2]; /* f20/16a0 */
|
||||||
|
ULONG HardErrorMode; /* f28/16b0 */
|
||||||
|
#ifdef _WIN64
|
||||||
|
PVOID Instrumentation[11]; /* /16b8 */
|
||||||
|
#else
|
||||||
|
PVOID Instrumentation[9]; /* f2c/ */
|
||||||
|
#endif
|
||||||
|
GUID ActivityId; /* f50/1710 */
|
||||||
|
PVOID SubProcessTag; /* f60/1720 */
|
||||||
|
PVOID PerflibData; /* f64/1728 */
|
||||||
|
PVOID EtwTraceData; /* f68/1730 */
|
||||||
|
PVOID WinSockData; /* f6c/1738 */
|
||||||
|
ULONG GdiBatchCount; /* f70/1740 */
|
||||||
|
ULONG IdealProcessorValue; /* f74/1744 */
|
||||||
|
ULONG GuaranteedStackBytes; /* f78/1748 */
|
||||||
|
PVOID ReservedForPerf; /* f7c/1750 */
|
||||||
|
PVOID ReservedForOle; /* f80/1758 */
|
||||||
|
ULONG WaitingOnLoaderLock; /* f84/1760 */
|
||||||
|
PVOID SavedPriorityState; /* f88/1768 */
|
||||||
|
ULONG_PTR ReservedForCodeCoverage; /* f8c/1770 */
|
||||||
|
PVOID ThreadPoolData; /* f90/1778 */
|
||||||
|
PVOID* TlsExpansionSlots; /* f94/1780 */
|
||||||
|
#ifdef _WIN64
|
||||||
|
union {
|
||||||
|
PVOID DeallocationBStore; /* /1788 */
|
||||||
|
PVOID* ChpeV2CpuAreaInfo; /* /1788 */
|
||||||
|
} DUMMYUNIONNAME;
|
||||||
|
PVOID BStoreLimit; /* /1790 */
|
||||||
|
#endif
|
||||||
|
ULONG MuiGeneration; /* f98/1798 */
|
||||||
|
ULONG IsImpersonating; /* f9c/179c */
|
||||||
|
PVOID NlsCache; /* fa0/17a0 */
|
||||||
|
PVOID ShimData; /* fa4/17a8 */
|
||||||
|
ULONG HeapVirtualAffinity; /* fa8/17b0 */
|
||||||
|
PVOID CurrentTransactionHandle; /* fac/17b8 */
|
||||||
|
TEB_ACTIVE_FRAME* ActiveFrame; /* fb0/17c0 */
|
||||||
|
PVOID* FlsSlots; /* fb4/17c8 */
|
||||||
|
PVOID PreferredLanguages; /* fb8/17d0 */
|
||||||
|
PVOID UserPrefLanguages; /* fbc/17d8 */
|
||||||
|
PVOID MergedPrefLanguages; /* fc0/17e0 */
|
||||||
|
ULONG MuiImpersonation; /* fc4/17e8 */
|
||||||
|
USHORT CrossTebFlags; /* fc8/17ec */
|
||||||
|
USHORT SameTebFlags; /* fca/17ee */
|
||||||
|
PVOID TxnScopeEnterCallback; /* fcc/17f0 */
|
||||||
|
PVOID TxnScopeExitCallback; /* fd0/17f8 */
|
||||||
|
PVOID TxnScopeContext; /* fd4/1800 */
|
||||||
|
ULONG LockCount; /* fd8/1808 */
|
||||||
|
LONG WowTebOffset; /* fdc/180c */
|
||||||
|
PVOID ResourceRetValue; /* fe0/1810 */
|
||||||
|
PVOID ReservedForWdf; /* fe4/1818 */
|
||||||
|
ULONGLONG ReservedForCrt; /* fe8/1820 */
|
||||||
|
GUID EffectiveContainerId; /* ff0/1828 */
|
||||||
|
} TEB, *PTEB;
|
||||||
|
static_assert(offsetof(TEB, DeallocationStack) ==
|
||||||
|
0x1478); /* The only member we care about at the moment */
|
||||||
|
|
||||||
|
typedef u64(__stdcall* NtClose_t)(HANDLE Handle);
|
||||||
|
|
||||||
|
typedef u64(__stdcall* NtDelayExecution_t)(BOOL Alertable, PLARGE_INTEGER DelayInterval);
|
||||||
|
|
||||||
|
typedef u64(__stdcall* NtSetInformationFile_t)(HANDLE FileHandle, PIO_STATUS_BLOCK IoStatusBlock,
|
||||||
PVOID FileInformation, ULONG Length,
|
PVOID FileInformation, ULONG Length,
|
||||||
FILE_INFORMATION_CLASS FileInformationClass);
|
FILE_INFORMATION_CLASS FileInformationClass);
|
||||||
|
|
||||||
|
typedef u64(__stdcall* NtCreateThread_t)(PHANDLE ThreadHandle, ACCESS_MASK DesiredAccess,
|
||||||
|
PCOBJECT_ATTRIBUTES ObjectAttributes, HANDLE ProcessHandle,
|
||||||
|
PCLIENT_ID ClientId, PCONTEXT ThreadContext,
|
||||||
|
PINITIAL_TEB InitialTeb, BOOLEAN CreateSuspended);
|
||||||
|
|
||||||
|
typedef u64(__stdcall* NtTerminateThread_t)(HANDLE ThreadHandle, u64 ExitStatus);
|
||||||
|
|
||||||
|
extern NtClose_t NtClose;
|
||||||
extern NtDelayExecution_t NtDelayExecution;
|
extern NtDelayExecution_t NtDelayExecution;
|
||||||
extern NtSetInformationFile_t NtSetInformationFile;
|
extern NtSetInformationFile_t NtSetInformationFile;
|
||||||
|
extern NtCreateThread_t NtCreateThread;
|
||||||
|
extern NtTerminateThread_t NtTerminateThread;
|
||||||
|
|
||||||
namespace Common::NtApi {
|
namespace Common::NtApi {
|
||||||
void Initialize();
|
void Initialize();
|
||||||
|
|
|
@ -206,6 +206,7 @@ static void RunThread(void* arg) {
|
||||||
DebugState.AddCurrentThreadToGuestList();
|
DebugState.AddCurrentThreadToGuestList();
|
||||||
|
|
||||||
/* Run the current thread's start routine with argument: */
|
/* Run the current thread's start routine with argument: */
|
||||||
|
curthread->native_thr.Initialize();
|
||||||
void* ret = Core::ExecuteGuest(curthread->start_routine, curthread->arg);
|
void* ret = Core::ExecuteGuest(curthread->start_routine, curthread->arg);
|
||||||
|
|
||||||
/* Remove thread from tracking */
|
/* Remove thread from tracking */
|
||||||
|
@ -280,7 +281,7 @@ int PS4_SYSV_ABI posix_pthread_create_name_np(PthreadT* thread, const PthreadAtt
|
||||||
(*thread) = new_thread;
|
(*thread) = new_thread;
|
||||||
|
|
||||||
/* Create thread */
|
/* Create thread */
|
||||||
new_thread->native_thr = Core::Thread();
|
new_thread->native_thr = Core::NativeThread();
|
||||||
int ret = new_thread->native_thr.Create(RunThread, new_thread, &new_thread->attr);
|
int ret = new_thread->native_thr.Create(RunThread, new_thread, &new_thread->attr);
|
||||||
ASSERT_MSG(ret == 0, "Failed to create thread with error {}", ret);
|
ASSERT_MSG(ret == 0, "Failed to create thread with error {}", ret);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
|
@ -412,6 +413,33 @@ int PS4_SYSV_ABI posix_pthread_getschedparam(PthreadT pthread, SchedPolicy* poli
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int PS4_SYSV_ABI posix_pthread_setschedparam(PthreadT pthread, SchedPolicy policy,
|
||||||
|
const SchedParam* param) {
|
||||||
|
if (pthread == nullptr || param == nullptr) {
|
||||||
|
return POSIX_EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
|
auto* thread_state = ThrState::Instance();
|
||||||
|
if (pthread == g_curthread) {
|
||||||
|
g_curthread->lock.lock();
|
||||||
|
} else if (int ret = thread_state->FindThread(pthread, /*include dead*/ 0); ret != 0) {
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (pthread->attr.sched_policy == policy &&
|
||||||
|
(policy == SchedPolicy::Other || pthread->attr.prio == param->sched_priority)) {
|
||||||
|
pthread->attr.prio = param->sched_priority;
|
||||||
|
pthread->lock.unlock();
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: _thr_setscheduler
|
||||||
|
pthread->attr.sched_policy = policy;
|
||||||
|
pthread->attr.prio = param->sched_priority;
|
||||||
|
pthread->lock.unlock();
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
int PS4_SYSV_ABI scePthreadGetprio(PthreadT thread, int* priority) {
|
int PS4_SYSV_ABI scePthreadGetprio(PthreadT thread, int* priority) {
|
||||||
SchedParam param;
|
SchedParam param;
|
||||||
SchedPolicy policy;
|
SchedPolicy policy;
|
||||||
|
@ -495,6 +523,7 @@ void RegisterThread(Core::Loader::SymbolsResolver* sym) {
|
||||||
LIB_FUNCTION("lZzFeSxPl08", "libScePosix", 1, "libkernel", 1, 1, posix_pthread_setcancelstate);
|
LIB_FUNCTION("lZzFeSxPl08", "libScePosix", 1, "libkernel", 1, 1, posix_pthread_setcancelstate);
|
||||||
LIB_FUNCTION("a2P9wYGeZvc", "libScePosix", 1, "libkernel", 1, 1, posix_pthread_setprio);
|
LIB_FUNCTION("a2P9wYGeZvc", "libScePosix", 1, "libkernel", 1, 1, posix_pthread_setprio);
|
||||||
LIB_FUNCTION("FIs3-UQT9sg", "libScePosix", 1, "libkernel", 1, 1, posix_pthread_getschedparam);
|
LIB_FUNCTION("FIs3-UQT9sg", "libScePosix", 1, "libkernel", 1, 1, posix_pthread_getschedparam);
|
||||||
|
LIB_FUNCTION("Xs9hdiD7sAA", "libScePosix", 1, "libkernel", 1, 1, posix_pthread_setschedparam);
|
||||||
LIB_FUNCTION("6XG4B33N09g", "libScePosix", 1, "libkernel", 1, 1, sched_yield);
|
LIB_FUNCTION("6XG4B33N09g", "libScePosix", 1, "libkernel", 1, 1, sched_yield);
|
||||||
|
|
||||||
// Posix-Kernel
|
// Posix-Kernel
|
||||||
|
|
|
@ -259,7 +259,7 @@ struct Pthread {
|
||||||
int refcount;
|
int refcount;
|
||||||
PthreadEntryFunc start_routine;
|
PthreadEntryFunc start_routine;
|
||||||
void* arg;
|
void* arg;
|
||||||
Core::Thread native_thr;
|
Core::NativeThread native_thr;
|
||||||
PthreadAttr attr;
|
PthreadAttr attr;
|
||||||
bool cancel_enable;
|
bool cancel_enable;
|
||||||
bool cancel_pending;
|
bool cancel_pending;
|
||||||
|
|
|
@ -328,7 +328,7 @@ int MemoryManager::MapFile(void** out_addr, VAddr virtual_addr, size_t size, Mem
|
||||||
}
|
}
|
||||||
|
|
||||||
// Map the file.
|
// Map the file.
|
||||||
impl.MapFile(mapped_addr, size, offset, std::bit_cast<u32>(prot), fd);
|
impl.MapFile(mapped_addr, size_aligned, offset, std::bit_cast<u32>(prot), fd);
|
||||||
|
|
||||||
// Add virtual memory area
|
// Add virtual memory area
|
||||||
auto& new_vma = CarveVMA(mapped_addr, size_aligned)->second;
|
auto& new_vma = CarveVMA(mapped_addr, size_aligned)->second;
|
||||||
|
@ -512,9 +512,8 @@ int MemoryManager::VirtualQuery(VAddr addr, int flags,
|
||||||
info->is_flexible.Assign(vma.type == VMAType::Flexible);
|
info->is_flexible.Assign(vma.type == VMAType::Flexible);
|
||||||
info->is_direct.Assign(vma.type == VMAType::Direct);
|
info->is_direct.Assign(vma.type == VMAType::Direct);
|
||||||
info->is_stack.Assign(vma.type == VMAType::Stack);
|
info->is_stack.Assign(vma.type == VMAType::Stack);
|
||||||
info->is_pooled.Assign(vma.type == VMAType::Pooled);
|
info->is_pooled.Assign(vma.type == VMAType::PoolReserved);
|
||||||
info->is_committed.Assign(vma.type != VMAType::Free && vma.type != VMAType::Reserved &&
|
info->is_committed.Assign(vma.type == VMAType::Pooled);
|
||||||
vma.type != VMAType::PoolReserved);
|
|
||||||
vma.name.copy(info->name.data(), std::min(info->name.size(), vma.name.size()));
|
vma.name.copy(info->name.data(), std::min(info->name.size(), vma.name.size()));
|
||||||
if (vma.type == VMAType::Direct) {
|
if (vma.type == VMAType::Direct) {
|
||||||
const auto dmem_it = FindDmemArea(vma.phys_base);
|
const auto dmem_it = FindDmemArea(vma.phys_base);
|
||||||
|
@ -585,6 +584,7 @@ void MemoryManager::NameVirtualRange(VAddr virtual_addr, size_t size, std::strin
|
||||||
"Range provided is not fully contained in vma");
|
"Range provided is not fully contained in vma");
|
||||||
it->second.name = name;
|
it->second.name = name;
|
||||||
}
|
}
|
||||||
|
|
||||||
VAddr MemoryManager::SearchFree(VAddr virtual_addr, size_t size, u32 alignment) {
|
VAddr MemoryManager::SearchFree(VAddr virtual_addr, size_t size, u32 alignment) {
|
||||||
// If the requested address is below the mapped range, start search from the lowest address
|
// If the requested address is below the mapped range, start search from the lowest address
|
||||||
auto min_search_address = impl.SystemManagedVirtualBase();
|
auto min_search_address = impl.SystemManagedVirtualBase();
|
||||||
|
@ -691,7 +691,7 @@ MemoryManager::DMemHandle MemoryManager::Split(DMemHandle dmem_handle, size_t of
|
||||||
new_area.size -= offset_in_area;
|
new_area.size -= offset_in_area;
|
||||||
|
|
||||||
return dmem_map.emplace_hint(std::next(dmem_handle), new_area.base, new_area);
|
return dmem_map.emplace_hint(std::next(dmem_handle), new_area.base, new_area);
|
||||||
};
|
}
|
||||||
|
|
||||||
int MemoryManager::GetDirectMemoryType(PAddr addr, int* directMemoryTypeOut,
|
int MemoryManager::GetDirectMemoryType(PAddr addr, int* directMemoryTypeOut,
|
||||||
void** directMemoryStartOut, void** directMemoryEndOut) {
|
void** directMemoryStartOut, void** directMemoryEndOut) {
|
||||||
|
|
|
@ -4,45 +4,125 @@
|
||||||
#include "libraries/kernel/threads/pthread.h"
|
#include "libraries/kernel/threads/pthread.h"
|
||||||
#include "thread.h"
|
#include "thread.h"
|
||||||
|
|
||||||
|
#include "core/libraries/kernel/threads/pthread.h"
|
||||||
|
|
||||||
#ifdef _WIN64
|
#ifdef _WIN64
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
#include "common/ntapi.h"
|
||||||
#else
|
#else
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
namespace Core {
|
namespace Core {
|
||||||
|
|
||||||
Thread::Thread() : native_handle{0} {}
|
|
||||||
|
|
||||||
Thread::~Thread() {}
|
|
||||||
|
|
||||||
int Thread::Create(ThreadFunc func, void* arg, const ::Libraries::Kernel::PthreadAttr* attr) {
|
|
||||||
#ifdef _WIN64
|
#ifdef _WIN64
|
||||||
native_handle = CreateThread(nullptr, 0, (LPTHREAD_START_ROUTINE)func, arg, 0, nullptr);
|
#define KGDT64_R3_DATA (0x28)
|
||||||
return native_handle ? 0 : -1;
|
#define KGDT64_R3_CODE (0x30)
|
||||||
#else
|
#define KGDT64_R3_CMTEB (0x50)
|
||||||
|
#define RPL_MASK (0x03)
|
||||||
|
|
||||||
|
#define INITIAL_FPUCW (0x037f)
|
||||||
|
#define INITIAL_MXCSR_MASK (0xffbf)
|
||||||
|
#define EFLAGS_INTERRUPT_MASK (0x200)
|
||||||
|
|
||||||
|
void InitializeTeb(INITIAL_TEB* teb, const ::Libraries::Kernel::PthreadAttr* attr) {
|
||||||
|
teb->StackBase = (void*)((u64)attr->stackaddr_attr + attr->stacksize_attr);
|
||||||
|
teb->StackLimit = nullptr;
|
||||||
|
teb->StackAllocationBase = attr->stackaddr_attr;
|
||||||
|
}
|
||||||
|
|
||||||
|
void InitializeContext(CONTEXT* ctx, ThreadFunc func, void* arg,
|
||||||
|
const ::Libraries::Kernel::PthreadAttr* attr) {
|
||||||
|
/* Note: The stack has to be reversed */
|
||||||
|
ctx->Rsp = (u64)attr->stackaddr_attr + attr->stacksize_attr;
|
||||||
|
ctx->Rbp = (u64)attr->stackaddr_attr + attr->stacksize_attr;
|
||||||
|
ctx->Rcx = (u64)arg;
|
||||||
|
ctx->Rip = (u64)func;
|
||||||
|
|
||||||
|
ctx->SegGs = KGDT64_R3_DATA | RPL_MASK;
|
||||||
|
ctx->SegEs = KGDT64_R3_DATA | RPL_MASK;
|
||||||
|
ctx->SegDs = KGDT64_R3_DATA | RPL_MASK;
|
||||||
|
ctx->SegCs = KGDT64_R3_CODE | RPL_MASK;
|
||||||
|
ctx->SegSs = KGDT64_R3_DATA | RPL_MASK;
|
||||||
|
ctx->SegFs = KGDT64_R3_CMTEB | RPL_MASK;
|
||||||
|
|
||||||
|
ctx->EFlags = 0x3000 | EFLAGS_INTERRUPT_MASK;
|
||||||
|
ctx->MxCsr = INITIAL_MXCSR;
|
||||||
|
|
||||||
|
ctx->FltSave.ControlWord = INITIAL_FPUCW;
|
||||||
|
ctx->FltSave.MxCsr = INITIAL_MXCSR;
|
||||||
|
ctx->FltSave.MxCsr_Mask = INITIAL_MXCSR_MASK;
|
||||||
|
|
||||||
|
ctx->ContextFlags =
|
||||||
|
CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | CONTEXT_FLOATING_POINT;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
NativeThread::NativeThread() : native_handle{0} {}
|
||||||
|
|
||||||
|
NativeThread::~NativeThread() {}
|
||||||
|
|
||||||
|
int NativeThread::Create(ThreadFunc func, void* arg, const ::Libraries::Kernel::PthreadAttr* attr) {
|
||||||
|
#ifndef _WIN64
|
||||||
pthread_t* pthr = reinterpret_cast<pthread_t*>(&native_handle);
|
pthread_t* pthr = reinterpret_cast<pthread_t*>(&native_handle);
|
||||||
pthread_attr_t pattr;
|
pthread_attr_t pattr;
|
||||||
pthread_attr_init(&pattr);
|
pthread_attr_init(&pattr);
|
||||||
pthread_attr_setstack(&pattr, attr->stackaddr_attr, attr->stacksize_attr);
|
pthread_attr_setstack(&pattr, attr->stackaddr_attr, attr->stacksize_attr);
|
||||||
return pthread_create(pthr, &pattr, (PthreadFunc)func, arg);
|
return pthread_create(pthr, &pattr, (PthreadFunc)func, arg);
|
||||||
|
#else
|
||||||
|
CLIENT_ID clientId{};
|
||||||
|
INITIAL_TEB teb{};
|
||||||
|
CONTEXT ctx{};
|
||||||
|
|
||||||
|
clientId.UniqueProcess = GetCurrentProcess();
|
||||||
|
clientId.UniqueThread = GetCurrentThread();
|
||||||
|
|
||||||
|
InitializeTeb(&teb, attr);
|
||||||
|
InitializeContext(&ctx, func, arg, attr);
|
||||||
|
|
||||||
|
return NtCreateThread(&native_handle, THREAD_ALL_ACCESS, nullptr, GetCurrentProcess(),
|
||||||
|
&clientId, &ctx, &teb, false);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void Thread::Exit() {
|
void NativeThread::Exit() {
|
||||||
if (!native_handle) {
|
if (!native_handle) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
tid = 0;
|
||||||
|
|
||||||
#ifdef _WIN64
|
#ifdef _WIN64
|
||||||
CloseHandle(native_handle);
|
NtClose(native_handle);
|
||||||
native_handle = nullptr;
|
native_handle = nullptr;
|
||||||
|
|
||||||
// We call this assuming the thread has finished execution.
|
/* The Windows kernel will free the stack
|
||||||
ExitThread(0);
|
given at thread creation via INITIAL_TEB
|
||||||
|
(StackAllocationBase) upon thread termination.
|
||||||
|
|
||||||
|
In earlier Windows versions (NT4 to Windows Server 2003),
|
||||||
|
you could get around this via disabling FreeStackOnTermination
|
||||||
|
on the TEB. This has been removed since then.
|
||||||
|
|
||||||
|
To avoid this, we must forcefully set the TEB
|
||||||
|
deallocation stack pointer to NULL so ZwFreeVirtualMemory fails
|
||||||
|
in the kernel and our stack is not freed.
|
||||||
|
*/
|
||||||
|
auto* teb = reinterpret_cast<TEB*>(NtCurrentTeb());
|
||||||
|
teb->DeallocationStack = nullptr;
|
||||||
|
|
||||||
|
NtTerminateThread(nullptr, 0);
|
||||||
#else
|
#else
|
||||||
pthread_exit(nullptr);
|
pthread_exit(nullptr);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void NativeThread::Initialize() {
|
||||||
|
#if _WIN64
|
||||||
|
tid = GetCurrentThreadId();
|
||||||
|
#else
|
||||||
|
tid = (u64)pthread_self();
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace Core
|
} // namespace Core
|
|
@ -11,27 +11,34 @@ struct PthreadAttr;
|
||||||
|
|
||||||
namespace Core {
|
namespace Core {
|
||||||
|
|
||||||
class Thread {
|
using ThreadFunc = void (*)(void*);
|
||||||
public:
|
using PthreadFunc = void* (*)(void*);
|
||||||
using ThreadFunc = void (*)(void*);
|
|
||||||
using PthreadFunc = void* (*)(void*);
|
|
||||||
|
|
||||||
Thread();
|
class NativeThread {
|
||||||
~Thread();
|
public:
|
||||||
|
NativeThread();
|
||||||
|
~NativeThread();
|
||||||
|
|
||||||
int Create(ThreadFunc func, void* arg, const ::Libraries::Kernel::PthreadAttr* attr);
|
int Create(ThreadFunc func, void* arg, const ::Libraries::Kernel::PthreadAttr* attr);
|
||||||
void Exit();
|
void Exit();
|
||||||
|
|
||||||
|
void Initialize();
|
||||||
|
|
||||||
uintptr_t GetHandle() {
|
uintptr_t GetHandle() {
|
||||||
return reinterpret_cast<uintptr_t>(native_handle);
|
return reinterpret_cast<uintptr_t>(native_handle);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
u64 GetTid() {
|
||||||
|
return tid;
|
||||||
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
#if _WIN64
|
#ifdef _WIN64
|
||||||
void* native_handle;
|
void* native_handle;
|
||||||
#else
|
#else
|
||||||
uintptr_t native_handle;
|
uintptr_t native_handle;
|
||||||
#endif
|
#endif
|
||||||
|
u64 tid;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Core
|
} // namespace Core
|
|
@ -46,7 +46,7 @@ Liverpool::~Liverpool() {
|
||||||
}
|
}
|
||||||
|
|
||||||
void Liverpool::Process(std::stop_token stoken) {
|
void Liverpool::Process(std::stop_token stoken) {
|
||||||
Common::SetCurrentThreadName("shadPS4:GPU_CommandProcessor");
|
Common::SetCurrentThreadName("shadPS4:GpuCommandProcessor");
|
||||||
|
|
||||||
while (!stoken.stop_requested()) {
|
while (!stoken.stop_requested()) {
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Reference in a new issue