misc: Avoid copy of ApplicationControlProperty (#4849 )

Avoid more giant copy when passing it around.
Ava: Fix SystemTimeOffset calculation (#4848 )
2023-05-08 01:50:07 +02:00 · 2023-05-08 00:31:08 +02:00 · 2023-05-08 00:15:58 +02:00 · 2023-05-07 20:50:45 +00:00
9 changed files with 133 additions and 100 deletions
--- a/src/Ryujinx.Ava/UI/ViewModels/SettingsViewModel.cs
+++ b/src/Ryujinx.Ava/UI/ViewModels/SettingsViewModel.cs
@@ -238,8 +238,9 @@ namespace Ryujinx.Ava.UI.ViewModels
            }
        }

-        public DateTimeOffset DateOffset { get; set; }
-        public TimeSpan TimeOffset { get; set; }
+        public DateTimeOffset CurrentDate { get; set; }
+        public TimeSpan CurrentTime { get; set; }
+
        internal AvaloniaList<TimeZone> TimeZones { get; set; }
        public AvaloniaList<string> GameDirectories { get; set; }
        public ObservableCollection<ComboBoxItem> AvailableGpus { get; set; }
@@ -397,10 +398,11 @@ namespace Ryujinx.Ava.UI.ViewModels
            Language = (int)config.System.Language.Value;
            TimeZone = config.System.TimeZone;

-            DateTime dateTimeOffset = DateTime.Now.AddSeconds(config.System.SystemTimeOffset);
+            DateTime currentDateTime = DateTime.Now;
+
+            CurrentDate = currentDateTime.Date;
+            CurrentTime = currentDateTime.TimeOfDay.Add(TimeSpan.FromSeconds(config.System.SystemTimeOffset));

-            DateOffset = dateTimeOffset.Date;
-            TimeOffset = dateTimeOffset.TimeOfDay;
            EnableVsync = config.Graphics.EnableVsync;
            EnableFsIntegrityChecks = config.System.EnableFsIntegrityChecks;
            ExpandDramSize = config.System.ExpandRam;
@@ -487,9 +489,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                config.System.TimeZone.Value = TimeZone;
            }

-            TimeSpan systemTimeOffset = DateOffset - DateTime.Now;
-
-            config.System.SystemTimeOffset.Value = systemTimeOffset.Seconds;
+            config.System.SystemTimeOffset.Value = Convert.ToInt64((CurrentDate.ToUnixTimeSeconds() + CurrentTime.TotalSeconds) - DateTimeOffset.Now.ToUnixTimeSeconds());
            config.Graphics.EnableVsync.Value = EnableVsync;
            config.System.EnableFsIntegrityChecks.Value = EnableFsIntegrityChecks;
            config.System.ExpandRam.Value = ExpandDramSize;
--- a/src/Ryujinx.Ava/UI/Views/Settings/SettingsSystemView.axaml
+++ b/src/Ryujinx.Ava/UI/Views/Settings/SettingsSystemView.axaml
@@ -3,12 +3,12 @@
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    mc:Ignorable="d"
    x:CompileBindings="True"
-    x:DataType="viewModels:SettingsViewModel">
+    x:DataType="viewModels:SettingsViewModel"
+    mc:Ignorable="d">
    <Design.DataContext>
        <viewModels:SettingsViewModel />
    </Design.DataContext>
@@ -27,13 +27,15 @@
                <TextBlock Classes="h1" Text="{locale:Locale SettingsTabSystemCore}" />
                <StackPanel Margin="10,0,0,0" Orientation="Vertical">
                    <StackPanel Margin="0,0,0,10" Orientation="Horizontal">
-                        <TextBlock VerticalAlignment="Center"
-                                   Text="{locale:Locale SettingsTabSystemSystemRegion}"
-                                   Width="250" />
-                        <ComboBox SelectedIndex="{Binding Region}"
-                                  ToolTip.Tip="{locale:Locale RegionTooltip}"
-                                  HorizontalContentAlignment="Left"
-                                  Width="350">
+                        <TextBlock
+                            Width="250"
+                            VerticalAlignment="Center"
+                            Text="{locale:Locale SettingsTabSystemSystemRegion}" />
+                        <ComboBox
+                            Width="350"
+                            HorizontalContentAlignment="Left"
+                            SelectedIndex="{Binding Region}"
+                            ToolTip.Tip="{locale:Locale RegionTooltip}">
                            <ComboBoxItem>
                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionJapan}" />
                            </ComboBoxItem>
@@ -58,20 +60,21 @@
                        </ComboBox>
                    </StackPanel>
                    <StackPanel Margin="0,0,0,10" Orientation="Horizontal">
-                        <TextBlock VerticalAlignment="Center"
-                                   Text="{locale:Locale SettingsTabSystemSystemLanguage}"
-                                   ToolTip.Tip="{locale:Locale LanguageTooltip}"
-                                   Width="250" />
-                        <ComboBox SelectedIndex="{Binding Language}"
-                                  ToolTip.Tip="{locale:Locale LanguageTooltip}"
-                                  HorizontalContentAlignment="Left"
-                                  Width="350">
+                        <TextBlock
+                            Width="250"
+                            VerticalAlignment="Center"
+                            Text="{locale:Locale SettingsTabSystemSystemLanguage}"
+                            ToolTip.Tip="{locale:Locale LanguageTooltip}" />
+                        <ComboBox
+                            Width="350"
+                            HorizontalContentAlignment="Left"
+                            SelectedIndex="{Binding Language}"
+                            ToolTip.Tip="{locale:Locale LanguageTooltip}">
                            <ComboBoxItem>
                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageJapanese}" />
                            </ComboBoxItem>
                            <ComboBoxItem>
-                                <TextBlock
-                                    Text="{locale:Locale SettingsTabSystemSystemLanguageAmericanEnglish}" />
+                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageAmericanEnglish}" />
                            </ComboBoxItem>
                            <ComboBoxItem>
                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageFrench}" />
@@ -104,71 +107,67 @@
                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageTaiwanese}" />
                            </ComboBoxItem>
                            <ComboBoxItem>
-                                <TextBlock
-                                    Text="{locale:Locale SettingsTabSystemSystemLanguageBritishEnglish}" />
+                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageBritishEnglish}" />
                            </ComboBoxItem>
                            <ComboBoxItem>
-                                <TextBlock
-                                    Text="{locale:Locale SettingsTabSystemSystemLanguageCanadianFrench}" />
+                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageCanadianFrench}" />
                            </ComboBoxItem>
                            <ComboBoxItem>
-                                <TextBlock
-                                    Text="{locale:Locale SettingsTabSystemSystemLanguageLatinAmericanSpanish}" />
+                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageLatinAmericanSpanish}" />
                            </ComboBoxItem>
                            <ComboBoxItem>
-                                <TextBlock
-                                    Text="{locale:Locale SettingsTabSystemSystemLanguageSimplifiedChinese}" />
+                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageSimplifiedChinese}" />
                            </ComboBoxItem>
                            <ComboBoxItem>
-                                <TextBlock
-                                    Text="{locale:Locale SettingsTabSystemSystemLanguageTraditionalChinese}" />
+                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageTraditionalChinese}" />
                            </ComboBoxItem>
                            <ComboBoxItem>
-                                <TextBlock
-                                    Text="{locale:Locale SettingsTabSystemSystemLanguageBrazilianPortuguese}" />
+                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageBrazilianPortuguese}" />
                            </ComboBoxItem>
                        </ComboBox>
                    </StackPanel>
                    <StackPanel Margin="0,0,0,10" Orientation="Horizontal">
-                        <TextBlock VerticalAlignment="Center"
-                                   Text="{locale:Locale SettingsTabSystemSystemTimeZone}"
-                                   ToolTip.Tip="{locale:Locale TimezoneTooltip}"
-                                   Width="250" />
+                        <TextBlock
+                            Width="250"
+                            VerticalAlignment="Center"
+                            Text="{locale:Locale SettingsTabSystemSystemTimeZone}"
+                            ToolTip.Tip="{locale:Locale TimezoneTooltip}" />
                        <AutoCompleteBox
                            Name="TimeZoneBox"
                            Width="350"
-                            MaxDropDownHeight="500"
                            FilterMode="Contains"
                            Items="{Binding TimeZones}"
+                            MaxDropDownHeight="500"
                            SelectionChanged="TimeZoneBox_OnSelectionChanged"
                            Text="{Binding Path=TimeZone, Mode=OneWay}"
                            TextChanged="TimeZoneBox_OnTextChanged"
                            ToolTip.Tip="{locale:Locale TimezoneTooltip}" />
                    </StackPanel>
                    <StackPanel Margin="0,0,0,10" Orientation="Horizontal">
-                        <TextBlock VerticalAlignment="Center"
-                                   Text="{locale:Locale SettingsTabSystemSystemTime}"
-                                   ToolTip.Tip="{locale:Locale TimeTooltip}"
-                                   Width="250"/>
-                        <DatePicker VerticalAlignment="Center" SelectedDate="{Binding DateOffset}"
-                                    ToolTip.Tip="{locale:Locale TimeTooltip}"
-                                    Width="350" />
+                        <TextBlock
+                            Width="250"
+                            VerticalAlignment="Center"
+                            Text="{locale:Locale SettingsTabSystemSystemTime}"
+                            ToolTip.Tip="{locale:Locale TimeTooltip}" />
+                        <DatePicker
+                            Width="350"
+                            VerticalAlignment="Center"
+                            SelectedDate="{Binding CurrentDate}"
+                            ToolTip.Tip="{locale:Locale TimeTooltip}" />
                    </StackPanel>
                    <StackPanel Margin="250,0,0,10" Orientation="Horizontal">
                        <TimePicker
+                            Width="350"
                            VerticalAlignment="Center"
                            ClockIdentifier="24HourClock"
-                            SelectedTime="{Binding TimeOffset}"
-                            Width="350"
+                            SelectedTime="{Binding CurrentTime}"
                            ToolTip.Tip="{locale:Locale TimeTooltip}" />
                    </StackPanel>
                    <CheckBox IsChecked="{Binding EnableVsync}">
-                        <TextBlock Text="{locale:Locale SettingsTabSystemEnableVsync}"
-                                   ToolTip.Tip="{locale:Locale VSyncToggleTooltip}" />
+                        <TextBlock Text="{locale:Locale SettingsTabSystemEnableVsync}" ToolTip.Tip="{locale:Locale VSyncToggleTooltip}" />
                    </CheckBox>
                    <CheckBox IsChecked="{Binding EnableFsIntegrityChecks}">
-                        <TextBlock Text="{locale:Locale SettingsTabSystemEnableFsIntegrityChecks}"
-                                   ToolTip.Tip="{locale:Locale FsIntegrityToggleTooltip}" />
+                        <TextBlock Text="{locale:Locale SettingsTabSystemEnableFsIntegrityChecks}" ToolTip.Tip="{locale:Locale FsIntegrityToggleTooltip}" />
                    </CheckBox>
                </StackPanel>
                <Separator Height="1" />
@@ -180,12 +179,10 @@
                    Margin="10,0,0,0"
                    HorizontalAlignment="Stretch"
                    Orientation="Vertical">
-                    <CheckBox IsChecked="{Binding ExpandDramSize}"
-                              ToolTip.Tip="{locale:Locale DRamTooltip}">
+                    <CheckBox IsChecked="{Binding ExpandDramSize}" ToolTip.Tip="{locale:Locale DRamTooltip}">
                        <TextBlock Text="{locale:Locale SettingsTabSystemExpandDramSize}" />
                    </CheckBox>
-                    <CheckBox IsChecked="{Binding IgnoreMissingServices}"
-                              ToolTip.Tip="{locale:Locale IgnoreMissingServicesTooltip}">
+                    <CheckBox IsChecked="{Binding IgnoreMissingServices}" ToolTip.Tip="{locale:Locale IgnoreMissingServicesTooltip}">
                        <TextBlock Text="{locale:Locale SettingsTabSystemIgnoreMissingServices}" />
                    </CheckBox>
                </StackPanel>
--- a/src/Ryujinx.HLE/HOS/Horizon.cs
+++ b/src/Ryujinx.HLE/HOS/Horizon.cs
@@ -200,9 +200,10 @@ namespace Ryujinx.HLE.HOS

            LibHacHorizonManager = device.Configuration.LibHacHorizonManager;

+            // We hardcode a clock source id to avoid it changing between each start.
            // TODO: use set:sys (and get external clock source id from settings)
            // TODO: use "time!standard_steady_clock_rtc_update_interval_minutes" and implement a worker thread to be accurate.
-            UInt128 clockSourceId = UInt128Utils.CreateRandom();
+            UInt128 clockSourceId = new UInt128(0x36a0328702ce8bc1, 0x1608eaba02333284);
            IRtcManager.GetExternalRtcValue(out ulong rtcValue);

            // We assume the rtc is system time.
@@ -222,22 +223,22 @@ namespace Ryujinx.HLE.HOS
                internalOffset = internalOffset.AddSeconds(-3600L);
            }

-            internalOffset = new TimeSpanType(-internalOffset.NanoSeconds);
+            systemTime = new TimeSpanType(systemTime.NanoSeconds + internalOffset.NanoSeconds);

            // First init the standard steady clock
-            TimeServiceManager.Instance.SetupStandardSteadyClock(TickSource, clockSourceId, systemTime, internalOffset, TimeSpanType.Zero, false);
+            TimeServiceManager.Instance.SetupStandardSteadyClock(TickSource, clockSourceId, TimeSpanType.Zero, TimeSpanType.Zero, TimeSpanType.Zero, false);
            TimeServiceManager.Instance.SetupStandardLocalSystemClock(TickSource, new SystemClockContext(), systemTime.ToSeconds());
+            TimeServiceManager.Instance.StandardLocalSystemClock.GetClockContext(TickSource, out SystemClockContext localSytemClockContext);

            if (NxSettings.Settings.TryGetValue("time!standard_network_clock_sufficient_accuracy_minutes", out object standardNetworkClockSufficientAccuracyMinutes))
            {
                TimeSpanType standardNetworkClockSufficientAccuracy = new TimeSpanType((int)standardNetworkClockSufficientAccuracyMinutes * 60000000000);

                // The network system clock needs a valid system clock, as such we setup this system clock using the local system clock.
-                TimeServiceManager.Instance.StandardLocalSystemClock.GetClockContext(TickSource, out SystemClockContext localSytemClockContext);
                TimeServiceManager.Instance.SetupStandardNetworkSystemClock(localSytemClockContext, standardNetworkClockSufficientAccuracy);
            }

-            TimeServiceManager.Instance.SetupStandardUserSystemClock(TickSource, false, SteadyClockTimePoint.GetRandom());
+            TimeServiceManager.Instance.SetupStandardUserSystemClock(TickSource, true, localSytemClockContext.SteadyTimePoint);

            // FIXME: TimeZone should be init here but it's actually done in ContentManager

--- a/src/Ryujinx.HLE/HOS/Services/Time/Clock/Types/ContinuousAdjustmentTimePoint.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Time/Clock/Types/ContinuousAdjustmentTimePoint.cs
@@ -0,0 +1,13 @@
+using System.Runtime.InteropServices;
+
+namespace Ryujinx.HLE.HOS.Services.Time.Clock.Types
+{
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct ContinuousAdjustmentTimePoint
+    {
+        public ulong ClockOffset;
+        public long Multiplier;
+        public long DivisorLog2;
+        public SystemClockContext Context;
+    }
+}
--- a/src/Ryujinx.HLE/HOS/Services/Time/TimeSharedMemory.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Time/TimeSharedMemory.cs
@@ -1,8 +1,8 @@
 using Ryujinx.Cpu;
 using Ryujinx.HLE.HOS.Kernel.Memory;
 using Ryujinx.HLE.HOS.Services.Time.Clock;
+using Ryujinx.HLE.HOS.Services.Time.Clock.Types;
 using Ryujinx.HLE.HOS.Services.Time.Types;
-using Ryujinx.HLE.Utilities;
 using System;
 using System.Runtime.CompilerServices;
 using System.Threading;
@@ -16,10 +16,11 @@ namespace Ryujinx.HLE.HOS.Services.Time
        private SharedMemoryStorage _timeSharedMemoryStorage;
        private int                 _timeSharedMemorySize;

-        private const uint SteadyClockContextOffset         = 0x00;
-        private const uint LocalSystemClockContextOffset    = 0x38;
-        private const uint NetworkSystemClockContextOffset  = 0x80;
+        private const uint SteadyClockContextOffset = 0x00;
+        private const uint LocalSystemClockContextOffset = 0x38;
+        private const uint NetworkSystemClockContextOffset = 0x80;
        private const uint AutomaticCorrectionEnabledOffset = 0xC8;
+        private const uint ContinuousAdjustmentTimePointOffset = 0xD0;

        public void Initialize(Switch device, KSharedMemory sharedMemory, SharedMemoryStorage timeSharedMemoryStorage, int timeSharedMemorySize)
        {
@@ -39,15 +40,7 @@ namespace Ryujinx.HLE.HOS.Services.Time

        public void SetupStandardSteadyClock(ITickSource tickSource, UInt128 clockSourceId, TimeSpanType currentTimePoint)
        {
-            TimeSpanType ticksTimeSpan = TimeSpanType.FromTicks(tickSource.Counter, tickSource.Frequency);
-
-            SteadyClockContext context = new SteadyClockContext
-            {
-                InternalOffset = (ulong)(currentTimePoint.NanoSeconds - ticksTimeSpan.NanoSeconds),
-                ClockSourceId  = clockSourceId
-            };
-
-            WriteObjectToSharedMemory(SteadyClockContextOffset, 4, context);
+            UpdateSteadyClock(tickSource, clockSourceId, currentTimePoint);
        }

        public void SetAutomaticCorrectionEnabled(bool isAutomaticCorrectionEnabled)
@@ -58,10 +51,38 @@ namespace Ryujinx.HLE.HOS.Services.Time

        public void SetSteadyClockRawTimePoint(ITickSource tickSource, TimeSpanType currentTimePoint)
        {
-            SteadyClockContext context       = ReadObjectFromSharedMemory<SteadyClockContext>(SteadyClockContextOffset, 4);
-            TimeSpanType       ticksTimeSpan = TimeSpanType.FromTicks(tickSource.Counter, tickSource.Frequency);
+            SteadyClockContext context = ReadObjectFromSharedMemory<SteadyClockContext>(SteadyClockContextOffset, 4);

-            context.InternalOffset = (ulong)(currentTimePoint.NanoSeconds - ticksTimeSpan.NanoSeconds);
+            UpdateSteadyClock(tickSource, context.ClockSourceId, currentTimePoint);
+        }
+
+        private void UpdateSteadyClock(ITickSource tickSource, UInt128 clockSourceId, TimeSpanType currentTimePoint)
+        {
+            TimeSpanType ticksTimeSpan = TimeSpanType.FromTicks(tickSource.Counter, tickSource.Frequency);
+
+            ContinuousAdjustmentTimePoint adjustmentTimePoint = new ContinuousAdjustmentTimePoint
+            {
+                ClockOffset = (ulong)ticksTimeSpan.NanoSeconds,
+                Multiplier = 1,
+                DivisorLog2 = 0,
+                Context = new SystemClockContext
+                {
+                    Offset = 0,
+                    SteadyTimePoint = new SteadyClockTimePoint
+                    {
+                        ClockSourceId = clockSourceId,
+                        TimePoint = 0
+                    }
+                }
+            };
+
+            WriteObjectToSharedMemory(ContinuousAdjustmentTimePointOffset, 4, adjustmentTimePoint);
+
+            SteadyClockContext context = new SteadyClockContext
+            {
+                InternalOffset = (ulong)(currentTimePoint.NanoSeconds - ticksTimeSpan.NanoSeconds),
+                ClockSourceId = clockSourceId
+            };

            WriteObjectToSharedMemory(SteadyClockContextOffset, 4, context);
        }
--- a/src/Ryujinx.HLE/Loaders/Processes/Extensions/FileSystemExtensions.cs
+++ b/src/Ryujinx.HLE/Loaders/Processes/Extensions/FileSystemExtensions.cs
@@ -116,7 +116,7 @@ namespace Ryujinx.HLE.Loaders.Processes.Extensions
                device,
                device.System.KernelContext,
                metaLoader,
-                nacpData.Value,
+                nacpData,
                enablePtc,
                allowCodeMemoryForJit,
                programName,
--- a/src/Ryujinx.HLE/Loaders/Processes/ProcessLoader.cs
+++ b/src/Ryujinx.HLE/Loaders/Processes/ProcessLoader.cs
@@ -209,7 +209,7 @@ namespace Ryujinx.HLE.Loaders.Processes
            ProcessResult processResult = ProcessLoaderHelper.LoadNsos(_device,
                                                                       _device.System.KernelContext,
                                                                       dummyExeFs.GetNpdm(),
-                                                                       nacpData.Value,
+                                                                       nacpData,
                                                                       diskCacheEnabled: false,
                                                                       allowCodeMemoryForJit: true,
                                                                       programName,
--- a/src/Ryujinx.HLE/Loaders/Processes/ProcessLoaderHelper.cs
+++ b/src/Ryujinx.HLE/Loaders/Processes/ProcessLoaderHelper.cs
@@ -219,7 +219,7 @@ namespace Ryujinx.HLE.Loaders.Processes
            Switch device,
            KernelContext context,
            MetaLoader metaLoader,
-            ApplicationControlProperty applicationControlProperties,
+            BlitStruct<ApplicationControlProperty> applicationControlProperties,
            bool diskCacheEnabled,
            bool allowCodeMemoryForJit,
            string name,
@@ -355,7 +355,7 @@ namespace Ryujinx.HLE.Loaders.Processes
                context.Device.System.TickSource,
                context.Device.Gpu,
                $"{programId:x16}",
-                applicationControlProperties.DisplayVersionString.ToString(),
+                applicationControlProperties.Value.DisplayVersionString.ToString(),
                diskCacheEnabled,
                codeStart,
                codeSize);
--- a/src/Ryujinx.HLE/Loaders/Processes/ProcessResult.cs
+++ b/src/Ryujinx.HLE/Loaders/Processes/ProcessResult.cs
@@ -1,4 +1,5 @@
-using LibHac.Loader;
+using LibHac.Common;
+using LibHac.Loader;
 using LibHac.Ns;
 using Ryujinx.Common.Logging;
 using Ryujinx.Cpu;
@@ -9,9 +10,9 @@ using System.Linq;

 namespace Ryujinx.HLE.Loaders.Processes
 {
-    public struct ProcessResult
+    public class ProcessResult
    {
-        public static ProcessResult Failed => new(null, new ApplicationControlProperty(), false, false, null, 0, 0, 0, TitleLanguage.AmericanEnglish);
+        public static ProcessResult Failed => new(null, new BlitStruct<ApplicationControlProperty>(1), false, false, null, 0, 0, 0, TitleLanguage.AmericanEnglish);

        private readonly byte _mainThreadPriority;
        private readonly uint _mainThreadStackSize;
@@ -31,15 +32,15 @@ namespace Ryujinx.HLE.Loaders.Processes
        public readonly bool   AllowCodeMemoryForJit;

        public ProcessResult(
-            MetaLoader                 metaLoader,
-            ApplicationControlProperty applicationControlProperties,
-            bool                       diskCacheEnabled,
-            bool                       allowCodeMemoryForJit,
-            IDiskCacheLoadState        diskCacheLoadState,
-            ulong                      pid,
-            byte                       mainThreadPriority,
-            uint                       mainThreadStackSize,
-            TitleLanguage              titleLanguage)
+            MetaLoader                             metaLoader,
+            BlitStruct<ApplicationControlProperty> applicationControlProperties,
+            bool                                   diskCacheEnabled,
+            bool                                   allowCodeMemoryForJit,
+            IDiskCacheLoadState                    diskCacheLoadState,
+            ulong                                  pid,
+            byte                                   mainThreadPriority,
+            uint                                   mainThreadStackSize,
+            TitleLanguage                          titleLanguage)
        {
            _mainThreadPriority  = mainThreadPriority;
            _mainThreadStackSize = mainThreadStackSize;
@@ -48,7 +49,7 @@ namespace Ryujinx.HLE.Loaders.Processes
            ProcessId          = pid;

            MetaLoader                   = metaLoader;
-            ApplicationControlProperties = applicationControlProperties;
+            ApplicationControlProperties = applicationControlProperties.Value;

            if (metaLoader is not null)
            {
Author	SHA1	Message	Date
Mary	0e06aace45	misc: Avoid copy of ApplicationControlProperty (#4849 ) Avoid more giant copy when passing it around.	2023-05-08 01:50:07 +02:00
Ac_K	adf4ebcd60	Ava: Fix SystemTimeOffset calculation (#4848 ) * Ava: Fix SystemTimeOffset calculation During testing of #4822, Mary pointed out the way we calculate time offset is wrong in our Avalonia UI. This PR fixed that. The axaml file is autoformatted too. * DateTime.Now in local var	2023-05-08 00:31:08 +02:00
Mary	470a8031a4	time: Update for 15.0.0 changes and fixes long standing issues (#4822 ) * time: Update for 15.0.0 changes Last time we did an upgrade on the time service was during 9.x era, it was about time to take back that reverse again! 15.0.0 added a new structure on the shared memory to get steady clock raw timepoints with a granularity in nanoseconds. This commit implements this new part. I plan to write a follow up with a bit of refactoring of this ancient part of the emulator. As always, reverse and work done by your truly. PS: As a reminder, if this change is reused anywhere else, work should be credited as Ryujinx and not my person. * time: Do not set setup value to posix time This should fix local and network clock returning 0 under usage with shared memory. This probably fix #2430. * Address gdkchan's comment * Fix internal offset not working since changes and ensure that user clock have a valid clock id * time: Report auto correcting clock and hardcode steady clock unique id Fix Pokemon Sword Pokejobs for real. * Address gdkchan's comment	2023-05-08 00:15:58 +02:00
Mary	5440d4ad5c	misc: Switch ProcessResult to a class (#4846 ) This avoid giant copies being performed when being returned or passed.	2023-05-07 20:50:45 +00:00