Mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Adjust naming conventions and general refactoring in HLE Project (#490)" (#526)

Browse source 
This reverts commit 85dbb9559a.
This commit is contained in:
gdkchan 2018-12-04 22:52:39 -02:00 • committed by GitHub
parent 85dbb9559a
commit 3615a70cae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
299 changed files with 12276 additions and 12268 deletions
Download patch file Download diff file Expand all files Collapse all files

58
Ryujinx.HLE/HOS/Kernel/SvcHandler.cs
View file

@ -10,38 +10,38 @@ namespace Ryujinx.HLE.HOS.Kernel
{
partial class SvcHandler
{
private delegate void SvcFunc(CpuThreadState threadState);
private delegate void SvcFunc(CpuThreadState ThreadState);
private Dictionary<int, SvcFunc> _svcFuncs;
private Dictionary<int, SvcFunc> SvcFuncs;
private Switch _device;
private KProcess _process;
private Horizon _system;
private MemoryManager _memory;
private Switch Device;
private KProcess Process;
private Horizon System;
private MemoryManager Memory;
private struct HleIpcMessage
{
public KThread Thread { get; }
public KSession Session { get; }
public IpcMessage Message { get; }
public long MessagePtr { get; }
public KThread Thread { get; private set; }
public KSession Session { get; private set; }
public IpcMessage Message { get; private set; }
public long MessagePtr { get; private set; }
public HleIpcMessage(
KThread thread,
KSession session,
IpcMessage message,
long messagePtr)
KThread Thread,
KSession Session,
IpcMessage Message,
long MessagePtr)
{
Thread = thread;
Session = session;
Message = message;
MessagePtr = messagePtr;
this.Thread = Thread;
this.Session = Session;
this.Message = Message;
this.MessagePtr = MessagePtr;
}
}
public SvcHandler(Switch device, KProcess process)
public SvcHandler(Switch Device, KProcess Process)
{
_svcFuncs = new Dictionary<int, SvcFunc>
SvcFuncs = new Dictionary<int, SvcFunc>()
{
{ 0x01, SvcSetHeapSize },
{ 0x03, SvcSetMemoryAttribute },
@ -93,23 +93,23 @@ namespace Ryujinx.HLE.HOS.Kernel
{ 0x71, ManageNamedPort64 }
};
_device = device;
_process = process;
_system = device.System;
_memory = process.CpuMemory;
this.Device = Device;
this.Process = Process;
this.System = Device.System;
this.Memory = Process.CpuMemory;
}
public void SvcCall(object sender, InstExceptionEventArgs e)
{
CpuThreadState threadState = (CpuThreadState)sender;
CpuThreadState ThreadState = (CpuThreadState)sender;
if (_svcFuncs.TryGetValue(e.Id, out SvcFunc func))
if (SvcFuncs.TryGetValue(e.Id, out SvcFunc Func))
{
Logger.PrintDebug(LogClass.KernelSvc, $"{func.Method.Name} called.");
Logger.PrintDebug(LogClass.KernelSvc, $"{Func.Method.Name} called.");
func(threadState);
Func(ThreadState);
Logger.PrintDebug(LogClass.KernelSvc, $"{func.Method.Name} ended.");
Logger.PrintDebug(LogClass.KernelSvc, $"{Func.Method.Name} ended.");
}
else
{