diff options
| author | emmauss <emmausssss@gmail.com> | 2018-04-14 04:02:24 +0300 |
|---|---|---|
| committer | gdkchan <gab.dark.100@gmail.com> | 2018-04-13 22:02:24 -0300 |
| commit | bbcad307bdb8edca121ef6e3d2b13196fdd96a2d (patch) | |
| tree | fc67010d2fc210fe041829f894659e30d48ac4b8 /Ryujinx.Core/OsHle/Svc | |
| parent | 435f9ffad8b87ae29f1735a200a5838e961163bd (diff) | |
Add logclass, made changes to logging calls (#79)
* add logclass, made changes to logging calls
* made enum parsing case insensitive
* enable logclass on partial or complete match
Diffstat (limited to 'Ryujinx.Core/OsHle/Svc')
| -rw-r--r-- | Ryujinx.Core/OsHle/Svc/SvcHandler.cs | 4 | ||||
| -rw-r--r-- | Ryujinx.Core/OsHle/Svc/SvcMemory.cs | 14 | ||||
| -rw-r--r-- | Ryujinx.Core/OsHle/Svc/SvcSystem.cs | 10 | ||||
| -rw-r--r-- | Ryujinx.Core/OsHle/Svc/SvcThread.cs | 2 |
4 files changed, 15 insertions, 15 deletions
diff --git a/Ryujinx.Core/OsHle/Svc/SvcHandler.cs b/Ryujinx.Core/OsHle/Svc/SvcHandler.cs index 3bdb1060..9fea59a8 100644 --- a/Ryujinx.Core/OsHle/Svc/SvcHandler.cs +++ b/Ryujinx.Core/OsHle/Svc/SvcHandler.cs @@ -80,11 +80,11 @@ namespace Ryujinx.Core.OsHle.Svc if (SvcFuncs.TryGetValue(e.Id, out SvcFunc Func)) { - Logging.Trace($"(Thread {ThreadState.ThreadId}) {Func.Method.Name} called."); + Logging.Trace(LogClass.KernelSvc, $"(Thread {ThreadState.ThreadId}) {Func.Method.Name} called."); Func(ThreadState); - Logging.Trace($"(Thread {ThreadState.ThreadId}) {Func.Method.Name} ended."); + Logging.Trace(LogClass.KernelSvc, $"(Thread {ThreadState.ThreadId}) {Func.Method.Name} ended."); } else { diff --git a/Ryujinx.Core/OsHle/Svc/SvcMemory.cs b/Ryujinx.Core/OsHle/Svc/SvcMemory.cs index 80f24d2b..73485715 100644 --- a/Ryujinx.Core/OsHle/Svc/SvcMemory.cs +++ b/Ryujinx.Core/OsHle/Svc/SvcMemory.cs @@ -57,7 +57,7 @@ namespace Ryujinx.Core.OsHle.Svc if (!IsValidPosition(Src)) { - Logging.Warn($"Tried to map Memory at invalid src address {Src:x16}!"); + Logging.Warn(LogClass.KernelSvc, $"Tried to map Memory at invalid src address {Src:x16}!"); ThreadState.X0 = MakeError(ErrorModule.Kernel, KernelErr.InvalidMemRange); @@ -66,7 +66,7 @@ namespace Ryujinx.Core.OsHle.Svc if (!IsValidMapPosition(Dst)) { - Logging.Warn($"Tried to map Memory at invalid dst address {Dst:x16}!"); + Logging.Warn(LogClass.KernelSvc, $"Tried to map Memory at invalid dst address {Dst:x16}!"); ThreadState.X0 = MakeError(ErrorModule.Kernel, KernelErr.InvalidMemRange); @@ -92,7 +92,7 @@ namespace Ryujinx.Core.OsHle.Svc if (!IsValidPosition(Src)) { - Logging.Warn($"Tried to unmap Memory at invalid src address {Src:x16}!"); + Logging.Warn(LogClass.KernelSvc, $"Tried to unmap Memory at invalid src address {Src:x16}!"); ThreadState.X0 = MakeError(ErrorModule.Kernel, KernelErr.InvalidMemRange); @@ -101,7 +101,7 @@ namespace Ryujinx.Core.OsHle.Svc if (!IsValidMapPosition(Dst)) { - Logging.Warn($"Tried to unmap Memory at invalid dst address {Dst:x16}!"); + Logging.Warn(LogClass.KernelSvc, $"Tried to unmap Memory at invalid dst address {Dst:x16}!"); ThreadState.X0 = MakeError(ErrorModule.Kernel, KernelErr.InvalidMemRange); @@ -158,7 +158,7 @@ namespace Ryujinx.Core.OsHle.Svc if (!IsValidPosition(Src)) { - Logging.Warn($"Tried to map SharedMemory at invalid address {Src:x16}!"); + Logging.Warn(LogClass.KernelSvc, $"Tried to map SharedMemory at invalid address {Src:x16}!"); ThreadState.X0 = MakeError(ErrorModule.Kernel, KernelErr.InvalidMemRange); @@ -196,7 +196,7 @@ namespace Ryujinx.Core.OsHle.Svc if (!IsValidPosition(Src)) { - Logging.Warn($"Tried to unmap SharedMemory at invalid address {Src:x16}!"); + Logging.Warn(LogClass.KernelSvc, $"Tried to unmap SharedMemory at invalid address {Src:x16}!"); ThreadState.X0 = MakeError(ErrorModule.Kernel, KernelErr.InvalidMemRange); @@ -230,7 +230,7 @@ namespace Ryujinx.Core.OsHle.Svc if (!IsValidPosition(Src)) { - Logging.Warn($"Tried to create TransferMemory at invalid address {Src:x16}!"); + Logging.Warn(LogClass.KernelSvc, $"Tried to create TransferMemory at invalid address {Src:x16}!"); ThreadState.X0 = MakeError(ErrorModule.Kernel, KernelErr.InvalidMemRange); diff --git a/Ryujinx.Core/OsHle/Svc/SvcSystem.cs b/Ryujinx.Core/OsHle/Svc/SvcSystem.cs index 68eebc88..e615b429 100644 --- a/Ryujinx.Core/OsHle/Svc/SvcSystem.cs +++ b/Ryujinx.Core/OsHle/Svc/SvcSystem.cs @@ -39,7 +39,7 @@ namespace Ryujinx.Core.OsHle.Svc if (Obj == null) { - Logging.Warn($"Tried to CloseHandle on invalid handle 0x{Handle:x8}!"); + Logging.Warn(LogClass.KernelSvc, $"Tried to CloseHandle on invalid handle 0x{Handle:x8}!"); ThreadState.X0 = MakeError(ErrorModule.Kernel, KernelErr.InvalidHandle); @@ -75,7 +75,7 @@ namespace Ryujinx.Core.OsHle.Svc } else { - Logging.Warn($"Tried to ResetSignal on invalid event handle 0x{Handle:x8}!"); + Logging.Warn(LogClass.KernelSvc, $"Tried to ResetSignal on invalid event handle 0x{Handle:x8}!"); ThreadState.X0 = MakeError(ErrorModule.Kernel, KernelErr.InvalidHandle); } @@ -99,7 +99,7 @@ namespace Ryujinx.Core.OsHle.Svc if (SyncObj == null) { - Logging.Warn($"Tried to WaitSynchronization on invalid handle 0x{Handle:x8}!"); + Logging.Warn(LogClass.KernelSvc, $"Tried to WaitSynchronization on invalid handle 0x{Handle:x8}!"); ThreadState.X0 = MakeError(ErrorModule.Kernel, KernelErr.InvalidHandle); @@ -199,7 +199,7 @@ namespace Ryujinx.Core.OsHle.Svc } else { - Logging.Warn($"Tried to SendSyncRequest on invalid session handle 0x{Handle:x8}!"); + Logging.Warn(LogClass.KernelSvc, $"Tried to SendSyncRequest on invalid session handle 0x{Handle:x8}!"); ThreadState.X0 = MakeError(ErrorModule.Kernel, KernelErr.InvalidHandle); } @@ -221,7 +221,7 @@ namespace Ryujinx.Core.OsHle.Svc string Str = AMemoryHelper.ReadAsciiString(Memory, Position, Size); - Logging.Info(Str); + Logging.Info(LogClass.KernelSvc, Str); ThreadState.X0 = 0; } diff --git a/Ryujinx.Core/OsHle/Svc/SvcThread.cs b/Ryujinx.Core/OsHle/Svc/SvcThread.cs index c58cffca..4dc9e15c 100644 --- a/Ryujinx.Core/OsHle/Svc/SvcThread.cs +++ b/Ryujinx.Core/OsHle/Svc/SvcThread.cs @@ -137,7 +137,7 @@ namespace Ryujinx.Core.OsHle.Svc } else { - Logging.Warn($"Tried to GetThreadId on invalid thread handle 0x{Handle:x8}!"); + Logging.Warn(LogClass.KernelSvc, $"Tried to GetThreadId on invalid thread handle 0x{Handle:x8}!"); ThreadState.X0 = MakeError(ErrorModule.Kernel, KernelErr.InvalidHandle); } |
