From 5f5cb73baa5013b7e79acac61b6b6841ff844c1f Mon Sep 17 00:00:00 2001 From: svc64 Date: Sat, 9 Dec 2023 20:16:09 +0200 Subject: [PATCH] Formatting --- src/Ryujinx.Cpu/AppleHv/Arm/ExceptionLevel.cs | 2 +- src/Ryujinx.Cpu/AppleHv/HvExecutionContext.cs | 2 +- src/Ryujinx.HLE/Debugger/Debugger.cs | 10 +++++----- src/Ryujinx.HLE/Debugger/IDebuggableProcess.cs | 4 ++-- src/Ryujinx.HLE/Debugger/StringStream.cs | 2 +- src/Ryujinx.HLE/FileSystem/ContentManager.cs | 2 +- src/Ryujinx.HLE/HLEConfiguration.cs | 6 +++--- src/Ryujinx.HLE/HOS/Kernel/Process/IProcessContext.cs | 2 +- src/Ryujinx.HLE/HOS/Kernel/Process/ProcessContext.cs | 2 +- src/Ryujinx.Tests/Cpu/CpuContext.cs | 2 +- .../Configuration/ConfigurationFileFormat.cs | 2 +- .../Configuration/ConfigurationState.cs | 2 +- src/Ryujinx/UI/ViewModels/SettingsViewModel.cs | 4 ++-- 13 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/Ryujinx.Cpu/AppleHv/Arm/ExceptionLevel.cs b/src/Ryujinx.Cpu/AppleHv/Arm/ExceptionLevel.cs index 96e3ae59a5..08114e12aa 100644 --- a/src/Ryujinx.Cpu/AppleHv/Arm/ExceptionLevel.cs +++ b/src/Ryujinx.Cpu/AppleHv/Arm/ExceptionLevel.cs @@ -1,6 +1,6 @@ namespace Ryujinx.Cpu.AppleHv.Arm { - enum ExceptionLevel: uint + enum ExceptionLevel : uint { PstateMask = 0xfffffff0, EL1h = 0b0101, diff --git a/src/Ryujinx.Cpu/AppleHv/HvExecutionContext.cs b/src/Ryujinx.Cpu/AppleHv/HvExecutionContext.cs index 1bd6db34d9..7b3b62c223 100644 --- a/src/Ryujinx.Cpu/AppleHv/HvExecutionContext.cs +++ b/src/Ryujinx.Cpu/AppleHv/HvExecutionContext.cs @@ -269,7 +269,7 @@ namespace Ryujinx.Cpu.AppleHv case ExceptionClass.SoftwareStepLowerEl: HvApi.hv_vcpu_get_sys_reg(vcpuHandle, HvSysReg.SPSR_EL1, out ulong spsr).ThrowOnError(); spsr &= ~((ulong)(1 << 21)); - HvApi.hv_vcpu_set_sys_reg(vcpuHandle, HvSysReg.SPSR_EL1, spsr).ThrowOnError(); + HvApi.hv_vcpu_set_sys_reg(vcpuHandle, HvSysReg.SPSR_EL1, spsr).ThrowOnError(); HvApi.hv_vcpu_set_sys_reg(vcpuHandle, HvSysReg.MDSCR_EL1, 0); ReturnToPool(vcpu); StepBarrier.SignalAndWait(); diff --git a/src/Ryujinx.HLE/Debugger/Debugger.cs b/src/Ryujinx.HLE/Debugger/Debugger.cs index 4870b56617..7b87f0eb7e 100644 --- a/src/Ryujinx.HLE/Debugger/Debugger.cs +++ b/src/Ryujinx.HLE/Debugger/Debugger.cs @@ -1,9 +1,9 @@ using ARMeilleure.State; using Ryujinx.Common; using Ryujinx.Common.Logging; -using Ryujinx.Memory; using Ryujinx.HLE.HOS.Kernel; using Ryujinx.HLE.HOS.Kernel.Threading; +using Ryujinx.Memory; using System; using System.Collections.Concurrent; using System.IO; @@ -151,13 +151,13 @@ namespace Ryujinx.HLE.Debugger WriteStream.WriteByte((byte)'-'); break; - case CommandMessage {Command: var cmd}: + case CommandMessage { Command: var cmd }: Logger.Debug?.Print(LogClass.GdbStub, $"Received Command: {cmd}"); WriteStream.WriteByte((byte)'+'); ProcessCommand(cmd); break; - case ThreadBreakMessage {Context: var ctx}: + case ThreadBreakMessage { Context: var ctx }: DebugProcess.DebugStop(); Reply($"T05thread:{ctx.ThreadUid:x};"); break; @@ -353,7 +353,7 @@ namespace Ryujinx.HLE.Debugger break; } default: - unknownCommand: + unknownCommand: Logger.Notice.Print(LogClass.GdbStub, $"Unknown command: {cmd}"); Reply(""); break; @@ -654,7 +654,7 @@ namespace Ryujinx.HLE.Debugger } } - eof: + eof: Logger.Notice.Print(LogClass.GdbStub, "GDB client lost connection"); ReadStream.Close(); ReadStream = null; diff --git a/src/Ryujinx.HLE/Debugger/IDebuggableProcess.cs b/src/Ryujinx.HLE/Debugger/IDebuggableProcess.cs index 98d2223a6e..609b9c8fb0 100644 --- a/src/Ryujinx.HLE/Debugger/IDebuggableProcess.cs +++ b/src/Ryujinx.HLE/Debugger/IDebuggableProcess.cs @@ -1,5 +1,5 @@ -using Ryujinx.Memory; -using Ryujinx.HLE.HOS.Kernel.Threading; +using Ryujinx.HLE.HOS.Kernel.Threading; +using Ryujinx.Memory; namespace Ryujinx.HLE.Debugger { diff --git a/src/Ryujinx.HLE/Debugger/StringStream.cs b/src/Ryujinx.HLE/Debugger/StringStream.cs index 5542aff018..5ab4970344 100644 --- a/src/Ryujinx.HLE/Debugger/StringStream.cs +++ b/src/Ryujinx.HLE/Debugger/StringStream.cs @@ -106,4 +106,4 @@ namespace Ryujinx.HLE.Debugger return Position >= Data.Length; } } -} \ No newline at end of file +} diff --git a/src/Ryujinx.HLE/FileSystem/ContentManager.cs b/src/Ryujinx.HLE/FileSystem/ContentManager.cs index ff9bef55bc..e6c0fce081 100644 --- a/src/Ryujinx.HLE/FileSystem/ContentManager.cs +++ b/src/Ryujinx.HLE/FileSystem/ContentManager.cs @@ -964,4 +964,4 @@ namespace Ryujinx.HLE.FileSystem return null; } } -} \ No newline at end of file +} diff --git a/src/Ryujinx.HLE/HLEConfiguration.cs b/src/Ryujinx.HLE/HLEConfiguration.cs index f6026e7b8b..6eeca8ee2b 100644 --- a/src/Ryujinx.HLE/HLEConfiguration.cs +++ b/src/Ryujinx.HLE/HLEConfiguration.cs @@ -169,7 +169,7 @@ namespace Ryujinx.HLE /// public Action RefreshInputConfig { internal get; set; } - /// + /// /// Enables gdbstub to allow for debugging of the guest . /// public bool EnableGdbStub { get; internal set; } @@ -205,8 +205,8 @@ namespace Ryujinx.HLE bool useHypervisor, string multiplayerLanInterfaceId, MultiplayerMode multiplayerMode, - bool enableGdbStub, - ushort gdbStubPort) + bool enableGdbStub, + ushort gdbStubPort) { VirtualFileSystem = virtualFileSystem; LibHacHorizonManager = libHacHorizonManager; diff --git a/src/Ryujinx.HLE/HOS/Kernel/Process/IProcessContext.cs b/src/Ryujinx.HLE/HOS/Kernel/Process/IProcessContext.cs index ff66b08155..ac36b781bf 100644 --- a/src/Ryujinx.HLE/HOS/Kernel/Process/IProcessContext.cs +++ b/src/Ryujinx.HLE/HOS/Kernel/Process/IProcessContext.cs @@ -14,4 +14,4 @@ namespace Ryujinx.HLE.HOS.Kernel.Process void Execute(IExecutionContext context, ulong codeAddress); void InvalidateCacheRegion(ulong address, ulong size); } -} \ No newline at end of file +} diff --git a/src/Ryujinx.HLE/HOS/Kernel/Process/ProcessContext.cs b/src/Ryujinx.HLE/HOS/Kernel/Process/ProcessContext.cs index 037994425f..b4ae6ec4e8 100644 --- a/src/Ryujinx.HLE/HOS/Kernel/Process/ProcessContext.cs +++ b/src/Ryujinx.HLE/HOS/Kernel/Process/ProcessContext.cs @@ -34,4 +34,4 @@ namespace Ryujinx.HLE.HOS.Kernel.Process { } } -} \ No newline at end of file +} diff --git a/src/Ryujinx.Tests/Cpu/CpuContext.cs b/src/Ryujinx.Tests/Cpu/CpuContext.cs index 1ae5f2d4de..96b4965a21 100644 --- a/src/Ryujinx.Tests/Cpu/CpuContext.cs +++ b/src/Ryujinx.Tests/Cpu/CpuContext.cs @@ -36,4 +36,4 @@ namespace Ryujinx.Tests.Cpu _translator.InvalidateJitCacheRegion(address, size); } } -} \ No newline at end of file +} diff --git a/src/Ryujinx.UI.Common/Configuration/ConfigurationFileFormat.cs b/src/Ryujinx.UI.Common/Configuration/ConfigurationFileFormat.cs index d041bf63ec..e90e58f2c3 100644 --- a/src/Ryujinx.UI.Common/Configuration/ConfigurationFileFormat.cs +++ b/src/Ryujinx.UI.Common/Configuration/ConfigurationFileFormat.cs @@ -426,4 +426,4 @@ namespace Ryujinx.UI.Common.Configuration JsonHelper.SerializeToFile(path, this, ConfigurationFileFormatSettings.SerializerContext.ConfigurationFileFormat); } } -} \ No newline at end of file +} diff --git a/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs b/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs index d5ee41e646..fe96420c47 100644 --- a/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs +++ b/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs @@ -1476,7 +1476,7 @@ namespace Ryujinx.UI.Common.Configuration Ryujinx.Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 38."); configurationFileFormat.EnableGdbStub = false; - configurationFileFormat.GdbStubPort = 55555; + configurationFileFormat.GdbStubPort = 55555; configurationFileUpdated = true; } diff --git a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs index b85ca8df52..88a4ab91b6 100644 --- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs @@ -270,7 +270,7 @@ namespace Ryujinx.Ava.UI.ViewModels ConfigurationState.Instance.Debug.EnableGdbStub.Value = _enableGDBStub; } } - + public ushort GDBStubPort { get => _gdbStubPort; @@ -496,7 +496,7 @@ namespace Ryujinx.Ava.UI.ViewModels // Multiplayer MultiplayerModeIndex = (int)config.Multiplayer.Mode.Value; - + // Debug EnableGdbStub = config.Debug.EnableGdbStub.Value; GDBStubPort = config.Debug.GdbStubPort.Value;