diff --git a/ChocolArm64/Instructions/InstEmit32Helper.cs b/ChocolArm64/Instructions/InstEmit32Helper.cs index 493779811c..c5d08b8aee 100644 --- a/ChocolArm64/Instructions/InstEmit32Helper.cs +++ b/ChocolArm64/Instructions/InstEmit32Helper.cs @@ -24,7 +24,7 @@ namespace ChocolArm64.Instructions } else { - context.EmitLdint(InstEmit32Helper.GetRegisterAlias(context.Mode, register)); + context.EmitLdint(GetRegisterAlias(context.Mode, register)); } } diff --git a/ChocolArm64/Memory/MemoryManagementUnix.cs b/ChocolArm64/Memory/MemoryManagementUnix.cs index 9fe1aef094..fe3cfb7ec1 100644 --- a/ChocolArm64/Memory/MemoryManagementUnix.cs +++ b/ChocolArm64/Memory/MemoryManagementUnix.cs @@ -30,22 +30,22 @@ namespace ChocolArm64.Memory return ptr; } - public static bool Reprotect(IntPtr address, ulong size, Memory.MemoryProtection protection) + public static bool Reprotect(IntPtr address, ulong size, MemoryProtection protection) { MmapProts prot = GetProtection(protection); return Syscall.mprotect(address, size, prot) == 0; } - private static MmapProts GetProtection(Memory.MemoryProtection protection) + private static MmapProts GetProtection(MemoryProtection protection) { switch (protection) { - case Memory.MemoryProtection.None: return MmapProts.PROT_NONE; - case Memory.MemoryProtection.Read: return MmapProts.PROT_READ; - case Memory.MemoryProtection.ReadAndWrite: return MmapProts.PROT_READ | MmapProts.PROT_WRITE; - case Memory.MemoryProtection.ReadAndExecute: return MmapProts.PROT_READ | MmapProts.PROT_EXEC; - case Memory.MemoryProtection.Execute: return MmapProts.PROT_EXEC; + case MemoryProtection.None: return MmapProts.PROT_NONE; + case MemoryProtection.Read: return MmapProts.PROT_READ; + case MemoryProtection.ReadAndWrite: return MmapProts.PROT_READ | MmapProts.PROT_WRITE; + case MemoryProtection.ReadAndExecute: return MmapProts.PROT_READ | MmapProts.PROT_EXEC; + case MemoryProtection.Execute: return MmapProts.PROT_EXEC; default: throw new ArgumentException($"Invalid permission \"{protection}\"."); } diff --git a/ChocolArm64/Translation/TranslatedSub.cs b/ChocolArm64/Translation/TranslatedSub.cs index 704e3b4758..a5efc56bf4 100644 --- a/ChocolArm64/Translation/TranslatedSub.cs +++ b/ChocolArm64/Translation/TranslatedSub.cs @@ -32,7 +32,7 @@ namespace ChocolArm64.Translation public TranslatedSub(DynamicMethod method, TranslationTier tier, bool rejit) { - Method = method ?? throw new ArgumentNullException(nameof(method));; + Method = method ?? throw new ArgumentNullException(nameof(method)); Tier = tier; _rejit = rejit; } diff --git a/Ryujinx.Common/Logging/LogEventArgs.cs b/Ryujinx.Common/Logging/LogEventArgs.cs index 363a45b9ad..2330dedd36 100644 --- a/Ryujinx.Common/Logging/LogEventArgs.cs +++ b/Ryujinx.Common/Logging/LogEventArgs.cs @@ -13,19 +13,19 @@ namespace Ryujinx.Common.Logging public LogEventArgs(LogLevel level, TimeSpan time, int threadId, string message) { - this.Level = level; - this.Time = time; - this.ThreadId = threadId; - this.Message = message; + Level = level; + Time = time; + ThreadId = threadId; + Message = message; } public LogEventArgs(LogLevel level, TimeSpan time, int threadId, string message, object data) { - this.Level = level; - this.Time = time; - this.ThreadId = threadId; - this.Message = message; - this.Data = data; + Level = level; + Time = time; + ThreadId = threadId; + Message = message; + Data = data; } } } \ No newline at end of file diff --git a/Ryujinx.Graphics/Shader/CodeGen/Glsl/OperandManager.cs b/Ryujinx.Graphics/Shader/CodeGen/Glsl/OperandManager.cs index 9aed8eb8c4..bb15f6b21d 100644 --- a/Ryujinx.Graphics/Shader/CodeGen/Glsl/OperandManager.cs +++ b/Ryujinx.Graphics/Shader/CodeGen/Glsl/OperandManager.cs @@ -187,7 +187,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Glsl public static string GetUbName(GalShaderType shaderType, int slot) { - string ubName = OperandManager.GetShaderStagePrefix(shaderType); + string ubName = GetShaderStagePrefix(shaderType); ubName += "_" + DefaultNames.UniformNamePrefix + slot; diff --git a/Ryujinx.HLE/HOS/Services/FspSrv/IFile.cs b/Ryujinx.HLE/HOS/Services/FspSrv/IFile.cs index 0b8b31fb75..482399401b 100644 --- a/Ryujinx.HLE/HOS/Services/FspSrv/IFile.cs +++ b/Ryujinx.HLE/HOS/Services/FspSrv/IFile.cs @@ -29,7 +29,7 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv }; _baseFile = baseFile; - Path = LibHac.Fs.PathTools.Normalize(path); + Path = PathTools.Normalize(path); } // Read(u32 readOption, u64 offset, u64 size) -> (u64 out_size, buffer out_buf) diff --git a/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystem.cs b/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystem.cs index 74ba62168e..01a8dc9b42 100644 --- a/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystem.cs +++ b/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystem.cs @@ -306,7 +306,7 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv try { - LibHac.Fs.DirectoryEntryType entryType = _provider.GetEntryType(name); + DirectoryEntryType entryType = _provider.GetEntryType(name); context.ResponseData.Write((int)entryType); } diff --git a/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystemProxy.cs b/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystemProxy.cs index 2398936549..7207aaf020 100644 --- a/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystemProxy.cs +++ b/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystemProxy.cs @@ -312,7 +312,7 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv private void ImportTitleKeysFromNsp(LibHac.Fs.IFileSystem nsp, Keyset keySet) { - foreach (LibHac.Fs.DirectoryEntry ticketEntry in nsp.EnumerateEntries("*.tik")) + foreach (DirectoryEntry ticketEntry in nsp.EnumerateEntries("*.tik")) { Ticket ticket = new Ticket(nsp.OpenFile(ticketEntry.FullPath, OpenMode.Read).AsStream()); diff --git a/Ryujinx.HLE/HOS/Services/Vi/GbpBuffer.cs b/Ryujinx.HLE/HOS/Services/Vi/GbpBuffer.cs index eb1adc7759..75b543b82e 100644 --- a/Ryujinx.HLE/HOS/Services/Vi/GbpBuffer.cs +++ b/Ryujinx.HLE/HOS/Services/Vi/GbpBuffer.cs @@ -150,7 +150,7 @@ namespace Ryujinx.HLE.HOS.Services.Android if (Header.IntsCount != 0x51) { - throw new System.NotImplementedException($"Unexpected Graphic Buffer ints count (expected 0x51, found 0x{Header.IntsCount:x}"); + throw new NotImplementedException($"Unexpected Graphic Buffer ints count (expected 0x51, found 0x{Header.IntsCount:x}"); } Buffer = reader.ReadStruct(); diff --git a/Ryujinx.Profiler/UI/SharpFontHelpers/FontService.cs b/Ryujinx.Profiler/UI/SharpFontHelpers/FontService.cs index 9e50bc28dd..32846977e9 100644 --- a/Ryujinx.Profiler/UI/SharpFontHelpers/FontService.cs +++ b/Ryujinx.Profiler/UI/SharpFontHelpers/FontService.cs @@ -36,7 +36,7 @@ namespace Ryujinx.Profiler.UI.SharpFontHelpers private string GetFontPath() { - string fontFolder = System.Environment.GetFolderPath(Environment.SpecialFolder.Fonts); + string fontFolder = Environment.GetFolderPath(Environment.SpecialFolder.Fonts); // Only uses Arial, add more fonts here if wanted string path = Path.Combine(fontFolder, "arial.ttf"); diff --git a/Ryujinx.Tests.Unicorn/IndexedProperty.cs b/Ryujinx.Tests.Unicorn/IndexedProperty.cs index 946620c694..8d1b83f2d5 100644 --- a/Ryujinx.Tests.Unicorn/IndexedProperty.cs +++ b/Ryujinx.Tests.Unicorn/IndexedProperty.cs @@ -9,8 +9,8 @@ namespace Ryujinx.Tests.Unicorn public IndexedProperty(Func getFunc, Action setAction) { - this.GetFunc = getFunc; - this.SetAction = setAction; + GetFunc = getFunc; + SetAction = setAction; } public TValue this[TIndex i] diff --git a/Ryujinx.Tests.Unicorn/UnicornAArch64.cs b/Ryujinx.Tests.Unicorn/UnicornAArch64.cs index 8ee4e76db9..1b17b3166d 100644 --- a/Ryujinx.Tests.Unicorn/UnicornAArch64.cs +++ b/Ryujinx.Tests.Unicorn/UnicornAArch64.cs @@ -31,38 +31,38 @@ namespace Ryujinx.Tests.Unicorn public ulong LR { - get { return GetRegister(Native.ArmRegister.LR); } - set { SetRegister(Native.ArmRegister.LR, value); } + get { return GetRegister(ArmRegister.LR); } + set { SetRegister(ArmRegister.LR, value); } } public ulong SP { - get { return GetRegister(Native.ArmRegister.SP); } - set { SetRegister(Native.ArmRegister.SP, value); } + get { return GetRegister(ArmRegister.SP); } + set { SetRegister(ArmRegister.SP, value); } } public ulong PC { - get { return GetRegister(Native.ArmRegister.PC); } - set { SetRegister(Native.ArmRegister.PC, value); } + get { return GetRegister(ArmRegister.PC); } + set { SetRegister(ArmRegister.PC, value); } } public uint Pstate { - get { return (uint)GetRegister(Native.ArmRegister.PSTATE); } - set { SetRegister(Native.ArmRegister.PSTATE, (uint)value); } + get { return (uint)GetRegister(ArmRegister.PSTATE); } + set { SetRegister(ArmRegister.PSTATE, (uint)value); } } public int Fpcr { - get { return (int)GetRegister(Native.ArmRegister.FPCR); } - set { SetRegister(Native.ArmRegister.FPCR, (uint)value); } + get { return (int)GetRegister(ArmRegister.FPCR); } + set { SetRegister(ArmRegister.FPCR, (uint)value); } } public int Fpsr { - get { return (int)GetRegister(Native.ArmRegister.FPSR); } - set { SetRegister(Native.ArmRegister.FPSR, (uint)value); } + get { return (int)GetRegister(ArmRegister.FPSR); } + set { SetRegister(ArmRegister.FPSR, (uint)value); } } public bool OverflowFlag @@ -91,18 +91,18 @@ namespace Ryujinx.Tests.Unicorn public UnicornAArch64() { - Native.Interface.Checked(Native.Interface.uc_open((uint)Native.UnicornArch.UC_ARCH_ARM64, (uint)Native.UnicornMode.UC_MODE_LITTLE_ENDIAN, out uc)); - SetRegister(Native.ArmRegister.CPACR_EL1, 0x00300000); + Interface.Checked(Interface.uc_open((uint)UnicornArch.UC_ARCH_ARM64, (uint)UnicornMode.UC_MODE_LITTLE_ENDIAN, out uc)); + SetRegister(ArmRegister.CPACR_EL1, 0x00300000); } ~UnicornAArch64() { - Native.Interface.Checked(Native.Interface.uc_close(uc)); + Interface.Checked(Interface.uc_close(uc)); } public void RunForCount(ulong count) { - Native.Interface.Checked(Native.Interface.uc_emu_start(uc, this.PC, 0xFFFFFFFFFFFFFFFFu, 0, count)); + Interface.Checked(Interface.uc_emu_start(uc, PC, 0xFFFFFFFFFFFFFFFFu, 0, count)); } public void Step() @@ -110,94 +110,94 @@ namespace Ryujinx.Tests.Unicorn RunForCount(1); } - internal static Native.ArmRegister[] X_registers = new Native.ArmRegister[31] + internal static ArmRegister[] X_registers = new ArmRegister[31] { - Native.ArmRegister.X0, - Native.ArmRegister.X1, - Native.ArmRegister.X2, - Native.ArmRegister.X3, - Native.ArmRegister.X4, - Native.ArmRegister.X5, - Native.ArmRegister.X6, - Native.ArmRegister.X7, - Native.ArmRegister.X8, - Native.ArmRegister.X9, - Native.ArmRegister.X10, - Native.ArmRegister.X11, - Native.ArmRegister.X12, - Native.ArmRegister.X13, - Native.ArmRegister.X14, - Native.ArmRegister.X15, - Native.ArmRegister.X16, - Native.ArmRegister.X17, - Native.ArmRegister.X18, - Native.ArmRegister.X19, - Native.ArmRegister.X20, - Native.ArmRegister.X21, - Native.ArmRegister.X22, - Native.ArmRegister.X23, - Native.ArmRegister.X24, - Native.ArmRegister.X25, - Native.ArmRegister.X26, - Native.ArmRegister.X27, - Native.ArmRegister.X28, - Native.ArmRegister.X29, - Native.ArmRegister.X30, + ArmRegister.X0, + ArmRegister.X1, + ArmRegister.X2, + ArmRegister.X3, + ArmRegister.X4, + ArmRegister.X5, + ArmRegister.X6, + ArmRegister.X7, + ArmRegister.X8, + ArmRegister.X9, + ArmRegister.X10, + ArmRegister.X11, + ArmRegister.X12, + ArmRegister.X13, + ArmRegister.X14, + ArmRegister.X15, + ArmRegister.X16, + ArmRegister.X17, + ArmRegister.X18, + ArmRegister.X19, + ArmRegister.X20, + ArmRegister.X21, + ArmRegister.X22, + ArmRegister.X23, + ArmRegister.X24, + ArmRegister.X25, + ArmRegister.X26, + ArmRegister.X27, + ArmRegister.X28, + ArmRegister.X29, + ArmRegister.X30, }; - internal static Native.ArmRegister[] Q_registers = new Native.ArmRegister[32] + internal static ArmRegister[] Q_registers = new ArmRegister[32] { - Native.ArmRegister.Q0, - Native.ArmRegister.Q1, - Native.ArmRegister.Q2, - Native.ArmRegister.Q3, - Native.ArmRegister.Q4, - Native.ArmRegister.Q5, - Native.ArmRegister.Q6, - Native.ArmRegister.Q7, - Native.ArmRegister.Q8, - Native.ArmRegister.Q9, - Native.ArmRegister.Q10, - Native.ArmRegister.Q11, - Native.ArmRegister.Q12, - Native.ArmRegister.Q13, - Native.ArmRegister.Q14, - Native.ArmRegister.Q15, - Native.ArmRegister.Q16, - Native.ArmRegister.Q17, - Native.ArmRegister.Q18, - Native.ArmRegister.Q19, - Native.ArmRegister.Q20, - Native.ArmRegister.Q21, - Native.ArmRegister.Q22, - Native.ArmRegister.Q23, - Native.ArmRegister.Q24, - Native.ArmRegister.Q25, - Native.ArmRegister.Q26, - Native.ArmRegister.Q27, - Native.ArmRegister.Q28, - Native.ArmRegister.Q29, - Native.ArmRegister.Q30, - Native.ArmRegister.Q31, + ArmRegister.Q0, + ArmRegister.Q1, + ArmRegister.Q2, + ArmRegister.Q3, + ArmRegister.Q4, + ArmRegister.Q5, + ArmRegister.Q6, + ArmRegister.Q7, + ArmRegister.Q8, + ArmRegister.Q9, + ArmRegister.Q10, + ArmRegister.Q11, + ArmRegister.Q12, + ArmRegister.Q13, + ArmRegister.Q14, + ArmRegister.Q15, + ArmRegister.Q16, + ArmRegister.Q17, + ArmRegister.Q18, + ArmRegister.Q19, + ArmRegister.Q20, + ArmRegister.Q21, + ArmRegister.Q22, + ArmRegister.Q23, + ArmRegister.Q24, + ArmRegister.Q25, + ArmRegister.Q26, + ArmRegister.Q27, + ArmRegister.Q28, + ArmRegister.Q29, + ArmRegister.Q30, + ArmRegister.Q31, }; - internal ulong GetRegister(Native.ArmRegister register) + internal ulong GetRegister(ArmRegister register) { byte[] value_bytes = new byte[8]; - Native.Interface.Checked(Native.Interface.uc_reg_read(uc, (int)register, value_bytes)); + Interface.Checked(Interface.uc_reg_read(uc, (int)register, value_bytes)); return (ulong)BitConverter.ToInt64(value_bytes, 0); } - internal void SetRegister(Native.ArmRegister register, ulong value) + internal void SetRegister(ArmRegister register, ulong value) { byte[] value_bytes = BitConverter.GetBytes(value); - Native.Interface.Checked(Native.Interface.uc_reg_write(uc, (int)register, value_bytes)); + Interface.Checked(Interface.uc_reg_write(uc, (int)register, value_bytes)); } - internal Vector128 GetVector(Native.ArmRegister register) + internal Vector128 GetVector(ArmRegister register) { byte[] value_bytes = new byte[16]; - Native.Interface.Checked(Native.Interface.uc_reg_read(uc, (int)register, value_bytes)); + Interface.Checked(Interface.uc_reg_read(uc, (int)register, value_bytes)); unsafe { fixed (byte* p = &value_bytes[0]) @@ -207,7 +207,7 @@ namespace Ryujinx.Tests.Unicorn } } - internal void SetVector(Native.ArmRegister register, Vector128 value) + internal void SetVector(ArmRegister register, Vector128 value) { byte[] value_bytes = new byte[16]; unsafe @@ -217,7 +217,7 @@ namespace Ryujinx.Tests.Unicorn Sse.Store((float*)p, value); } } - Native.Interface.Checked(Native.Interface.uc_reg_write(uc, (int)register, value_bytes)); + Interface.Checked(Interface.uc_reg_write(uc, (int)register, value_bytes)); } public ulong GetX(int index) @@ -251,7 +251,7 @@ namespace Ryujinx.Tests.Unicorn public byte[] MemoryRead(ulong address, ulong size) { byte[] value = new byte[size]; - Native.Interface.Checked(Native.Interface.uc_mem_read(uc, address, value, size)); + Interface.Checked(Interface.uc_mem_read(uc, address, value, size)); return value; } @@ -262,7 +262,7 @@ namespace Ryujinx.Tests.Unicorn public void MemoryWrite(ulong address, byte[] value) { - Native.Interface.Checked(Native.Interface.uc_mem_write(uc, address, value, (ulong)value.Length)); + Interface.Checked(Interface.uc_mem_write(uc, address, value, (ulong)value.Length)); } public void MemoryWrite8 (ulong address, byte value) { MemoryWrite(address, new byte[]{value}); } @@ -275,23 +275,23 @@ namespace Ryujinx.Tests.Unicorn public void MemoryMap(ulong address, ulong size, MemoryPermission permissions) { - Native.Interface.Checked(Native.Interface.uc_mem_map(uc, address, size, (uint)permissions)); + Interface.Checked(Interface.uc_mem_map(uc, address, size, (uint)permissions)); } public void MemoryUnmap(ulong address, ulong size) { - Native.Interface.Checked(Native.Interface.uc_mem_unmap(uc, address, size)); + Interface.Checked(Interface.uc_mem_unmap(uc, address, size)); } public void MemoryProtect(ulong address, ulong size, MemoryPermission permissions) { - Native.Interface.Checked(Native.Interface.uc_mem_protect(uc, address, size, (uint)permissions)); + Interface.Checked(Interface.uc_mem_protect(uc, address, size, (uint)permissions)); } public void DumpMemoryInformation() { - Native.Interface.Checked(Native.Interface.uc_mem_regions(uc, out IntPtr regions_raw, out uint length)); - Native.Interface.MarshalArrayOf(regions_raw, (int)length, out var regions); + Interface.Checked(Interface.uc_mem_regions(uc, out IntPtr regions_raw, out uint length)); + Interface.MarshalArrayOf(regions_raw, (int)length, out var regions); foreach (var region in regions) { Console.WriteLine("region: begin {0:X16} end {1:X16} perms {2:X8}", region.begin, region.end, region.perms); @@ -302,7 +302,7 @@ namespace Ryujinx.Tests.Unicorn { try { - Native.Interface.uc_version(out uint major, out uint minor); + Interface.uc_version(out uint major, out uint minor); return true; } catch (DllNotFoundException)