diff options
| author | Alex Barney <thealexbarney@gmail.com> | 2018-12-06 05:16:24 -0600 |
|---|---|---|
| committer | gdkchan <gab.dark.100@gmail.com> | 2018-12-06 09:16:24 -0200 |
| commit | fb1d9493a3d43f2b86c551682586905a1f0e9ea7 (patch) | |
| tree | d842685ff5bdd45d11d94bd1a45a002b9d532fe7 /Ryujinx.HLE/HOS/Kernel/KernelInit.cs | |
| parent | 3615a70cae3f89197fe185dfc5d0a47fa42151d9 (diff) | |
Adjust naming conventions and general refactoring in HLE Project (#527)
* Rename enum fields
* Naming conventions
* Remove unneeded ".this"
* Remove unneeded semicolons
* Remove unused Usings
* Don't use var
* Remove unneeded enum underlying types
* Explicitly label class visibility
* Remove unneeded @ prefixes
* Remove unneeded commas
* Remove unneeded if expressions
* Method doesn't use unsafe code
* Remove unneeded casts
* Initialized objects don't need an empty constructor
* Remove settings from DotSettings
* Revert "Explicitly label class visibility"
This reverts commit ad5eb5787cc5b27a4631cd46ef5f551c4ae95e51.
* Small changes
* Revert external enum renaming
* Changes from feedback
* Apply previous refactorings to the merged code
Diffstat (limited to 'Ryujinx.HLE/HOS/Kernel/KernelInit.cs')
| -rw-r--r-- | Ryujinx.HLE/HOS/Kernel/KernelInit.cs | 118 |
1 files changed, 59 insertions, 59 deletions
diff --git a/Ryujinx.HLE/HOS/Kernel/KernelInit.cs b/Ryujinx.HLE/HOS/Kernel/KernelInit.cs index efb514c1..a797951b 100644 --- a/Ryujinx.HLE/HOS/Kernel/KernelInit.cs +++ b/Ryujinx.HLE/HOS/Kernel/KernelInit.cs @@ -4,28 +4,28 @@ namespace Ryujinx.HLE.HOS.Kernel { static class KernelInit { - public static void InitializeResourceLimit(KResourceLimit ResourceLimit) + public static void InitializeResourceLimit(KResourceLimit resourceLimit) { - void EnsureSuccess(KernelResult Result) + void EnsureSuccess(KernelResult result) { - if (Result != KernelResult.Success) + if (result != KernelResult.Success) { - throw new InvalidOperationException($"Unexpected result \"{Result}\"."); + throw new InvalidOperationException($"Unexpected result \"{result}\"."); } } - int KernelMemoryCfg = 0; + int kernelMemoryCfg = 0; - long RamSize = GetRamSize(KernelMemoryCfg); + long ramSize = GetRamSize(kernelMemoryCfg); - EnsureSuccess(ResourceLimit.SetLimitValue(LimitableResource.Memory, RamSize)); - EnsureSuccess(ResourceLimit.SetLimitValue(LimitableResource.Thread, 800)); - EnsureSuccess(ResourceLimit.SetLimitValue(LimitableResource.Event, 700)); - EnsureSuccess(ResourceLimit.SetLimitValue(LimitableResource.TransferMemory, 200)); - EnsureSuccess(ResourceLimit.SetLimitValue(LimitableResource.Session, 900)); + EnsureSuccess(resourceLimit.SetLimitValue(LimitableResource.Memory, ramSize)); + EnsureSuccess(resourceLimit.SetLimitValue(LimitableResource.Thread, 800)); + EnsureSuccess(resourceLimit.SetLimitValue(LimitableResource.Event, 700)); + EnsureSuccess(resourceLimit.SetLimitValue(LimitableResource.TransferMemory, 200)); + EnsureSuccess(resourceLimit.SetLimitValue(LimitableResource.Session, 900)); - if (!ResourceLimit.Reserve(LimitableResource.Memory, 0) || - !ResourceLimit.Reserve(LimitableResource.Memory, 0x60000)) + if (!resourceLimit.Reserve(LimitableResource.Memory, 0) || + !resourceLimit.Reserve(LimitableResource.Memory, 0x60000)) { throw new InvalidOperationException("Unexpected failure reserving memory on resource limit."); } @@ -33,99 +33,99 @@ namespace Ryujinx.HLE.HOS.Kernel public static KMemoryRegionManager[] GetMemoryRegions() { - KMemoryArrange Arrange = GetMemoryArrange(); + KMemoryArrange arrange = GetMemoryArrange(); return new KMemoryRegionManager[] { - GetMemoryRegion(Arrange.Application), - GetMemoryRegion(Arrange.Applet), - GetMemoryRegion(Arrange.Service), - GetMemoryRegion(Arrange.NvServices) + GetMemoryRegion(arrange.Application), + GetMemoryRegion(arrange.Applet), + GetMemoryRegion(arrange.Service), + GetMemoryRegion(arrange.NvServices) }; } - private static KMemoryRegionManager GetMemoryRegion(KMemoryArrangeRegion Region) + private static KMemoryRegionManager GetMemoryRegion(KMemoryArrangeRegion region) { - return new KMemoryRegionManager(Region.Address, Region.Size, Region.EndAddr); + return new KMemoryRegionManager(region.Address, region.Size, region.EndAddr); } private static KMemoryArrange GetMemoryArrange() { - int McEmemCfg = 0x1000; + int mcEmemCfg = 0x1000; - ulong EmemApertureSize = (ulong)(McEmemCfg & 0x3fff) << 20; + ulong ememApertureSize = (ulong)(mcEmemCfg & 0x3fff) << 20; - int KernelMemoryCfg = 0; + int kernelMemoryCfg = 0; - ulong RamSize = (ulong)GetRamSize(KernelMemoryCfg); + ulong ramSize = (ulong)GetRamSize(kernelMemoryCfg); - ulong RamPart0; - ulong RamPart1; + ulong ramPart0; + ulong ramPart1; - if (RamSize * 2 > EmemApertureSize) + if (ramSize * 2 > ememApertureSize) { - RamPart0 = EmemApertureSize / 2; - RamPart1 = EmemApertureSize / 2; + ramPart0 = ememApertureSize / 2; + ramPart1 = ememApertureSize / 2; } else { - RamPart0 = EmemApertureSize; - RamPart1 = 0; + ramPart0 = ememApertureSize; + ramPart1 = 0; } - int MemoryArrange = 1; + int memoryArrange = 1; - ulong ApplicationRgSize; + ulong applicationRgSize; - switch (MemoryArrange) + switch (memoryArrange) { - case 2: ApplicationRgSize = 0x80000000; break; + case 2: applicationRgSize = 0x80000000; break; case 0x11: - case 0x21: ApplicationRgSize = 0x133400000; break; - default: ApplicationRgSize = 0xcd500000; break; + case 0x21: applicationRgSize = 0x133400000; break; + default: applicationRgSize = 0xcd500000; break; } - ulong AppletRgSize; + ulong appletRgSize; - switch (MemoryArrange) + switch (memoryArrange) { - case 2: AppletRgSize = 0x61200000; break; - case 3: AppletRgSize = 0x1c000000; break; - case 0x11: AppletRgSize = 0x23200000; break; + case 2: appletRgSize = 0x61200000; break; + case 3: appletRgSize = 0x1c000000; break; + case 0x11: appletRgSize = 0x23200000; break; case 0x12: - case 0x21: AppletRgSize = 0x89100000; break; - default: AppletRgSize = 0x1fb00000; break; + case 0x21: appletRgSize = 0x89100000; break; + default: appletRgSize = 0x1fb00000; break; } - KMemoryArrangeRegion ServiceRg; - KMemoryArrangeRegion NvServicesRg; - KMemoryArrangeRegion AppletRg; - KMemoryArrangeRegion ApplicationRg; + KMemoryArrangeRegion serviceRg; + KMemoryArrangeRegion nvServicesRg; + KMemoryArrangeRegion appletRg; + KMemoryArrangeRegion applicationRg; - const ulong NvServicesRgSize = 0x29ba000; + const ulong nvServicesRgSize = 0x29ba000; - ulong ApplicationRgEnd = DramMemoryMap.DramEnd; //- RamPart0; + ulong applicationRgEnd = DramMemoryMap.DramEnd; //- RamPart0; - ApplicationRg = new KMemoryArrangeRegion(ApplicationRgEnd - ApplicationRgSize, ApplicationRgSize); + applicationRg = new KMemoryArrangeRegion(applicationRgEnd - applicationRgSize, applicationRgSize); - ulong NvServicesRgEnd = ApplicationRg.Address - AppletRgSize; + ulong nvServicesRgEnd = applicationRg.Address - appletRgSize; - NvServicesRg = new KMemoryArrangeRegion(NvServicesRgEnd - NvServicesRgSize, NvServicesRgSize); - AppletRg = new KMemoryArrangeRegion(NvServicesRgEnd, AppletRgSize); + nvServicesRg = new KMemoryArrangeRegion(nvServicesRgEnd - nvServicesRgSize, nvServicesRgSize); + appletRg = new KMemoryArrangeRegion(nvServicesRgEnd, appletRgSize); //Note: There is an extra region used by the kernel, however //since we are doing HLE we are not going to use that memory, so give all //the remaining memory space to services. - ulong ServiceRgSize = NvServicesRg.Address - DramMemoryMap.SlabHeapEnd; + ulong serviceRgSize = nvServicesRg.Address - DramMemoryMap.SlabHeapEnd; - ServiceRg = new KMemoryArrangeRegion(DramMemoryMap.SlabHeapEnd, ServiceRgSize); + serviceRg = new KMemoryArrangeRegion(DramMemoryMap.SlabHeapEnd, serviceRgSize); - return new KMemoryArrange(ServiceRg, NvServicesRg, AppletRg, ApplicationRg); + return new KMemoryArrange(serviceRg, nvServicesRg, appletRg, applicationRg); } - private static long GetRamSize(int KernelMemoryCfg) + private static long GetRamSize(int kernelMemoryCfg) { - switch ((KernelMemoryCfg >> 16) & 3) + switch ((kernelMemoryCfg >> 16) & 3) { case 1: return 0x180000000; case 2: return 0x200000000; |