ShuriZma
/
Ryujinx
mirror of https://github.com/Ryujinx/Ryujinx.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Settings option for suspending application on start

This commit is contained in:
svc64 2023-12-20 20:52:46 +02:00
parent eea36e8a37
commit 1bf244173d
14 changed files with 81 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Ryujinx.Gtk3/UI/MainWindow.cs
View File

@ -679,7 +679,8 @@ namespace Ryujinx.UI
ConfigurationState.Instance.Multiplayer.LanInterfaceId.Value,
ConfigurationState.Instance.Multiplayer.Mode,
ConfigurationState.Instance.Debug.EnableGdbStub,
ConfigurationState.Instance.Debug.GdbStubPort);
ConfigurationState.Instance.Debug.GdbStubPort,
ConfigurationState.Instance.Debug.DebuggerSuspendOnStart);
_emulationContext = new HLE.Switch(configuration);
}

7
src/Ryujinx.Gtk3/UI/Windows/SettingsWindow.cs
View File

@ -118,6 +118,7 @@ namespace Ryujinx.UI.Windows
[GUI] ToggleButton _configureController8;
[GUI] ToggleButton _configureControllerH;
[GUI] ToggleButton _gdbStubToggle;
[GUI] ToggleButton _suspendOnStartToggle;
[GUI] Adjustment _gdbStubPortSpinAdjustment;
#pragma warning restore CS0649, IDE0044
@ -322,6 +323,11 @@ namespace Ryujinx.UI.Windows
_gdbStubToggle.Click();
}
if (ConfigurationState.Instance.Debug.DebuggerSuspendOnStart)
{
_suspendOnStartToggle.Click();
}
// Custom EntryCompletion Columns. If added to glade, need to override more signals
ListStore tzList = new(typeof(string), typeof(string), typeof(string));
_systemTimeZoneCompletion.Model = tzList;
@ -668,6 +674,7 @@ namespace Ryujinx.UI.Windows
ConfigurationState.Instance.Graphics.ScalingFilterLevel.Value = (int)_scalingFilterLevel.Value;
ConfigurationState.Instance.Multiplayer.LanInterfaceId.Value = _multiLanSelect.ActiveId;
ConfigurationState.Instance.Debug.EnableGdbStub.Value = _gdbStubToggle.Active;
ConfigurationState.Instance.Debug.DebuggerSuspendOnStart.Value = _suspendOnStartToggle.Active;
ConfigurationState.Instance.Debug.GdbStubPort.Value = (ushort)_gdbStubPortSpinAdjustment.Value;
_previousVolumeLevel = ConfigurationState.Instance.System.AudioVolume.Value;

18
src/Ryujinx.Gtk3/UI/Windows/SettingsWindow.glade
View File

@ -3252,6 +3252,24 @@
<property name="position">9</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="_suspendOnStartToggle">
<property name="label" translatable="yes">Suspend application on start</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="tooltip-text" translatable="yes">Suspends the application before executing the first instruction, allowing for debugging from the earliest point.</property>
<property name="halign">start</property>
<property name="margin-top">5</property>
<property name="margin-bottom">5</property>
<property name="draw-indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>

4
src/Ryujinx.HLE/Debugger/Debugger.cs
View File

@ -21,6 +21,7 @@ namespace Ryujinx.HLE.Debugger
internal Switch Device { get; private set; }
public ushort GdbStubPort { get; private set; }
public bool SuspendOnStart { get; private set; }
private TcpListener ListenerSocket;
private Socket ClientSocket = null;
@ -34,10 +35,11 @@ namespace Ryujinx.HLE.Debugger
private ulong? cThread;
private ulong? gThread;
public Debugger(Switch device, ushort port)
public Debugger(Switch device, ushort port, bool suspendOnStart)
{
Device = device;
GdbStubPort = port;
SuspendOnStart = suspendOnStart;
ARMeilleure.Optimizations.EnableDebugging = true;

9
src/Ryujinx.HLE/HLEConfiguration.cs
View File

@ -179,6 +179,11 @@ namespace Ryujinx.HLE
/// </summary>
public ushort GdbStubPort { get; internal set; }
/// <summary>
/// Suspend execution when starting an application
/// </summary>
public bool DebuggerSuspendOnStart { get; internal set; }
public HLEConfiguration(VirtualFileSystem virtualFileSystem,
LibHacHorizonManager libHacHorizonManager,
ContentManager contentManager,
@ -206,7 +211,8 @@ namespace Ryujinx.HLE
string multiplayerLanInterfaceId,
MultiplayerMode multiplayerMode,
bool enableGdbStub,
ushort gdbStubPort)
ushort gdbStubPort,
bool debuggerSuspendOnStart)
{
VirtualFileSystem = virtualFileSystem;
LibHacHorizonManager = libHacHorizonManager;
@ -236,6 +242,7 @@ namespace Ryujinx.HLE
MultiplayerMode = multiplayerMode;
EnableGdbStub = enableGdbStub;
GdbStubPort = gdbStubPort;
DebuggerSuspendOnStart = debuggerSuspendOnStart;
}
}
}

2
src/Ryujinx.HLE/Switch.cs
View File

@ -54,7 +54,7 @@ namespace Ryujinx.HLE
AudioDeviceDriver = new CompatLayerHardwareDeviceDriver(Configuration.AudioDeviceDriver);
Memory = new MemoryBlock(Configuration.MemoryConfiguration.ToDramSize(), memoryAllocationFlags);
Gpu = new GpuContext(Configuration.GpuRenderer);
Debugger = Configuration.EnableGdbStub ? new Debugger.Debugger(this, Configuration.GdbStubPort) : null;
Debugger = Configuration.EnableGdbStub ? new Debugger.Debugger(this, Configuration.GdbStubPort, Configuration.DebuggerSuspendOnStart) : null;
System = new HOS.Horizon(this);
Statistics = new PerformanceStatistics();
Hid = new Hid(this, System.HidStorage);

3
src/Ryujinx.Headless.SDL2/Options.cs
View File

@ -233,6 +233,9 @@ namespace Ryujinx.Headless.SDL2
[Option("gdb-stub-port", Required = false, Default = 55555, HelpText = "Specifies which TCP port the GDB stub listens on.")]
public ushort GdbStubPort { get; set; }
[Option("suspend-on-start", Required = false, Default = false, HelpText = "Suspend execution when starting an application.")]
public bool DebuggerSuspendOnStart { get; set; }
// Values
[Value(0, MetaName = "input", HelpText = "Input to load.", Required = true)]

3
src/Ryujinx.Headless.SDL2/Program.cs
View File

@ -573,7 +573,8 @@ namespace Ryujinx.Headless.SDL2
options.MultiplayerLanInterfaceId,
Common.Configuration.Multiplayer.MultiplayerMode.Disabled,
options.EnableGdbStub,
options.GdbStubPort);
options.GdbStubPort,
options.DebuggerSuspendOnStart);
return new Switch(configuration);
}

5
src/Ryujinx.UI.Common/Configuration/ConfigurationFileFormat.cs
View File

@ -396,6 +396,11 @@ namespace Ryujinx.UI.Common.Configuration
/// </summary>
public ushort GdbStubPort { get; set; }
/// <summary>
/// Which TCP port should the GDB stub listen on
/// </summary>
public ushort DebuggerSuspendOnStart { get; set; }
/// <summary>
/// Loads a configuration file from disk
/// </summary>

7
src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs
View File

@ -592,12 +592,19 @@ namespace Ryujinx.UI.Common.Configuration
/// </summary>
public ReactiveObject<ushort> GdbStubPort { get; private set; }
/// <summary>
/// Suspend execution when starting an application
/// </summary>
public ReactiveObject<bool> DebuggerSuspendOnStart { get; private set; }
public DebugSection()
{
EnableGdbStub = new ReactiveObject<bool>();
EnableGdbStub.Event += static (sender, e) => LogValueChange(e, nameof(EnableGdbStub));
GdbStubPort = new ReactiveObject<ushort>();
GdbStubPort.Event += static (sender, e) => LogValueChange(e, nameof(GdbStubPort));
DebuggerSuspendOnStart = new ReactiveObject<bool>();
DebuggerSuspendOnStart.Event += static (sender, e) => LogValueChange(e, nameof(DebuggerSuspendOnStart));
}
}

3
src/Ryujinx/AppHost.cs
View File

@ -871,7 +871,8 @@ namespace Ryujinx.Ava
ConfigurationState.Instance.Multiplayer.LanInterfaceId.Value,
ConfigurationState.Instance.Multiplayer.Mode,
ConfigurationState.Instance.Debug.EnableGdbStub.Value,
ConfigurationState.Instance.Debug.GdbStubPort.Value);
ConfigurationState.Instance.Debug.GdbStubPort.Value,
ConfigurationState.Instance.Debug.DebuggerSuspendOnStart.Value);
Device = new Switch(configuration);
}

6
src/Ryujinx/Assets/Locales/en_US.json
View File

@ -783,7 +783,9 @@
"MultiplayerModeLdnMitm": "ldn_mitm",
"SettingsTabDebug": "Debug",
"SettingsTabDebugTitle": "Debug (WARNING: For developer use only)",
"SettingsTabDebugEnableGDBStub": "Enable GDB Stub",
"EnableGDBStub": "Enable GDB Stub",
"GDBStubToggleTooltip": "Enables the GDB stub which makes it possible to debug the running application. For development use only!",
"GDBStubPort": "GDB stub port:"
"GDBStubPort": "GDB stub port:",
"DebuggerSuspendOnStart": "Suspend application on start",
"DebuggerSuspendOnStartTooltip": "Suspends the application before executing the first instruction, allowing for debugging from the earliest point."
}

11
src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
View File

@ -56,6 +56,7 @@ namespace Ryujinx.Ava.UI.ViewModels
private int _multiplayerModeIndex;
private bool _enableGDBStub;
private ushort _gdbStubPort;
private bool _debuggerSuspendOnStart;
public int ResolutionScale
{
@ -281,6 +282,16 @@ namespace Ryujinx.Ava.UI.ViewModels
}
}
public bool DebuggerSuspendOnStart
{
get => _debuggerSuspendOnStart;
set
{
_debuggerSuspendOnStart = value;
ConfigurationState.Instance.Debug.DebuggerSuspendOnStart.Value = _debuggerSuspendOnStart;
}
}
public SettingsViewModel(VirtualFileSystem virtualFileSystem, ContentManager contentManager) : this()
{
_virtualFileSystem = virtualFileSystem;

9
src/Ryujinx/UI/Views/Settings/SettingsDebugView.axaml
View File

@ -30,7 +30,7 @@
HorizontalAlignment="Stretch"
Orientation="Vertical">
<CheckBox IsChecked="{Binding EnableGdbStub}">
<TextBlock Text="{locale:Locale SettingsTabDebugEnableGDBStub}"
<TextBlock Text="{locale:Locale EnableGDBStub}"
ToolTip.Tip="{locale:Locale GDBStubToggleTooltip}" />
</CheckBox>
</StackPanel>
@ -48,6 +48,13 @@
Minimum="1024"
Maximum="65535" />
</StackPanel>
<StackPanel
Orientation="Horizontal">
<CheckBox IsChecked="{Binding DebuggerSuspendOnStart}">
<TextBlock Text="{locale:Locale DebuggerSuspendOnStart}"
ToolTip.Tip="{locale:Locale DebuggerSuspendOnStartTooltip}" />
</CheckBox>
</StackPanel>
</StackPanel>
</Border>
</ScrollViewer>