* dotnet format style --severity info Some changes were manually reverted. * dotnet format analyzers --serverity info Some changes have been minimally adapted. * Restore a few unused methods and variables * Silence dotnet format IDE0060 warnings * Silence dotnet format IDE0052 warnings * Address or silence dotnet format IDE1006 warnings * Address dotnet format CA1816 warnings * Address or silence dotnet format CA2208 warnings * Address or silence dotnet format CA1806 and a few CA1854 warnings * Address dotnet format CA2211 warnings * Address dotnet format CA1822 warnings * Address or silence dotnet format CA1069 warnings * Make dotnet format succeed in style mode * Address or silence dotnet format CA2211 warnings * Address review comments * Address dotnet format CA2208 warnings properly * Make ProcessResult readonly * Address most dotnet format whitespace warnings * Apply dotnet format whitespace formatting A few of them have been manually reverted and the corresponding warning was silenced * Add previously silenced warnings back I have no clue how these disappeared * Revert formatting changes for while and for-loops * Format if-blocks correctly * Run dotnet format style after rebase * Run dotnet format whitespace after rebase * Run dotnet format style after rebase * Run dotnet format analyzers after rebase * Run dotnet format after rebase and remove unused usings - analyzers - style - whitespace * Disable 'prefer switch expression' rule * Add comments to disabled warnings * Fix a few disabled warnings * Fix naming rule violation, Convert shader properties to auto-property and convert values to const * Simplify properties and array initialization, Use const when possible, Remove trailing commas * Start working on disabled warnings * Fix and silence a few dotnet-format warnings again * Run dotnet format after rebase * Use using declaration instead of block syntax * Address IDE0251 warnings * Address a few disabled IDE0060 warnings * Silence IDE0060 in .editorconfig * Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas" This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e. * dotnet format whitespace after rebase * First dotnet format pass * Fix naming rule violations * Fix typo * Add trailing commas, use targeted new and use array initializer * Fix build issues * Fix remaining build issues * Remove SuppressMessage for CA1069 where possible * Address dotnet format issues * Address formatting issues Co-authored-by: Ac_K <acoustik666@gmail.com> * Add GetHashCode implementation for RenderingSurfaceInfo * Explicitly silence CA1822 for every affected method in Syscall * Address formatting issues in Demangler.cs * Address review feedback Co-authored-by: Ac_K <acoustik666@gmail.com> * Revert marking service methods as static * Next dotnet format pass * Address review feedback --------- Co-authored-by: Ac_K <acoustik666@gmail.com>
96 lines
3.2 KiB
C#
96 lines
3.2 KiB
C#
using Ryujinx.Common.Logging;
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
|
|
namespace Ryujinx.HLE.Loaders.Mods
|
|
{
|
|
public class MemPatch
|
|
{
|
|
readonly Dictionary<uint, byte[]> _patches = new();
|
|
|
|
/// <summary>
|
|
/// Adds a patch to specified offset. Overwrites if already present.
|
|
/// </summary>
|
|
/// <param name="offset">Memory offset</param>
|
|
/// <param name="patch">The patch to add</param>
|
|
public void Add(uint offset, byte[] patch)
|
|
{
|
|
_patches[offset] = patch;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Adds a patch in the form of an RLE (Fill mode).
|
|
/// </summary>
|
|
/// <param name="offset">Memory offset</param>
|
|
/// <param name="length"The fill length</param>
|
|
/// <param name="filler">The byte to fill</param>
|
|
public void AddFill(uint offset, int length, byte filler)
|
|
{
|
|
// TODO: Can be made space efficient by changing `_patches`
|
|
// Should suffice for now
|
|
byte[] patch = new byte[length];
|
|
patch.AsSpan().Fill(filler);
|
|
|
|
_patches[offset] = patch;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Adds all patches from an existing MemPatch
|
|
/// </summary>
|
|
/// <param name="patches">The patches to add</param>
|
|
public void AddFrom(MemPatch patches)
|
|
{
|
|
if (patches == null)
|
|
{
|
|
return;
|
|
}
|
|
|
|
foreach (var (patchOffset, patch) in patches._patches)
|
|
{
|
|
_patches[patchOffset] = patch;
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Applies all the patches added to this instance.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// Patches are applied in ascending order of offsets to guarantee
|
|
/// overlapping patches always apply the same way.
|
|
/// </remarks>
|
|
/// <param name="memory">The span of bytes to patch</param>
|
|
/// <param name="maxSize">The maximum size of the slice of patchable memory</param>
|
|
/// <param name="protectedOffset">A secondary offset used in special cases (NSO header)</param>
|
|
/// <returns>Successful patches count</returns>
|
|
public int Patch(Span<byte> memory, int protectedOffset = 0)
|
|
{
|
|
int count = 0;
|
|
foreach (var (offset, patch) in _patches.OrderBy(item => item.Key))
|
|
{
|
|
int patchOffset = (int)offset;
|
|
int patchSize = patch.Length;
|
|
|
|
if (patchOffset < protectedOffset || patchOffset > memory.Length)
|
|
{
|
|
continue; // Add warning?
|
|
}
|
|
|
|
patchOffset -= protectedOffset;
|
|
|
|
if (patchOffset + patchSize > memory.Length)
|
|
{
|
|
patchSize = memory.Length - patchOffset; // Add warning?
|
|
}
|
|
|
|
Logger.Info?.Print(LogClass.ModLoader, $"Patching address offset {patchOffset:x} <= {BitConverter.ToString(patch).Replace('-', ' ')} len={patchSize}");
|
|
|
|
patch.AsSpan(0, patchSize).CopyTo(memory.Slice(patchOffset, patchSize));
|
|
|
|
count++;
|
|
}
|
|
|
|
return count;
|
|
}
|
|
}
|
|
}
|