aboutsummaryrefslogtreecommitdiff
path: root/src/Ryujinx.HLE/HOS/Kernel/Common
diff options
context:
space:
mode:
Diffstat (limited to 'src/Ryujinx.HLE/HOS/Kernel/Common')
-rw-r--r--src/Ryujinx.HLE/HOS/Kernel/Common/IKFutureSchedulerObject.cs2
-rw-r--r--src/Ryujinx.HLE/HOS/Kernel/Common/KAutoObject.cs2
-rw-r--r--src/Ryujinx.HLE/HOS/Kernel/Common/KResourceLimit.cs8
-rw-r--r--src/Ryujinx.HLE/HOS/Kernel/Common/KSynchronizationObject.cs2
-rw-r--r--src/Ryujinx.HLE/HOS/Kernel/Common/KSystemControl.cs8
-rw-r--r--src/Ryujinx.HLE/HOS/Kernel/Common/KTimeManager.cs8
-rw-r--r--src/Ryujinx.HLE/HOS/Kernel/Common/KernelInit.cs26
-rw-r--r--src/Ryujinx.HLE/HOS/Kernel/Common/KernelTransfer.cs4
-rw-r--r--src/Ryujinx.HLE/HOS/Kernel/Common/LimitableResource.cs12
-rw-r--r--src/Ryujinx.HLE/HOS/Kernel/Common/MemoryArrange.cs4
-rw-r--r--src/Ryujinx.HLE/HOS/Kernel/Common/MemorySize.cs (renamed from src/Ryujinx.HLE/HOS/Kernel/Common/MemroySize.cs)4
-rw-r--r--src/Ryujinx.HLE/HOS/Kernel/Common/MersenneTwister.cs16
12 files changed, 48 insertions, 48 deletions
diff --git a/src/Ryujinx.HLE/HOS/Kernel/Common/IKFutureSchedulerObject.cs b/src/Ryujinx.HLE/HOS/Kernel/Common/IKFutureSchedulerObject.cs
index 473683ff..1550c9bf 100644
--- a/src/Ryujinx.HLE/HOS/Kernel/Common/IKFutureSchedulerObject.cs
+++ b/src/Ryujinx.HLE/HOS/Kernel/Common/IKFutureSchedulerObject.cs
@@ -4,4 +4,4 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
{
void TimeUp();
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Kernel/Common/KAutoObject.cs b/src/Ryujinx.HLE/HOS/Kernel/Common/KAutoObject.cs
index 424bf788..e5dd3d17 100644
--- a/src/Ryujinx.HLE/HOS/Kernel/Common/KAutoObject.cs
+++ b/src/Ryujinx.HLE/HOS/Kernel/Common/KAutoObject.cs
@@ -70,4 +70,4 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
{
}
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Kernel/Common/KResourceLimit.cs b/src/Ryujinx.HLE/HOS/Kernel/Common/KResourceLimit.cs
index b1a602f1..3f16f8c2 100644
--- a/src/Ryujinx.HLE/HOS/Kernel/Common/KResourceLimit.cs
+++ b/src/Ryujinx.HLE/HOS/Kernel/Common/KResourceLimit.cs
@@ -22,10 +22,10 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
public KResourceLimit(KernelContext context) : base(context)
{
- _current = new long[(int)LimitableResource.Count];
- _limit = new long[(int)LimitableResource.Count];
+ _current = new long[(int)LimitableResource.Count];
+ _limit = new long[(int)LimitableResource.Count];
_current2 = new long[(int)LimitableResource.Count];
- _peak = new long[(int)LimitableResource.Count];
+ _peak = new long[(int)LimitableResource.Count];
_lock = new object();
@@ -185,4 +185,4 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
return (int)resource;
}
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Kernel/Common/KSynchronizationObject.cs b/src/Ryujinx.HLE/HOS/Kernel/Common/KSynchronizationObject.cs
index ddc0069d..7e725e74 100644
--- a/src/Ryujinx.HLE/HOS/Kernel/Common/KSynchronizationObject.cs
+++ b/src/Ryujinx.HLE/HOS/Kernel/Common/KSynchronizationObject.cs
@@ -32,4 +32,4 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
return false;
}
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Kernel/Common/KSystemControl.cs b/src/Ryujinx.HLE/HOS/Kernel/Common/KSystemControl.cs
index 8a727c30..10f0b6f7 100644
--- a/src/Ryujinx.HLE/HOS/Kernel/Common/KSystemControl.cs
+++ b/src/Ryujinx.HLE/HOS/Kernel/Common/KSystemControl.cs
@@ -30,7 +30,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
MemoryArrange.MemoryArrange4GiBAppletDev => 2048 * MiB,
MemoryArrange.MemoryArrange6GiB or
MemoryArrange.MemoryArrange8GiB => 4916 * MiB,
- _ => throw new ArgumentException($"Invalid memory arrange \"{arrange}\".")
+ _ => throw new ArgumentException($"Invalid memory arrange \"{arrange}\"."),
};
}
@@ -44,7 +44,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
MemoryArrange.MemoryArrange6GiB => 562 * MiB,
MemoryArrange.MemoryArrange6GiBAppletDev or
MemoryArrange.MemoryArrange8GiB => 2193 * MiB,
- _ => throw new ArgumentException($"Invalid memory arrange \"{arrange}\".")
+ _ => throw new ArgumentException($"Invalid memory arrange \"{arrange}\"."),
};
}
@@ -71,8 +71,8 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
MemorySize.MemorySize4GiB => 4 * GiB,
MemorySize.MemorySize6GiB => 6 * GiB,
MemorySize.MemorySize8GiB => 8 * GiB,
- _ => throw new ArgumentException($"Invalid memory size \"{size}\".")
+ _ => throw new ArgumentException($"Invalid memory size \"{size}\"."),
};
}
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Kernel/Common/KTimeManager.cs b/src/Ryujinx.HLE/HOS/Kernel/Common/KTimeManager.cs
index c0cd9ce9..499bc2c6 100644
--- a/src/Ryujinx.HLE/HOS/Kernel/Common/KTimeManager.cs
+++ b/src/Ryujinx.HLE/HOS/Kernel/Common/KTimeManager.cs
@@ -36,9 +36,9 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
_waitingObjects = new List<WaitingObject>();
_keepRunning = true;
- Thread work = new Thread(WaitAndCheckScheduledObjects)
+ Thread work = new(WaitAndCheckScheduledObjects)
{
- Name = "HLE.TimeManager"
+ Name = "HLE.TimeManager",
};
work.Start();
@@ -83,7 +83,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
private void WaitAndCheckScheduledObjects()
{
- SpinWait spinWait = new SpinWait();
+ SpinWait spinWait = new();
WaitingObject next;
using (_waitEvent = new AutoResetEvent(false))
@@ -215,4 +215,4 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
_waitEvent?.Set();
}
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Kernel/Common/KernelInit.cs b/src/Ryujinx.HLE/HOS/Kernel/Common/KernelInit.cs
index efa2a480..8021d8da 100644
--- a/src/Ryujinx.HLE/HOS/Kernel/Common/KernelInit.cs
+++ b/src/Ryujinx.HLE/HOS/Kernel/Common/KernelInit.cs
@@ -9,20 +9,20 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
private readonly struct MemoryRegion
{
public ulong Address { get; }
- public ulong Size { get; }
+ public ulong Size { get; }
public ulong EndAddress => Address + Size;
public MemoryRegion(ulong address, ulong size)
{
Address = address;
- Size = size;
+ Size = size;
}
}
public static void InitializeResourceLimit(KResourceLimit resourceLimit, MemorySize size)
{
- void EnsureSuccess(Result result)
+ static void EnsureSuccess(Result result)
{
if (result != Result.Success)
{
@@ -32,11 +32,11 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
ulong ramSize = KSystemControl.GetDramSize(size);
- EnsureSuccess(resourceLimit.SetLimitValue(LimitableResource.Memory, (long)ramSize));
- EnsureSuccess(resourceLimit.SetLimitValue(LimitableResource.Thread, 800));
- EnsureSuccess(resourceLimit.SetLimitValue(LimitableResource.Event, 700));
+ EnsureSuccess(resourceLimit.SetLimitValue(LimitableResource.Memory, (long)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.Session, 900));
if (!resourceLimit.Reserve(LimitableResource.Memory, 0) ||
!resourceLimit.Reserve(LimitableResource.Memory, 0x60000))
@@ -47,9 +47,9 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
public static KMemoryRegionManager[] GetMemoryRegions(MemorySize size, MemoryArrange arrange)
{
- ulong poolEnd = KSystemControl.GetDramEndAddress(size);
+ ulong poolEnd = KSystemControl.GetDramEndAddress(size);
ulong applicationPoolSize = KSystemControl.GetApplicationPoolSize(arrange);
- ulong appletPoolSize = KSystemControl.GetAppletPoolSize(arrange);
+ ulong appletPoolSize = KSystemControl.GetAppletPoolSize(arrange);
MemoryRegion servicePool;
MemoryRegion nvServicesPool;
@@ -63,7 +63,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
ulong nvServicesPoolEnd = applicationPool.Address - appletPoolSize;
nvServicesPool = new MemoryRegion(nvServicesPoolEnd - nvServicesPoolSize, nvServicesPoolSize);
- appletPool = new MemoryRegion(nvServicesPoolEnd, appletPoolSize);
+ appletPool = new MemoryRegion(nvServicesPoolEnd, appletPoolSize);
// 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
@@ -72,12 +72,12 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
servicePool = new MemoryRegion(DramMemoryMap.SlabHeapEnd, servicePoolSize);
- return new KMemoryRegionManager[]
+ return new[]
{
GetMemoryRegion(applicationPool),
GetMemoryRegion(appletPool),
GetMemoryRegion(servicePool),
- GetMemoryRegion(nvServicesPool)
+ GetMemoryRegion(nvServicesPool),
};
}
@@ -86,4 +86,4 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
return new KMemoryRegionManager(region.Address, region.Size, region.EndAddress);
}
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Kernel/Common/KernelTransfer.cs b/src/Ryujinx.HLE/HOS/Kernel/Common/KernelTransfer.cs
index cbc276c5..082d25ff 100644
--- a/src/Ryujinx.HLE/HOS/Kernel/Common/KernelTransfer.cs
+++ b/src/Ryujinx.HLE/HOS/Kernel/Common/KernelTransfer.cs
@@ -56,7 +56,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
return false;
}
- public static bool KernelToUser<T>(ulong address, T value) where T: unmanaged
+ public static bool KernelToUser<T>(ulong address, T value) where T : unmanaged
{
KProcess currentProcess = KernelStatic.GetCurrentProcess();
@@ -70,4 +70,4 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
return false;
}
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Kernel/Common/LimitableResource.cs b/src/Ryujinx.HLE/HOS/Kernel/Common/LimitableResource.cs
index 2e6a3e45..8655e61c 100644
--- a/src/Ryujinx.HLE/HOS/Kernel/Common/LimitableResource.cs
+++ b/src/Ryujinx.HLE/HOS/Kernel/Common/LimitableResource.cs
@@ -2,12 +2,12 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
{
enum LimitableResource : byte
{
- Memory = 0,
- Thread = 1,
- Event = 2,
+ Memory = 0,
+ Thread = 1,
+ Event = 2,
TransferMemory = 3,
- Session = 4,
+ Session = 4,
- Count = 5
+ Count = 5,
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Kernel/Common/MemoryArrange.cs b/src/Ryujinx.HLE/HOS/Kernel/Common/MemoryArrange.cs
index d2bcfd62..2c88d8b3 100644
--- a/src/Ryujinx.HLE/HOS/Kernel/Common/MemoryArrange.cs
+++ b/src/Ryujinx.HLE/HOS/Kernel/Common/MemoryArrange.cs
@@ -7,6 +7,6 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
MemoryArrange4GiBSystemDev,
MemoryArrange6GiB,
MemoryArrange6GiBAppletDev,
- MemoryArrange8GiB
+ MemoryArrange8GiB,
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Kernel/Common/MemroySize.cs b/src/Ryujinx.HLE/HOS/Kernel/Common/MemorySize.cs
index 159385b6..7cc34a72 100644
--- a/src/Ryujinx.HLE/HOS/Kernel/Common/MemroySize.cs
+++ b/src/Ryujinx.HLE/HOS/Kernel/Common/MemorySize.cs
@@ -4,6 +4,6 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
{
MemorySize4GiB = 0,
MemorySize6GiB = 1,
- MemorySize8GiB = 2
+ MemorySize8GiB = 2,
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Kernel/Common/MersenneTwister.cs b/src/Ryujinx.HLE/HOS/Kernel/Common/MersenneTwister.cs
index 4c99f425..9f078b10 100644
--- a/src/Ryujinx.HLE/HOS/Kernel/Common/MersenneTwister.cs
+++ b/src/Ryujinx.HLE/HOS/Kernel/Common/MersenneTwister.cs
@@ -5,7 +5,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
class MersenneTwister
{
private int _index;
- private uint[] _mt;
+ private readonly uint[] _mt;
public MersenneTwister(uint seed)
{
@@ -46,12 +46,12 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
// If Range is already power of 2, subtract one to use log2(Range) directly.
int rangeLog2 = nextRangeLog2 - (BitOperations.IsPow2(range) ? 1 : 0);
- int parts = rangeLog2 > 32 ? 2 : 1;
+ int parts = rangeLog2 > 32 ? 2 : 1;
int bitsPerPart = rangeLog2 / parts;
int fullParts = parts - (rangeLog2 - parts * bitsPerPart);
- uint mask = 0xffffffffu >> (32 - bitsPerPart);
+ uint mask = 0xffffffffu >> (32 - bitsPerPart);
uint maskPlus1 = 0xffffffffu >> (31 - bitsPerPart);
long randomNumber;
@@ -66,9 +66,9 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
}
private long GenRandomNumber(
- int parts,
- int fullParts,
- int bitsPerPart,
+ int parts,
+ int fullParts,
+ int bitsPerPart,
uint mask,
uint maskPlus1)
{
@@ -79,13 +79,13 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
for (; part < fullParts; part++)
{
randomNumber <<= bitsPerPart;
- randomNumber |= GenRandomNumber() & mask;
+ randomNumber |= GenRandomNumber() & mask;
}
for (; part < parts; part++)
{
randomNumber <<= bitsPerPart + 1;
- randomNumber |= GenRandomNumber() & maskPlus1;
+ randomNumber |= GenRandomNumber() & maskPlus1;
}
return randomNumber;