aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.HLE/HOS/Kernel/SupervisorCall/SvcSystem.cs
diff options
context:
space:
mode:
authorThog <me@thog.eu>2020-01-13 03:04:28 +0100
committerjduncanator <1518948+jduncanator@users.noreply.github.com>2020-01-13 13:04:28 +1100
commit892df335e6f633a5bcc2ce265749e15365ea2549 (patch)
tree701f9033d7a56a4fa75b1ac5e2900cb26f9de487 /Ryujinx.HLE/HOS/Kernel/SupervisorCall/SvcSystem.cs
parent5facc0c07f8a3f6fd0f39229044fe120501162a7 (diff)
Rework SVC handling (#883)
* Rework SVC handling Prepare for 32 bits support. * QueryMemory64 x1 is an output * Pregenerate all SVC handler Also clean up + 32 bits code path * Address gdk's comments * Simplify local setter loop * Address jd's comments
Diffstat (limited to 'Ryujinx.HLE/HOS/Kernel/SupervisorCall/SvcSystem.cs')
-rw-r--r--Ryujinx.HLE/HOS/Kernel/SupervisorCall/SvcSystem.cs24
1 files changed, 12 insertions, 12 deletions
diff --git a/Ryujinx.HLE/HOS/Kernel/SupervisorCall/SvcSystem.cs b/Ryujinx.HLE/HOS/Kernel/SupervisorCall/SvcSystem.cs
index 7961f124..dad9612c 100644
--- a/Ryujinx.HLE/HOS/Kernel/SupervisorCall/SvcSystem.cs
+++ b/Ryujinx.HLE/HOS/Kernel/SupervisorCall/SvcSystem.cs
@@ -17,7 +17,7 @@ namespace Ryujinx.HLE.HOS.Kernel.SupervisorCall
ExitProcess();
}
- public KernelResult TerminateProcess64(int handle)
+ public KernelResult TerminateProcess64([R(0)] int handle)
{
return TerminateProcess(handle);
}
@@ -54,7 +54,7 @@ namespace Ryujinx.HLE.HOS.Kernel.SupervisorCall
_system.Scheduler.GetCurrentProcess().TerminateCurrentProcess();
}
- public KernelResult SignalEvent64(int handle)
+ public KernelResult SignalEvent64([R(0)] int handle)
{
return SignalEvent(handle);
}
@@ -79,7 +79,7 @@ namespace Ryujinx.HLE.HOS.Kernel.SupervisorCall
return result;
}
- public KernelResult ClearEvent64(int handle)
+ public KernelResult ClearEvent64([R(0)] int handle)
{
return ClearEvent(handle);
}
@@ -104,7 +104,7 @@ namespace Ryujinx.HLE.HOS.Kernel.SupervisorCall
return result;
}
- public KernelResult CloseHandle64(int handle)
+ public KernelResult CloseHandle64([R(0)] int handle)
{
return CloseHandle(handle);
}
@@ -134,7 +134,7 @@ namespace Ryujinx.HLE.HOS.Kernel.SupervisorCall
return KernelResult.Success;
}
- public KernelResult ResetSignal64(int handle)
+ public KernelResult ResetSignal64([R(0)] int handle)
{
return ResetSignal(handle);
}
@@ -173,7 +173,7 @@ namespace Ryujinx.HLE.HOS.Kernel.SupervisorCall
return _system.Scheduler.GetCurrentThread().Context.CntpctEl0;
}
- public KernelResult GetProcessId64(int handle, out long pid)
+ public KernelResult GetProcessId64([R(1)] int handle, [R(1)] out long pid)
{
return GetProcessId(handle, out pid);
}
@@ -203,7 +203,7 @@ namespace Ryujinx.HLE.HOS.Kernel.SupervisorCall
: KernelResult.InvalidHandle;
}
- public void Break64(ulong reason, ulong x1, ulong info)
+ public void Break64([R(0)] ulong reason, [R(1)] ulong x1, [R(2)] ulong info)
{
Break(reason);
}
@@ -235,7 +235,7 @@ namespace Ryujinx.HLE.HOS.Kernel.SupervisorCall
}
}
- public void OutputDebugString64(ulong strPtr, ulong size)
+ public void OutputDebugString64([R(0)] ulong strPtr, [R(1)] ulong size)
{
OutputDebugString(strPtr, size);
}
@@ -247,7 +247,7 @@ namespace Ryujinx.HLE.HOS.Kernel.SupervisorCall
Logger.PrintWarning(LogClass.KernelSvc, str);
}
- public KernelResult GetInfo64(uint id, int handle, long subId, out long value)
+ public KernelResult GetInfo64([R(1)] uint id, [R(2)] int handle, [R(3)] long subId, [R(1)] out long value)
{
return GetInfo(id, handle, subId, out value);
}
@@ -478,7 +478,7 @@ namespace Ryujinx.HLE.HOS.Kernel.SupervisorCall
return KernelResult.Success;
}
- public KernelResult CreateEvent64(out int wEventHandle, out int rEventHandle)
+ public KernelResult CreateEvent64([R(1)] out int wEventHandle, [R(2)] out int rEventHandle)
{
return CreateEvent(out wEventHandle, out rEventHandle);
}
@@ -506,7 +506,7 @@ namespace Ryujinx.HLE.HOS.Kernel.SupervisorCall
return result;
}
- public KernelResult GetProcessList64(ulong address, int maxCount, out int count)
+ public KernelResult GetProcessList64([R(1)] ulong address, [R(2)] int maxCount, [R(1)] out int count)
{
return GetProcessList(address, maxCount, out count);
}
@@ -560,7 +560,7 @@ namespace Ryujinx.HLE.HOS.Kernel.SupervisorCall
return KernelResult.Success;
}
- public KernelResult GetSystemInfo64(uint id, int handle, long subId, out long value)
+ public KernelResult GetSystemInfo64([R(1)] uint id, [R(2)] int handle, [R(3)] long subId, [R(1)] out long value)
{
return GetSystemInfo(id, handle, subId, out value);
}