mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2025-01-05 16:16:02 +00:00
326749498b
* 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>
108 lines
4.7 KiB
C#
108 lines
4.7 KiB
C#
using Ryujinx.Common.Configuration;
|
|
using Ryujinx.Common.Logging;
|
|
using Ryujinx.Cpu;
|
|
using Ryujinx.Cpu.AppleHv;
|
|
using Ryujinx.Cpu.Jit;
|
|
using Ryujinx.Graphics.Gpu;
|
|
using Ryujinx.HLE.HOS.Kernel;
|
|
using Ryujinx.HLE.HOS.Kernel.Process;
|
|
using Ryujinx.Memory;
|
|
using System;
|
|
using System.Runtime.InteropServices;
|
|
|
|
namespace Ryujinx.HLE.HOS
|
|
{
|
|
class ArmProcessContextFactory : IProcessContextFactory
|
|
{
|
|
private readonly ITickSource _tickSource;
|
|
private readonly GpuContext _gpu;
|
|
private readonly string _titleIdText;
|
|
private readonly string _displayVersion;
|
|
private readonly bool _diskCacheEnabled;
|
|
private readonly ulong _codeAddress;
|
|
private readonly ulong _codeSize;
|
|
|
|
public IDiskCacheLoadState DiskCacheLoadState { get; private set; }
|
|
|
|
public ArmProcessContextFactory(
|
|
ITickSource tickSource,
|
|
GpuContext gpu,
|
|
string titleIdText,
|
|
string displayVersion,
|
|
bool diskCacheEnabled,
|
|
ulong codeAddress,
|
|
ulong codeSize)
|
|
{
|
|
_tickSource = tickSource;
|
|
_gpu = gpu;
|
|
_titleIdText = titleIdText;
|
|
_displayVersion = displayVersion;
|
|
_diskCacheEnabled = diskCacheEnabled;
|
|
_codeAddress = codeAddress;
|
|
_codeSize = codeSize;
|
|
}
|
|
|
|
public IProcessContext Create(KernelContext context, ulong pid, ulong addressSpaceSize, InvalidAccessHandler invalidAccessHandler, bool for64Bit)
|
|
{
|
|
IArmProcessContext processContext;
|
|
|
|
if (OperatingSystem.IsMacOS() && RuntimeInformation.ProcessArchitecture == Architecture.Arm64 && for64Bit && context.Device.Configuration.UseHypervisor)
|
|
{
|
|
var cpuEngine = new HvEngine(_tickSource);
|
|
var memoryManager = new HvMemoryManager(context.Memory, addressSpaceSize, invalidAccessHandler);
|
|
processContext = new ArmProcessContext<HvMemoryManager>(pid, cpuEngine, _gpu, memoryManager, addressSpaceSize, for64Bit);
|
|
}
|
|
else
|
|
{
|
|
MemoryManagerMode mode = context.Device.Configuration.MemoryManagerMode;
|
|
|
|
if (!MemoryBlock.SupportsFlags(MemoryAllocationFlags.ViewCompatible))
|
|
{
|
|
Logger.Warning?.Print(LogClass.Cpu, "Host system doesn't support views, falling back to software page table");
|
|
|
|
mode = MemoryManagerMode.SoftwarePageTable;
|
|
}
|
|
|
|
var cpuEngine = new JitEngine(_tickSource);
|
|
|
|
AddressSpace addressSpace = null;
|
|
|
|
if (mode == MemoryManagerMode.HostMapped || mode == MemoryManagerMode.HostMappedUnsafe)
|
|
{
|
|
if (!AddressSpace.TryCreate(context.Memory, addressSpaceSize, MemoryBlock.GetPageSize() == MemoryManagerHostMapped.PageSize, out addressSpace))
|
|
{
|
|
Logger.Warning?.Print(LogClass.Cpu, "Address space creation failed, falling back to software page table");
|
|
|
|
mode = MemoryManagerMode.SoftwarePageTable;
|
|
}
|
|
}
|
|
|
|
switch (mode)
|
|
{
|
|
case MemoryManagerMode.SoftwarePageTable:
|
|
var memoryManager = new MemoryManager(context.Memory, addressSpaceSize, invalidAccessHandler);
|
|
processContext = new ArmProcessContext<MemoryManager>(pid, cpuEngine, _gpu, memoryManager, addressSpaceSize, for64Bit);
|
|
break;
|
|
|
|
case MemoryManagerMode.HostMapped:
|
|
case MemoryManagerMode.HostMappedUnsafe:
|
|
if (addressSpaceSize != addressSpace.AddressSpaceSize)
|
|
{
|
|
Logger.Warning?.Print(LogClass.Emulation, $"Allocated address space (0x{addressSpace.AddressSpaceSize:X}) is smaller than guest application requirements (0x{addressSpaceSize:X})");
|
|
}
|
|
|
|
var memoryManagerHostMapped = new MemoryManagerHostMapped(addressSpace, mode == MemoryManagerMode.HostMappedUnsafe, invalidAccessHandler);
|
|
processContext = new ArmProcessContext<MemoryManagerHostMapped>(pid, cpuEngine, _gpu, memoryManagerHostMapped, addressSpace.AddressSpaceSize, for64Bit);
|
|
break;
|
|
|
|
default:
|
|
throw new InvalidOperationException($"{nameof(mode)} contains an invalid value: {mode}");
|
|
}
|
|
}
|
|
|
|
DiskCacheLoadState = processContext.Initialize(_titleIdText, _displayVersion, _diskCacheEnabled, _codeAddress, _codeSize);
|
|
|
|
return processContext;
|
|
}
|
|
}
|
|
}
|