misc: chore: Use explicit types & fix object creation

This commit is contained in:
KeatonTheBot committed 2026-05-30 16:26:50 -05:00
1 parent 9d3fecf334
commit 76a123b81d
454 files changed
+3042 -2961

No files matched your search

@@ -24,9 +24,9 @@ namespace Ryujinx.Tests.Common.Extensions
ReadOnlySequence<byte> sequence =
CreateSegmentedByteSequence(originalStructs, maxSegmentSize ?? Unsafe.SizeOf<MyUnmanagedStruct>());
var sequenceReader = new SequenceReader<byte>(sequence);
SequenceReader<byte> sequenceReader = new(sequence);
foreach (var original in originalStructs)
foreach (MyUnmanagedStruct original in originalStructs)
{
// Act
ref readonly MyUnmanagedStruct read = ref sequenceReader.GetRefOrRefToCopy<MyUnmanagedStruct>(out _);
@@ -44,12 +44,12 @@ namespace Ryujinx.Tests.Common.Extensions
ReadOnlySequence<byte> sequence = CreateSegmentedByteSequence(originalStructs, 3);
var sequenceReader = new SequenceReader<byte>(sequence);
SequenceReader<byte> sequenceReader = new(sequence);
foreach (var original in originalStructs)
foreach (MyUnmanagedStruct original in originalStructs)
{
// Act
ref readonly MyUnmanagedStruct read = ref sequenceReader.GetRefOrRefToCopy<MyUnmanagedStruct>(out var copy);
ref readonly MyUnmanagedStruct read = ref sequenceReader.GetRefOrRefToCopy<MyUnmanagedStruct>(out MyUnmanagedStruct copy);
// Assert
MyUnmanagedStruct.Assert(ClassicAssert.AreEqual, original, read);
@@ -65,12 +65,12 @@ namespace Ryujinx.Tests.Common.Extensions
ReadOnlySequence<byte> sequence = CreateSegmentedByteSequence(originalStructs, int.MaxValue);
var sequenceReader = new SequenceReader<byte>(sequence);
SequenceReader<byte> sequenceReader = new(sequence);
foreach (var original in originalStructs)
foreach (MyUnmanagedStruct original in originalStructs)
{
// Act
ref readonly MyUnmanagedStruct read = ref sequenceReader.GetRefOrRefToCopy<MyUnmanagedStruct>(out var copy);
ref readonly MyUnmanagedStruct read = ref sequenceReader.GetRefOrRefToCopy<MyUnmanagedStruct>(out MyUnmanagedStruct copy);
// Assert
MyUnmanagedStruct.Assert(ClassicAssert.AreEqual, original, read);
@@ -89,7 +89,7 @@ namespace Ryujinx.Tests.Common.Extensions
// Act/Assert
ClassicAssert.Throws<ArgumentOutOfRangeException>(() =>
{
var sequenceReader = new SequenceReader<byte>(sequence);
SequenceReader<byte> sequenceReader = new(sequence);
sequenceReader.Advance(1);
@@ -107,7 +107,7 @@ namespace Ryujinx.Tests.Common.Extensions
BinaryPrimitives.WriteInt32LittleEndian(buffer.AsSpan(), TestValue);
var sequenceReader = new SequenceReader<byte>(new ReadOnlySequence<byte>(buffer));
SequenceReader<byte> sequenceReader = new(new ReadOnlySequence<byte>(buffer));
// Act
sequenceReader.ReadLittleEndian(out int roundTrippedValue);
@@ -126,7 +126,7 @@ namespace Ryujinx.Tests.Common.Extensions
BinaryPrimitives.WriteInt32BigEndian(buffer.AsSpan(), TestValue);
var sequenceReader = new SequenceReader<byte>(new ReadOnlySequence<byte>(buffer));
SequenceReader<byte> sequenceReader = new(new ReadOnlySequence<byte>(buffer));
// Act
sequenceReader.ReadLittleEndian(out int roundTrippedValue);
@@ -148,7 +148,7 @@ namespace Ryujinx.Tests.Common.Extensions
// Act/Assert
ClassicAssert.Throws<ArgumentOutOfRangeException>(() =>
{
var sequenceReader = new SequenceReader<byte>(new ReadOnlySequence<byte>(buffer));
SequenceReader<byte> sequenceReader = new(new ReadOnlySequence<byte>(buffer));
sequenceReader.Advance(1);
sequenceReader.ReadLittleEndian(out int roundTrippedValue);
@@ -174,7 +174,7 @@ namespace Ryujinx.Tests.Common.Extensions
// Act/Assert
ClassicAssert.Throws<ArgumentOutOfRangeException>(() =>
{
var sequenceReader = new SequenceReader<byte>(sequence);
SequenceReader<byte> sequenceReader = new(sequence);
sequenceReader.Advance(1);
@@ -201,7 +201,7 @@ namespace Ryujinx.Tests.Common.Extensions
ClassicAssert.Throws<ArgumentOutOfRangeException>(() =>
{
var sequenceReader = new SequenceReader<byte>(sequence);
SequenceReader<byte> sequenceReader = new(sequence);
sequenceReader.SetConsumed(MyUnmanagedStruct.SizeOf * StructCount + 1);
});
@@ -214,9 +214,9 @@ namespace Ryujinx.Tests.Common.Extensions
ReadOnlySequence<byte> sequence = CreateSegmentedByteSequence(originalStructs, maxSegmentLength);
var sequenceReader = new SequenceReader<byte>(sequence);
SequenceReader<byte> sequenceReader = new(sequence);
foreach (var original in originalStructs)
foreach (MyUnmanagedStruct original in originalStructs)
{
// Act
sequenceReader.ReadUnmanaged(out MyUnmanagedStruct read);
@@ -233,7 +233,7 @@ namespace Ryujinx.Tests.Common.Extensions
ReadOnlySequence<byte> sequence = CreateSegmentedByteSequence(originalStructs, maxSegmentLength);
var sequenceReader = new SequenceReader<byte>(sequence);
SequenceReader<byte> sequenceReader = new(sequence);
static void SetConsumedAndAssert(scoped ref SequenceReader<byte> sequenceReader, long consumed)
{
@@ -284,7 +284,7 @@ namespace Ryujinx.Tests.Common.Extensions
const int BaseInt32Value = 0x1234abcd;
const short BaseInt16Value = 0x5678;
var result = new MyUnmanagedStruct
MyUnmanagedStruct result = new()
{
BehaviourSize = BaseInt32Value ^ rng.Next(),
MemoryPoolsSize = BaseInt32Value ^ rng.Next(),
@@ -321,7 +321,7 @@ namespace Ryujinx.Tests.Common.Extensions
private static IEnumerable<MyUnmanagedStruct> EnumerateNewUnmanagedStructs()
{
var rng = new Random(0);
Random rng = new(0);
while (true)
{
@@ -332,7 +332,7 @@ namespace Ryujinx.Tests.Common.Extensions
private static ReadOnlySequence<byte> CreateSegmentedByteSequence<T>(T[] array, int maxSegmentLength) where T : unmanaged
{
byte[] arrayBytes = MemoryMarshal.AsBytes(array.AsSpan()).ToArray();
var memory = new Memory<byte>(arrayBytes);
Memory<byte> memory = new(arrayBytes);
int index = 0;
BytesReadOnlySequenceSegment first = null, last = null;
@@ -340,7 +340,7 @@ namespace Ryujinx.Tests.Common.Extensions
while (index < memory.Length)
{
int nextSegmentLength = Math.Min(maxSegmentLength, memory.Length - index);
var nextSegment = memory.Slice(index, nextSegmentLength);
Memory<byte> nextSegment = memory.Slice(index, nextSegmentLength);
if (first == null)
{
+1 -1
View File
@@ -295,7 +295,7 @@ namespace Ryujinx.Tests.Cpu
FinalRegs = test.FinalRegs,
});
foreach (var (address, value) in test.MemoryDelta)
foreach ((ulong address, ushort value) in test.MemoryDelta)
{
testMem[address - DataBaseAddress + 0] = (byte)(value >> 0);
testMem[address - DataBaseAddress + 1] = (byte)(value >> 8);
+2 -2
View File
@@ -466,7 +466,7 @@ namespace Ryujinx.Tests.Cpu
opcode |= (fixImm & 0x3f) << 16;
var v0 = new V128((uint)s0, (uint)s1, (uint)s2, (uint)s3);
V128 v0 = new((uint)s0, (uint)s1, (uint)s2, (uint)s3);
SingleOpcode(opcode, v0: v0);
@@ -506,7 +506,7 @@ namespace Ryujinx.Tests.Cpu
opcode |= (fixImm & 0x3f) << 16;
var v0 = new V128(s0, s1, s2, s3);
V128 v0 = new(s0, s1, s2, s3);
SingleOpcode(opcode, v0: v0);
+9 -9
View File
@@ -44,7 +44,7 @@ namespace Ryujinx.Tests.Cpu
[Range(0u, 3u)] uint n,
[Values(0x0u)] uint offset)
{
var data = GenerateVectorSequence((int)MemoryBlock.GetPageSize());
byte[] data = GenerateVectorSequence((int)MemoryBlock.GetPageSize());
SetWorkingMemory(0, data);
uint opcode = 0xf4a00000u; // VLD1.8 {D0[0]}, [R0], R0
@@ -74,7 +74,7 @@ namespace Ryujinx.Tests.Cpu
[Values] bool t,
[Values(0x0u)] uint offset)
{
var data = GenerateVectorSequence((int)MemoryBlock.GetPageSize());
byte[] data = GenerateVectorSequence((int)MemoryBlock.GetPageSize());
SetWorkingMemory(0, data);
uint opcode = 0xf4a00c00u; // VLD1.8 {D0[0]}, [R0], R0
@@ -103,7 +103,7 @@ namespace Ryujinx.Tests.Cpu
[Range(0u, 10u)] uint mode,
[Values(0x0u)] uint offset)
{
var data = GenerateVectorSequence((int)MemoryBlock.GetPageSize());
byte[] data = GenerateVectorSequence((int)MemoryBlock.GetPageSize());
SetWorkingMemory(0, data);
uint opcode = 0xf4200000u; // VLD4.8 {D0, D1, D2, D3}, [R0], R0
@@ -133,7 +133,7 @@ namespace Ryujinx.Tests.Cpu
[Range(0u, 3u)] uint n,
[Values(0x0u)] uint offset)
{
var data = GenerateVectorSequence((int)MemoryBlock.GetPageSize());
byte[] data = GenerateVectorSequence((int)MemoryBlock.GetPageSize());
SetWorkingMemory(0, data);
(V128 vec1, V128 vec2, V128 vec3, V128 vec4) = GenerateTestVectors();
@@ -164,7 +164,7 @@ namespace Ryujinx.Tests.Cpu
[Range(0u, 10u)] uint mode,
[Values(0x0u)] uint offset)
{
var data = GenerateVectorSequence((int)MemoryBlock.GetPageSize());
byte[] data = GenerateVectorSequence((int)MemoryBlock.GetPageSize());
SetWorkingMemory(0, data);
(V128 vec1, V128 vec2, V128 vec3, V128 vec4) = GenerateTestVectors();
@@ -194,7 +194,7 @@ namespace Ryujinx.Tests.Cpu
[Values(0x1u, 0x32u)] uint regs,
[Values] bool single)
{
var data = GenerateVectorSequence((int)MemoryBlock.GetPageSize());
byte[] data = GenerateVectorSequence((int)MemoryBlock.GetPageSize());
SetWorkingMemory(0, data);
uint opcode = 0xec100a00u; // VST4.8 {D0, D1, D2, D3}, [R0], R0
@@ -246,7 +246,7 @@ namespace Ryujinx.Tests.Cpu
[Values(0x0u)] uint imm,
[Values] bool sub)
{
var data = GenerateVectorSequence((int)MemoryBlock.GetPageSize());
byte[] data = GenerateVectorSequence((int)MemoryBlock.GetPageSize());
SetWorkingMemory(0, data);
uint opcode = 0xed900a00u; // VLDR.32 S0, [R0, #0]
@@ -281,7 +281,7 @@ namespace Ryujinx.Tests.Cpu
[Values(0x0u)] uint imm,
[Values] bool sub)
{
var data = GenerateVectorSequence((int)MemoryBlock.GetPageSize());
byte[] data = GenerateVectorSequence((int)MemoryBlock.GetPageSize());
SetWorkingMemory(0, data);
uint opcode = 0xed800a00u; // VSTR.32 S0, [R0, #0]
@@ -331,7 +331,7 @@ namespace Ryujinx.Tests.Cpu
data[i] = i + (i / 9f);
}
var result = new byte[length];
byte[] result = new byte[length];
Buffer.BlockCopy(data, 0, result, 0, result.Length);
return result;
}
+2 -1
View File
@@ -2,6 +2,7 @@
using ARMeilleure.State;
using NUnit.Framework;
using NUnit.Framework.Internal;
namespace Ryujinx.Tests.Cpu
{
@@ -467,7 +468,7 @@ namespace Ryujinx.Tests.Cpu
opcode |= (vn & 0xf) << 16;
opcode |= (length & 0x3) << 8;
var rnd = TestContext.CurrentContext.Random;
Randomizer rnd = TestContext.CurrentContext.Random;
V128 v2 = new(TestContext.CurrentContext.Random.NextULong(), TestContext.CurrentContext.Random.NextULong());
V128 v3 = new(TestContext.CurrentContext.Random.NextULong(), TestContext.CurrentContext.Random.NextULong());
V128 v4 = new(TestContext.CurrentContext.Random.NextULong(), TestContext.CurrentContext.Random.NextULong());
+1 -1
View File
@@ -54,7 +54,7 @@ namespace Ryujinx.Tests.Cpu
bool methodCalled = false;
bool isFz = false;
var method = TranslatorTestMethods.GenerateFpFlagsPInvokeTest();
TranslatorTestMethods.FpFlagsPInvokeTest method = TranslatorTestMethods.GenerateFpFlagsPInvokeTest();
// This method sets flush-to-zero and then calls the managed method.
// Before and after setting the flags, it ensures subnormal addition works as expected.
+22 -21
View File
@@ -4,6 +4,7 @@ using ARMeilleure.Signal;
using ARMeilleure.Translation;
using NUnit.Framework;
using NUnit.Framework.Legacy;
using Ryujinx.Common.Memory;
using Ryujinx.Common.Memory.PartialUnmaps;
using Ryujinx.Cpu;
using Ryujinx.Cpu.Jit;
@@ -27,11 +28,11 @@ namespace Ryujinx.Tests.Memory
{
MemoryAllocationFlags asFlags = MemoryAllocationFlags.Reserve | MemoryAllocationFlags.ViewCompatible;
var addressSpace = new MemoryBlock(asSize, asFlags);
var addressSpaceMirror = new MemoryBlock(asSize, asFlags);
MemoryBlock addressSpace = new(asSize, asFlags);
MemoryBlock addressSpaceMirror = new(asSize, asFlags);
var tracking = new MemoryTracking(new MockVirtualMemoryManager(asSize, 0x1000), 0x1000);
var exceptionHandler = new MemoryEhMeilleure(addressSpace, addressSpaceMirror, tracking);
MemoryTracking tracking = new(new MockVirtualMemoryManager(asSize, 0x1000), 0x1000);
MemoryEhMeilleure exceptionHandler = new(addressSpace, addressSpaceMirror, tracking);
return (addressSpace, addressSpaceMirror, exceptionHandler);
}
@@ -40,7 +41,7 @@ namespace Ryujinx.Tests.Memory
{
int count = 0;
ref var ids = ref state.LocalCounts.ThreadIds;
ref Array20<int> ids = ref state.LocalCounts.ThreadIds;
for (int i = 0; i < ids.Length; i++)
{
@@ -72,13 +73,13 @@ namespace Ryujinx.Tests.Memory
ulong vaSize = 0x100000;
// The first 0x100000 is mapped to start. It is replaced from the center with the 0x200000 mapping.
var backing = new MemoryBlock(vaSize * 2, MemoryAllocationFlags.Mirrorable);
MemoryBlock backing = new(vaSize * 2, MemoryAllocationFlags.Mirrorable);
(MemoryBlock unusedMainMemory, MemoryBlock memory, MemoryEhMeilleure exceptionHandler) = GetVirtual(vaSize * 2);
EnsureTranslator();
ref var state = ref PartialUnmapState.GetRef();
ref PartialUnmapState state = ref PartialUnmapState.GetRef();
Thread testThread = null;
bool shouldAccess = true;
@@ -217,17 +218,17 @@ namespace Ryujinx.Tests.Memory
ulong vaSize = 0x100000;
// The first 0x100000 is mapped to start. It is replaced from the center with the 0x200000 mapping.
var backing = new MemoryBlock(vaSize * 2, MemoryAllocationFlags.Mirrorable);
MemoryBlock backing = new(vaSize * 2, MemoryAllocationFlags.Mirrorable);
(MemoryBlock mainMemory, MemoryBlock unusedMirror, MemoryEhMeilleure exceptionHandler) = GetVirtual(vaSize * 2);
EnsureTranslator();
ref var state = ref PartialUnmapState.GetRef();
ref PartialUnmapState state = ref PartialUnmapState.GetRef();
// Create some info to be used for managing the native writing loop.
int stateSize = Unsafe.SizeOf<NativeWriteLoopState>();
var statePtr = Marshal.AllocHGlobal(stateSize);
IntPtr statePtr = Marshal.AllocHGlobal(stateSize);
Unsafe.InitBlockUnaligned((void*)statePtr, 0, (uint)stateSize);
ref NativeWriteLoopState writeLoopState = ref Unsafe.AsRef<NativeWriteLoopState>((void*)statePtr);
@@ -242,7 +243,7 @@ namespace Ryujinx.Tests.Memory
// Create a large mapping.
mainMemory.MapView(backing, 0, 0, vaSize);
var writeFunc = TestMethods.GenerateDebugNativeWriteLoop();
TestMethods.DebugNativeWriteLoop writeFunc = TestMethods.GenerateDebugNativeWriteLoop();
nint writePtr = mainMemory.GetPointer(vaSize - 0x1000, 4);
Thread testThread = new(() =>
@@ -293,10 +294,10 @@ namespace Ryujinx.Tests.Memory
public void ThreadLocalMap()
{
PartialUnmapState.Reset();
ref var state = ref PartialUnmapState.GetRef();
ref PartialUnmapState state = ref PartialUnmapState.GetRef();
bool running = true;
var testThread = new Thread(() =>
Thread testThread = new(() =>
{
PartialUnmapState.GetRef().RetryFromAccessViolation();
while (running)
@@ -332,11 +333,11 @@ namespace Ryujinx.Tests.Memory
PartialUnmapState.Reset();
ref var state = ref PartialUnmapState.GetRef();
ref PartialUnmapState state = ref PartialUnmapState.GetRef();
fixed (void* localMap = &state.LocalCounts)
{
var getOrReserve = TestMethods.GenerateDebugThreadLocalMapGetOrReserve((nint)localMap);
TestMethods.DebugThreadLocalMapGetOrReserve getOrReserve = TestMethods.GenerateDebugThreadLocalMapGetOrReserve((nint)localMap);
for (int i = 0; i < ThreadLocalMap<int>.MapSize; i++)
{
@@ -376,8 +377,8 @@ namespace Ryujinx.Tests.Memory
[Test]
public void NativeReaderWriterLock()
{
var rwLock = new NativeReaderWriterLock();
var threads = new List<Thread>();
NativeReaderWriterLock rwLock = new();
List<Thread> threads = new();
int value = 0;
@@ -387,7 +388,7 @@ namespace Ryujinx.Tests.Memory
for (int i = 0; i < 5; i++)
{
var readThread = new Thread(() =>
Thread readThread = new(() =>
{
int count = 0;
while (running)
@@ -424,7 +425,7 @@ namespace Ryujinx.Tests.Memory
for (int i = 0; i < 2; i++)
{
var writeThread = new Thread(() =>
Thread writeThread = new(() =>
{
int count = 0;
while (running)
@@ -454,7 +455,7 @@ namespace Ryujinx.Tests.Memory
threads.Add(writeThread);
}
foreach (var thread in threads)
foreach (Thread thread in threads)
{
thread.Start();
}
@@ -463,7 +464,7 @@ namespace Ryujinx.Tests.Memory
running = false;
foreach (var thread in threads)
foreach (Thread thread in threads)
{
thread.Join();
}