mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-08-18 14:48:44 +02:00
* Refactoring of KMemoryManager class * Replace some trivial uses of DRAM address with VA * Get rid of GetDramAddressFromVa * Abstracting more operations on derived page table class * Run auto-format on KPageTableBase * Managed to make TryConvertVaToPa private, few uses remains now * Implement guest physical pages ref counting, remove manual freeing * Make DoMmuOperation private and call new abstract methods only from the base class * Pass pages count rather than size on Map/UnmapMemory * Change memory managers to take host pointers * Fix a guest memory leak and simplify KPageTable * Expose new methods for host range query and mapping * Some refactoring of MapPagesFromClientProcess to allow proper page ref counting and mapping without KPageLists * Remove more uses of AddVaRangeToPageList, now only one remains (shared memory page checking) * Add a SharedMemoryStorage class, will be useful for host mapping * Sayonara AddVaRangeToPageList, you served us well * Start to implement host memory mapping (WIP) * Support memory tracking through host exception handling * Fix some access violations from HLE service guest memory access and CPU * Fix memory tracking * Fix mapping list bugs, including a race and a error adding mapping ranges * Simple page table for memory tracking * Simple "volatile" region handle mode * Update UBOs directly (experimental, rough) * Fix the overlap check * Only set non-modified buffers as volatile * Fix some memory tracking issues * Fix possible race in MapBufferFromClientProcess (block list updates were not locked) * Write uniform update to memory immediately, only defer the buffer set. * Fix some memory tracking issues * Pass correct pages count on shared memory unmap * Armeilleure Signal Handler v1 + Unix changes Unix currently behaves like windows, rather than remapping physical * Actually check if the host platform is unix * Fix decommit on linux. * Implement windows 10 placeholder shared memory, fix a buffer issue. * Make PTC version something that will never match with master * Remove testing variable for block count * Add reference count for memory manager, fix dispose Can still deadlock with OpenAL * Add address validation, use page table for mapped check, add docs Might clean up the page table traversing routines. * Implement batched mapping/tracking. * Move documentation, fix tests. * Cleanup uniform buffer update stuff. * Remove unnecessary assignment. * Add unsafe host mapped memory switch On by default. Would be good to turn this off for untrusted code (homebrew, exefs mods) and give the user the option to turn it on manually, though that requires some UI work. * Remove C# exception handlers They have issues due to current .NET limitations, so the meilleure one fully replaces them for now. * Fix MapPhysicalMemory on the software MemoryManager. * Null check for GetHostAddress, docs * Add configuration for setting memory manager mode (not in UI yet) * Add config to UI * Fix type mismatch on Unix signal handler code emit * Fix 6GB DRAM mode. The size can be greater than `uint.MaxValue` when the DRAM is >4GB. * Address some feedback. * More detailed error if backing memory cannot be mapped. * SetLastError on all OS functions for consistency * Force pages dirty with UBO update instead of setting them directly. Seems to be much faster across a few games. Need retesting. * Rebase, configuration rework, fix mem tracking regression * Fix race in FreePages * Set memory managers null after decrementing ref count * Remove readonly keyword, as this is now modified. * Use a local variable for the signal handler rather than a register. * Fix bug with buffer resize, and index/uniform buffer binding. Should fix flickering in games. * Add InvalidAccessHandler to MemoryTracking Doesn't do anything yet * Call invalid access handler on unmapped read/write. Same rules as the regular memory manager. * Make unsafe mapped memory its own MemoryManagerType * Move FlushUboDirty into UpdateState. * Buffer dirty cache, rather than ubo cache Much cleaner, may be reusable for Inline2Memory updates. * This doesn't return anything anymore. * Add sigaction remove methods, correct a few function signatures. * Return empty list of physical regions for size 0. * Also on AddressSpaceManager Co-authored-by: gdkchan <gab.dark.100@gmail.com>
187 lines
7.7 KiB
C#
187 lines
7.7 KiB
C#
using LibHac.FsSystem;
|
|
using Ryujinx.Audio.Integration;
|
|
using Ryujinx.Common;
|
|
using Ryujinx.Common.Configuration;
|
|
using Ryujinx.Common.Configuration.Hid;
|
|
using Ryujinx.Graphics.GAL;
|
|
using Ryujinx.HLE.FileSystem;
|
|
using Ryujinx.HLE.FileSystem.Content;
|
|
using Ryujinx.HLE.HOS;
|
|
using Ryujinx.HLE.HOS.Services.Account.Acc;
|
|
using Ryujinx.HLE.HOS.SystemState;
|
|
using System;
|
|
using System.Collections.Generic;
|
|
|
|
namespace Ryujinx.HLE
|
|
{
|
|
/// <summary>
|
|
/// HLE configuration.
|
|
/// </summary>
|
|
public class HLEConfiguration
|
|
{
|
|
/// <summary>
|
|
/// The virtual file system used by the FS service.
|
|
/// </summary>
|
|
/// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
|
|
internal readonly VirtualFileSystem VirtualFileSystem;
|
|
|
|
/// <summary>
|
|
/// The account manager used by the account service.
|
|
/// </summary>
|
|
/// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
|
|
internal readonly AccountManager AccountManager;
|
|
|
|
/// <summary>
|
|
/// The content manager used by the NCM service.
|
|
/// </summary>
|
|
/// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
|
|
internal readonly ContentManager ContentManager;
|
|
|
|
/// <summary>
|
|
/// The persistant information between run for multi-application capabilities.
|
|
/// </summary>
|
|
/// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
|
|
public readonly UserChannelPersistence UserChannelPersistence;
|
|
|
|
/// <summary>
|
|
/// The GPU renderer to use for all GPU operations.
|
|
/// </summary>
|
|
/// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
|
|
internal readonly IRenderer GpuRenderer;
|
|
|
|
/// <summary>
|
|
/// The audio device driver to use for all audio operations.
|
|
/// </summary>
|
|
/// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
|
|
internal readonly IHardwareDeviceDriver AudioDeviceDriver;
|
|
|
|
/// <summary>
|
|
/// The handler for various UI related operations needed outside of HLE.
|
|
/// </summary>
|
|
/// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
|
|
internal readonly IHostUiHandler HostUiHandler;
|
|
|
|
/// <summary>
|
|
/// Control the memory configuration used by the emulation context.
|
|
/// </summary>
|
|
/// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
|
|
internal readonly MemoryConfiguration MemoryConfiguration;
|
|
|
|
/// <summary>
|
|
/// The system language to use in the settings service.
|
|
/// </summary>
|
|
/// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
|
|
internal readonly SystemLanguage SystemLanguage;
|
|
|
|
/// <summary>
|
|
/// The system region to use in the settings service.
|
|
/// </summary>
|
|
/// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
|
|
internal readonly RegionCode Region;
|
|
|
|
/// <summary>
|
|
/// Control the initial state of the vertical sync in the SurfaceFlinger service.
|
|
/// </summary>
|
|
internal readonly bool EnableVsync;
|
|
|
|
/// <summary>
|
|
/// Control the initial state of the docked mode.
|
|
/// </summary>
|
|
internal readonly bool EnableDockedMode;
|
|
|
|
/// <summary>
|
|
/// Control if the Profiled Translation Cache (PTC) should be used.
|
|
/// </summary>
|
|
internal readonly bool EnablePtc;
|
|
|
|
/// <summary>
|
|
/// Control LibHac's integrity check level.
|
|
/// </summary>
|
|
/// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
|
|
internal readonly IntegrityCheckLevel FsIntegrityCheckLevel;
|
|
|
|
/// <summary>
|
|
/// Control LibHac's global access logging level. Value must be between 0 and 3.
|
|
/// </summary>
|
|
/// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
|
|
internal readonly int FsGlobalAccessLogMode;
|
|
|
|
/// <summary>
|
|
/// The system time offset to apply to the time service steady and local clocks.
|
|
/// </summary>
|
|
/// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
|
|
internal readonly long SystemTimeOffset;
|
|
|
|
/// <summary>
|
|
/// The system timezone used by the time service.
|
|
/// </summary>
|
|
/// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
|
|
internal readonly string TimeZone;
|
|
|
|
|
|
/// <summary>
|
|
/// </summary>
|
|
public MemoryManagerMode MemoryManagerMode { internal get; set; }
|
|
|
|
/// <summary>
|
|
/// Control the inital state of the ignore missing services setting.
|
|
/// If this is set to true, when a missing service is encountered, it will try to automatically handle it instead of throwing an exception.
|
|
/// </summary>
|
|
/// TODO: Update this again.
|
|
public bool IgnoreMissingServices { internal get; set; }
|
|
|
|
/// <summary>
|
|
/// Aspect Ratio applied to the renderer window by the SurfaceFlinger service.
|
|
/// </summary>
|
|
public AspectRatio AspectRatio { internal get; set; }
|
|
|
|
/// <summary>
|
|
/// An action called when HLE force a refresh of output after docked mode changed.
|
|
/// </summary>
|
|
public Action RefreshInputConfig { internal get; set; }
|
|
|
|
public HLEConfiguration(VirtualFileSystem virtualFileSystem,
|
|
ContentManager contentManager,
|
|
AccountManager accountManager,
|
|
UserChannelPersistence userChannelPersistence,
|
|
IRenderer gpuRenderer,
|
|
IHardwareDeviceDriver audioDeviceDriver,
|
|
MemoryConfiguration memoryConfiguration,
|
|
IHostUiHandler hostUiHandler,
|
|
SystemLanguage systemLanguage,
|
|
RegionCode region,
|
|
bool enableVsync,
|
|
bool enableDockedMode,
|
|
bool enablePtc,
|
|
IntegrityCheckLevel fsIntegrityCheckLevel,
|
|
int fsGlobalAccessLogMode,
|
|
long systemTimeOffset,
|
|
string timeZone,
|
|
MemoryManagerMode memoryManagerMode,
|
|
bool ignoreMissingServices,
|
|
AspectRatio aspectRatio)
|
|
{
|
|
VirtualFileSystem = virtualFileSystem;
|
|
AccountManager = accountManager;
|
|
ContentManager = contentManager;
|
|
UserChannelPersistence = userChannelPersistence;
|
|
GpuRenderer = gpuRenderer;
|
|
AudioDeviceDriver = audioDeviceDriver;
|
|
MemoryConfiguration = memoryConfiguration;
|
|
HostUiHandler = hostUiHandler;
|
|
SystemLanguage = systemLanguage;
|
|
Region = region;
|
|
EnableVsync = enableVsync;
|
|
EnableDockedMode = enableDockedMode;
|
|
EnablePtc = enablePtc;
|
|
FsIntegrityCheckLevel = fsIntegrityCheckLevel;
|
|
FsGlobalAccessLogMode = fsGlobalAccessLogMode;
|
|
SystemTimeOffset = systemTimeOffset;
|
|
TimeZone = timeZone;
|
|
MemoryManagerMode = memoryManagerMode;
|
|
IgnoreMissingServices = ignoreMissingServices;
|
|
AspectRatio = aspectRatio;
|
|
}
|
|
}
|
|
}
|