CCF_100/ryujinx
1
1
Fork 0
mirror of https://github.com/ryujinx-mirror/ryujinx.git synced 2025-09-16 00:17:54 -05:00
Code Issues Releases Wiki Activity

Rename ARegisters to AThreadState

Browse Source
This commit is contained in:
gdkchan
2018-02-18 16:28:07 -03:00
parent 5a0396efaf
commit f35d286c8d
25 changed files with 303 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Ryujinx/OsHle/Svc/SvcHandler.cs
View File

@@ -7,7 +7,7 @@ namespace Ryujinx.OsHle.Svc
{
partial class SvcHandler
{
private delegate void SvcFunc(ARegisters Registers);
private delegate void SvcFunc(AThreadState ThreadState);
private Dictionary<int, SvcFunc> SvcFuncs;
@@ -61,15 +61,15 @@ namespace Ryujinx.OsHle.Svc
public void SvcCall(object sender, AInstExceptEventArgs e)
{
ARegisters Registers = (ARegisters)sender;
AThreadState ThreadState = (AThreadState)sender;
if (SvcFuncs.TryGetValue(e.Id, out SvcFunc Func))
{
Logging.Trace($"(Thread {Registers.ThreadId}) {Func.Method.Name} called.");
Logging.Trace($"(Thread {ThreadState.ThreadId}) {Func.Method.Name} called.");
Func(Registers);
Func(ThreadState);
Logging.Trace($"(Thread {Registers.ThreadId}) {Func.Method.Name} ended.");
Logging.Trace($"(Thread {ThreadState.ThreadId}) {Func.Method.Name} ended.");
}
else
{

74
Ryujinx/OsHle/Svc/SvcMemory.cs
View File

@@ -6,43 +6,43 @@ namespace Ryujinx.OsHle.Svc
{
partial class SvcHandler
{
private void SvcSetHeapSize(ARegisters Registers)
private void SvcSetHeapSize(AThreadState ThreadState)
{
uint Size = (uint)Registers.X1;
uint Size = (uint)ThreadState.X1;
Memory.Manager.SetHeapSize(Size, (int)MemoryType.Heap);
Registers.X0 = (int)SvcResult.Success;
Registers.X1 = (ulong)Memory.Manager.HeapAddr;
ThreadState.X0 = (int)SvcResult.Success;
ThreadState.X1 = (ulong)Memory.Manager.HeapAddr;
}
private void SvcSetMemoryAttribute(ARegisters Registers)
private void SvcSetMemoryAttribute(AThreadState ThreadState)
{
long Position = (long)Registers.X0;
long Size = (long)Registers.X1;
int State0 = (int)Registers.X2;
int State1 = (int)Registers.X3;
long Position = (long)ThreadState.X0;
long Size = (long)ThreadState.X1;
int State0 = (int)ThreadState.X2;
int State1 = (int)ThreadState.X3;
//TODO
Registers.X0 = (int)SvcResult.Success;
ThreadState.X0 = (int)SvcResult.Success;
}
private void SvcMapMemory(ARegisters Registers)
private void SvcMapMemory(AThreadState ThreadState)
{
long Dst = (long)Registers.X0;
long Src = (long)Registers.X1;
long Size = (long)Registers.X2;
long Dst = (long)ThreadState.X0;
long Src = (long)ThreadState.X1;
long Size = (long)ThreadState.X2;
Memory.Manager.MapMirror(Src, Dst, Size, (int)MemoryType.MappedMemory);
Registers.X0 = (int)SvcResult.Success;
ThreadState.X0 = (int)SvcResult.Success;
}
private void SvcQueryMemory(ARegisters Registers)
private void SvcQueryMemory(AThreadState ThreadState)
{
long InfoPtr = (long)Registers.X0;
long Position = (long)Registers.X2;
long InfoPtr = (long)ThreadState.X0;
long Position = (long)ThreadState.X2;
AMemoryMapInfo MapInfo = Memory.Manager.GetMapInfo(Position);
@@ -59,16 +59,16 @@ namespace Ryujinx.OsHle.Svc
//TODO: X1.
Registers.X0 = (int)SvcResult.Success;
Registers.X1 = 0;
ThreadState.X0 = (int)SvcResult.Success;
ThreadState.X1 = 0;
}
private void SvcMapSharedMemory(ARegisters Registers)
private void SvcMapSharedMemory(AThreadState ThreadState)
{
int Handle = (int)Registers.X0;
long Src = (long)Registers.X1;
long Size = (long)Registers.X2;
int Perm = (int)Registers.X3;
int Handle = (int)ThreadState.X0;
long Src = (long)ThreadState.X1;
long Size = (long)ThreadState.X2;
int Perm = (int)ThreadState.X3;
HSharedMem SharedMem = Ns.Os.Handles.GetData<HSharedMem>(Handle);
@@ -78,33 +78,33 @@ namespace Ryujinx.OsHle.Svc
Memory.Manager.MapPhys(Src, Size, (int)MemoryType.SharedMemory, (AMemoryPerm)Perm);
Registers.X0 = (int)SvcResult.Success;
ThreadState.X0 = (int)SvcResult.Success;
}
//TODO: Error codes.
}
private void SvcUnmapSharedMemory(ARegisters Registers)
private void SvcUnmapSharedMemory(AThreadState ThreadState)
{
int Handle = (int)Registers.X0;
long Position = (long)Registers.X1;
long Size = (long)Registers.X2;
int Handle = (int)ThreadState.X0;
long Position = (long)ThreadState.X1;
long Size = (long)ThreadState.X2;
HSharedMem HndData = Ns.Os.Handles.GetData<HSharedMem>(Handle);
if (HndData != null)
{
Registers.X0 = (int)SvcResult.Success;
ThreadState.X0 = (int)SvcResult.Success;
}
//TODO: Error codes.
}
private void SvcCreateTransferMemory(ARegisters Registers)
private void SvcCreateTransferMemory(AThreadState ThreadState)
{
long Position = (long)Registers.X1;
long Size = (long)Registers.X2;
int Perm = (int)Registers.X3;
long Position = (long)ThreadState.X1;
long Size = (long)ThreadState.X2;
int Perm = (int)ThreadState.X3;
AMemoryMapInfo MapInfo = Memory.Manager.GetMapInfo(Position);
@@ -114,8 +114,8 @@ namespace Ryujinx.OsHle.Svc
int Handle = Ns.Os.Handles.GenerateId(HndData);
Registers.X1 = (ulong)Handle;
Registers.X0 = (int)SvcResult.Success;
ThreadState.X1 = (ulong)Handle;
ThreadState.X0 = (int)SvcResult.Success;
}
}
}

120
Ryujinx/OsHle/Svc/SvcSystem.cs
View File

@@ -9,57 +9,57 @@ namespace Ryujinx.OsHle.Svc
{
partial class SvcHandler
{
private void SvcExitProcess(ARegisters Registers) => Ns.Os.ExitProcess(Registers.ProcessId);
private void SvcExitProcess(AThreadState ThreadState) => Ns.Os.ExitProcess(ThreadState.ProcessId);
private void SvcCloseHandle(ARegisters Registers)
private void SvcCloseHandle(AThreadState ThreadState)
{
int Handle = (int)Registers.X0;
int Handle = (int)ThreadState.X0;
Ns.Os.CloseHandle(Handle);
Registers.X0 = (int)SvcResult.Success;
ThreadState.X0 = (int)SvcResult.Success;
}
private void SvcResetSignal(ARegisters Registers)
private void SvcResetSignal(AThreadState ThreadState)
{
int Handle = (int)Registers.X0;
int Handle = (int)ThreadState.X0;
//TODO: Implement events.
Registers.X0 = (int)SvcResult.Success;
ThreadState.X0 = (int)SvcResult.Success;
}
private void SvcWaitSynchronization(ARegisters Registers)
private void SvcWaitSynchronization(AThreadState ThreadState)
{
long HandlesPtr = (long)Registers.X0;
int HandlesCount = (int)Registers.X2;
long Timeout = (long)Registers.X3;
long HandlesPtr = (long)ThreadState.X0;
int HandlesCount = (int)ThreadState.X2;
long Timeout = (long)ThreadState.X3;
//TODO: Implement events.
//Logging.Info($"SvcWaitSynchronization Thread {Registers.ThreadId}");
//Logging.Info($"SvcWaitSynchronization Thread {ThreadState.ThreadId}");
if (Process.TryGetThread(Registers.Tpidr, out HThread Thread))
if (Process.TryGetThread(ThreadState.Tpidr, out HThread Thread))
{
Process.Scheduler.Yield(Thread);
}
else
{
Logging.Error($"Thread with TPIDR_EL0 0x{Registers.Tpidr:x16} not found!");
Logging.Error($"Thread with TPIDR_EL0 0x{ThreadState.Tpidr:x16} not found!");
}
Registers.X0 = (int)SvcResult.Success;
ThreadState.X0 = (int)SvcResult.Success;
}
private void SvcGetSystemTick(ARegisters Registers)
private void SvcGetSystemTick(AThreadState ThreadState)
{
Registers.X0 = (ulong)Registers.CntpctEl0;
ThreadState.X0 = (ulong)ThreadState.CntpctEl0;
}
private void SvcConnectToNamedPort(ARegisters Registers)
private void SvcConnectToNamedPort(AThreadState ThreadState)
{
long StackPtr = (long)Registers.X0;
long NamePtr = (long)Registers.X1;
long StackPtr = (long)ThreadState.X0;
long NamePtr = (long)ThreadState.X1;
string Name = AMemoryHelper.ReadAsciiString(Memory, NamePtr, 8);
@@ -68,35 +68,35 @@ namespace Ryujinx.OsHle.Svc
HSession Session = new HSession(Name);
Registers.X1 = (ulong)Ns.Os.Handles.GenerateId(Session);
Registers.X0 = (int)SvcResult.Success;
ThreadState.X1 = (ulong)Ns.Os.Handles.GenerateId(Session);
ThreadState.X0 = (int)SvcResult.Success;
}
private void SvcSendSyncRequest(ARegisters Registers)
private void SvcSendSyncRequest(AThreadState ThreadState)
{
SendSyncRequest(Registers, false);
SendSyncRequest(ThreadState, false);
}
private void SvcSendSyncRequestWithUserBuffer(ARegisters Registers)
private void SvcSendSyncRequestWithUserBuffer(AThreadState ThreadState)
{
SendSyncRequest(Registers, true);
SendSyncRequest(ThreadState, true);
}
private void SendSyncRequest(ARegisters Registers, bool UserBuffer)
private void SendSyncRequest(AThreadState ThreadState, bool UserBuffer)
{
long CmdPtr = Registers.Tpidr;
long CmdPtr = ThreadState.Tpidr;
long Size = 0x100;
int Handle = 0;
if (UserBuffer)
{
CmdPtr = (long)Registers.X0;
Size = (long)Registers.X1;
Handle = (int)Registers.X2;
CmdPtr = (long)ThreadState.X0;
Size = (long)ThreadState.X1;
Handle = (int)ThreadState.X2;
}
else
{
Handle = (int)Registers.X0;
Handle = (int)ThreadState.X0;
}
byte[] CmdData = AMemoryHelper.ReadBytes(Memory, CmdPtr, (int)Size);
@@ -111,69 +111,69 @@ namespace Ryujinx.OsHle.Svc
byte[] Response = AMemoryHelper.ReadBytes(Memory, CmdPtr, (int)Size);
Registers.X0 = (int)SvcResult.Success;
ThreadState.X0 = (int)SvcResult.Success;
}
else
{
Registers.X0 = (int)SvcResult.ErrBadIpcReq;
ThreadState.X0 = (int)SvcResult.ErrBadIpcReq;
}
}
private void SvcBreak(ARegisters Registers)
private void SvcBreak(AThreadState ThreadState)
{
long Reason = (long)Registers.X0;
long Unknown = (long)Registers.X1;
long Info = (long)Registers.X2;
long Reason = (long)ThreadState.X0;
long Unknown = (long)ThreadState.X1;
long Info = (long)ThreadState.X2;
throw new GuestBrokeExecutionException();
}
private void SvcOutputDebugString(ARegisters Registers)
private void SvcOutputDebugString(AThreadState ThreadState)
{
long Position = (long)Registers.X0;
long Size = (long)Registers.X1;
long Position = (long)ThreadState.X0;
long Size = (long)ThreadState.X1;
string Str = AMemoryHelper.ReadAsciiString(Memory, Position, (int)Size);
Logging.Info($"SvcOutputDebugString: {Str}");
Registers.X0 = (int)SvcResult.Success;
ThreadState.X0 = (int)SvcResult.Success;
}
private void SvcGetInfo(ARegisters Registers)
private void SvcGetInfo(AThreadState ThreadState)
{
long StackPtr = (long)Registers.X0;
int InfoType = (int)Registers.X1;
long Handle = (long)Registers.X2;
int InfoId = (int)Registers.X3;
long StackPtr = (long)ThreadState.X0;
int InfoType = (int)ThreadState.X1;
long Handle = (long)ThreadState.X2;
int InfoId = (int)ThreadState.X3;
//Fail for info not available on older Kernel versions.
if (InfoType == 18 ||
InfoType == 19)
{
Registers.X0 = (int)SvcResult.ErrBadInfo;
ThreadState.X0 = (int)SvcResult.ErrBadInfo;
return;
}
switch (InfoType)
{
case 2: Registers.X1 = GetMapRegionBaseAddr(); break;
case 3: Registers.X1 = GetMapRegionSize(); break;
case 4: Registers.X1 = GetHeapRegionBaseAddr(); break;
case 5: Registers.X1 = GetHeapRegionSize(); break;
case 6: Registers.X1 = GetTotalMem(); break;
case 7: Registers.X1 = GetUsedMem(); break;
case 11: Registers.X1 = GetRnd64(); break;
case 12: Registers.X1 = GetAddrSpaceBaseAddr(); break;
case 13: Registers.X1 = GetAddrSpaceSize(); break;
case 14: Registers.X1 = GetMapRegionBaseAddr(); break;
case 15: Registers.X1 = GetMapRegionSize(); break;
case 2: ThreadState.X1 = GetMapRegionBaseAddr(); break;
case 3: ThreadState.X1 = GetMapRegionSize(); break;
case 4: ThreadState.X1 = GetHeapRegionBaseAddr(); break;
case 5: ThreadState.X1 = GetHeapRegionSize(); break;
case 6: ThreadState.X1 = GetTotalMem(); break;
case 7: ThreadState.X1 = GetUsedMem(); break;
case 11: ThreadState.X1 = GetRnd64(); break;
case 12: ThreadState.X1 = GetAddrSpaceBaseAddr(); break;
case 13: ThreadState.X1 = GetAddrSpaceSize(); break;
case 14: ThreadState.X1 = GetMapRegionBaseAddr(); break;
case 15: ThreadState.X1 = GetMapRegionSize(); break;
default: throw new NotImplementedException($"SvcGetInfo: {InfoType} {Handle} {InfoId}");
}
Registers.X0 = (int)SvcResult.Success;
ThreadState.X0 = (int)SvcResult.Success;
}
private ulong GetTotalMem()

40
Ryujinx/OsHle/Svc/SvcThread.cs
View File

@@ -6,15 +6,15 @@ namespace Ryujinx.OsHle.Svc
{
partial class SvcHandler
{
private void SvcCreateThread(ARegisters Registers)
private void SvcCreateThread(AThreadState ThreadState)
{
long EntryPoint = (long)Registers.X1;
long ArgsPtr = (long)Registers.X2;
long StackTop = (long)Registers.X3;
int Priority = (int)Registers.X4;
int ProcessorId = (int)Registers.X5;
long EntryPoint = (long)ThreadState.X1;
long ArgsPtr = (long)ThreadState.X2;
long StackTop = (long)ThreadState.X3;
int Priority = (int)ThreadState.X4;
int ProcessorId = (int)ThreadState.X5;
if (Ns.Os.TryGetProcess(Registers.ProcessId, out Process Process))
if (Ns.Os.TryGetProcess(ThreadState.ProcessId, out Process Process))
{
if (ProcessorId == -2)
{
@@ -28,16 +28,16 @@ namespace Ryujinx.OsHle.Svc
Priority,
ProcessorId);
Registers.X0 = (int)SvcResult.Success;
Registers.X1 = (ulong)Handle;
ThreadState.X0 = (int)SvcResult.Success;
ThreadState.X1 = (ulong)Handle;
}
//TODO: Error codes.
}
private void SvcStartThread(ARegisters Registers)
private void SvcStartThread(AThreadState ThreadState)
{
int Handle = (int)Registers.X0;
int Handle = (int)ThreadState.X0;
HThread Thread = Ns.Os.Handles.GetData<HThread>(Handle);
@@ -45,38 +45,38 @@ namespace Ryujinx.OsHle.Svc
{
Process.Scheduler.StartThread(Thread);
Registers.X0 = (int)SvcResult.Success;
ThreadState.X0 = (int)SvcResult.Success;
}
//TODO: Error codes.
}
private void SvcSleepThread(ARegisters Registers)
private void SvcSleepThread(AThreadState ThreadState)
{
ulong NanoSecs = Registers.X0;
ulong NanoSecs = ThreadState.X0;
if (Process.TryGetThread(Registers.Tpidr, out HThread CurrThread))
if (Process.TryGetThread(ThreadState.Tpidr, out HThread CurrThread))
{
Process.Scheduler.Yield(CurrThread);
}
else
{
Logging.Error($"Thread with TPIDR_EL0 0x{Registers.Tpidr:x16} not found!");
Logging.Error($"Thread with TPIDR_EL0 0x{ThreadState.Tpidr:x16} not found!");
}
Thread.Sleep((int)(NanoSecs / 1000000));
}
private void SvcGetThreadPriority(ARegisters Registers)
private void SvcGetThreadPriority(AThreadState ThreadState)
{
int Handle = (int)Registers.X1;
int Handle = (int)ThreadState.X1;
HThread Thread = Ns.Os.Handles.GetData<HThread>(Handle);
if (Thread != null)
{
Registers.X1 = (ulong)Thread.Priority;
Registers.X0 = (int)SvcResult.Success;
ThreadState.X1 = (ulong)Thread.Priority;
ThreadState.X0 = (int)SvcResult.Success;
}
//TODO: Error codes.

36
Ryujinx/OsHle/Svc/SvcThreadSync.cs
View File

@@ -5,11 +5,11 @@ namespace Ryujinx.OsHle.Svc
{
partial class SvcHandler
{
private void SvcArbitrateLock(ARegisters Registers)
private void SvcArbitrateLock(AThreadState ThreadState)
{
int OwnerThreadHandle = (int)Registers.X0;
long MutexAddress = (long)Registers.X1;
int RequestingThreadHandle = (int)Registers.X2;
int OwnerThreadHandle = (int)ThreadState.X0;
long MutexAddress = (long)ThreadState.X1;
int RequestingThreadHandle = (int)ThreadState.X2;
HThread RequestingThread = Ns.Os.Handles.GetData<HThread>(RequestingThreadHandle);
@@ -19,27 +19,27 @@ namespace Ryujinx.OsHle.Svc
M.WaitForLock(RequestingThread, RequestingThreadHandle);
Registers.X0 = (int)SvcResult.Success;
ThreadState.X0 = (int)SvcResult.Success;
}
private void SvcArbitrateUnlock(ARegisters Registers)
private void SvcArbitrateUnlock(AThreadState ThreadState)
{
long MutexAddress = (long)Registers.X0;
long MutexAddress = (long)ThreadState.X0;
if (Ns.Os.Mutexes.TryGetValue(MutexAddress, out Mutex M))
{
M.Unlock();
}
Registers.X0 = (int)SvcResult.Success;
ThreadState.X0 = (int)SvcResult.Success;
}
private void SvcWaitProcessWideKeyAtomic(ARegisters Registers)
private void SvcWaitProcessWideKeyAtomic(AThreadState ThreadState)
{
long MutexAddress = (long)Registers.X0;
long CondVarAddress = (long)Registers.X1;
int ThreadHandle = (int)Registers.X2;
long Timeout = (long)Registers.X3;
long MutexAddress = (long)ThreadState.X0;
long CondVarAddress = (long)ThreadState.X1;
int ThreadHandle = (int)ThreadState.X2;
long Timeout = (long)ThreadState.X3;
HThread Thread = Ns.Os.Handles.GetData<HThread>(ThreadHandle);
@@ -60,20 +60,20 @@ namespace Ryujinx.OsHle.Svc
M.WaitForLock(Thread, ThreadHandle);
Registers.X0 = (int)SvcResult.Success;
ThreadState.X0 = (int)SvcResult.Success;
}
private void SvcSignalProcessWideKey(ARegisters Registers)
private void SvcSignalProcessWideKey(AThreadState ThreadState)
{
long CondVarAddress = (long)Registers.X0;
int Count = (int)Registers.X1;
long CondVarAddress = (long)ThreadState.X0;
int Count = (int)ThreadState.X1;
if (Ns.Os.CondVars.TryGetValue(CondVarAddress, out CondVar Cv))
{
Cv.SetSignal(Count);
}
Registers.X0 = (int)SvcResult.Success;
ThreadState.X0 = (int)SvcResult.Success;
}
}
}