Settings option for suspending application on start

src/Ryujinx.Gtk3/UI/MainWindow.cs

@@ -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);
         }

src/Ryujinx.Gtk3/UI/Windows/SettingsWindow.cs

@@ -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;

src/Ryujinx.Gtk3/UI/Windows/SettingsWindow.glade

@@ -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>

src/Ryujinx.HLE/Debugger/Debugger.cs

@@ -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;
 

src/Ryujinx.HLE/HLEConfiguration.cs

@@ -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;
         }
     }
 }

src/Ryujinx.HLE/Switch.cs

@@ -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);

src/Ryujinx.Headless.SDL2/Options.cs

@@ -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)]

src/Ryujinx.Headless.SDL2/Program.cs

@@ -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);
         }

src/Ryujinx.UI.Common/Configuration/ConfigurationFileFormat.cs

@@ -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>

src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs

@@ -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));
             }
         }
 

src/Ryujinx/AppHost.cs

@@ -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);
         }

src/Ryujinx/Assets/Locales/en_US.json

@@ -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."
 }

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -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;

src/Ryujinx/UI/Views/Settings/SettingsDebugView.axaml

@@ -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>