misc: chore: Use explicit types & fix object creation

src/ARMeilleure/CodeGen/Arm64/Arm64Optimizer.cs

@@ -13,13 +13,13 @@ namespace ARMeilleure.CodeGen.Arm64
 
         public static void RunPass(ControlFlowGraph cfg)
         {
-            var constants = new Dictionary<ulong, Operand>();
+            Dictionary<ulong, Operand> constants = new();
 
             Operand GetConstantCopy(BasicBlock block, Operation operation, Operand source)
             {
                 // If the constant has many uses, we also force a new constant mov to be added, in order
                 // to avoid overflow of the counts field (that is limited to 16 bits).
-                if (!constants.TryGetValue(source.Value, out var constant) || constant.UsesCount > MaxConstantUses)
+                if (!constants.TryGetValue(source.Value, out Operand constant) || constant.UsesCount > MaxConstantUses)
                 {
                     constant = Local(source.Type);
 

src/ARMeilleure/CodeGen/Arm64/Assembler.cs

@@ -123,7 +123,7 @@ namespace ARMeilleure.CodeGen.Arm64
 
         public void Cset(Operand rd, ArmCondition condition)
         {
-            var zr = Factory.Register(ZrRegister, RegisterType.Integer, rd.Type);
+            Operand zr = Factory.Register(ZrRegister, RegisterType.Integer, rd.Type);
             Csinc(rd, zr, zr, (ArmCondition)((int)condition ^ 1));
         }
 

src/ARMeilleure/CodeGen/Arm64/CodeGenContext.cs

@@ -91,7 +91,7 @@ namespace ARMeilleure.CodeGen.Arm64
 
             long target = _stream.Position;
 
-            if (_pendingBranches.TryGetValue(block, out var list))
+            if (_pendingBranches.TryGetValue(block, out List<(ArmCondition Condition, long BranchPos)> list))
             {
                 foreach ((ArmCondition condition, long branchPos) in list)
                 {
@@ -119,7 +119,7 @@ namespace ARMeilleure.CodeGen.Arm64
             }
             else
             {
-                if (!_pendingBranches.TryGetValue(target, out var list))
+                if (!_pendingBranches.TryGetValue(target, out List<(ArmCondition Condition, long BranchPos)> list))
                 {
                     list = new List<(ArmCondition, long)>();
                     _pendingBranches.Add(target, list);

src/ARMeilleure/CodeGen/Arm64/CodeGenerator.cs

@@ -321,7 +321,7 @@ namespace ARMeilleure.CodeGen.Arm64
 
             Debug.Assert(comp.Kind == OperandKind.Constant);
 
-            var cond = ((Comparison)comp.AsInt32()).ToArmCondition();
+            ArmCondition cond = ((Comparison)comp.AsInt32()).ToArmCondition();
 
             GenerateCompareCommon(context, operation);
 
@@ -353,7 +353,7 @@ namespace ARMeilleure.CodeGen.Arm64
             Debug.Assert(dest.Type == OperandType.I32);
             Debug.Assert(comp.Kind == OperandKind.Constant);
 
-            var cond = ((Comparison)comp.AsInt32()).ToArmCondition();
+            ArmCondition cond = ((Comparison)comp.AsInt32()).ToArmCondition();
 
             GenerateCompareCommon(context, operation);
 

src/ARMeilleure/CodeGen/Arm64/PreAllocator.cs

@@ -847,7 +847,7 @@ namespace ARMeilleure.CodeGen.Arm64
 
                         Debug.Assert(comp.Kind == OperandKind.Constant);
 
-                        var compType = (Comparison)comp.AsInt32();
+                        Comparison compType = (Comparison)comp.AsInt32();
 
                         return compType is Comparison.Equal or Comparison.NotEqual;
                     }

src/ARMeilleure/CodeGen/RegisterAllocators/LinearScanAllocator.cs

@@ -115,7 +115,7 @@ namespace ARMeilleure.CodeGen.RegisterAllocators
         {
             NumberLocals(cfg, regMasks.RegistersCount);
 
-            var context = new AllocationContext(stackAlloc, regMasks, _intervals.Count);
+            AllocationContext context = new(stackAlloc, regMasks, _intervals.Count);
 
             BuildIntervals(cfg, context);
 

src/ARMeilleure/CodeGen/RegisterAllocators/LiveIntervalList.cs

@@ -15,12 +15,12 @@ namespace ARMeilleure.CodeGen.RegisterAllocators
         {
             if (_count + 1 > _capacity)
             {
-                var oldSpan = Span;
+                Span<LiveInterval> oldSpan = Span;
 
                 _capacity = Math.Max(4, _capacity * 2);
                 _items = Allocators.References.Allocate<LiveInterval>((uint)_capacity);
 
-                var newSpan = Span;
+                Span<LiveInterval> newSpan = Span;
 
                 oldSpan.CopyTo(newSpan);
             }

src/ARMeilleure/CodeGen/RegisterAllocators/UseList.cs

@@ -16,12 +16,12 @@ namespace ARMeilleure.CodeGen.RegisterAllocators
         {
             if (Count + 1 > _capacity)
             {
-                var oldSpan = Span;
+                Span<int> oldSpan = Span;
 
                 _capacity = Math.Max(4, _capacity * 2);
                 _items = Allocators.Default.Allocate<int>((uint)_capacity);
 
-                var newSpan = Span;
+                Span<int> newSpan = Span;
 
                 oldSpan.CopyTo(newSpan);
             }

src/ARMeilleure/CodeGen/X86/Assembler.cs

@@ -1,5 +1,6 @@
 using ARMeilleure.CodeGen.Linking;
 using ARMeilleure.IntermediateRepresentation;
+using Microsoft.IO;
 using Ryujinx.Common.Memory;
 using System;
 using System.Collections.Generic;
@@ -1324,8 +1325,8 @@ namespace ARMeilleure.CodeGen.X86
 
         public (byte[], RelocInfo) GetCode()
         {
-            var jumps = CollectionsMarshal.AsSpan(_jumps);
-            var relocs = CollectionsMarshal.AsSpan(_relocs);
+            Span<Jump> jumps = CollectionsMarshal.AsSpan(_jumps);
+            Span<Reloc> relocs = CollectionsMarshal.AsSpan(_relocs);
 
             // Write jump relative offsets.
             bool modified;
@@ -1410,13 +1411,13 @@ namespace ARMeilleure.CodeGen.X86
             // Write the code, ignoring the dummy bytes after jumps, into a new stream.
             _stream.Seek(0, SeekOrigin.Begin);
 
-            using var codeStream = MemoryStreamManager.Shared.GetStream();
-            var assembler = new Assembler(codeStream, HasRelocs);
+            using RecyclableMemoryStream codeStream = MemoryStreamManager.Shared.GetStream();
+            Assembler assembler = new(codeStream, HasRelocs);
 
             bool hasRelocs = HasRelocs;
             int relocIndex = 0;
             int relocOffset = 0;
-            var relocEntries = hasRelocs
+            RelocEntry[] relocEntries = hasRelocs
                 ? new RelocEntry[relocs.Length]
                 : Array.Empty<RelocEntry>();
 
@@ -1469,8 +1470,8 @@ namespace ARMeilleure.CodeGen.X86
 
             _stream.CopyTo(codeStream);
 
-            var code = codeStream.ToArray();
-            var relocInfo = new RelocInfo(relocEntries);
+            byte[] code = codeStream.ToArray();
+            RelocInfo relocInfo = new(relocEntries);
 
             return (code, relocInfo);
         }

src/ARMeilleure/CodeGen/X86/CodeGenerator.cs

@@ -622,7 +622,7 @@ namespace ARMeilleure.CodeGen.X86
 
             Debug.Assert(comp.Kind == OperandKind.Constant);
 
-            var cond = ((Comparison)comp.AsInt32()).ToX86Condition();
+            X86Condition cond = ((Comparison)comp.AsInt32()).ToX86Condition();
 
             GenerateCompareCommon(context, operation);
 
@@ -660,7 +660,7 @@ namespace ARMeilleure.CodeGen.X86
             Debug.Assert(dest.Type == OperandType.I32);
             Debug.Assert(comp.Kind == OperandKind.Constant);
 
-            var cond = ((Comparison)comp.AsInt32()).ToX86Condition();
+            X86Condition cond = ((Comparison)comp.AsInt32()).ToX86Condition();
 
             GenerateCompareCommon(context, operation);
 

src/ARMeilleure/CodeGen/X86/HardwareCapabilities.cs

@@ -53,7 +53,7 @@ namespace ARMeilleure.CodeGen.X86
 
             memGetXcr0.Reprotect(0, (ulong)asmGetXcr0.Length, MemoryPermission.ReadAndExecute);
 
-            var fGetXcr0 = Marshal.GetDelegateForFunctionPointer<GetXcr0>(memGetXcr0.Pointer);
+            GetXcr0 fGetXcr0 = Marshal.GetDelegateForFunctionPointer<GetXcr0>(memGetXcr0.Pointer);
 
             return fGetXcr0();
         }

src/ARMeilleure/CodeGen/X86/PreAllocator.cs

@@ -759,7 +759,7 @@ namespace ARMeilleure.CodeGen.X86
 
                         Debug.Assert(comp.Kind == OperandKind.Constant);
 
-                        var compType = (Comparison)comp.AsInt32();
+                        Comparison compType = (Comparison)comp.AsInt32();
 
                         return compType is Comparison.Equal or Comparison.NotEqual;
                     }

src/ARMeilleure/CodeGen/X86/X86Optimizer.cs

@@ -13,13 +13,13 @@ namespace ARMeilleure.CodeGen.X86
 
         public static void RunPass(ControlFlowGraph cfg)
         {
-            var constants = new Dictionary<ulong, Operand>();
+            Dictionary<ulong, Operand> constants = new();
 
             Operand GetConstantCopy(BasicBlock block, Operation operation, Operand source)
             {
                 // If the constant has many uses, we also force a new constant mov to be added, in order
                 // to avoid overflow of the counts field (that is limited to 16 bits).
-                if (!constants.TryGetValue(source.Value, out var constant) || constant.UsesCount > MaxConstantUses)
+                if (!constants.TryGetValue(source.Value, out Operand constant) || constant.UsesCount > MaxConstantUses)
                 {
                     constant = Local(source.Type);
 

src/ARMeilleure/Common/BitMap.cs

@@ -129,13 +129,13 @@ namespace ARMeilleure.Common
 
             if (count > _count)
             {
-                var oldMask = _masks;
-                var oldSpan = new Span<long>(_masks, _count);
+                long* oldMask = _masks;
+                Span<long> oldSpan = new(_masks, _count);
 
                 _masks = _allocator.Allocate<long>((uint)count);
                 _count = count;
 
-                var newSpan = new Span<long>(_masks, _count);
+                Span<long> newSpan = new(_masks, _count);
 
                 oldSpan.CopyTo(newSpan);
                 newSpan[oldSpan.Length..].Clear();

src/ARMeilleure/Common/EntryTable.cs

@@ -63,7 +63,7 @@ namespace ARMeilleure.Common
                 }
 
                 int index = _freeHint++;
-                var page = GetPage(index);
+                Span<TEntry> page = GetPage(index);
 
                 _allocated.Set(index);
 
@@ -111,7 +111,7 @@ namespace ARMeilleure.Common
                     throw new ArgumentException("Entry at the specified index was not allocated", nameof(index));
                 }
 
-                var page = GetPage(index);
+                Span<TEntry> page = GetPage(index);
 
                 return ref GetValue(page, index);
             }
@@ -136,7 +136,7 @@ namespace ARMeilleure.Common
         /// <returns>Page for the specified <see cref="index"/></returns>
         private unsafe Span<TEntry> GetPage(int index)
         {
-            var pageIndex = (int)((uint)(index & ~(_pageCapacity - 1)) >> _pageLogCapacity);
+            int pageIndex = (int)((uint)(index & ~(_pageCapacity - 1)) >> _pageLogCapacity);
 
             if (!_pages.TryGetValue(pageIndex, out nint page))
             {
@@ -168,7 +168,7 @@ namespace ARMeilleure.Common
             {
                 _allocated.Dispose();
 
-                foreach (var page in _pages.Values)
+                foreach (IntPtr page in _pages.Values)
                 {
                     NativeAllocator.Instance.Free((void*)page);
                 }

src/ARMeilleure/Decoders/OpCode32SimdDupElem.cs

@@ -9,7 +9,7 @@ namespace ARMeilleure.Decoders
 
         public OpCode32SimdDupElem(InstDescriptor inst, ulong address, int opCode, bool isThumb) : base(inst, address, opCode, isThumb)
         {
-            var opc = (opCode >> 16) & 0xf;
+            int opc = (opCode >> 16) & 0xf;
 
             if ((opc & 0b1) == 1)
             {

src/ARMeilleure/Decoders/OpCode32SimdMovGpElem.cs

@@ -21,7 +21,7 @@ namespace ARMeilleure.Decoders
             Op = (opCode >> 20) & 0x1;
             U = ((opCode >> 23) & 1) != 0;
 
-            var opc = (((opCode >> 23) & 1) << 4) | (((opCode >> 21) & 0x3) << 2) | ((opCode >> 5) & 0x3);
+            int opc = (((opCode >> 23) & 1) << 4) | (((opCode >> 21) & 0x3) << 2) | ((opCode >> 5) & 0x3);
 
             if ((opc & 0b01000) == 0b01000)
             {

src/ARMeilleure/Decoders/OpCodeAluImm.cs

@@ -20,7 +20,7 @@ namespace ARMeilleure.Decoders
             }
             else if (DataOp == DataOp.Logical)
             {
-                var bm = DecoderHelper.DecodeBitMask(opCode, true);
+                DecoderHelper.BitMask bm = DecoderHelper.DecodeBitMask(opCode, true);
 
                 if (bm.IsUndefined)
                 {

src/ARMeilleure/Decoders/OpCodeBfm.cs

@@ -11,7 +11,7 @@ namespace ARMeilleure.Decoders
 
         public OpCodeBfm(InstDescriptor inst, ulong address, int opCode) : base(inst, address, opCode)
         {
-            var bm = DecoderHelper.DecodeBitMask(opCode, false);
+            DecoderHelper.BitMask bm = DecoderHelper.DecodeBitMask(opCode, false);
 
             if (bm.IsUndefined)
             {

src/ARMeilleure/Decoders/Optimizations/TailCallRemover.cs

@@ -69,7 +69,7 @@ namespace ARMeilleure.Decoders.Optimizations
                 }
             }
 
-            var newBlocks = new List<Block>(blocks.Count);
+            List<Block> newBlocks = new(blocks.Count);
 
             // Finally, rebuild decoded block list, ignoring blocks outside the contiguous range.
             for (int i = 0; i < blocks.Count; i++)

src/ARMeilleure/Diagnostics/IRDumper.cs

@@ -141,7 +141,7 @@ namespace ARMeilleure.Diagnostics
                     break;
 
                 case OperandKind.Memory:
-                    var memOp = operand.GetMemory();
+                    MemoryOperand memOp = operand.GetMemory();
 
                     _builder.Append('[');
 
@@ -284,7 +284,7 @@ namespace ARMeilleure.Diagnostics
 
         public static string GetDump(ControlFlowGraph cfg)
         {
-            var dumper = new IRDumper(1);
+            IRDumper dumper = new(1);
 
             for (BasicBlock block = cfg.Blocks.First; block != null; block = block.ListNext)
             {

src/ARMeilleure/Instructions/InstEmitAlu32.cs

@@ -415,7 +415,7 @@ namespace ARMeilleure.Instructions
         {
             IOpCode32AluBf op = (IOpCode32AluBf)context.CurrOp;
 
-            var msb = op.Lsb + op.Msb; // For this instruction, the msb is actually a width.
+            int msb = op.Lsb + op.Msb; // For this instruction, the msb is actually a width.
 
             Operand n = GetIntA32(context, op.Rn);
             Operand res = context.ShiftRightSI(context.ShiftLeft(n, Const(31 - msb)), Const(31 - op.Msb));
@@ -547,7 +547,7 @@ namespace ARMeilleure.Instructions
         {
             IOpCode32AluBf op = (IOpCode32AluBf)context.CurrOp;
 
-            var msb = op.Lsb + op.Msb; // For this instruction, the msb is actually a width.
+            int msb = op.Lsb + op.Msb; // For this instruction, the msb is actually a width.
 
             Operand n = GetIntA32(context, op.Rn);
             Operand res = context.ShiftRightUI(context.ShiftLeft(n, Const(31 - msb)), Const(31 - op.Msb));

src/ARMeilleure/Instructions/InstEmitFlowHelper.cs

@@ -1,4 +1,5 @@
 using ARMeilleure.CodeGen.Linking;
+using ARMeilleure.Common;
 using ARMeilleure.Decoders;
 using ARMeilleure.IntermediateRepresentation;
 using ARMeilleure.State;
@@ -205,7 +206,7 @@ namespace ARMeilleure.Instructions
 
             Operand hostAddress;
 
-            var table = context.FunctionTable;
+            IAddressTable<ulong> table = context.FunctionTable;
 
             // If address is mapped onto the function table, we can skip the table walk. Otherwise we fallback
             // onto the dispatch stub.
@@ -230,7 +231,7 @@ namespace ARMeilleure.Instructions
 
                 for (int i = 0; i < table.Levels.Length; i++)
                 {
-                    var level = table.Levels[i];
+                    AddressTableLevel level = table.Levels[i];
                     int clearBits = 64 - (level.Index + level.Length);
 
                     Operand index = context.ShiftLeft(

src/ARMeilleure/Instructions/InstEmitMemoryEx32.cs

@@ -143,8 +143,8 @@ namespace ARMeilleure.Instructions
 
             Operand address = context.Copy(GetIntA32(context, op.Rn));
 
-            var exclusive = (accType & AccessType.Exclusive) != 0;
-            var ordered = (accType & AccessType.Ordered) != 0;
+            bool exclusive = (accType & AccessType.Exclusive) != 0;
+            bool ordered = (accType & AccessType.Ordered) != 0;
 
             if ((accType & AccessType.Load) != 0)
             {

src/ARMeilleure/Instructions/InstEmitSimdCmp32.cs

@@ -229,7 +229,7 @@ namespace ARMeilleure.Instructions
 
         private static Operand ZerosOrOnes(ArmEmitterContext context, Operand fromBool, OperandType baseType)
         {
-            var ones = (baseType == OperandType.I64) ? Const(-1L) : Const(-1);
+            Operand ones = (baseType == OperandType.I64) ? Const(-1L) : Const(-1);
 
             return context.ConditionalSelect(fromBool, ones, Const(baseType, 0L));
         }

src/ARMeilleure/Instructions/InstEmitSimdCvt32.cs

@@ -118,15 +118,15 @@ namespace ARMeilleure.Instructions
         {
             OpCode32SimdCvtFFixed op = (OpCode32SimdCvtFFixed)context.CurrOp;
 
-            var toFixed = op.Opc == 1;
+            bool toFixed = op.Opc == 1;
             int fracBits = op.Fbits;
-            var unsigned = op.U;
+            bool unsigned = op.U;
 
             if (toFixed) // F32 to S32 or U32 (fixed)
             {
                 EmitVectorUnaryOpF32(context, (op1) =>
                 {
-                    var scaledValue = context.Multiply(op1, ConstF(MathF.Pow(2f, fracBits)));
+                    Operand scaledValue = context.Multiply(op1, ConstF(MathF.Pow(2f, fracBits)));
                     MethodInfo info = unsigned ? typeof(SoftFallback).GetMethod(nameof(SoftFallback.SatF32ToU32)) : typeof(SoftFallback).GetMethod(nameof(SoftFallback.SatF32ToS32));
 
                     return context.Call(info, scaledValue);
@@ -136,7 +136,7 @@ namespace ARMeilleure.Instructions
             {
                 EmitVectorUnaryOpI32(context, (op1) =>
                 {
-                    var floatValue = unsigned ? context.ConvertToFPUI(OperandType.FP32, op1) : context.ConvertToFP(OperandType.FP32, op1);
+                    Operand floatValue = unsigned ? context.ConvertToFPUI(OperandType.FP32, op1) : context.ConvertToFP(OperandType.FP32, op1);
 
                     return context.Multiply(floatValue, ConstF(1f / MathF.Pow(2f, fracBits)));
                 }, !unsigned);

src/ARMeilleure/Instructions/InstEmitSimdMemory32.cs

@@ -87,7 +87,7 @@ namespace ARMeilleure.Instructions
                         {
                             if (op.Replicate)
                             {
-                                var regs = (count > 1) ? 1 : op.Increment;
+                                int regs = (count > 1) ? 1 : op.Increment;
                                 for (int reg = 0; reg < regs; reg++)
                                 {
                                     int dreg = reg + d;

src/ARMeilleure/Instructions/SoftFloat.cs

@@ -1686,7 +1686,7 @@ namespace ARMeilleure.Instructions
             }
             else if (MathF.Abs(value) < MathF.Pow(2f, -128))
             {
-                var overflowToInf = fpcr.GetRoundingMode() switch
+                bool overflowToInf = fpcr.GetRoundingMode() switch
                 {
                     FPRoundingMode.ToNearest => true,
                     FPRoundingMode.TowardsPlusInfinity => !sign,
@@ -3393,7 +3393,7 @@ namespace ARMeilleure.Instructions
             }
             else if (Math.Abs(value) < Math.Pow(2d, -1024))
             {
-                var overflowToInf = fpcr.GetRoundingMode() switch
+                bool overflowToInf = fpcr.GetRoundingMode() switch
                 {
                     FPRoundingMode.ToNearest => true,
                     FPRoundingMode.TowardsPlusInfinity => !sign,

src/ARMeilleure/IntermediateRepresentation/Operand.cs

@@ -304,7 +304,7 @@ namespace ARMeilleure.IntermediateRepresentation
                 ushort newCount = checked((ushort)(count + 1));
                 ushort newCapacity = (ushort)Math.Min(capacity * 2, ushort.MaxValue);
 
-                var oldSpan = new Span<T>(data, count);
+                Span<T> oldSpan = new(data, count);
 
                 capacity = newCapacity;
                 data = Allocators.References.Allocate<T>(capacity);
@@ -338,7 +338,7 @@ namespace ARMeilleure.IntermediateRepresentation
                     throw new OverflowException();
                 }
 
-                var oldSpan = new Span<T>(data, (int)count);
+                Span<T> oldSpan = new(data, (int)count);
 
                 capacity = newCapacity;
                 data = Allocators.References.Allocate<T>(capacity);
@@ -352,7 +352,7 @@ namespace ARMeilleure.IntermediateRepresentation
 
         private static void Remove<T>(in T item, ref T* data, ref ushort count) where T : unmanaged
         {
-            var span = new Span<T>(data, count);
+            Span<T> span = new(data, count);
 
             for (int i = 0; i < span.Length; i++)
             {
@@ -372,7 +372,7 @@ namespace ARMeilleure.IntermediateRepresentation
 
         private static void Remove<T>(in T item, ref T* data, ref uint count) where T : unmanaged
         {
-            var span = new Span<T>(data, (int)count);
+            Span<T> span = new(data, (int)count);
 
             for (int i = 0; i < span.Length; i++)
             {

src/ARMeilleure/Signal/TestMethods.cs

@@ -21,7 +21,7 @@ namespace ARMeilleure.Signal
         {
             EmitterContext context = new();
 
-            var result = WindowsPartialUnmapHandler.EmitRetryFromAccessViolation(context);
+            Operand result = WindowsPartialUnmapHandler.EmitRetryFromAccessViolation(context);
 
             context.Return(result);
 
@@ -38,7 +38,7 @@ namespace ARMeilleure.Signal
         {
             EmitterContext context = new();
 
-            var result = WindowsPartialUnmapHandler.EmitThreadLocalMapIntGetOrReserve(context, structPtr, context.LoadArgument(OperandType.I32, 0), context.LoadArgument(OperandType.I32, 1));
+            Operand result = WindowsPartialUnmapHandler.EmitThreadLocalMapIntGetOrReserve(context, structPtr, context.LoadArgument(OperandType.I32, 0), context.LoadArgument(OperandType.I32, 1));
 
             context.Return(result);
 

src/ARMeilleure/Translation/Cache/JitCache.cs

@@ -271,7 +271,7 @@ namespace ARMeilleure.Translation.Cache
                 {
                     entry = _cacheEntries[index];
 
-                    if (Optimizations.CacheEviction && _entryUsageStats.TryGetValue(offset, out var stats))
+                    if (Optimizations.CacheEviction && _entryUsageStats.TryGetValue(offset, out EntryUsageStats stats))
                     {
                         stats.UpdateUsage();
                     }

src/ARMeilleure/Translation/Cache/JitUnwindWindows.cs

@@ -122,13 +122,13 @@ namespace ARMeilleure.Translation.Cache
                 return null; // Not found.
             }
 
-            var unwindInfo = funcEntry.UnwindInfo;
+            CodeGen.Unwinding.UnwindInfo unwindInfo = funcEntry.UnwindInfo;
 
             int codeIndex = 0;
 
             for (int index = unwindInfo.PushEntries.Length - 1; index >= 0; index--)
             {
-                var entry = unwindInfo.PushEntries[index];
+                UnwindPushEntry entry = unwindInfo.PushEntries[index];
 
                 switch (entry.PseudoOp)
                 {

src/ARMeilleure/Translation/ControlFlowGraph.cs

@@ -47,8 +47,8 @@ namespace ARMeilleure.Translation
         {
             RemoveUnreachableBlocks(Blocks);
 
-            var visited = new HashSet<BasicBlock>();
-            var blockStack = new Stack<BasicBlock>();
+            HashSet<BasicBlock> visited = new();
+            Stack<BasicBlock> blockStack = new();
 
             Array.Resize(ref _postOrderBlocks, Blocks.Count);
             Array.Resize(ref _postOrderMap, Blocks.Count);
@@ -88,8 +88,8 @@ namespace ARMeilleure.Translation
 
         private void RemoveUnreachableBlocks(IntrusiveList<BasicBlock> blocks)
         {
-            var visited = new HashSet<BasicBlock>();
-            var workQueue = new Queue<BasicBlock>();
+            HashSet<BasicBlock> visited = new();
+            Queue<BasicBlock> workQueue = new();
 
             visited.Add(Entry);
             workQueue.Enqueue(Entry);

src/ARMeilleure/Translation/PTC/Ptc.cs

@@ -10,6 +10,7 @@ using Ryujinx.Common.Logging;
 using Ryujinx.Common.Memory;
 using System;
 using System.Buffers.Binary;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
@@ -542,7 +543,7 @@ namespace ARMeilleure.Translation.PTC
 
                     bool isEntryChanged = infoEntry.Hash != ComputeHash(translator.Memory, infoEntry.Address, infoEntry.GuestSize);
 
-                    if (isEntryChanged || (!infoEntry.HighCq && Profiler.ProfiledFuncs.TryGetValue(infoEntry.Address, out var value) && value.HighCq))
+                    if (isEntryChanged || (!infoEntry.HighCq && Profiler.ProfiledFuncs.TryGetValue(infoEntry.Address, out PtcProfiler.FuncProfile value) && value.HighCq))
                     {
                         infoEntry.Stubbed = true;
                         infoEntry.CodeLength = 0;
@@ -729,8 +730,8 @@ namespace ARMeilleure.Translation.PTC
             UnwindInfo unwindInfo,
             bool highCq)
         {
-            var cFunc = new CompiledFunction(code, unwindInfo, RelocInfo.Empty);
-            var gFunc = cFunc.MapWithPointer<GuestFunction>(out nint gFuncPointer);
+            CompiledFunction cFunc = new(code, unwindInfo, RelocInfo.Empty);
+            GuestFunction gFunc = cFunc.MapWithPointer<GuestFunction>(out nint gFuncPointer);
 
             return new TranslatedFunction(gFunc, gFuncPointer, callCounter, guestSize, highCq);
         }
@@ -767,7 +768,7 @@ namespace ARMeilleure.Translation.PTC
 
         public void MakeAndSaveTranslations(Translator translator)
         {
-            var profiledFuncsToTranslate = Profiler.GetProfiledFuncsToTranslate(translator.Functions);
+            ConcurrentQueue<(ulong address, PtcProfiler.FuncProfile funcProfile)> profiledFuncsToTranslate = Profiler.GetProfiledFuncsToTranslate(translator.Functions);
 
             _translateCount = 0;
             _translateTotalCount = profiledFuncsToTranslate.Count;
@@ -811,7 +812,7 @@ namespace ARMeilleure.Translation.PTC
 
             void TranslateFuncs()
             {
-                while (profiledFuncsToTranslate.TryDequeue(out var item))
+                while (profiledFuncsToTranslate.TryDequeue(out (ulong address, PtcProfiler.FuncProfile funcProfile) item))
                 {
                     ulong address = item.address;
                     ExecutionMode executionMode = item.funcProfile.Mode;
@@ -856,11 +857,11 @@ namespace ARMeilleure.Translation.PTC
 
             Stopwatch sw = Stopwatch.StartNew();
 
-            foreach (var thread in threads)
+            foreach (Thread thread in threads)
             {
                 thread.Start();
             }
-            foreach (var thread in threads)
+            foreach (Thread thread in threads)
             {
                 thread.Join();
             }
@@ -940,7 +941,7 @@ namespace ARMeilleure.Translation.PTC
                 WriteCode(code.AsSpan());
 
                 // WriteReloc.
-                using var relocInfoWriter = new BinaryWriter(_relocsStream, EncodingCache.UTF8NoBOM, true);
+                using BinaryWriter relocInfoWriter = new(_relocsStream, EncodingCache.UTF8NoBOM, true);
 
                 foreach (RelocEntry entry in relocInfo.Entries)
                 {
@@ -950,7 +951,7 @@ namespace ARMeilleure.Translation.PTC
                 }
 
                 // WriteUnwindInfo.
-                using var unwindInfoWriter = new BinaryWriter(_unwindInfosStream, EncodingCache.UTF8NoBOM, true);
+                using BinaryWriter unwindInfoWriter = new(_unwindInfosStream, EncodingCache.UTF8NoBOM, true);
 
                 unwindInfoWriter.Write(unwindInfo.PushEntries.Length);
 

src/ARMeilleure/Translation/PTC/PtcProfiler.cs

@@ -119,9 +119,9 @@ namespace ARMeilleure.Translation.PTC
 
         public ConcurrentQueue<(ulong address, FuncProfile funcProfile)> GetProfiledFuncsToTranslate(TranslatorCache<TranslatedFunction> funcs)
         {
-            var profiledFuncsToTranslate = new ConcurrentQueue<(ulong address, FuncProfile funcProfile)>();
+            ConcurrentQueue<(ulong address, FuncProfile funcProfile)> profiledFuncsToTranslate = new();
 
-            foreach (var profiledFunc in ProfiledFuncs)
+            foreach (KeyValuePair<ulong, FuncProfile> profiledFunc in ProfiledFuncs)
             {
                 if (!funcs.ContainsKey(profiledFunc.Key) && !profiledFunc.Value.Blacklist)
                 {
@@ -142,7 +142,7 @@ namespace ARMeilleure.Translation.PTC
         {
             List<ulong> funcs = [];
 
-            foreach (var profiledFunc in ProfiledFuncs)
+            foreach (KeyValuePair<ulong, FuncProfile> profiledFunc in ProfiledFuncs)
             {
                 if (profiledFunc.Value.Blacklist)
                 {

src/ARMeilleure/Translation/SsaConstruction.cs

@@ -44,10 +44,10 @@ namespace ARMeilleure.Translation
 
         public static void Construct(ControlFlowGraph cfg)
         {
-            var globalDefs = new DefMap[cfg.Blocks.Count];
-            var localDefs = new Operand[cfg.LocalsCount + RegisterConsts.TotalCount];
+            DefMap[] globalDefs = new DefMap[cfg.Blocks.Count];
+            Operand[] localDefs = new Operand[cfg.LocalsCount + RegisterConsts.TotalCount];
 
-            var dfPhiBlocks = new Queue<BasicBlock>();
+            Queue<BasicBlock> dfPhiBlocks = new();
 
             for (BasicBlock block = cfg.Blocks.First; block != null; block = block.ListNext)
             {

src/ARMeilleure/Translation/Translator.cs

@@ -222,7 +222,7 @@ namespace ARMeilleure.Translation
 
         internal TranslatedFunction Translate(ulong address, ExecutionMode mode, bool highCq, bool singleStep = false, bool pptcTranslation = false)
         {
-            var context = new ArmEmitterContext(
+            ArmEmitterContext context = new(
                 Memory,
                 CountTable,
                 FunctionTable,
@@ -265,10 +265,10 @@ namespace ARMeilleure.Translation
 
             Logger.EndPass(PassName.RegisterUsage);
 
-            var retType = OperandType.I64;
-            var argTypes = new OperandType[] { OperandType.I64 };
+            OperandType retType = OperandType.I64;
+            OperandType[] argTypes = new OperandType[] { OperandType.I64 };
 
-            var options = highCq ? CompilerOptions.HighCq : CompilerOptions.None;
+            CompilerOptions options = highCq ? CompilerOptions.HighCq : CompilerOptions.None;
 
             if (context.HasPtc && !singleStep)
             {
@@ -536,7 +536,7 @@ namespace ARMeilleure.Translation
 
             List<TranslatedFunction> functions = Functions.AsList();
 
-            foreach (var func in functions)
+            foreach (TranslatedFunction func in functions)
             {
                 JitCache.Unmap(func.FuncPointer);
 
@@ -545,7 +545,7 @@ namespace ARMeilleure.Translation
 
             Functions.Clear();
 
-            while (_oldFuncs.TryDequeue(out var kv))
+            while (_oldFuncs.TryDequeue(out KeyValuePair<ulong, TranslatedFunction> kv))
             {
                 JitCache.Unmap(kv.Value.FuncPointer);
 
@@ -566,7 +566,7 @@ namespace ARMeilleure.Translation
             {
                 while (Queue.Count > 0 && Queue.TryDequeue(out RejitRequest request))
                 {
-                    if (Functions.TryGetValue(request.Address, out var func) && func.CallCounter != null)
+                    if (Functions.TryGetValue(request.Address, out TranslatedFunction func) && func.CallCounter != null)
                     {
                         Volatile.Write(ref func.CallCounter.Value, 0);
                     }

src/ARMeilleure/Translation/TranslatorStubs.cs

@@ -141,7 +141,7 @@ namespace ARMeilleure.Translation
         /// <returns>Generated <see cref="DispatchStub"/></returns>
         private nint GenerateDispatchStub()
         {
-            var context = new EmitterContext();
+            EmitterContext context = new();
 
             Operand lblFallback = Label();
             Operand lblEnd = Label();
@@ -160,7 +160,7 @@ namespace ARMeilleure.Translation
 
             for (int i = 0; i < _functionTable.Levels.Length; i++)
             {
-                ref var level = ref _functionTable.Levels[i];
+                ref AddressTableLevel level = ref _functionTable.Levels[i];
 
                 // level.Mask is not used directly because it is more often bigger than 32-bits, so it will not
                 // be encoded as an immediate on x86's bitwise and operation.
@@ -184,11 +184,11 @@ namespace ARMeilleure.Translation
             hostAddress = context.Call(typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetFunctionAddress)), guestAddress);
             context.Tailcall(hostAddress, nativeContext);
 
-            var cfg = context.GetControlFlowGraph();
-            var retType = OperandType.I64;
-            var argTypes = new[] { OperandType.I64 };
+            ControlFlowGraph cfg = context.GetControlFlowGraph();
+            OperandType retType = OperandType.I64;
+            OperandType[] argTypes = new[] { OperandType.I64 };
 
-            var func = Compiler.Compile(cfg, argTypes, retType, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<GuestFunction>();
+            GuestFunction func = Compiler.Compile(cfg, argTypes, retType, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<GuestFunction>();
 
             return Marshal.GetFunctionPointerForDelegate(func);
         }
@@ -199,7 +199,7 @@ namespace ARMeilleure.Translation
         /// <returns>Generated <see cref="SlowDispatchStub"/></returns>
         private nint GenerateSlowDispatchStub()
         {
-            var context = new EmitterContext();
+            EmitterContext context = new();
 
             // Load the target guest address from the native context.
             Operand nativeContext = context.LoadArgument(OperandType.I64, 0);
@@ -209,11 +209,11 @@ namespace ARMeilleure.Translation
             Operand hostAddress = context.Call(typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetFunctionAddress)), guestAddress);
             context.Tailcall(hostAddress, nativeContext);
 
-            var cfg = context.GetControlFlowGraph();
-            var retType = OperandType.I64;
-            var argTypes = new[] { OperandType.I64 };
+            ControlFlowGraph cfg = context.GetControlFlowGraph();
+            OperandType retType = OperandType.I64;
+            OperandType[] argTypes = new[] { OperandType.I64 };
 
-            var func = Compiler.Compile(cfg, argTypes, retType, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<GuestFunction>();
+            GuestFunction func = Compiler.Compile(cfg, argTypes, retType, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<GuestFunction>();
 
             return Marshal.GetFunctionPointerForDelegate(func);
         }
@@ -250,7 +250,7 @@ namespace ARMeilleure.Translation
         /// <returns><see cref="DispatchLoop"/> function</returns>
         private DispatcherFunction GenerateDispatchLoop()
         {
-            var context = new EmitterContext();
+            EmitterContext context = new();
 
             Operand beginLbl = Label();
             Operand endLbl = Label();
@@ -286,9 +286,9 @@ namespace ARMeilleure.Translation
 
             context.Return();
 
-            var cfg = context.GetControlFlowGraph();
-            var retType = OperandType.None;
-            var argTypes = new[] { OperandType.I64, OperandType.I64 };
+            ControlFlowGraph cfg = context.GetControlFlowGraph();
+            OperandType retType = OperandType.None;
+            OperandType[] argTypes = new[] { OperandType.I64, OperandType.I64 };
 
             return Compiler.Compile(cfg, argTypes, retType, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<DispatcherFunction>();
         }
@@ -299,7 +299,7 @@ namespace ARMeilleure.Translation
         /// <returns><see cref="ContextWrapper"/> function</returns>
         private WrapperFunction GenerateContextWrapper()
         {
-            var context = new EmitterContext();
+            EmitterContext context = new();
 
             Operand nativeContext = context.LoadArgument(OperandType.I64, 0);
             Operand guestMethod = context.LoadArgument(OperandType.I64, 1);
@@ -310,9 +310,9 @@ namespace ARMeilleure.Translation
 
             context.Return(returnValue);
 
-            var cfg = context.GetControlFlowGraph();
-            var retType = OperandType.I64;
-            var argTypes = new[] { OperandType.I64, OperandType.I64 };
+            ControlFlowGraph cfg = context.GetControlFlowGraph();
+            OperandType retType = OperandType.I64;
+            OperandType[] argTypes = new[] { OperandType.I64, OperandType.I64 };
 
             return Compiler.Compile(cfg, argTypes, retType, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<WrapperFunction>();
         }

src/LibKenjinx/Android/Interop.cs

@@ -32,10 +32,10 @@ namespace LibKenjinx.Android
 
         internal static void Initialize(JEnvRef jniEnv)
         {
-            var vm = JniHelper.GetVirtualMachine(jniEnv);
+            JavaVMRef? vm = JniHelper.GetVirtualMachine(jniEnv);
             if (_classId == null)
             {
-                var className = new ReadOnlySpan<Byte>(Encoding.UTF8.GetBytes(BaseClassName));
+                ReadOnlySpan<byte> className = new(Encoding.UTF8.GetBytes(BaseClassName));
                 using (IReadOnlyFixedMemory<Byte>.IDisposable cName = className.GetUnsafeValPtr()
                            .GetUnsafeFixedContext(className.Length))
                 {
@@ -48,7 +48,7 @@ namespace LibKenjinx.Android
                 }
             }
 
-            foreach (var x in _methods)
+            foreach ((string name, string descriptor) x in _methods)
             {
                 CacheMethod(jniEnv, x.name, x.descriptor);
             }
@@ -58,10 +58,10 @@ namespace LibKenjinx.Android
 
         private static void CacheMethod(JEnvRef jEnv, string name, string descriptor)
         {
-            if (!_methodCache.TryGetValue((name, descriptor), out var method))
+            if (!_methodCache.TryGetValue((name, descriptor), out JMethodId method))
             {
-                var methodName = new ReadOnlySpan<Byte>(Encoding.UTF8.GetBytes(name));
-                var descriptorId = new ReadOnlySpan<Byte>(Encoding.UTF8.GetBytes(descriptor));
+                ReadOnlySpan<byte> methodName = new(Encoding.UTF8.GetBytes(name));
+                ReadOnlySpan<byte> descriptorId = new(Encoding.UTF8.GetBytes(descriptor));
                 using (IReadOnlyFixedMemory<Byte>.IDisposable mName = methodName.GetUnsafeValPtr()
                        .GetUnsafeFixedContext(methodName.Length))
                 using (IReadOnlyFixedMemory<Byte>.IDisposable dName = descriptorId.GetUnsafeValPtr()
@@ -69,7 +69,7 @@ namespace LibKenjinx.Android
                 {
                     if (_classId != null)
                     {
-                        var methodId = JniHelper.GetStaticMethodId(jEnv, (JClassLocalRef)(_classId.Value.Value), mName, dName);
+                        JMethodId? methodId = JniHelper.GetStaticMethodId(jEnv, (JClassLocalRef)(_classId.Value.Value), mName, dName);
                         if (methodId == null)
                         {
                             Logger.Warning?.Print(LogClass.Application, $"Java Method Id {name} not found");
@@ -86,8 +86,8 @@ namespace LibKenjinx.Android
 
         private static void CallVoidMethod(string name, string descriptor, params JValue[] values)
         {
-            using var env = JniEnv.Create();
-            if (_methodCache.TryGetValue((name, descriptor), out var method))
+            using JniEnv? env = JniEnv.Create();
+            if (_methodCache.TryGetValue((name, descriptor), out JMethodId method))
             {
                 if (descriptor.EndsWith("V"))
                 {
@@ -101,8 +101,8 @@ namespace LibKenjinx.Android
 
         private static JLong CallLongMethod(string name, string descriptor, params JValue[] values)
         {
-            using var env = JniEnv.Create();
-            if (_methodCache.TryGetValue((name, descriptor), out var method))
+            using JniEnv? env = JniEnv.Create();
+            if (_methodCache.TryGetValue((name, descriptor), out JMethodId method))
             {
                 if (descriptor.EndsWith("J"))
                     if (env != null && _classId != null)
@@ -127,7 +127,7 @@ namespace LibKenjinx.Android
 
         public static void UpdateProgress(string info, float progress)
         {
-            using var infoPtr = new TempNativeString(info);
+            using TempNativeString infoPtr = new(info);
             CallVoidMethod("updateProgress", "(JF)V",
                 JValue.Create(infoPtr.AsBytes()),
                 JValue.Create(progress.AsBytes()));
@@ -153,11 +153,11 @@ namespace LibKenjinx.Android
             string newSubtitle,
             string newInitialText)
         {
-            using var titlePointer = new TempNativeString(newTitle);
-            using var messagePointer = new TempNativeString(newMessage);
-            using var watermarkPointer = new TempNativeString(newWatermark);
-            using var subtitlePointer = new TempNativeString(newSubtitle);
-            using var newInitialPointer = new TempNativeString(newInitialText);
+            using TempNativeString titlePointer = new(newTitle);
+            using TempNativeString messagePointer = new(newMessage);
+            using TempNativeString watermarkPointer = new(newWatermark);
+            using TempNativeString subtitlePointer = new(newSubtitle);
+            using TempNativeString newInitialPointer = new(newInitialText);
             CallVoidMethod("updateUiHandler", "(JJJIIIIJJ)V",
                 JValue.Create(titlePointer.AsBytes()),
                 JValue.Create(messagePointer.AsBytes()),
@@ -224,7 +224,7 @@ namespace LibKenjinx.Android
             {
                 bool newAttach = false;
                 ReadOnlySpan<Byte> threadName = "JvmCall"u8;
-                var env = _jvm == null ? default : JniHelper.Attach(_jvm.Value, threadName.GetUnsafeValPtr().GetUnsafeFixedContext(threadName.Length),
+                JEnvRef? env = _jvm == null ? default : JniHelper.Attach(_jvm.Value, threadName.GetUnsafeValPtr().GetUnsafeFixedContext(threadName.Length),
                                          out newAttach);
 
                 return env != null ? new JniEnv(env.Value, newAttach) : null;

src/LibKenjinx/Android/JniExportedMethods.cs

@@ -1,6 +1,7 @@
 using LibKenjinx.Android;
 using LibKenjinx.Jni.Pointers;
 using Ryujinx.Audio.Backends.OpenAL;
+using Ryujinx.Audio.Integration;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
@@ -17,6 +18,8 @@ using System.Linq;
 using System.Numerics;
 using System.Runtime.InteropServices;
 using Ryujinx.Graphics.Vulkan;
+using System.IO;
+using System.Reflection;
 
 namespace LibKenjinx
 {
@@ -64,10 +67,10 @@ namespace LibKenjinx
         private static bool TryCallBool(object? target, string[] names, bool arg)
         {
             if (target == null) return false;
-            var t = target.GetType();
-            foreach (var name in names)
+            Type t = target.GetType();
+            foreach (string name in names)
             {
-                var m = t.GetMethod(name, new[] { typeof(bool) });
+                MethodInfo? m = t.GetMethod(name, new[] { typeof(bool) });
                 if (m != null)
                 {
                     try { m.Invoke(target, new object[] { arg }); return true; } catch { }
@@ -80,10 +83,10 @@ namespace LibKenjinx
         private static bool TryCallFloat(object? target, string[] names, float arg)
         {
             if (target == null) return false;
-            var t = target.GetType();
-            foreach (var name in names)
+            Type t = target.GetType();
+            foreach (string name in names)
             {
-                var m = t.GetMethod(name, new[] { typeof(float) });
+                MethodInfo? m = t.GetMethod(name, new[] { typeof(float) });
                 if (m != null)
                 {
                     try { m.Invoke(target, new object[] { arg }); return true; } catch { }
@@ -96,10 +99,10 @@ namespace LibKenjinx
         private static bool TrySetFloatProp(object? target, string[] names, float value)
         {
             if (target == null) return false;
-            var t = target.GetType();
-            foreach (var name in names)
+            Type t = target.GetType();
+            foreach (string name in names)
             {
-                var p = t.GetProperty(name);
+                PropertyInfo? p = t.GetProperty(name);
                 if (p != null && p.CanWrite)
                 {
                     try
@@ -119,10 +122,10 @@ namespace LibKenjinx
         private static bool TrySetBoolProp(object target, params string[] names)
         {
             if (target == null) return false;
-            var t = target.GetType();
-            foreach (var name in names)
+            Type t = target.GetType();
+            foreach (string name in names)
             {
-                var p = t.GetProperty(name);
+                PropertyInfo? p = t.GetProperty(name);
                 if (p != null && p.CanWrite && p.PropertyType == typeof(bool))
                 {
                     try { p.SetValue(target, true); return true; } catch { }
@@ -138,9 +141,9 @@ namespace LibKenjinx
 
             yield return root;
 
-            var t = root.GetType();
-            var props = t.GetProperties();
-            foreach (var p in props)
+            Type t = root.GetType();
+            PropertyInfo[] props = t.GetProperties();
+            foreach (PropertyInfo p in props)
             {
                 object? val = null;
                 try { val = p.GetValue(root); } catch { /* ignore */ }
@@ -154,7 +157,7 @@ namespace LibKenjinx
                     p.Name.IndexOf("Output", StringComparison.OrdinalIgnoreCase) >= 0 ||
                     p.PropertyType.Name.IndexOf("Audio", StringComparison.OrdinalIgnoreCase) >= 0)
                 {
-                    foreach (var x in WalkAudioObjects(val, depth - 1))
+                    foreach (object? x in WalkAudioObjects(val, depth - 1))
                         yield return x;
                 }
             }
@@ -171,26 +174,26 @@ namespace LibKenjinx
             try
             {
                 // 1) Try SwitchDevice wrapper itself
-                var dev = SwitchDevice;
+                SwitchDevice? dev = SwitchDevice;
                 if (dev != null && TryCallBool(dev, PauseMethodCandidates, pause)) hits++;
 
                 // 2) Try underlying Switch or similar inner object
-                var inner =
+                object? inner =
                     dev?.GetType().GetProperty("Switch")?.GetValue(dev) ??
                     dev?.GetType().GetProperty("Device")?.GetValue(dev);
                 if (inner != null && TryCallBool(inner, PauseMethodCandidates, pause)) hits++;
 
                 // 3) Try EmulationContext and its "System" (kernel/front controller etc.)
-                var ctx = dev?.EmulationContext;
+                Switch? ctx = dev?.EmulationContext;
                 if (ctx != null)
                 {
                     if (TryCallBool(ctx, PauseMethodCandidates, pause)) hits++;
 
-                    var sys = ctx.GetType().GetProperty("System")?.GetValue(ctx);
+                    object? sys = ctx.GetType().GetProperty("System")?.GetValue(ctx);
                     if (sys != null && TryCallBool(sys, PauseMethodCandidates, pause)) hits++;
 
                     // 4) walk all audio-ish descendants and try pause
-                    foreach (var node in WalkAudioObjects(ctx, depth: 2))
+                    foreach (object? node in WalkAudioObjects(ctx, depth: 2))
                     {
                         if (node != null && TryCallBool(node, PauseMethodCandidates, pause))
                             hits++;
@@ -218,7 +221,7 @@ namespace LibKenjinx
             // A) Direct: OpenAL driver (if used)
             try
             {
-                var oal = _openAl;
+                OpenALHardwareDeviceDriver? oal = _openAl;
                 if (oal != null)
                 {
                     bool p = TryCallBool(oal, PauseMethodCandidates, _audioPaused);
@@ -231,10 +234,10 @@ namespace LibKenjinx
             // B) EmulationContext managers (AudioRendererManager/AudioManager/AudioOutManager/…)
             try
             {
-                var ctx = SwitchDevice?.EmulationContext;
+                Switch? ctx = SwitchDevice?.EmulationContext;
                 if (ctx != null)
                 {
-                    foreach (var node in WalkAudioObjects(ctx, depth: 2))
+                    foreach (object? node in WalkAudioObjects(ctx, depth: 2))
                     {
                         if (node == null) continue;
 
@@ -254,7 +257,7 @@ namespace LibKenjinx
             // C) Generic driver fallback (whatever AudioDriver actually is)
             try
             {
-                var drv = AudioDriver;
+                IHardwareDeviceDriver? drv = AudioDriver;
                 if (drv != null)
                 {
                     bool p = TryCallBool(drv, PauseMethodCandidates, _audioPaused);
@@ -307,9 +310,9 @@ namespace LibKenjinx
                     AsyncLogTargetOverflowAction.Block
                 ));
 
-            var path = Marshal.PtrToStringAnsi(jpathId);
+            string? path = Marshal.PtrToStringAnsi(jpathId);
 
-            var init = Initialize(path);
+            bool init = Initialize(path);
 
             Interop.Initialize(new JEnvRef(jniEnv));
 
@@ -347,7 +350,7 @@ namespace LibKenjinx
             AudioDriver = new OpenALHardwareDeviceDriver();
             _openAl = AudioDriver as OpenALHardwareDeviceDriver; // <-- audio patch: keep a strong ref
 
-            var timezone = Marshal.PtrToStringAnsi(timeZonePtr);
+            string? timezone = Marshal.PtrToStringAnsi(timeZonePtr);
             return InitializeDevice((MemoryManagerMode)memoryManagerMode,
                                     useNce,
                                     (MemoryConfiguration)memoryConfiguration,
@@ -369,7 +372,7 @@ namespace LibKenjinx
         public static double JnaGetGameFifo()
         {
             Logger.Trace?.Print(LogClass.Application, "Jni Function Call");
-            var stats = SwitchDevice?.EmulationContext?.Statistics.GetFifoPercent() ?? 0;
+            double stats = SwitchDevice?.EmulationContext?.Statistics.GetFifoPercent() ?? 0;
 
             return stats;
         }
@@ -378,7 +381,7 @@ namespace LibKenjinx
         public static double JnaGetGameFrameTime()
         {
             Logger.Trace?.Print(LogClass.Application, "Jni Function Call");
-            var stats = SwitchDevice?.EmulationContext?.Statistics.GetGameFrameTime() ?? 0;
+            double stats = SwitchDevice?.EmulationContext?.Statistics.GetGameFrameTime() ?? 0;
 
             return stats;
         }
@@ -387,7 +390,7 @@ namespace LibKenjinx
         public static double JnaGetGameFrameRate()
         {
             Logger.Trace?.Print(LogClass.Application, "Jni Function Call");
-            var stats = SwitchDevice?.EmulationContext?.Statistics.GetGameFrameRate() ?? 0;
+            double stats = SwitchDevice?.EmulationContext?.Statistics.GetGameFrameRate() ?? 0;
 
             return stats;
         }
@@ -408,7 +411,7 @@ namespace LibKenjinx
         public static nint JniGetDlcContentListNative(nint pathPtr, long titleId)
         {
             Logger.Trace?.Print(LogClass.Application, "Jni Function Call");
-            var list = GetDlcContentList(Marshal.PtrToStringAnsi(pathPtr) ?? "", (ulong)titleId);
+            List<string> list = GetDlcContentList(Marshal.PtrToStringAnsi(pathPtr) ?? "", (ulong)titleId);
 
             return CreateStringArray(list);
         }
@@ -450,8 +453,8 @@ namespace LibKenjinx
                 return false;
             }
 
-            var stream = OpenFile(descriptor);
-            var update = updateDescriptor == -1 ? null : OpenFile(updateDescriptor);
+            FileStream stream = OpenFile(descriptor);
+            FileStream? update = updateDescriptor == -1 ? null : OpenFile(updateDescriptor);
 
             return LoadApplication(stream, (FileType)type, update);
         }
@@ -461,7 +464,7 @@ namespace LibKenjinx
         {
             Logger.Trace?.Print(LogClass.Application, "Jni Function Call");
 
-            var stream = OpenFile(descriptor);
+            FileStream stream = OpenFile(descriptor);
 
             nint stringHandle = 0;
             string? version = "0.0";
@@ -488,7 +491,7 @@ namespace LibKenjinx
         {
             Logger.Trace?.Print(LogClass.Application, "Jni Function Call");
 
-            var stream = OpenFile(descriptor);
+            FileStream stream = OpenFile(descriptor);
 
             InstallFirmware(stream, isXci);
         }
@@ -498,7 +501,7 @@ namespace LibKenjinx
         {
             Logger.Trace?.Print(LogClass.Application, "Jni Function Call");
 
-            var version = GetInstalledFirmwareVersion() ?? "0.0";
+            string version = GetInstalledFirmwareVersion() ?? "0.0";
             return Marshal.StringToHGlobalAnsi(version);
         }
 
@@ -557,16 +560,16 @@ namespace LibKenjinx
                 _surfacePtr = Interop.GetSurfacePtr();
                 _window = Interop.GetWindowsHandle();
 
-                var api = VulkanLoader?.GetApi() ?? Vk.GetApi();
+                Vk? api = VulkanLoader?.GetApi() ?? Vk.GetApi();
                 if (api.TryGetInstanceExtension(new Instance(instance), out KhrAndroidSurface surfaceExtension))
                 {
-                    var createInfo = new AndroidSurfaceCreateInfoKHR
+                    AndroidSurfaceCreateInfoKHR createInfo = new()
                     {
                         SType = StructureType.AndroidSurfaceCreateInfoKhr,
                         Window = (nint*)_surfacePtr,
                     };
 
-                    var result = surfaceExtension.CreateAndroidSurface(new Instance(instance), in createInfo, null, out var surface);
+                    Result result = surfaceExtension.CreateAndroidSurface(new Instance(instance), in createInfo, null, out SurfaceKHR* surface);
 
                     // If a rotation was applied before the surface was created → apply it now
                     if (_window != 0 && _pendingRotationDegrees != -1)
@@ -618,7 +621,7 @@ namespace LibKenjinx
             {
                 if (SwitchDevice?.EmulationContext != null)
                 {
-                    var time = SwitchDevice.EmulationContext.Statistics.GetGameFrameTime();
+                    double time = SwitchDevice.EmulationContext.Statistics.GetGameFrameTime();
                     Interop.FrameEnded(time);
                 }
             });
@@ -641,11 +644,11 @@ namespace LibKenjinx
         public unsafe static void JniGetGameInfo(int fileDescriptor, nint extension, nint infoPtr)
         {
             Logger.Trace?.Print(LogClass.Application, "Jni Function Call");
-            using var stream = OpenFile(fileDescriptor);
-            var ext = Marshal.PtrToStringAnsi(extension);
-            var info = GetGameInfo(stream, ext?.ToLower() ?? string.Empty) ?? GetDefaultInfo(stream);
-            var i = (GameInfoNative*)infoPtr;
-            var n = new GameInfoNative(info);
+            using FileStream stream = OpenFile(fileDescriptor);
+            string? ext = Marshal.PtrToStringAnsi(extension);
+            GameInfo info = GetGameInfo(stream, ext?.ToLower() ?? string.Empty) ?? GetDefaultInfo(stream);
+            GameInfoNative* i = (GameInfoNative*)infoPtr;
+            GameInfoNative n = new(info);
             i->TitleId = n.TitleId;
             i->TitleName = n.TitleName;
             i->Version = n.Version;
@@ -714,14 +717,14 @@ namespace LibKenjinx
         [UnmanagedCallersOnly(EntryPoint = "inputSetAccelerometerData")]
         public static void JniSetAccelerometerData(float x, float y, float z, int id)
         {
-            var accel = new Vector3(x, y, z);
+            Vector3 accel = new(x, y, z);
             SetAccelerometerData(accel, id);
         }
 
         [UnmanagedCallersOnly(EntryPoint = "inputSetGyroData")]
         public static void JniSetGyroData(float x, float y, float z, int id)
         {
-            var gryo = new Vector3(x, y, z);
+            Vector3 gryo = new(x, y, z);
             SetGryoData(gryo, id);
         }
 
@@ -743,8 +746,8 @@ namespace LibKenjinx
         public static nint JniGetOpenedUser()
         {
             Logger.Trace?.Print(LogClass.Application, "Jni Function Call");
-            var userId = GetOpenedUser();
-            var ptr = Marshal.StringToHGlobalAnsi(userId);
+            string userId = GetOpenedUser();
+            IntPtr ptr = Marshal.StringToHGlobalAnsi(userId);
 
             return ptr;
         }
@@ -753,7 +756,7 @@ namespace LibKenjinx
         public static nint JniGetUserPicture(nint userIdPtr)
         {
             Logger.Trace?.Print(LogClass.Application, "Jni Function Call");
-            var userId = Marshal.PtrToStringAnsi(userIdPtr) ?? "";
+            string userId = Marshal.PtrToStringAnsi(userIdPtr) ?? "";
 
             return Marshal.StringToHGlobalAnsi(GetUserPicture(userId));
         }
@@ -762,8 +765,8 @@ namespace LibKenjinx
         public static void JniGetUserPicture(nint userIdPtr, nint picturePtr)
         {
             Logger.Trace?.Print(LogClass.Application, "Jni Function Call");
-            var userId = Marshal.PtrToStringAnsi(userIdPtr) ?? "";
-            var picture = Marshal.PtrToStringAnsi(picturePtr) ?? "";
+            string userId = Marshal.PtrToStringAnsi(userIdPtr) ?? "";
+            string picture = Marshal.PtrToStringAnsi(picturePtr) ?? "";
 
             SetUserPicture(userId, picture);
         }
@@ -772,7 +775,7 @@ namespace LibKenjinx
         public static nint JniGetUserName(nint userIdPtr)
         {
             Logger.Trace?.Print(LogClass.Application, "Jni Function Call");
-            var userId = Marshal.PtrToStringAnsi(userIdPtr) ?? "";
+            string userId = Marshal.PtrToStringAnsi(userIdPtr) ?? "";
 
             return Marshal.StringToHGlobalAnsi(GetUserName(userId));
         }
@@ -781,8 +784,8 @@ namespace LibKenjinx
         public static void JniSetUserName(nint userIdPtr, nint userNamePtr)
         {
             Logger.Trace?.Print(LogClass.Application, "Jni Function Call");
-            var userId = Marshal.PtrToStringAnsi(userIdPtr) ?? "";
-            var userName = Marshal.PtrToStringAnsi(userNamePtr) ?? "";
+            string userId = Marshal.PtrToStringAnsi(userIdPtr) ?? "";
+            string userName = Marshal.PtrToStringAnsi(userNamePtr) ?? "";
 
             SetUserName(userId, userName);
         }
@@ -791,7 +794,7 @@ namespace LibKenjinx
         public static nint JniGetAllUsers()
         {
             Logger.Trace?.Print(LogClass.Application, "Jni Function Call");
-            var users = GetAllUsers();
+            string[] users = GetAllUsers();
 
             return CreateStringArray(users.ToList());
         }
@@ -800,8 +803,8 @@ namespace LibKenjinx
         public static void JniAddUser(nint userNamePtr, nint picturePtr)
         {
             Logger.Trace?.Print(LogClass.Application, "Jni Function Call");
-            var userName = Marshal.PtrToStringAnsi(userNamePtr) ?? "";
-            var picture = Marshal.PtrToStringAnsi(picturePtr) ?? "";
+            string userName = Marshal.PtrToStringAnsi(userNamePtr) ?? "";
+            string picture = Marshal.PtrToStringAnsi(picturePtr) ?? "";
 
             AddUser(userName, picture);
         }
@@ -810,7 +813,7 @@ namespace LibKenjinx
         public static void JniDeleteUser(nint userIdPtr)
         {
             Logger.Trace?.Print(LogClass.Application, "Jni Function Call");
-            var userId = Marshal.PtrToStringAnsi(userIdPtr) ?? "";
+            string userId = Marshal.PtrToStringAnsi(userIdPtr) ?? "";
 
             DeleteUser(userId);
         }
@@ -847,7 +850,7 @@ namespace LibKenjinx
         public static void JniOpenUser(nint userIdPtr)
         {
             Logger.Trace?.Print(LogClass.Application, "Jni Function Call");
-            var userId = Marshal.PtrToStringAnsi(userIdPtr) ?? "";
+            string userId = Marshal.PtrToStringAnsi(userIdPtr) ?? "";
 
             OpenUser(userId);
         }
@@ -856,7 +859,7 @@ namespace LibKenjinx
         public static void JniCloseUser(nint userIdPtr)
         {
             Logger.Trace?.Print(LogClass.Application, "Jni Function Call");
-            var userId = Marshal.PtrToStringAnsi(userIdPtr) ?? "";
+            string userId = Marshal.PtrToStringAnsi(userIdPtr) ?? "";
 
             CloseUser(userId);
         }

src/LibKenjinx/LibKenjinx.Device.cs

@@ -59,7 +59,7 @@ namespace LibKenjinx
 
         public static string GetInstalledFirmwareVersion()
         {
-            var version = SwitchDevice?.ContentManager?.GetCurrentFirmwareVersion();
+            SystemVersion? version = SwitchDevice?.ContentManager?.GetCurrentFirmwareVersion();
 
             if (version != null)
             {
@@ -76,7 +76,7 @@ namespace LibKenjinx
 
         public static bool LoadApplication(Stream stream, FileType type, Stream? updateStream = null)
         {
-            var emulationContext = SwitchDevice?.EmulationContext;
+            Switch? emulationContext = SwitchDevice?.EmulationContext;
             
             return type switch
             {
@@ -97,7 +97,7 @@ namespace LibKenjinx
 
         public static bool LoadApplication(string? path)
         {
-            var emulationContext = SwitchDevice?.EmulationContext;
+            Switch? emulationContext = SwitchDevice?.EmulationContext;
 
             if (Directory.Exists(path))
             {
@@ -249,7 +249,7 @@ namespace LibKenjinx
 
         private static FileStream OpenFile(int descriptor)
         {
-            var safeHandle = new SafeFileHandle(descriptor, false);
+            SafeFileHandle safeHandle = new(descriptor, false);
 
             return new FileStream(safeHandle, FileAccess.ReadWrite);
         }

src/LibKenjinx/LibKenjinx.Graphics.cs

@@ -8,6 +8,7 @@ using Ryujinx.Graphics.Gpu;
 using Ryujinx.Graphics.Gpu.Shader;
 using Ryujinx.Graphics.OpenGL;
 using Ryujinx.Graphics.Vulkan;
+using Ryujinx.HLE;
 using Silk.NET.Vulkan;
 using System;
 using System.Runtime.InteropServices;
@@ -62,7 +63,7 @@ namespace LibKenjinx
             else if (graphicsBackend == GraphicsBackend.Vulkan)
             {
                 // Prefer the platform-provided Vulkan loader (if present), fall back to default.
-                var api = VulkanLoader?.GetApi() ?? Vk.GetApi();
+                Vk? api = VulkanLoader?.GetApi() ?? Vk.GetApi();
 
                 Renderer = new VulkanRenderer(
                     api,
@@ -89,7 +90,7 @@ namespace LibKenjinx
 
         public static void SetVsyncState(Ryujinx.Common.Configuration.VSyncMode vSyncMode)
         {
-            var device = SwitchDevice!.EmulationContext!;
+            Switch device = SwitchDevice!.EmulationContext!;
             device.VSyncMode = vSyncMode;
             device.Gpu.Renderer.Window.ChangeVSyncMode((Ryujinx.Graphics.GAL.VSyncMode)vSyncMode);
         }
@@ -103,7 +104,7 @@ namespace LibKenjinx
             ARMeilleure.Optimizations.EcoFriendly = SwitchDevice!.EnableLowPowerPtc;
             ARMeilleure.Optimizations.CacheEviction = SwitchDevice.EnableJitCacheEviction;
 
-            var device = SwitchDevice.EmulationContext!;
+            Switch device = SwitchDevice.EmulationContext!;
             _gpuDoneEvent = new ManualResetEvent(true);
 
             device.Gpu.Renderer.Initialize(_enableGraphicsLogging ? GraphicsDebugLevel.All : GraphicsDebugLevel.None);
@@ -179,8 +180,8 @@ namespace LibKenjinx
                     Interop.UpdateProgress(status, value);
                 }
             }
-            var status = $"{current} / {total}";
-            var progress = current / (float)total;
+            string status = $"{current} / {total}";
+            float progress = current / (float)total;
             if (float.IsNaN(progress))
                 progress = 0;
 

src/LibKenjinx/LibKenjinx.Input.cs

@@ -92,10 +92,10 @@ namespace LibKenjinx
 
         public static int ConnectGamepad(int index)
         {
-            var gamepad = _gamepadDriver?.GetGamepad(index);
+            IGamepad? gamepad = _gamepadDriver?.GetGamepad(index);
             if (gamepad != null)
             {
-                var config = CreateDefaultInputConfig();
+                InputConfig config = CreateDefaultInputConfig();
 
                 config.Id = gamepad.Id;
                 config.PlayerIndex = (PlayerIndex)index;
@@ -105,7 +105,7 @@ namespace LibKenjinx
 
             _npadManager?.ReloadConfiguration(_configs.Where(x => x != null).ToList(), false, false);
 
-            return int.TryParse(gamepad?.Id, out var idInt) ? idInt : -1;
+            return int.TryParse(gamepad?.Id, out int idInt) ? idInt : -1;
         }
 
         private static InputConfig CreateDefaultInputConfig()
@@ -356,7 +356,7 @@ namespace LibKenjinx
             if (disposing)
             {
                 // Simulate a full disconnect when disposing
-                var ids = GamepadsIds;
+                ReadOnlySpan<string> ids = GamepadsIds;
                 foreach (string id in ids)
                 {
                     OnGamepadDisconnected?.Invoke(id);
@@ -381,7 +381,7 @@ namespace LibKenjinx
 
         public void SetStickAxis(StickInputId stick, Vector2 axes, int deviceId)
         {
-            if(_gamePads.TryGetValue(deviceId, out var gamePad))
+            if(_gamePads.TryGetValue(deviceId, out VirtualGamepad? gamePad))
             {
                 gamePad.StickInputs[(int)stick] = axes;
             }
@@ -389,7 +389,7 @@ namespace LibKenjinx
 
         public void SetButtonPressed(GamepadButtonInputId button, int deviceId)
         {
-            if (_gamePads.TryGetValue(deviceId, out var gamePad))
+            if (_gamePads.TryGetValue(deviceId, out VirtualGamepad? gamePad))
             {
                 gamePad.ButtonInputs[(int)button] = true;
             }
@@ -397,7 +397,7 @@ namespace LibKenjinx
 
         public void SetButtonReleased(GamepadButtonInputId button, int deviceId)
         {
-            if (_gamePads.TryGetValue(deviceId, out var gamePad))
+            if (_gamePads.TryGetValue(deviceId, out VirtualGamepad? gamePad))
             {
                 gamePad.ButtonInputs[(int)button] = false;
             }
@@ -405,7 +405,7 @@ namespace LibKenjinx
 
         public void SetAccelerometerData(Vector3 accel, int deviceId)
         {
-            if (_gamePads.TryGetValue(deviceId, out var gamePad))
+            if (_gamePads.TryGetValue(deviceId, out VirtualGamepad? gamePad))
             {
                 gamePad.Accelerometer = accel;
             }
@@ -413,7 +413,7 @@ namespace LibKenjinx
 
         public void SetGryoData(Vector3 gyro, int deviceId)
         {
-            if (_gamePads.TryGetValue(deviceId, out var gamePad))
+            if (_gamePads.TryGetValue(deviceId, out VirtualGamepad? gamePad))
             {
                 gamePad.Gyro = gyro;
             }
@@ -458,7 +458,7 @@ namespace LibKenjinx
 
         public (float, float) GetStick(StickInputId inputId)
         {
-            var v = _stickInputs[(int)inputId];
+            Vector2 v = _stickInputs[(int)inputId];
 
             return (v.X, v.Y);
         }
@@ -496,7 +496,7 @@ namespace LibKenjinx
         {
             GamepadStateSnapshot result = default;
 
-            foreach (var button in Enum.GetValues<GamepadButtonInputId>())
+            foreach (GamepadButtonInputId button in Enum.GetValues<GamepadButtonInputId>())
             {
                 // Do not touch state of button already pressed
                 if (button != GamepadButtonInputId.Count && !result.IsPressed(button))

src/LibKenjinx/LibKenjinx.Native.cs

@@ -8,6 +8,7 @@ using Ryujinx.HLE.HOS.SystemState;
 using Ryujinx.Input;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Numerics;
 using System.Runtime.CompilerServices;
@@ -66,7 +67,7 @@ namespace LibKenjinx
                 return false;
             }
 
-            var path = Marshal.PtrToStringAnsi(pathPtr);
+            string? path = Marshal.PtrToStringAnsi(pathPtr);
 
             return LoadApplication(path);
         }
@@ -74,7 +75,7 @@ namespace LibKenjinx
         [UnmanagedCallersOnly(EntryPoint = "device_install_firmware")]
         public static void InstallFirmwareNative(int descriptor, bool isXci)
         {
-            var stream = OpenFile(descriptor);
+            FileStream stream = OpenFile(descriptor);
 
             InstallFirmware(stream, isXci);
         }
@@ -82,16 +83,16 @@ namespace LibKenjinx
         [UnmanagedCallersOnly(EntryPoint = "device_get_installed_firmware_version")]
         public static nint GetInstalledFirmwareVersionNative()
         {
-            var result = GetInstalledFirmwareVersion();
+            string result = GetInstalledFirmwareVersion();
             return Marshal.StringToHGlobalAnsi(result);
         }
 
         [UnmanagedCallersOnly(EntryPoint = "initialize")]
         public static bool InitializeNative(nint basePathPtr)
         {
-            var path = Marshal.PtrToStringAnsi(basePathPtr);
+            string? path = Marshal.PtrToStringAnsi(basePathPtr);
 
-            var res = Initialize(path);
+            bool res = Initialize(path);
 
             InitializeAudio();
 
@@ -119,10 +120,10 @@ namespace LibKenjinx
             }
 
             List<string> extensions = [];
-            var extPtr = (nint*)nativeGraphicsInterop.VkRequiredExtensions;
+            IntPtr* extPtr = (nint*)nativeGraphicsInterop.VkRequiredExtensions;
             for (int i = 0; i < nativeGraphicsInterop.VkRequiredExtensionsCount; i++)
             {
-                var ptr = extPtr[i];
+                IntPtr ptr = extPtr[i];
                 extensions.Add(Marshal.PtrToStringAnsi(ptr) ?? string.Empty);
             }
 
@@ -142,7 +143,7 @@ namespace LibKenjinx
         {
             if (Renderer is OpenGLRenderer)
             {
-                var proc = Marshal.GetDelegateForFunctionPointer<GetProcAddress>(_nativeGraphicsInterop.GlGetProcAddress);
+                GetProcAddress proc = Marshal.GetDelegateForFunctionPointer<GetProcAddress>(_nativeGraphicsInterop.GlGetProcAddress);
                 GL.LoadBindings(new OpenTKBindingsContext(x => proc.Invoke(x)));
             }
             RunLoop();
@@ -163,10 +164,10 @@ namespace LibKenjinx
         [UnmanagedCallersOnly(EntryPoint = "get_game_info")]
         public static GameInfoNative GetGameInfoNative(int descriptor, nint extensionPtr)
         {
-            var extension = Marshal.PtrToStringAnsi(extensionPtr);
-            var stream = OpenFile(descriptor);
+            string? extension = Marshal.PtrToStringAnsi(extensionPtr);
+            FileStream stream = OpenFile(descriptor);
 
-            var gameInfo = GetGameInfo(stream, extension ?? "");
+            GameInfo? gameInfo = GetGameInfo(stream, extension ?? "");
 
             return gameInfo == null ? default : new GameInfoNative(gameInfo.FileSize, gameInfo.TitleName, gameInfo.TitleId, gameInfo.Developer, gameInfo.Version, gameInfo.Icon);
         }
@@ -240,7 +241,7 @@ namespace LibKenjinx
         [UnmanagedCallersOnly(EntryPoint = "device_get_game_fifo")]
         public static double GetGameInfoNative()
         {
-            var stats = SwitchDevice?.EmulationContext?.Statistics.GetFifoPercent() ?? 0;
+            double stats = SwitchDevice?.EmulationContext?.Statistics.GetFifoPercent() ?? 0;
 
             return stats;
         }
@@ -248,7 +249,7 @@ namespace LibKenjinx
         [UnmanagedCallersOnly(EntryPoint = "device_get_game_frame_time")]
         public static double GetGameFrameTimeNative()
         {
-            var stats = SwitchDevice?.EmulationContext?.Statistics.GetGameFrameTime() ?? 0;
+            double stats = SwitchDevice?.EmulationContext?.Statistics.GetGameFrameTime() ?? 0;
 
             return stats;
         }
@@ -256,7 +257,7 @@ namespace LibKenjinx
         [UnmanagedCallersOnly(EntryPoint = "device_get_game_frame_rate")]
         public static double GetGameFrameRateNative()
         {
-            var stats = SwitchDevice?.EmulationContext?.Statistics.GetGameFrameRate() ?? 0;
+            double stats = SwitchDevice?.EmulationContext?.Statistics.GetGameFrameRate() ?? 0;
 
             return stats;
         }
@@ -275,7 +276,7 @@ namespace LibKenjinx
         [UnmanagedCallersOnly(EntryPoint = "device_get_dlc_content_list")]
         public static nint GetDlcContentListNative(nint pathPtr, long titleId)
         {
-            var list = GetDlcContentList(Marshal.PtrToStringAnsi(pathPtr) ?? "", (ulong)titleId);
+            List<string> list = GetDlcContentList(Marshal.PtrToStringAnsi(pathPtr) ?? "", (ulong)titleId);
 
             return CreateStringArray(list);
         }
@@ -312,8 +313,8 @@ namespace LibKenjinx
                 return false;
             }
 
-            var stream = OpenFile(descriptor);
-            var update = updateDescriptor == -1 ? null : OpenFile(updateDescriptor);
+            FileStream stream = OpenFile(descriptor);
+            FileStream? update = updateDescriptor == -1 ? null : OpenFile(updateDescriptor);
 
             return LoadApplication(stream, (FileType)type, update);
         }
@@ -321,7 +322,7 @@ namespace LibKenjinx
         [UnmanagedCallersOnly(EntryPoint = "device_verify_firmware")]
         public static nint VerifyFirmwareNative(int descriptor, bool isXci)
         {
-            var stream = OpenFile(descriptor);
+            FileStream stream = OpenFile(descriptor);
 
             nint stringHandle = 0;
             string? version = "0.0";
@@ -358,11 +359,11 @@ namespace LibKenjinx
         [UnmanagedCallersOnly(EntryPoint = "device_get_game_info")]
         public unsafe static void GetGameInfoNative(int fileDescriptor, nint extension, nint infoPtr)
         {
-            using var stream = OpenFile(fileDescriptor);
-            var ext = Marshal.PtrToStringAnsi(extension);
-            var info = GetGameInfo(stream, ext?.ToLower() ?? string.Empty) ?? GetDefaultInfo(stream);
-            var i = (GameInfoNative*)infoPtr;
-            var n = new GameInfoNative(info);
+            using FileStream stream = OpenFile(fileDescriptor);
+            string? ext = Marshal.PtrToStringAnsi(extension);
+            GameInfo info = GetGameInfo(stream, ext?.ToLower() ?? string.Empty) ?? GetDefaultInfo(stream);
+            GameInfoNative* i = (GameInfoNative*)infoPtr;
+            GameInfoNative n = new(info);
             i->TitleId = n.TitleId;
             i->TitleName = n.TitleName;
             i->Version = n.Version;
@@ -375,8 +376,8 @@ namespace LibKenjinx
         [UnmanagedCallersOnly(EntryPoint = "user_get_opened_user")]
         public static nint GetOpenedUserNative()
         {
-            var userId = GetOpenedUser();
-            var ptr = Marshal.StringToHGlobalAnsi(userId);
+            string userId = GetOpenedUser();
+            IntPtr ptr = Marshal.StringToHGlobalAnsi(userId);
 
             return ptr;
         }
@@ -384,7 +385,7 @@ namespace LibKenjinx
         [UnmanagedCallersOnly(EntryPoint = "user_get_user_picture")]
         public static nint GetUserPictureNative(nint userIdPtr)
         {
-            var userId = Marshal.PtrToStringAnsi(userIdPtr) ?? "";
+            string userId = Marshal.PtrToStringAnsi(userIdPtr) ?? "";
 
             return Marshal.StringToHGlobalAnsi(GetUserPicture(userId));
         }
@@ -392,8 +393,8 @@ namespace LibKenjinx
         [UnmanagedCallersOnly(EntryPoint = "user_set_user_picture")]
         public static void SetUserPictureNative(nint userIdPtr, nint picturePtr)
         {
-            var userId = Marshal.PtrToStringAnsi(userIdPtr) ?? "";
-            var picture = Marshal.PtrToStringAnsi(picturePtr) ?? "";
+            string userId = Marshal.PtrToStringAnsi(userIdPtr) ?? "";
+            string picture = Marshal.PtrToStringAnsi(picturePtr) ?? "";
 
             SetUserPicture(userId, picture);
         }
@@ -401,7 +402,7 @@ namespace LibKenjinx
         [UnmanagedCallersOnly(EntryPoint = "user_get_user_name")]
         public static nint GetUserNameNative(nint userIdPtr)
         {
-            var userId = Marshal.PtrToStringAnsi(userIdPtr) ?? "";
+            string userId = Marshal.PtrToStringAnsi(userIdPtr) ?? "";
 
             return Marshal.StringToHGlobalAnsi(GetUserName(userId));
         }
@@ -409,8 +410,8 @@ namespace LibKenjinx
         [UnmanagedCallersOnly(EntryPoint = "user_set_user_name")]
         public static void SetUserNameNative(nint userIdPtr, nint userNamePtr)
         {
-            var userId = Marshal.PtrToStringAnsi(userIdPtr) ?? "";
-            var userName = Marshal.PtrToStringAnsi(userNamePtr) ?? "";
+            string userId = Marshal.PtrToStringAnsi(userIdPtr) ?? "";
+            string userName = Marshal.PtrToStringAnsi(userNamePtr) ?? "";
 
             SetUserName(userId, userName);
         }
@@ -418,7 +419,7 @@ namespace LibKenjinx
         [UnmanagedCallersOnly(EntryPoint = "user_get_all_users")]
         public static nint GetAllUsersNative()
         {
-            var users = GetAllUsers();
+            string[] users = GetAllUsers();
 
             return CreateStringArray(users.ToList());
         }
@@ -426,8 +427,8 @@ namespace LibKenjinx
         [UnmanagedCallersOnly(EntryPoint = "user_add_user")]
         public static void AddUserNative(nint userNamePtr, nint picturePtr)
         {
-            var userName = Marshal.PtrToStringAnsi(userNamePtr) ?? "";
-            var picture = Marshal.PtrToStringAnsi(picturePtr) ?? "";
+            string userName = Marshal.PtrToStringAnsi(userNamePtr) ?? "";
+            string picture = Marshal.PtrToStringAnsi(picturePtr) ?? "";
 
             AddUser(userName, picture);
         }
@@ -435,7 +436,7 @@ namespace LibKenjinx
         [UnmanagedCallersOnly(EntryPoint = "user_delete_user")]
         public static void DeleteUserNative(nint userIdPtr)
         {
-            var userId = Marshal.PtrToStringAnsi(userIdPtr) ?? "";
+            string userId = Marshal.PtrToStringAnsi(userIdPtr) ?? "";
 
             DeleteUser(userId);
         }
@@ -443,7 +444,7 @@ namespace LibKenjinx
         [UnmanagedCallersOnly(EntryPoint = "user_open_user")]
         public static void OpenUserNative(nint userIdPtr)
         {
-            var userId = Marshal.PtrToStringAnsi(userIdPtr) ?? "";
+            string userId = Marshal.PtrToStringAnsi(userIdPtr) ?? "";
 
             OpenUser(userId);
         }
@@ -451,7 +452,7 @@ namespace LibKenjinx
         [UnmanagedCallersOnly(EntryPoint = "user_close_user")]
         public static void CloseUserNative(nint userIdPtr)
         {
-            var userId = Marshal.PtrToStringAnsi(userIdPtr) ?? "";
+            string userId = Marshal.PtrToStringAnsi(userIdPtr) ?? "";
 
             CloseUser(userId);
         }

src/LibKenjinx/LibKenjinx.NativeHelpers.cs

@@ -1,4 +1,5 @@
 using Ryujinx.Common.Configuration;
+using Ryujinx.HLE;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -12,7 +13,7 @@ namespace LibKenjinx
         private unsafe static nint CreateStringArray(List<string> strings)
         {
             uint size = (uint)(Marshal.SizeOf<nint>() * (strings.Count + 1));
-            var array = (char**)Marshal.AllocHGlobal((int)size);
+            char** array = (char**)Marshal.AllocHGlobal((int)size);
             Unsafe.InitBlockUnaligned(array, 0, size);
 
             for (int i = 0; i < strings.Count; i++)
@@ -25,13 +26,13 @@ namespace LibKenjinx
 
         private static void ApplyFullscreenStretch(bool enable)
         {
-            var ar = enable ? AspectRatio.Stretched : AspectRatio.Fixed16x9;
+            AspectRatio ar = enable ? AspectRatio.Stretched : AspectRatio.Fixed16x9;
 
-            var cfg = GraphicsConfiguration;
+            GraphicsConfiguration cfg = GraphicsConfiguration;
             cfg.AspectRatio = ar;
             GraphicsConfiguration = cfg;
 
-            var dev = SwitchDevice?.EmulationContext;
+            Switch? dev = SwitchDevice?.EmulationContext;
             if (dev != null)
             {
                 try { dev.Configuration.AspectRatio = ar; } catch { }

src/LibKenjinx/LibKenjinx.User.cs

@@ -8,44 +8,44 @@ namespace LibKenjinx
     {
         public static string GetOpenedUser()
         {
-            var lastProfile = SwitchDevice?.AccountManager?.LastOpenedUser;
+            UserProfile? lastProfile = SwitchDevice?.AccountManager?.LastOpenedUser;
 
             return lastProfile?.UserId.ToString() ?? "";
         }
 
         public static string GetUserPicture(string userId)
         {
-            var uid = new UserId(userId);
+            UserId uid = new(userId);
 
-            var user = SwitchDevice?.AccountManager?.GetAllUsers().FirstOrDefault(x => x.UserId == uid);
+            UserProfile? user = SwitchDevice?.AccountManager?.GetAllUsers().FirstOrDefault(x => x.UserId == uid);
 
             if (user == null)
                 return "";
 
-            var pic = user.Image;
+            byte[]? pic = user.Image;
 
             return pic != null ? Convert.ToBase64String(pic) : "";
         }
 
         public static void SetUserPicture(string userId, string picture)
         {
-            var uid = new UserId(userId);
+            UserId uid = new(userId);
 
             SwitchDevice?.AccountManager?.SetUserImage(uid, Convert.FromBase64String(picture));
         }
 
         public static string GetUserName(string userId)
         {
-            var uid = new UserId(userId);
+            UserId uid = new(userId);
 
-            var user = SwitchDevice?.AccountManager?.GetAllUsers().FirstOrDefault(x => x.UserId == uid);
+            UserProfile? user = SwitchDevice?.AccountManager?.GetAllUsers().FirstOrDefault(x => x.UserId == uid);
 
             return user?.Name ?? "";
         }
 
         public static void SetUserName(string userId, string name)
         {
-            var uid = new UserId(userId);
+            UserId uid = new(userId);
 
             SwitchDevice?.AccountManager?.SetUserName(uid, name);
         }
@@ -63,19 +63,19 @@ namespace LibKenjinx
 
         public static void DeleteUser(string userId)
         {
-            var uid = new UserId(userId);
+            UserId uid = new(userId);
             SwitchDevice?.AccountManager?.DeleteUser(uid);
         }
 
         public static void OpenUser(string userId)
         {
-            var uid = new UserId(userId);
+            UserId uid = new(userId);
             SwitchDevice?.AccountManager?.OpenUser(uid);
         }
 
         public static void CloseUser(string userId)
         {
-            var uid = new UserId(userId);
+            UserId uid = new(userId);
             SwitchDevice?.AccountManager?.CloseUser(uid);
         }
     }

src/LibKenjinx/LibKenjinx.cs

@@ -1,5 +1,6 @@
 // State class for the library
 using Gommon;
+using LibHac;
 using LibHac.Account;
 using LibHac.Common;
 using LibHac.Common.Keys;
@@ -18,6 +19,7 @@ using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Logging.Targets;
 using Ryujinx.Common.Utilities;
+using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.GAL.Multithreading;
 using Ryujinx.HLE;
 using Ryujinx.HLE.Kenjinx;
@@ -38,7 +40,9 @@ using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.Json;
+using ApplicationId = LibHac.Ncm.ApplicationId;
 using Path = System.IO.Path;
+using VSyncMode = Ryujinx.Common.Configuration.VSyncMode;
 
 namespace LibKenjinx
 {
@@ -105,7 +109,7 @@ namespace LibKenjinx
             {
                 return new GameStats();
             }
-            var context = SwitchDevice.EmulationContext;
+            Switch? context = SwitchDevice.EmulationContext;
 
             return new GameStats
             {
@@ -124,7 +128,7 @@ namespace LibKenjinx
 
             Logger.Info?.Print(LogClass.Application, $"Getting game info for file: {file}");
 
-            using var stream = File.Open(file, FileMode.Open);
+            using FileStream stream = File.Open(file, FileMode.Open);
 
             return GetGameInfo(stream, new FileInfo(file).Extension.Remove('.'));
         }
@@ -160,7 +164,7 @@ namespace LibKenjinx
                         }
                         else
                         {
-                            var pfsTemp = new PartitionFileSystem();
+                            PartitionFileSystem pfsTemp = new();
                             pfsTemp.Initialize(gameStream.AsStorage()).ThrowIfFailure();
                             pfs = pfsTemp;
 
@@ -256,7 +260,7 @@ namespace LibKenjinx
                                         continue;
                                     }
 
-                                    using var icon = new UniqueRef<IFile>();
+                                    using UniqueRef<IFile> icon = new();
 
                                     controlFs?.OpenFile(ref icon.Ref, entry.FullPath.ToU8Span(), OpenMode.Read).ThrowIfFailure();
 
@@ -434,7 +438,7 @@ namespace LibKenjinx
 
                 foreach (DirectoryEntryEx fileEntry in pfs.EnumerateEntries("/", "*.nca"))
                 {
-                    using var ncaFile = new UniqueRef<IFile>();
+                    using UniqueRef<IFile> ncaFile = new();
 
                     pfs.OpenFile(ref ncaFile.Ref, fileEntry.FullPath.ToU8Span(), OpenMode.Read).ThrowIfFailure();
 
@@ -531,7 +535,7 @@ namespace LibKenjinx
                             }
                             else
                             {
-                                var pfsTemp = new PartitionFileSystem();
+                                PartitionFileSystem pfsTemp = new();
 
                                 pfsTemp.Initialize(file.AsStorage()).ThrowIfFailure();
                                 pfs = pfsTemp;
@@ -554,7 +558,7 @@ namespace LibKenjinx
 
                 foreach (DirectoryEntryEx fileEntry in pfs.EnumerateEntries("/", "*.nca"))
                 {
-                    using var ncaFile = new UniqueRef<IFile>();
+                    using UniqueRef<IFile> ncaFile = new();
 
                     pfs.OpenFile(ref ncaFile.Ref, fileEntry.FullPath.ToU8Span(), OpenMode.Read).ThrowIfFailure();
 
@@ -656,7 +660,7 @@ namespace LibKenjinx
 
             foreach (DirectoryEntryEx fileEntry in partitionFileSystem.EnumerateEntries("/", "*.nca"))
             {
-                using var ncaFile = new UniqueRef<IFile>();
+                using UniqueRef<IFile> ncaFile = new();
 
                 partitionFileSystem.OpenFile(ref ncaFile.Ref, fileEntry.FullPath.ToU8Span(), OpenMode.Read).ThrowIfFailure();
 
@@ -705,7 +709,7 @@ namespace LibKenjinx
                 return false;
             }
 
-            var dev = SwitchDevice?.EmulationContext;
+            Switch? dev = SwitchDevice?.EmulationContext;
             if (dev == null)
             {
                 Logger.Warning?.Print(LogClass.Service, "[Amiibo] Load aborted: no active EmulationContext.");
@@ -714,7 +718,7 @@ namespace LibKenjinx
 
             try
             {
-                var ok = AmiiboBridge.TryLoadVirtualAmiibo(dev, data, out string msg);
+                bool ok = AmiiboBridge.TryLoadVirtualAmiibo(dev, data, out string msg);
                 if (ok)
                     Logger.Info?.Print(LogClass.Service, $"[Amiibo] Loaded {data.Length} bytes. {msg}");
                 else
@@ -730,7 +734,7 @@ namespace LibKenjinx
 
         public static void AmiiboClear()
         {
-            var dev = SwitchDevice?.EmulationContext;
+            Switch? dev = SwitchDevice?.EmulationContext;
             if (dev == null)
             {
                 Logger.Warning?.Print(LogClass.Service, "[Amiibo] Clear aborted: no active EmulationContext.");
@@ -879,7 +883,7 @@ namespace LibKenjinx
                 return false;
             }
 
-            var renderer = LibKenjinx.Renderer;
+            IRenderer renderer = LibKenjinx.Renderer;
             BackendThreading threadingMode = LibKenjinx.GraphicsConfiguration.BackendThreading;
 
             bool threadedGAL = threadingMode == BackendThreading.On || (threadingMode == BackendThreading.Auto && renderer.PreferThreading);
@@ -931,7 +935,7 @@ namespace LibKenjinx
 
         public void CreateSaveDir(ulong titleId, BlitStruct<LibHac.Ns.ApplicationControlProperty> nacpData)
         {
-            var applicationId = new LibHac.Ncm.ApplicationId(titleId);
+            ApplicationId applicationId = new(titleId);
 
             Logger.Info?.Print(LogClass.Application, $"Ensuring required savedata exists for title id: {titleId}.");
 
@@ -964,7 +968,7 @@ namespace LibKenjinx
             // Call existing Horizon APIs to create/secure the saves
             if (LibHacHorizonManager != null)
             {
-                var rc = LibHacHorizonManager.RyujinxClient.Fs.EnsureApplicationCacheStorage(out _, out _, applicationId, in control);
+                Result rc = LibHacHorizonManager.RyujinxClient.Fs.EnsureApplicationCacheStorage(out _, out _, applicationId, in control);
                 if (rc.IsFailure())
                 {
                     Logger.Error?.Print(LogClass.Application, $"Error calling EnsureApplicationCacheStorage. Result code {rc.ToStringWithName()}");
@@ -988,10 +992,10 @@ namespace LibKenjinx
             {
                 Directory.CreateDirectory(savesRoot);
 
-                var after = Directory.GetDirectories(savesRoot);
-                var beforeSet = new HashSet<string>(before, StringComparer.OrdinalIgnoreCase);
+                string[] after = Directory.GetDirectories(savesRoot);
+                HashSet<string> beforeSet = new(before, StringComparer.OrdinalIgnoreCase);
 
-                foreach (var d in after)
+                foreach (string d in after)
                 {
                     if (!beforeSet.Contains(d))
                     {
@@ -1053,28 +1057,28 @@ namespace LibKenjinx
             string mapPath = Path.Combine(savesRoot, "titleid_map.ndjson");
 
             // titleId (lowercase) -> (Name, Folder, Timestamp)
-            var byTitleId = new Dictionary<string, (string Name, string Folder, string Timestamp)>(StringComparer.OrdinalIgnoreCase);
+            Dictionary<string, (string Name, string Folder, string Timestamp)> byTitleId = new(StringComparer.OrdinalIgnoreCase);
 
             // Read existing file
             try
             {
                 if (File.Exists(mapPath))
                 {
-                    foreach (var line in File.ReadLines(mapPath, Encoding.UTF8))
+                    foreach (string line in File.ReadLines(mapPath, Encoding.UTF8))
                     {
                         if (string.IsNullOrWhiteSpace(line)) continue;
 
                         try
                         {
-                            using var doc = JsonDocument.Parse(line);
-                            var root = doc.RootElement;
+                            using JsonDocument doc = JsonDocument.Parse(line);
+                            JsonElement root = doc.RootElement;
 
-                            string tid = root.TryGetProperty("titleId", out var tidEl) ? (tidEl.GetString() ?? "").Trim() : "";
+                            string tid = root.TryGetProperty("titleId", out JsonElement tidEl) ? (tidEl.GetString() ?? "").Trim() : "";
                             if (string.IsNullOrEmpty(tid)) continue;
 
-                            string name    = root.TryGetProperty("name", out var nameEl)       ? (nameEl.GetString()    ?? "") : "";
-                            string folder  = root.TryGetProperty("folder", out var folderEl)   ? (folderEl.GetString()  ?? "") : "";
-                            string ts      = root.TryGetProperty("timestamp", out var tsEl)    ? (tsEl.GetString()      ?? "") : "";
+                            string name    = root.TryGetProperty("name", out JsonElement nameEl)       ? (nameEl.GetString()    ?? "") : "";
+                            string folder  = root.TryGetProperty("folder", out JsonElement folderEl)   ? (folderEl.GetString()  ?? "") : "";
+                            string ts      = root.TryGetProperty("timestamp", out JsonElement tsEl)    ? (tsEl.GetString()      ?? "") : "";
 
                             byTitleId[tid.ToLowerInvariant()] = (name, folder, ts);
                         }
@@ -1090,11 +1094,11 @@ namespace LibKenjinx
                 byTitleId.Clear();
             }
 
-            var nowIso   = DateTime.UtcNow.ToString("O");
-            var titleIdLc = (titleIdHex ?? string.Empty).ToLowerInvariant();
+            string nowIso   = DateTime.UtcNow.ToString("O");
+            string titleIdLc = (titleIdHex ?? string.Empty).ToLowerInvariant();
 
             // 1) take existing folder if known
-            byTitleId.TryGetValue(titleIdLc, out var existing);
+            byTitleId.TryGetValue(titleIdLc, out (string Name, string Folder, string Timestamp) existing);
             string existingFolder = existing.Folder ?? "";
 
             // 2) figure out effective folder
@@ -1136,7 +1140,7 @@ namespace LibKenjinx
             // 5) rewrite file (stable: sort by titleId)
             try
             {
-                var ordered = byTitleId
+                IEnumerable<string> ordered = byTitleId
                     .OrderBy(kv => kv.Key, StringComparer.OrdinalIgnoreCase)
                     .Select(kv =>
                         $"{{\"titleId\":\"{EscapeJson(kv.Key)}\",\"name\":\"{EscapeJson(kv.Value.Name)}\"," +
@@ -1160,14 +1164,14 @@ namespace LibKenjinx
             {
                 if (!Directory.Exists(savesRoot)) return null;
 
-                foreach (var dir in Directory.GetDirectories(savesRoot))
+                foreach (string dir in Directory.GetDirectories(savesRoot))
                 {
                     string marker = Path.Combine(dir, "TITLEID.txt");
                     if (!File.Exists(marker)) continue;
 
                     try
                     {
-                        using var sr = new StreamReader(marker, Encoding.UTF8, true);
+                        using StreamReader sr = new(marker, Encoding.UTF8, true);
                         string? first = sr.ReadLine()?.Trim().ToLowerInvariant();
                         if (first == titleIdLc)
                         {
@@ -1199,7 +1203,7 @@ namespace LibKenjinx
                 int idx = (int)Language.AmericanEnglish;
                 if (control.Title.Length > idx)
                 {
-                    var s = control.Title[idx].NameString.ToString();
+                    string? s = control.Title[idx].NameString.ToString();
                     if (!string.IsNullOrWhiteSpace(s)) return s;
                 }
 

src/LibKenjinx/VulkanLoader.cs

@@ -30,8 +30,8 @@ namespace LibKenjinx
 
             if (_loadedLibrary != nint.Zero)
             {
-                var instanceGetProc = NativeLibrary.GetExport(_loadedLibrary, "vkGetInstanceProcAddr");
-                var deviceProc = NativeLibrary.GetExport(_loadedLibrary, "vkGetDeviceProcAddr");
+                IntPtr instanceGetProc = NativeLibrary.GetExport(_loadedLibrary, "vkGetInstanceProcAddr");
+                IntPtr deviceProc = NativeLibrary.GetExport(_loadedLibrary, "vkGetDeviceProcAddr");
 
                 _getInstanceProcAddr = Marshal.GetDelegateForFunctionPointer<GetInstanceProcAddress>(instanceGetProc);
                 _getDeviceProcAddr = Marshal.GetDelegateForFunctionPointer<GetDeviceProcAddress>(deviceProc);
@@ -45,13 +45,13 @@ namespace LibKenjinx
             {
                 return Vk.GetApi();
             }
-            var ctx = new MultiNativeContext(new INativeContext[1]);
-            var ret = new Vk(ctx);
+            MultiNativeContext? ctx = new(new INativeContext[1]);
+            Vk ret = new Vk(ctx);
             ctx.Contexts[0] = new LamdaNativeContext
             (
                 x =>
                 {
-                    var xPtr = Marshal.StringToHGlobalAnsi(x);
+                    IntPtr xPtr = Marshal.StringToHGlobalAnsi(x);
                     byte* xp = (byte*)xPtr;
                     try
                     {
@@ -64,7 +64,7 @@ namespace LibKenjinx
 
                             if (ptr == 0)
                             {
-                                var currentDevice = ret.CurrentDevice.GetValueOrDefault().Handle;
+                                IntPtr currentDevice = ret.CurrentDevice.GetValueOrDefault().Handle;
                                 if (currentDevice != nint.Zero)
                                 {
                                     ptr = _getDeviceProcAddr(currentDevice, xPtr);

src/Ryujinx.Audio.Backends.SDL3/SDL3HardwareDeviceDriver.cs

@@ -130,7 +130,7 @@ namespace Ryujinx.Audio.Backends.SDL3
         {
             SDL_AudioSpec desired = GetSDL3Spec(requestedSampleFormat, requestedSampleRate, requestedChannelCount);
             SDL_AudioSpec got = desired;
-            var pCallback = callback != null ? (SDL_AudioStreamCallbackPointer)Marshal.GetFunctionPointerForDelegate(callback) : null;
+            SDL_AudioStreamCallbackPointer pCallback = callback != null ? (SDL_AudioStreamCallbackPointer)Marshal.GetFunctionPointerForDelegate(callback) : null;
 
             // From SDL 3 and on, SDL requires us to set this as a hint
             SDL_SetHint(SDL_HINT_AUDIO_DEVICE_SAMPLE_FRAMES, $"{sampleCount}");

src/Ryujinx.Audio.Backends.SoundIo/Native/SoundIoOutStreamContext.cs

@@ -38,7 +38,7 @@ namespace Ryujinx.Audio.Backends.SoundIo.Native
             get => Marshal.PtrToStringAnsi(GetOutContext().Name);
             set
             {
-                var context = GetOutContext();
+                SoundIoOutStream context = GetOutContext();
 
                 if (_nameStored != nint.Zero && context.Name == _nameStored)
                 {
@@ -129,8 +129,8 @@ namespace Ryujinx.Audio.Backends.SoundIo.Native
 
             unsafe
             {
-                var frameCountPtr = &nativeFrameCount;
-                var arenasPtr = &arenas;
+                int* frameCountPtr = &nativeFrameCount;
+                IntPtr* arenasPtr = &arenas;
                 CheckError(soundio_outstream_begin_write(_context, (nint)arenasPtr, (nint)frameCountPtr));
 
                 frameCount = *frameCountPtr;

src/Ryujinx.Audio/Renderer/Utils/FileHardwareDevice.cs

@@ -27,7 +27,7 @@ namespace Ryujinx.Audio.Renderer.Utils
 
         private void UpdateHeader()
         {
-            var writer = new BinaryWriter(_stream);
+            BinaryWriter writer = new(_stream);
 
             long currentPos = writer.Seek(0, SeekOrigin.Current);
 

src/Ryujinx.Common/AsyncWorkQueue.cs

@@ -34,7 +34,7 @@ namespace Ryujinx.Common
         {
             try
             {
-                foreach (var item in _queue.GetConsumingEnumerable(_cts.Token))
+                foreach (T item in _queue.GetConsumingEnumerable(_cts.Token))
                 {
                     _workerAction(item);
                 }

src/Ryujinx.Common/Extensions/SequenceReaderExtensions.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Buffers;
 using System.Diagnostics;
+using System.IO;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -16,15 +17,15 @@ namespace Ryujinx.Common.Extensions
         /// <param name="fileFullName">The path and name of the file to create and dump to</param>
         public static void DumpToFile(this ref SequenceReader<byte> reader, string fileFullName)
         {
-            var initialConsumed = reader.Consumed;
+            long initialConsumed = reader.Consumed;
 
             reader.Rewind(initialConsumed);
 
-            using (var fileStream = System.IO.File.Create(fileFullName, 4096, System.IO.FileOptions.None))
+            using (FileStream fileStream = System.IO.File.Create(fileFullName, 4096, System.IO.FileOptions.None))
             {
                 while (reader.End == false)
                 {
-                    var span = reader.CurrentSpan;
+                    ReadOnlySpan<byte> span = reader.CurrentSpan;
                     fileStream.Write(span);
                     reader.Advance(span.Length);
                 }

src/Ryujinx.Common/Logging/Formatters/DynamicObjectFormatter.cs

@@ -41,7 +41,7 @@ namespace Ryujinx.Common.Logging.Formatters
 
             sb.Append('{');
 
-            foreach (var prop in props)
+            foreach (PropertyInfo prop in props)
             {
                 sb.Append(prop.Name);
                 sb.Append(": ");
@@ -52,7 +52,7 @@ namespace Ryujinx.Common.Logging.Formatters
 
                     if (array is not null)
                     {
-                        foreach (var item in array)
+                        foreach (object? item in array)
                         {
                             sb.Append(item);
                             sb.Append(", ");

src/Ryujinx.Common/Logging/Logger.cs

@@ -207,7 +207,7 @@ namespace Ryujinx.Common.Logging
 
             _stdErrAdapter.Dispose();
 
-            foreach (var target in _logTargets)
+            foreach (ILogTarget target in _logTargets)
             {
                 target.Dispose();
             }
@@ -217,9 +217,9 @@ namespace Ryujinx.Common.Logging
 
         public static IReadOnlyCollection<LogLevel> GetEnabledLevels()
         {
-            var logs = new[] { Debug, Info, Warning, Error, Guest, AccessLog, Stub, Trace };
+            Log?[] logs = new[] { Debug, Info, Warning, Error, Guest, AccessLog, Stub, Trace };
             List<LogLevel> levels = new(logs.Length);
-            foreach (var log in logs)
+            foreach (Log? log in logs)
             {
                 if (log.HasValue)
                 {

src/Ryujinx.Common/Logging/Targets/AsyncLogTargetWrapper.cs

@@ -94,7 +94,7 @@ namespace Ryujinx.Common.Logging.Targets
                 return;
             }
 
-            using var signal = new ManualResetEventSlim(false);
+            using ManualResetEventSlim signal = new(false);
             try
             {
                 _messageQueue.Add(new FlushEventArgs(signal));

src/Ryujinx.Common/Logging/Targets/JsonLogTarget.cs

@@ -26,7 +26,7 @@ namespace Ryujinx.Common.Logging.Targets
 
         public void Log(object sender, LogEventArgs e)
         {
-            var logEventArgsJson = LogEventArgsJson.FromLogEventArgs(e);
+            LogEventArgsJson logEventArgsJson = LogEventArgsJson.FromLogEventArgs(e);
             JsonHelper.SerializeToStream(_stream, logEventArgsJson, LogEventJsonSerializerContext.Default.LogEventArgsJson);
         }
 

src/Ryujinx.Common/Utilities/EmbeddedResources.cs

@@ -19,21 +19,21 @@ namespace Ryujinx.Common
 
         public static byte[] Read(string filename)
         {
-            var (assembly, path) = ResolveManifestPath(filename);
+            (Assembly assembly, string path) = ResolveManifestPath(filename);
 
             return Read(assembly, path);
         }
 
         public static Task<byte[]> ReadAsync(string filename)
         {
-            var (assembly, path) = ResolveManifestPath(filename);
+            (Assembly assembly, string path) = ResolveManifestPath(filename);
 
             return ReadAsync(assembly, path);
         }
 
         public static byte[] Read(Assembly assembly, string filename)
         {
-            using var stream = GetStream(assembly, filename);
+            using Stream stream = GetStream(assembly, filename);
             if (stream == null)
             {
                 return null;
@@ -44,14 +44,14 @@ namespace Ryujinx.Common
 
         public static MemoryOwner<byte> ReadFileToRentedMemory(string filename)
         {
-            var (assembly, path) = ResolveManifestPath(filename);
+            (Assembly assembly, string path) = ResolveManifestPath(filename);
 
             return ReadFileToRentedMemory(assembly, path);
         }
 
         public static MemoryOwner<byte> ReadFileToRentedMemory(Assembly assembly, string filename)
         {
-            using var stream = GetStream(assembly, filename);
+            using Stream stream = GetStream(assembly, filename);
 
             return stream is null
                 ? null
@@ -60,7 +60,7 @@ namespace Ryujinx.Common
 
         public async static Task<byte[]> ReadAsync(Assembly assembly, string filename)
         {
-            using var stream = GetStream(assembly, filename);
+            using Stream stream = GetStream(assembly, filename);
             if (stream == null)
             {
                 return null;
@@ -71,55 +71,55 @@ namespace Ryujinx.Common
 
         public static string ReadAllText(string filename)
         {
-            var (assembly, path) = ResolveManifestPath(filename);
+            (Assembly assembly, string path) = ResolveManifestPath(filename);
 
             return ReadAllText(assembly, path);
         }
 
         public static Task<string> ReadAllTextAsync(string filename)
         {
-            var (assembly, path) = ResolveManifestPath(filename);
+            (Assembly assembly, string path) = ResolveManifestPath(filename);
 
             return ReadAllTextAsync(assembly, path);
         }
 
         public static string ReadAllText(Assembly assembly, string filename)
         {
-            using var stream = GetStream(assembly, filename);
+            using Stream stream = GetStream(assembly, filename);
             if (stream == null)
             {
                 return null;
             }
 
-            using var reader = new StreamReader(stream);
+            using StreamReader reader = new(stream);
             return reader.ReadToEnd();
         }
 
         public async static Task<string> ReadAllTextAsync(Assembly assembly, string filename)
         {
-            using var stream = GetStream(assembly, filename);
+            using Stream stream = GetStream(assembly, filename);
             if (stream == null)
             {
                 return null;
             }
 
-            using var reader = new StreamReader(stream);
+            using StreamReader reader = new(stream);
             return await reader.ReadToEndAsync();
         }
 
         public static Stream GetStream(string filename)
         {
-            var (assembly, path) = ResolveManifestPath(filename);
+            (Assembly assembly, string path) = ResolveManifestPath(filename);
 
             return GetStream(assembly, path);
         }
 
         public static Stream GetStream(Assembly assembly, string filename)
         {
-            var @namespace = assembly.GetName().Name;
-            var manifestUri = @namespace + "." + filename.Replace('/', '.');
+            string @namespace = assembly.GetName().Name;
+            string manifestUri = @namespace + "." + filename.Replace('/', '.');
 
-            var stream = assembly.GetManifestResourceStream(manifestUri);
+            Stream stream = assembly.GetManifestResourceStream(manifestUri);
 
             return stream;
         }
@@ -133,11 +133,11 @@ namespace Ryujinx.Common
 
         private static (Assembly, string) ResolveManifestPath(string filename)
         {
-            var segments = filename.Split('/', 2, StringSplitOptions.RemoveEmptyEntries);
+            string[] segments = filename.Split('/', 2, StringSplitOptions.RemoveEmptyEntries);
 
             if (segments.Length >= 2)
             {
-                foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
+                foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies())
                 {
                     if (assembly.GetName().Name == segments[0])
                     {

src/Ryujinx.Common/Utilities/FileSystemUtils.cs

@@ -9,7 +9,7 @@ namespace Ryujinx.Common.Utilities
         public static void CopyDirectory(string sourceDir, string destinationDir, bool recursive)
         {
             // Get information about the source directory
-            var dir = new DirectoryInfo(sourceDir);
+            DirectoryInfo dir = new(sourceDir);
 
             // Check if the source directory exists
             if (!dir.Exists)
@@ -49,7 +49,7 @@ namespace Ryujinx.Common.Utilities
 
         public static string SanitizeFileName(string fileName)
         {
-            var reservedChars = new HashSet<char>(Path.GetInvalidFileNameChars());
+            HashSet<char> reservedChars = new(Path.GetInvalidFileNameChars());
             return string.Concat(fileName.Select(c => reservedChars.Contains(c) ? '_' : c));
         }
     }

src/Ryujinx.Common/Utilities/MessagePackObjectFormatter.cs

@@ -1,5 +1,6 @@
 using MsgPack;
 using System;
+using System.Collections.Generic;
 using System.Text;
 
 namespace Ryujinx.Common.Utilities
@@ -18,7 +19,7 @@ namespace Ryujinx.Common.Utilities
 
         public static string Format(MessagePackObject obj)
         {
-            var builder = new IndentedStringBuilder();
+            IndentedStringBuilder builder = new();
 
             FormatMsgPackObj(obj, builder);
 
@@ -41,7 +42,7 @@ namespace Ryujinx.Common.Utilities
             }
             else
             {
-                var literal = obj.ToObject();
+                object literal = obj.ToObject();
 
                 if (literal is String)
                 {
@@ -88,7 +89,7 @@ namespace Ryujinx.Common.Utilities
         {
             builder.Append("[ ");
 
-            foreach (var b in arr)
+            foreach (byte b in arr)
             {
                 builder.Append("0x");
                 builder.Append(ToHexChar(b >> 4));
@@ -111,7 +112,7 @@ namespace Ryujinx.Common.Utilities
                 builder.Append("0x");
             }
 
-            foreach (var b in arr)
+            foreach (byte b in arr)
             {
                 builder.Append(ToHexChar(b >> 4));
                 builder.Append(ToHexChar(b & 0xF));
@@ -122,7 +123,7 @@ namespace Ryujinx.Common.Utilities
 
         private static void FormatMsgPackMap(MessagePackObject obj, IndentedStringBuilder builder)
         {
-            var map = obj.AsDictionary();
+            MessagePackObjectDictionary map = obj.AsDictionary();
 
             builder.Append('{');
 
@@ -130,7 +131,7 @@ namespace Ryujinx.Common.Utilities
             builder.IncreaseIndent()
                    .AppendLine();
 
-            foreach (var item in map)
+            foreach (KeyValuePair<MessagePackObject, MessagePackObject> item in map)
             {
                 FormatMsgPackObj(item.Key, builder);
 
@@ -154,11 +155,11 @@ namespace Ryujinx.Common.Utilities
 
         private static void FormatMsgPackArray(MessagePackObject obj, IndentedStringBuilder builder)
         {
-            var arr = obj.AsList();
+            IList<MessagePackObject> arr = obj.AsList();
 
             builder.Append("[ ");
 
-            foreach (var item in arr)
+            foreach (MessagePackObject item in arr)
             {
                 FormatMsgPackObj(item, builder);
 

src/Ryujinx.Common/Utilities/StreamUtils.cs

@@ -1,5 +1,6 @@
 using Microsoft.IO;
 using Ryujinx.Common.Memory;
+using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -27,7 +28,7 @@ namespace Ryujinx.Common.Utilities
 
                 MemoryOwner<byte> ownedMemory = MemoryOwner<byte>.Rent(checked((int)bytesExpected));
 
-                var destSpan = ownedMemory.Span;
+                Span<byte> destSpan = ownedMemory.Span;
 
                 int totalBytesRead = 0;
 

src/Ryujinx.Common/Utilities/XCIFileTrimmer.cs

@@ -15,7 +15,7 @@ namespace Ryujinx.Common.Utilities
     {
         internal static TimeSpan Measure(Action action)
         {
-            var sw = new Stopwatch();
+            Stopwatch sw = new();
             sw.Start();
 
             try
@@ -66,7 +66,7 @@ namespace Ryujinx.Common.Utilities
         {
             if (Path.GetExtension(filename).Equals(".XCI", StringComparison.InvariantCultureIgnoreCase))
             {
-                var trimmer = new XCIFileTrimmer(filename, log);
+                XCIFileTrimmer trimmer = new(filename, log);
                 return trimmer.CanBeTrimmed;
             }
 
@@ -77,7 +77,7 @@ namespace Ryujinx.Common.Utilities
         {
             if (Path.GetExtension(filename).Equals(".XCI", StringComparison.InvariantCultureIgnoreCase))
             {
-                var trimmer = new XCIFileTrimmer(filename, log);
+                XCIFileTrimmer trimmer = new(filename, log);
                 return trimmer.CanBeUntrimmed;
             }
 
@@ -221,7 +221,7 @@ namespace Ryujinx.Common.Utilities
         {
             long maxReads = readSizeB / BufferSize;
             long read = 0;
-            var buffer = new byte[BufferSize];
+            byte[] buffer = new byte[BufferSize];
 
             while (true)
             {
@@ -287,7 +287,7 @@ namespace Ryujinx.Common.Utilities
 
             try
             {
-                var info = new FileInfo(Filename);
+                FileInfo info = new(Filename);
                 if ((info.Attributes & FileAttributes.ReadOnly) == FileAttributes.ReadOnly)
                 {
                     try
@@ -308,7 +308,7 @@ namespace Ryujinx.Common.Utilities
                     return OperationOutcome.FileSizeChanged;
                 }
 
-                var outfileStream = new FileStream(_filename, FileMode.Open, FileAccess.Write, FileShare.Write);
+                FileStream outfileStream = new(_filename, FileMode.Open, FileAccess.Write, FileShare.Write);
 
                 try
                 {
@@ -347,7 +347,7 @@ namespace Ryujinx.Common.Utilities
             {
                 Log?.Write(LogType.Info, "Untrimming...");
 
-                var info = new FileInfo(Filename);
+                FileInfo info = new(Filename);
                 if ((info.Attributes & FileAttributes.ReadOnly) == FileAttributes.ReadOnly)
                 {
                     try
@@ -368,7 +368,7 @@ namespace Ryujinx.Common.Utilities
                     return OperationOutcome.FileSizeChanged;
                 }
 
-                var outfileStream = new FileStream(_filename, FileMode.Append, FileAccess.Write, FileShare.Write);
+                FileStream outfileStream = new(_filename, FileMode.Append, FileAccess.Write, FileShare.Write);
                 long bytesToWriteB = UntrimmedFileSizeB - FileSizeB;
 
                 try
@@ -413,7 +413,7 @@ namespace Ryujinx.Common.Utilities
 
             try
             {
-                var buffer = new byte[BufferSize];
+                byte[] buffer = new byte[BufferSize];
                 Array.Fill<byte>(buffer, PaddingByte);
 
                 while (bytesLeftToWriteB > 0)

src/Ryujinx.Cpu/AddressTable.cs

@@ -49,7 +49,7 @@ namespace ARMeilleure.Common
 
             public TableSparseBlock(ulong size, Action<nint> ensureMapped, PageInitDelegate pageInit)
             {
-                var block = new SparseMemoryBlock(size, pageInit, null);
+                SparseMemoryBlock block = new(size, pageInit, null);
 
                 _trackingEvent = (ulong address, ulong _, bool _) =>
                 {
@@ -146,7 +146,7 @@ namespace ARMeilleure.Common
             Levels = levels;
             Mask = 0;
 
-            foreach (var level in Levels)
+            foreach (AddressTableLevel level in Levels)
             {
                 Mask |= level.Mask;
             }
@@ -366,7 +366,7 @@ namespace ARMeilleure.Common
         /// <returns>The new sparse block that was added</returns>
         private TableSparseBlock ReserveNewSparseBlock()
         {
-            var block = new TableSparseBlock(_sparseBlockSize, EnsureMapped, InitLeafPage);
+            TableSparseBlock block = new(_sparseBlockSize, EnsureMapped, InitLeafPage);
 
             _sparseReserved.Add(block);
             _sparseReservedOffset = 0;
@@ -384,7 +384,7 @@ namespace ARMeilleure.Common
         /// <returns>Allocated block</returns>
         private nint Allocate<T>(int length, T fill, bool leaf) where T : unmanaged
         {
-            var size = sizeof(T) * length;
+            int size = sizeof(T) * length;
 
             AddressTablePage page;
 
@@ -416,10 +416,10 @@ namespace ARMeilleure.Common
             }
             else
             {
-                var address = (nint)NativeAllocator.Instance.Allocate((uint)size);
+                IntPtr address = (nint)NativeAllocator.Instance.Allocate((uint)size);
                 page = new AddressTablePage(false, address);
 
-                var span = new Span<T>((void*)page.Address, length);
+                Span<T> span = new((void*)page.Address, length);
                 span.Fill(fill);
             }
 
@@ -448,7 +448,7 @@ namespace ARMeilleure.Common
         {
             if (!_disposed)
             {
-                foreach (var page in _pages)
+                foreach (AddressTablePage page in _pages)
                 {
                     if (!page.IsSparse)
                     {

src/Ryujinx.Cpu/AppleHv/HvAddressSpace.cs

@@ -29,7 +29,7 @@ namespace Ryujinx.Cpu.AppleHv
 
         public HvAddressSpace(MemoryBlock backingMemory, ulong asSize)
         {
-            (_asBase, var ipaAllocator) = HvVm.CreateAddressSpace(backingMemory);
+            (_asBase, HvIpaAllocator ipaAllocator) = HvVm.CreateAddressSpace(backingMemory);
             _backingSize = backingMemory.Size;
 
             _userRange = new HvAddressSpaceRange(ipaAllocator);

src/Ryujinx.Cpu/AppleHv/HvMemoryBlockAllocator.cs

@@ -45,7 +45,7 @@ namespace Ryujinx.Cpu.AppleHv
 
         public HvMemoryBlockAllocation Allocate(ulong size, ulong alignment)
         {
-            var allocation = Allocate(size, alignment, CreateBlock);
+            Allocation allocation = Allocate(size, alignment, CreateBlock);
 
             return new HvMemoryBlockAllocation(this, allocation.Block, allocation.Offset, allocation.Size);
         }

src/Ryujinx.Cpu/AppleHv/HvMemoryManager.cs

@@ -237,17 +237,17 @@ namespace Ryujinx.Cpu.AppleHv
                 return [];
             }
 
-            var guestRegions = GetPhysicalRegionsImpl(va, size);
+            List<MemoryRange> guestRegions = GetPhysicalRegionsImpl(va, size);
             if (guestRegions == null)
             {
                 return null;
             }
 
-            var regions = new HostMemoryRange[guestRegions.Count];
+            HostMemoryRange[] regions = new HostMemoryRange[guestRegions.Count];
 
             for (int i = 0; i < regions.Length; i++)
             {
-                var guestRegion = guestRegions[i];
+                MemoryRange guestRegion = guestRegions[i];
                 nint pointer = _backingMemory.GetPointer(guestRegion.Address, guestRegion.Size);
                 regions[i] = new HostMemoryRange((nuint)(ulong)pointer, guestRegion.Size);
             }
@@ -275,7 +275,7 @@ namespace Ryujinx.Cpu.AppleHv
 
             int pages = GetPagesCount(va, (uint)size, out va);
 
-            var regions = new List<MemoryRange>();
+            List<MemoryRange> regions = new();
 
             ulong regionStart = GetPhysicalAddressInternal(va);
             ulong regionSize = PageSize;

src/Ryujinx.Cpu/AppleHv/HvVcpu.cs

@@ -41,7 +41,7 @@ namespace Ryujinx.Cpu.AppleHv
             {
                 // Calculate our time delta in ticks based on the current clock frequency.
 
-                int result = TimeApi.mach_timebase_info(out var timeBaseInfo);
+                int result = TimeApi.mach_timebase_info(out MachTimebaseInfo timeBaseInfo);
 
                 Debug.Assert(result == 0);
 

src/Ryujinx.Cpu/AppleHv/HvVm.cs

@@ -38,7 +38,7 @@ namespace Ryujinx.Cpu.AppleHv
                 baseAddress = ipaAllocator.Allocate(block.Size, AsIpaAlignment);
             }
 
-            var rwx = HvMemoryFlags.Read | HvMemoryFlags.Write | HvMemoryFlags.Exec;
+            HvMemoryFlags rwx = HvMemoryFlags.Read | HvMemoryFlags.Write | HvMemoryFlags.Exec;
 
             HvApi.hv_vm_map((ulong)block.Pointer, baseAddress, block.Size, rwx).ThrowOnError();
 

src/Ryujinx.Cpu/Jit/HostTracked/AddressSpacePartition.cs

@@ -127,7 +127,7 @@ namespace Ryujinx.Cpu.Jit.HostTracked
                 Debug.Assert(leftSize > 0);
                 Debug.Assert(rightSize > 0);
 
-                (var leftAllocation, PrivateAllocation) = PrivateAllocation.Split(leftSize);
+                (PrivateMemoryAllocation leftAllocation, PrivateAllocation) = PrivateAllocation.Split(leftSize);
 
                 PrivateMapping left = new(Address, leftSize, leftAllocation);
 

src/Ryujinx.Cpu/Jit/MemoryManager.cs

@@ -257,17 +257,17 @@ namespace Ryujinx.Cpu.Jit
                 return [];
             }
 
-            var guestRegions = GetPhysicalRegionsImpl(va, size);
+            List<MemoryRange> guestRegions = GetPhysicalRegionsImpl(va, size);
             if (guestRegions == null)
             {
                 return null;
             }
 
-            var regions = new HostMemoryRange[guestRegions.Count];
+            HostMemoryRange[] regions = new HostMemoryRange[guestRegions.Count];
 
             for (int i = 0; i < regions.Length; i++)
             {
-                var guestRegion = guestRegions[i];
+                MemoryRange guestRegion = guestRegions[i];
                 nint pointer = _backingMemory.GetPointer(guestRegion.Address, guestRegion.Size);
                 regions[i] = new HostMemoryRange((nuint)(ulong)pointer, guestRegion.Size);
             }
@@ -295,7 +295,7 @@ namespace Ryujinx.Cpu.Jit
 
             int pages = GetPagesCount(va, (uint)size, out va);
 
-            var regions = new List<MemoryRange>();
+            List<MemoryRange> regions = new();
 
             ulong regionStart = GetPhysicalAddressInternal(va);
             ulong regionSize = PageSize;

src/Ryujinx.Cpu/Jit/MemoryManagerHostMapped.cs

@@ -345,7 +345,7 @@ namespace Ryujinx.Cpu.Jit
         {
             int pages = GetPagesCount(va, (uint)size, out va);
 
-            var regions = new List<MemoryRange>();
+            List<MemoryRange> regions = new();
 
             ulong regionStart = GetPhysicalAddressChecked(va);
             ulong regionSize = PageSize;

src/Ryujinx.Cpu/Jit/MemoryManagerHostNoMirror.cs

@@ -175,17 +175,17 @@ namespace Ryujinx.Cpu.Jit
                 return Enumerable.Empty<HostMemoryRange>();
             }
 
-            var guestRegions = GetPhysicalRegionsImpl(va, size);
+            List<MemoryRange> guestRegions = GetPhysicalRegionsImpl(va, size);
             if (guestRegions == null)
             {
                 return null;
             }
 
-            var regions = new HostMemoryRange[guestRegions.Count];
+            HostMemoryRange[] regions = new HostMemoryRange[guestRegions.Count];
 
             for (int i = 0; i < regions.Length; i++)
             {
-                var guestRegion = guestRegions[i];
+                MemoryRange guestRegion = guestRegions[i];
                 nint pointer = _backingMemory.GetPointer(guestRegion.Address, guestRegion.Size);
                 regions[i] = new HostMemoryRange((nuint)(ulong)pointer, guestRegion.Size);
             }
@@ -213,7 +213,7 @@ namespace Ryujinx.Cpu.Jit
 
             int pages = GetPagesCount(va, (uint)size, out va);
 
-            var regions = new List<MemoryRange>();
+            List<MemoryRange> regions = new();
 
             ulong regionStart = GetPhysicalAddressInternal(va);
             ulong regionSize = PageSize;

src/Ryujinx.Cpu/Jit/MemoryManagerHostTracked.cs

@@ -249,7 +249,7 @@ namespace Ryujinx.Cpu.Jit
 
             if (TryGetVirtualContiguous(va, data.Length, out MemoryBlock memoryBlock, out ulong offset))
             {
-                var target = memoryBlock.GetSpan(offset, data.Length);
+                Span<byte> target = memoryBlock.GetSpan(offset, data.Length);
 
                 bool changed = !data.SequenceEqual(target);
 
@@ -448,7 +448,7 @@ namespace Ryujinx.Cpu.Jit
                 return null;
             }
 
-            var regions = new List<HostMemoryRange>();
+            List<HostMemoryRange> regions = new();
             ulong endVa = va + size;
 
             try
@@ -489,7 +489,7 @@ namespace Ryujinx.Cpu.Jit
 
             int pages = GetPagesCount(va, (uint)size, out va);
 
-            var regions = new List<MemoryRange>();
+            List<MemoryRange> regions = new();
 
             ulong regionStart = GetPhysicalAddressInternal(va);
             ulong regionSize = PageSize;

src/Ryujinx.Cpu/LightningJit/Arm32/Target/Arm64/InstEmitFlow.cs

@@ -205,7 +205,7 @@ namespace Ryujinx.Cpu.LightningJit.Arm32.Target.Arm64
 
                 for (int i = 0; i < funcTable.Levels.Length; i++)
                 {
-                    var level = funcTable.Levels[i];
+                    AddressTableLevel level = funcTable.Levels[i];
                     asm.Ubfx(indexReg, guestAddress, level.Index, level.Length);
                     asm.Lsl(indexReg, indexReg, Const(3));
 

src/Ryujinx.Cpu/LightningJit/Arm64/Target/Arm64/InstEmitSystem.cs

@@ -370,7 +370,7 @@ namespace Ryujinx.Cpu.LightningJit.Arm64.Target.Arm64
 
                 for (int i = 0; i < funcTable.Levels.Length; i++)
                 {
-                    var level = funcTable.Levels[i];
+                    AddressTableLevel level = funcTable.Levels[i];
                     asm.Ubfx(indexReg, guestAddress, level.Index, level.Length);
                     asm.Lsl(indexReg, indexReg, Const(3));
 

src/Ryujinx.Cpu/LightningJit/Cache/JitCache.cs

@@ -262,7 +262,7 @@ namespace Ryujinx.Cpu.LightningJit.Cache
                 {
                     entry = _cacheEntries[index];
 
-                    if (Optimizations.CacheEviction && _entryUsageStats.TryGetValue(offset, out var stats))
+                    if (Optimizations.CacheEviction && _entryUsageStats.TryGetValue(offset, out EntryUsageStats stats))
                     {
                         stats.UpdateUsage();
                     }

src/Ryujinx.Cpu/LightningJit/Cache/NoWxCache.cs

@@ -190,7 +190,7 @@ namespace Ryujinx.Cpu.LightningJit.Cache
 
         private bool TryGetThreadLocalFunction(ulong guestAddress, out nint funcPtr)
         {
-            if ((_threadLocalCache ??= new()).TryGetValue(guestAddress, out var entry))
+            if ((_threadLocalCache ??= new()).TryGetValue(guestAddress, out ThreadLocalCacheEntry entry))
             {
                 if (entry.IncrementUseCount() >= MinCallsForPad)
                 {

src/Ryujinx.Cpu/LightningJit/CodeGen/Arm64/Assembler.cs

@@ -41,7 +41,7 @@ namespace Ryujinx.Cpu.LightningJit.CodeGen.Arm64
         {
             int targetIndex = _code.Count;
 
-            var state = _labels[label.AsInt32()];
+            LabelState state = _labels[label.AsInt32()];
 
             state.TargetIndex = targetIndex;
             state.HasTarget = true;
@@ -68,7 +68,7 @@ namespace Ryujinx.Cpu.LightningJit.CodeGen.Arm64
         {
             int branchIndex = _code.Count;
 
-            var state = _labels[label.AsInt32()];
+            LabelState state = _labels[label.AsInt32()];
 
             state.BranchIndex = branchIndex;
             state.HasBranch = true;
@@ -94,7 +94,7 @@ namespace Ryujinx.Cpu.LightningJit.CodeGen.Arm64
         {
             int branchIndex = _code.Count;
 
-            var state = _labels[label.AsInt32()];
+            LabelState state = _labels[label.AsInt32()];
 
             state.BranchIndex = branchIndex;
             state.HasBranch = true;
@@ -113,7 +113,7 @@ namespace Ryujinx.Cpu.LightningJit.CodeGen.Arm64
         {
             int branchIndex = _code.Count;
 
-            var state = _labels[label.AsInt32()];
+            LabelState state = _labels[label.AsInt32()];
 
             state.BranchIndex = branchIndex;
             state.HasBranch = true;
@@ -342,7 +342,7 @@ namespace Ryujinx.Cpu.LightningJit.CodeGen.Arm64
 
         public readonly void Cset(Operand rd, ArmCondition condition)
         {
-            var zr = new Operand(ZrRegister, RegisterType.Integer, rd.Type);
+            Operand zr = new(ZrRegister, RegisterType.Integer, rd.Type);
             Csinc(rd, zr, zr, (ArmCondition)((int)condition ^ 1));
         }
 

src/Ryujinx.Cpu/LightningJit/Translator.cs

@@ -162,14 +162,14 @@ namespace Ryujinx.Cpu.LightningJit
         {
             List<TranslatedFunction> functions = Functions.AsList();
 
-            foreach (var func in functions)
+            foreach (TranslatedFunction func in functions)
             {
                 JitCache.Unmap(func.FuncPointer);
             }
 
             Functions.Clear();
 
-            while (_oldFuncs.TryDequeue(out var kv))
+            while (_oldFuncs.TryDequeue(out KeyValuePair<ulong, TranslatedFunction> kv))
             {
                 JitCache.Unmap(kv.Value.FuncPointer);
             }

src/Ryujinx.Cpu/LightningJit/TranslatorStubs.cs

@@ -174,7 +174,7 @@ namespace Ryujinx.Cpu.LightningJit
 
                 for (int i = 0; i < _functionTable.Levels.Length; i++)
                 {
-                    ref var level = ref _functionTable.Levels[i];
+                    ref AddressTableLevel level = ref _functionTable.Levels[i];
 
                     asm.Mov(mask, level.Mask >> level.Index);
                     asm.And(index, mask, guestAddress, ArmShiftType.Lsr, level.Index);

src/Ryujinx.Cpu/Nce/Arm64/Assembler.cs

@@ -43,7 +43,7 @@ namespace Ryujinx.Cpu.Nce.Arm64
         {
             int targetIndex = _code.Count;
 
-            var state = _labels[label.AsInt32()];
+            LabelState state = _labels[label.AsInt32()];
 
             state.TargetIndex = targetIndex;
             state.HasTarget = true;
@@ -68,7 +68,7 @@ namespace Ryujinx.Cpu.Nce.Arm64
         {
             int branchIndex = _code.Count;
 
-            var state = _labels[label.AsInt32()];
+            LabelState state = _labels[label.AsInt32()];
 
             state.BranchIndex = branchIndex;
             state.HasBranch = true;
@@ -94,7 +94,7 @@ namespace Ryujinx.Cpu.Nce.Arm64
         {
             int branchIndex = _code.Count;
 
-            var state = _labels[label.AsInt32()];
+            LabelState state = _labels[label.AsInt32()];
 
             state.BranchIndex = branchIndex;
             state.HasBranch = true;
@@ -113,7 +113,7 @@ namespace Ryujinx.Cpu.Nce.Arm64
         {
             int branchIndex = _code.Count;
 
-            var state = _labels[label.AsInt32()];
+            LabelState state = _labels[label.AsInt32()];
 
             state.BranchIndex = branchIndex;
             state.HasBranch = true;
@@ -225,7 +225,7 @@ namespace Ryujinx.Cpu.Nce.Arm64
 
         public void Cset(Operand rd, ArmCondition condition)
         {
-            var zr = new Operand(ZrRegister, RegisterType.Integer, rd.Type);
+            Operand zr = new(ZrRegister, RegisterType.Integer, rd.Type);
             Csinc(rd, zr, zr, (ArmCondition)((int)condition ^ 1));
         }
 

src/Ryujinx.Cpu/Nce/MemoryManagerNative.cs

@@ -163,17 +163,17 @@ namespace Ryujinx.Cpu.Nce
                 return Enumerable.Empty<HostMemoryRange>();
             }
 
-            var guestRegions = GetPhysicalRegionsImpl(va, size);
+            List<MemoryRange> guestRegions = GetPhysicalRegionsImpl(va, size);
             if (guestRegions == null)
             {
                 return null;
             }
 
-            var regions = new HostMemoryRange[guestRegions.Count];
+            HostMemoryRange[] regions = new HostMemoryRange[guestRegions.Count];
 
             for (int i = 0; i < regions.Length; i++)
             {
-                var guestRegion = guestRegions[i];
+                MemoryRange guestRegion = guestRegions[i];
                 nint pointer = _backingMemory.GetPointer(guestRegion.Address, guestRegion.Size);
                 regions[i] = new HostMemoryRange((nuint)(ulong)pointer, guestRegion.Size);
             }
@@ -201,7 +201,7 @@ namespace Ryujinx.Cpu.Nce
 
             int pages = GetPagesCount(va, (uint)size, out va);
 
-            var regions = new List<MemoryRange>();
+            List<MemoryRange> regions = new();
 
             ulong regionStart = GetPhysicalAddressInternal(va);
             ulong regionSize = PageSize;

src/Ryujinx.Cpu/Nce/NceCpuCodePatch.cs

@@ -50,7 +50,7 @@ namespace Ryujinx.Cpu.Nce
         {
             uint[] code = _code.ToArray();
 
-            foreach (var patchTarget in _patchTargets)
+            foreach (PatchTarget patchTarget in _patchTargets)
             {
                 ulong instPatchStartAddress = patchAddress + (ulong)patchTarget.PatchStartIndex * sizeof(uint);
                 ulong instPatchBranchAddress = patchAddress + (ulong)patchTarget.PatchBranchIndex * sizeof(uint);

src/Ryujinx.Cpu/Nce/NceExecutionContext.cs

@@ -74,7 +74,7 @@ namespace Ryujinx.Cpu.Nce
 
             _context = new NceNativeContext();
 
-            ref var storage = ref _context.GetStorage();
+            ref NceNativeContext.NativeCtxStorage storage = ref _context.GetStorage();
             storage.SvcCallHandler = svcHandlerPtr;
             storage.InManaged = 1u;
             storage.CtrEl0 = 0x8444c004; // TODO: Get value from host CPU instead of using guest one?
@@ -99,7 +99,7 @@ namespace Ryujinx.Cpu.Nce
 
         public void SetStartAddress(ulong address)
         {
-            ref var storage = ref _context.GetStorage();
+            ref NceNativeContext.NativeCtxStorage storage = ref _context.GetStorage();
             storage.X[30] = address;
             storage.HostThreadHandle = NceThreadPal.GetCurrentThreadHandle();
 

src/Ryujinx.Cpu/Nce/NcePatcher.cs

@@ -16,7 +16,7 @@ namespace Ryujinx.Cpu.Nce
         {
             NceCpuCodePatch codePatch = new();
 
-            var textUint = MemoryMarshal.Cast<byte, uint>(textSection);
+            ReadOnlySpan<uint> textUint = MemoryMarshal.Cast<byte, uint>(textSection);
 
             for (int i = 0; i < textUint.Length; i++)
             {

src/Ryujinx.Cpu/PrivateMemoryAllocator.cs

@@ -48,7 +48,7 @@ namespace Ryujinx.Cpu
             {
                 for (int i = 0; i < _freeRanges.Count; i++)
                 {
-                    var range = _freeRanges[i];
+                    Range range = _freeRanges[i];
 
                     ulong alignedOffset = BitUtils.AlignUp(range.Offset, alignment);
                     ulong sizeDelta = alignedOffset - range.Offset;
@@ -84,7 +84,7 @@ namespace Ryujinx.Cpu
 
             private void InsertFreeRange(ulong offset, ulong size)
             {
-                var range = new Range(offset, size);
+                Range range = new(offset, size);
                 int index = _freeRanges.BinarySearch(range);
                 if (index < 0)
                 {
@@ -97,7 +97,7 @@ namespace Ryujinx.Cpu
             private void InsertFreeRangeComingled(ulong offset, ulong size)
             {
                 ulong endOffset = offset + size;
-                var range = new Range(offset, size);
+                Range range = new(offset, size);
                 int index = _freeRanges.BinarySearch(range);
                 if (index < 0)
                 {
@@ -149,7 +149,7 @@ namespace Ryujinx.Cpu
 
         public PrivateMemoryAllocation Allocate(ulong size, ulong alignment)
         {
-            var allocation = Allocate(size, alignment, CreateBlock);
+            Allocation allocation = Allocate(size, alignment, CreateBlock);
 
             return new PrivateMemoryAllocation(this, allocation.Block, allocation.Offset, allocation.Size);
         }
@@ -200,7 +200,7 @@ namespace Ryujinx.Cpu
 
             for (int i = 0; i < _blocks.Count; i++)
             {
-                var block = _blocks[i];
+                T block = _blocks[i];
 
                 if (block.Size >= size)
                 {
@@ -214,8 +214,8 @@ namespace Ryujinx.Cpu
 
             ulong blockAlignedSize = BitUtils.AlignUp(size, _blockAlignment);
 
-            var memory = new MemoryBlock(blockAlignedSize, _allocationFlags);
-            var newBlock = createBlock(memory, blockAlignedSize);
+            MemoryBlock memory = new(blockAlignedSize, _allocationFlags);
+            T newBlock = createBlock(memory, blockAlignedSize);
 
             InsertBlock(newBlock);
 

src/Ryujinx.Cpu/Signal/NativeSignalHandler.cs

@@ -104,7 +104,7 @@ namespace Ryujinx.Cpu.Signal
                         _signalHandlerPtr = customSignalHandlerFactory(UnixSignalHandlerRegistration.GetSegfaultExceptionHandler().sa_handler, _signalHandlerPtr);
                     }
 
-                    var old = UnixSignalHandlerRegistration.RegisterExceptionHandler(_signalHandlerPtr);
+                    UnixSignalHandlerRegistration.SigAction old = UnixSignalHandlerRegistration.RegisterExceptionHandler(_signalHandlerPtr);
 
                     config.UnixOldSigaction = (nuint)(ulong)old.sa_handler;
                     config.UnixOldSigaction3Arg = old.sa_flags & 4;

src/Ryujinx.Graphics.Device/DeviceState.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -32,15 +33,15 @@ namespace Ryujinx.Graphics.Device
                 _debugLogCallback = debugLogCallback;
             }
 
-            var fields = typeof(TState).GetFields();
+            FieldInfo[] fields = typeof(TState).GetFields();
             int offset = 0;
 
             for (int fieldIndex = 0; fieldIndex < fields.Length; fieldIndex++)
             {
-                var field = fields[fieldIndex];
+                FieldInfo field = fields[fieldIndex];
 
-                var currentFieldOffset = (int)Marshal.OffsetOf<TState>(field.Name);
-                var nextFieldOffset = fieldIndex + 1 == fields.Length ? Unsafe.SizeOf<TState>() : (int)Marshal.OffsetOf<TState>(fields[fieldIndex + 1].Name);
+                int currentFieldOffset = (int)Marshal.OffsetOf<TState>(field.Name);
+                int nextFieldOffset = fieldIndex + 1 == fields.Length ? Unsafe.SizeOf<TState>() : (int)Marshal.OffsetOf<TState>(fields[fieldIndex + 1].Name);
 
                 int sizeOfField = nextFieldOffset - currentFieldOffset;
 
@@ -48,7 +49,7 @@ namespace Ryujinx.Graphics.Device
                 {
                     int index = (offset + i) / RegisterSize;
 
-                    if (callbacks != null && callbacks.TryGetValue(field.Name, out var cb))
+                    if (callbacks != null && callbacks.TryGetValue(field.Name, out RwCallback cb))
                     {
                         if (cb.Read != null)
                         {

src/Ryujinx.Graphics.GAL/Multithreading/ThreadedPipeline.cs

@@ -361,7 +361,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading
 
         public unsafe bool TryHostConditionalRendering(ICounterEvent value, ulong compare, bool isEqual)
         {
-            var evt = value as ThreadedCounterEvent;
+            ThreadedCounterEvent evt = value as ThreadedCounterEvent;
             if (evt != null)
             {
                 if (compare == 0 && evt.Type == CounterType.SamplesPassed && evt.ClearCounter)

src/Ryujinx.Graphics.GAL/Multithreading/ThreadedRenderer.cs

@@ -294,7 +294,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading
 
         public unsafe IImageArray CreateImageArray(int size, bool isBuffer)
         {
-            var imageArray = new ThreadedImageArray(this);
+            ThreadedImageArray imageArray = new(this);
             New<CreateImageArrayCommand>()->Set(Ref(imageArray), size, isBuffer);
             QueueCommand();
 
@@ -303,7 +303,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading
 
         public unsafe IProgram CreateProgram(ShaderSource[] shaders, ShaderInfo info)
         {
-            var program = new ThreadedProgram(this);
+            ThreadedProgram program = new(this);
 
             SourceProgramRequest request = new(program, shaders, info);
 
@@ -319,7 +319,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading
 
         public unsafe ISampler CreateSampler(SamplerCreateInfo info)
         {
-            var sampler = new ThreadedSampler(this);
+            ThreadedSampler sampler = new(this);
             New<CreateSamplerCommand>()->Set(Ref(sampler), info);
             QueueCommand();
 
@@ -337,7 +337,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading
         {
             if (IsGpuThread())
             {
-                var texture = new ThreadedTexture(this, info);
+                ThreadedTexture texture = new(this, info);
                 New<CreateTextureCommand>()->Set(Ref(texture), info);
                 QueueCommand();
 
@@ -345,7 +345,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading
             }
             else
             {
-                var texture = new ThreadedTexture(this, info)
+                ThreadedTexture texture = new(this, info)
                 {
                     Base = _baseRenderer.CreateTexture(info),
                 };
@@ -355,7 +355,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading
         }
         public unsafe ITextureArray CreateTextureArray(int size, bool isBuffer)
         {
-            var textureArray = new ThreadedTextureArray(this);
+            ThreadedTextureArray textureArray = new(this);
             New<CreateTextureArrayCommand>()->Set(Ref(textureArray), size, isBuffer);
             QueueCommand();
 
@@ -414,7 +414,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading
 
         public unsafe IProgram LoadProgramBinary(byte[] programBinary, bool hasFragmentShader, ShaderInfo info)
         {
-            var program = new ThreadedProgram(this);
+            ThreadedProgram program = new(this);
 
             BinaryProgramRequest request = new(program, programBinary, hasFragmentShader, info);
             Programs.Add(request);

src/Ryujinx.Graphics.GAL/ResourceLayout.cs

@@ -126,7 +126,7 @@ namespace Ryujinx.Graphics.GAL
 
             if (Descriptors != null)
             {
-                foreach (var descriptor in Descriptors)
+                foreach (ResourceDescriptor descriptor in Descriptors)
                 {
                     hasher.Add(descriptor);
                 }

src/Ryujinx.Graphics.Gpu/Engine/Compute/ComputeClass.cs

@@ -2,6 +2,7 @@ using Ryujinx.Graphics.Device;
 using Ryujinx.Graphics.Gpu.Engine.InlineToMemory;
 using Ryujinx.Graphics.Gpu.Engine.Threed;
 using Ryujinx.Graphics.Gpu.Engine.Types;
+using Ryujinx.Graphics.Gpu.Memory;
 using Ryujinx.Graphics.Gpu.Shader;
 using Ryujinx.Graphics.Shader;
 using System;
@@ -90,7 +91,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Compute
         /// <param name="argument">Method call argument</param>
         private void SendSignalingPcasB(int argument)
         {
-            var memoryManager = _channel.MemoryManager;
+            MemoryManager memoryManager = _channel.MemoryManager;
 
             // Since we're going to change the state, make sure any pending instanced draws are done.
             _3dEngine.PerformDeferredDraws();
@@ -100,7 +101,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Compute
 
             uint qmdAddress = _state.State.SendPcasA;
 
-            var qmd = _channel.MemoryManager.Read<ComputeQmd>((ulong)qmdAddress << 8);
+            ComputeQmd qmd = _channel.MemoryManager.Read<ComputeQmd>((ulong)qmdAddress << 8);
 
             ulong shaderGpuVa = ((ulong)_state.State.SetProgramRegionAAddressUpper << 32) | _state.State.SetProgramRegionB;
 

src/Ryujinx.Graphics.Gpu/Engine/DeviceStateWithShadow.cs

@@ -80,7 +80,7 @@ namespace Ryujinx.Graphics.Gpu.Engine
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void WriteWithRedundancyCheck(int offset, int value, out bool changed)
         {
-            var shadowRamControl = _state.State.SetMmeShadowRamControlMode;
+            SetMmeShadowRamControlMode shadowRamControl = _state.State.SetMmeShadowRamControlMode;
             if (shadowRamControl == SetMmeShadowRamControlMode.MethodPassthrough || offset < 0x200)
             {
                 _state.WriteWithRedundancyCheck(offset, value, out changed);

src/Ryujinx.Graphics.Gpu/Engine/Dma/DmaClass.cs

@@ -190,7 +190,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Dma
         /// <param name="argument">The LaunchDma call argument</param>
         private void DmaCopy(int argument)
         {
-            var memoryManager = _channel.MemoryManager;
+            MemoryManager memoryManager = _channel.MemoryManager;
 
             CopyFlags copyFlags = (CopyFlags)argument;
 
@@ -225,8 +225,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Dma
                 int srcBpp = remap ? srcComponents * componentSize : 1;
                 int dstBpp = remap ? dstComponents * componentSize : 1;
 
-                var dst = Unsafe.As<uint, DmaTexture>(ref _state.State.SetDstBlockSize);
-                var src = Unsafe.As<uint, DmaTexture>(ref _state.State.SetSrcBlockSize);
+                DmaTexture dst = Unsafe.As<uint, DmaTexture>(ref _state.State.SetDstBlockSize);
+                DmaTexture src = Unsafe.As<uint, DmaTexture>(ref _state.State.SetSrcBlockSize);
 
                 int srcRegionX = 0, srcRegionY = 0, dstRegionX = 0, dstRegionY = 0;
 
@@ -245,7 +245,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Dma
                 int srcStride = (int)_state.State.PitchIn;
                 int dstStride = (int)_state.State.PitchOut;
 
-                var srcCalculator = new OffsetCalculator(
+                OffsetCalculator srcCalculator = new(
                     src.Width,
                     src.Height,
                     srcStride,
@@ -254,7 +254,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Dma
                     src.MemoryLayout.UnpackGobBlocksInZ(),
                     srcBpp);
 
-                var dstCalculator = new OffsetCalculator(
+                OffsetCalculator dstCalculator = new(
                     dst.Width,
                     dst.Height,
                     dstStride,
@@ -293,7 +293,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Dma
 
                 if (completeSource && completeDest && !srcLinear && isIdentityRemap)
                 {
-                    var source = memoryManager.Physical.TextureCache.FindTexture(
+                    Image.Texture source = memoryManager.Physical.TextureCache.FindTexture(
                         memoryManager,
                         srcGpuVa,
                         srcBpp,
@@ -309,7 +309,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Dma
                     {
                         source.SynchronizeMemory();
 
-                        var target = memoryManager.Physical.TextureCache.FindOrCreateTexture(
+                        Image.Texture target = memoryManager.Physical.TextureCache.FindOrCreateTexture(
                             memoryManager,
                             source.Info.FormatInfo,
                             dstGpuVa,
@@ -339,7 +339,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Dma
 
                 if (completeSource && completeDest && !(dstLinear && !srcLinear) && isIdentityRemap)
                 {
-                    var target = memoryManager.Physical.TextureCache.FindTexture(
+                    Image.Texture target = memoryManager.Physical.TextureCache.FindTexture(
                         memoryManager,
                         dstGpuVa,
                         dstBpp,

src/Ryujinx.Graphics.Gpu/Engine/GPFifo/GPFifoProcessor.cs

@@ -159,7 +159,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.GPFifo
                 int availableCount = commandBuffer.Length - offset;
                 int consumeCount = Math.Min(_state.MethodCount, availableCount);
 
-                var data = commandBuffer.Slice(offset, consumeCount);
+                ReadOnlySpan<int> data = commandBuffer.Slice(offset, consumeCount);
 
                 if (_state.SubChannel == 0)
                 {

src/Ryujinx.Graphics.Gpu/Engine/InlineToMemory/InlineToMemoryClass.cs

@@ -1,6 +1,7 @@
 using Ryujinx.Common;
 using Ryujinx.Common.Memory;
 using Ryujinx.Graphics.Device;
+using Ryujinx.Graphics.Gpu.Memory;
 using Ryujinx.Graphics.Texture;
 using System;
 using System.Collections.Generic;
@@ -168,9 +169,9 @@ namespace Ryujinx.Graphics.Gpu.Engine.InlineToMemory
         /// </summary>
         private void FinishTransfer()
         {
-            var memoryManager = _channel.MemoryManager;
+            MemoryManager memoryManager = _channel.MemoryManager;
 
-            var data = MemoryMarshal.Cast<int, byte>(_buffer)[.._size];
+            Span<byte> data = MemoryMarshal.Cast<int, byte>(_buffer)[.._size];
 
             if (_isLinear && _lineCount == 1)
             {
@@ -184,7 +185,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.InlineToMemory
                 // Right now the copy code at the bottom assumes that it is used on both which might be incorrect.
                 if (!_isLinear)
                 {
-                    var target = memoryManager.Physical.TextureCache.FindTexture(
+                    Image.Texture target = memoryManager.Physical.TextureCache.FindTexture(
                         memoryManager,
                         _dstGpuVa,
                         1,
@@ -199,7 +200,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.InlineToMemory
                     if (target != null)
                     {
                         target.SynchronizeMemory();
-                        var dataCopy = MemoryOwner<byte>.RentCopy(data);
+                        MemoryOwner<byte> dataCopy = MemoryOwner<byte>.RentCopy(data);
                         target.SetData(dataCopy, 0, 0, new GAL.Rectangle<int>(_dstX, _dstY, _lineLengthIn / target.Info.FormatInfo.BytesPerPixel, _lineCount));
                         target.SignalModified();
 
@@ -207,7 +208,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.InlineToMemory
                     }
                 }
 
-                var dstCalculator = new OffsetCalculator(
+                OffsetCalculator dstCalculator = new(
                     _dstWidth,
                     _dstHeight,
                     _dstStride,

src/Ryujinx.Graphics.Gpu/Engine/MME/MacroHLE.cs

@@ -287,12 +287,12 @@ namespace Ryujinx.Graphics.Gpu.Engine.MME
         /// <param name="arg0">First argument of the call</param>
         private void DrawArraysInstanced(IDeviceState state, int arg0)
         {
-            var topology = (PrimitiveTopology)arg0;
+            PrimitiveTopology topology = (PrimitiveTopology)arg0;
 
-            var count = FetchParam();
-            var instanceCount = FetchParam();
-            var firstVertex = FetchParam();
-            var firstInstance = FetchParam();
+            FifoWord count = FetchParam();
+            FifoWord instanceCount = FetchParam();
+            FifoWord firstVertex = FetchParam();
+            FifoWord firstInstance = FetchParam();
 
             if (ShouldSkipDraw(state, instanceCount.Word))
             {
@@ -316,13 +316,13 @@ namespace Ryujinx.Graphics.Gpu.Engine.MME
         /// <param name="arg0">First argument of the call</param>
         private void DrawElements(IDeviceState state, int arg0)
         {
-            var topology = (PrimitiveTopology)arg0;
+            PrimitiveTopology topology = (PrimitiveTopology)arg0;
 
-            var indexAddressHigh = FetchParam();
-            var indexAddressLow = FetchParam();
-            var indexType = FetchParam();
-            var firstIndex = 0;
-            var indexCount = FetchParam();
+            FifoWord indexAddressHigh = FetchParam();
+            FifoWord indexAddressLow = FetchParam();
+            FifoWord indexType = FetchParam();
+            int firstIndex = 0;
+            FifoWord indexCount = FetchParam();
 
             _processor.ThreedClass.UpdateIndexBuffer(
                 (uint)indexAddressHigh.Word,
@@ -346,13 +346,13 @@ namespace Ryujinx.Graphics.Gpu.Engine.MME
         /// <param name="arg0">First argument of the call</param>
         private void DrawElementsInstanced(IDeviceState state, int arg0)
         {
-            var topology = (PrimitiveTopology)arg0;
+            PrimitiveTopology topology = (PrimitiveTopology)arg0;
 
-            var count = FetchParam();
-            var instanceCount = FetchParam();
-            var firstIndex = FetchParam();
-            var firstVertex = FetchParam();
-            var firstInstance = FetchParam();
+            FifoWord count = FetchParam();
+            FifoWord instanceCount = FetchParam();
+            FifoWord firstIndex = FetchParam();
+            FifoWord firstVertex = FetchParam();
+            FifoWord firstInstance = FetchParam();
 
             if (ShouldSkipDraw(state, instanceCount.Word))
             {
@@ -376,17 +376,17 @@ namespace Ryujinx.Graphics.Gpu.Engine.MME
         /// <param name="arg0">First argument of the call</param>
         private void DrawElementsIndirect(IDeviceState state, int arg0)
         {
-            var topology = (PrimitiveTopology)arg0;
+            PrimitiveTopology topology = (PrimitiveTopology)arg0;
 
-            var count = FetchParam();
-            var instanceCount = FetchParam();
-            var firstIndex = FetchParam();
-            var firstVertex = FetchParam();
-            var firstInstance = FetchParam();
+            FifoWord count = FetchParam();
+            FifoWord instanceCount = FetchParam();
+            FifoWord firstIndex = FetchParam();
+            FifoWord firstVertex = FetchParam();
+            FifoWord firstInstance = FetchParam();
 
             ulong indirectBufferGpuVa = count.GpuVa;
 
-            var bufferCache = _processor.MemoryManager.Physical.BufferCache;
+            BufferCache bufferCache = _processor.MemoryManager.Physical.BufferCache;
 
             bool useBuffer = bufferCache.CheckModified(_processor.MemoryManager, indirectBufferGpuVa, IndirectIndexedDataEntrySize, out ulong indirectBufferAddress);
 
@@ -434,7 +434,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.MME
 
             int startDraw = arg0;
             int endDraw = arg1;
-            var topology = (PrimitiveTopology)arg2;
+            PrimitiveTopology topology = (PrimitiveTopology)arg2;
             int paddingWords = arg3;
             int stride = paddingWords * 4 + 0x14;
 
@@ -470,12 +470,12 @@ namespace Ryujinx.Graphics.Gpu.Engine.MME
 
             for (int i = 0; i < maxDrawCount; i++)
             {
-                var count = FetchParam();
+                FifoWord count = FetchParam();
 #pragma warning disable IDE0059 // Remove unnecessary value assignment
-                var instanceCount = FetchParam();
-                var firstIndex = FetchParam();
-                var firstVertex = FetchParam();
-                var firstInstance = FetchParam();
+                FifoWord instanceCount = FetchParam();
+                FifoWord firstIndex = FetchParam();
+                FifoWord firstVertex = FetchParam();
+                FifoWord firstInstance = FetchParam();
 #pragma warning restore IDE0059
 
                 if (i == 0)
@@ -494,7 +494,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.MME
                 }
             }
 
-            var bufferCache = _processor.MemoryManager.Physical.BufferCache;
+            BufferCache bufferCache = _processor.MemoryManager.Physical.BufferCache;
 
             ulong indirectBufferSize = (ulong)maxDrawCount * (ulong)stride;
 
@@ -528,7 +528,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.MME
         /// <returns>The call argument, or a 0 value with null address if the FIFO is empty</returns>
         private FifoWord FetchParam()
         {
-            if (!Fifo.TryDequeue(out var value))
+            if (!Fifo.TryDequeue(out FifoWord value))
             {
                 Logger.Warning?.Print(LogClass.Gpu, "Macro attempted to fetch an inexistent argument.");
 

src/Ryujinx.Graphics.Gpu/Engine/MME/MacroHLETable.cs

@@ -90,13 +90,13 @@ namespace Ryujinx.Graphics.Gpu.Engine.MME
         /// <returns>True if there is a implementation available and supported, false otherwise</returns>
         public static bool TryGetMacroHLEFunction(ReadOnlySpan<int> code, Capabilities caps, out MacroHLEFunctionName name)
         {
-            var mc = MemoryMarshal.Cast<int, byte>(code);
+            ReadOnlySpan<byte> mc = MemoryMarshal.Cast<int, byte>(code);
 
             for (int i = 0; i < _table.Length; i++)
             {
-                ref var entry = ref _table[i];
+                ref TableEntry entry = ref _table[i];
 
-                var hash = XXHash128.ComputeHash(mc[..entry.Length]);
+                Hash128 hash = XXHash128.ComputeHash(mc[..entry.Length]);
                 if (hash == entry.Hash)
                 {
                     if (IsMacroHLESupported(caps, entry.Name))

src/Ryujinx.Graphics.Gpu/Engine/MME/MacroInterpreter.cs

@@ -369,7 +369,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.MME
         /// <returns>The call argument, or 0 if the FIFO is empty</returns>
         private int FetchParam()
         {
-            if (!Fifo.TryDequeue(out var value))
+            if (!Fifo.TryDequeue(out FifoWord value))
             {
                 Logger.Warning?.Print(LogClass.Gpu, "Macro attempted to fetch an inexistent argument.");
 

src/Ryujinx.Graphics.Gpu/Engine/MME/MacroJitContext.cs

@@ -20,7 +20,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.MME
         /// <returns>The call argument, or 0 if the FIFO is empty</returns>
         public int FetchParam()
         {
-            if (!Fifo.TryDequeue(out var value))
+            if (!Fifo.TryDequeue(out FifoWord value))
             {
                 Logger.Warning?.Print(LogClass.Gpu, "Macro attempted to fetch an inexistent argument.");