Formatting
This commit is contained in:
parent
652423cfeb
commit
5f5cb73baa
13 changed files with 21 additions and 21 deletions
|
@ -1,6 +1,6 @@
|
||||||
namespace Ryujinx.Cpu.AppleHv.Arm
|
namespace Ryujinx.Cpu.AppleHv.Arm
|
||||||
{
|
{
|
||||||
enum ExceptionLevel: uint
|
enum ExceptionLevel : uint
|
||||||
{
|
{
|
||||||
PstateMask = 0xfffffff0,
|
PstateMask = 0xfffffff0,
|
||||||
EL1h = 0b0101,
|
EL1h = 0b0101,
|
||||||
|
|
|
@ -269,7 +269,7 @@ namespace Ryujinx.Cpu.AppleHv
|
||||||
case ExceptionClass.SoftwareStepLowerEl:
|
case ExceptionClass.SoftwareStepLowerEl:
|
||||||
HvApi.hv_vcpu_get_sys_reg(vcpuHandle, HvSysReg.SPSR_EL1, out ulong spsr).ThrowOnError();
|
HvApi.hv_vcpu_get_sys_reg(vcpuHandle, HvSysReg.SPSR_EL1, out ulong spsr).ThrowOnError();
|
||||||
spsr &= ~((ulong)(1 << 21));
|
spsr &= ~((ulong)(1 << 21));
|
||||||
HvApi.hv_vcpu_set_sys_reg(vcpuHandle, HvSysReg.SPSR_EL1, spsr).ThrowOnError();
|
HvApi.hv_vcpu_set_sys_reg(vcpuHandle, HvSysReg.SPSR_EL1, spsr).ThrowOnError();
|
||||||
HvApi.hv_vcpu_set_sys_reg(vcpuHandle, HvSysReg.MDSCR_EL1, 0);
|
HvApi.hv_vcpu_set_sys_reg(vcpuHandle, HvSysReg.MDSCR_EL1, 0);
|
||||||
ReturnToPool(vcpu);
|
ReturnToPool(vcpu);
|
||||||
StepBarrier.SignalAndWait();
|
StepBarrier.SignalAndWait();
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
using ARMeilleure.State;
|
using ARMeilleure.State;
|
||||||
using Ryujinx.Common;
|
using Ryujinx.Common;
|
||||||
using Ryujinx.Common.Logging;
|
using Ryujinx.Common.Logging;
|
||||||
using Ryujinx.Memory;
|
|
||||||
using Ryujinx.HLE.HOS.Kernel;
|
using Ryujinx.HLE.HOS.Kernel;
|
||||||
using Ryujinx.HLE.HOS.Kernel.Threading;
|
using Ryujinx.HLE.HOS.Kernel.Threading;
|
||||||
|
using Ryujinx.Memory;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Concurrent;
|
using System.Collections.Concurrent;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
@ -151,13 +151,13 @@ namespace Ryujinx.HLE.Debugger
|
||||||
WriteStream.WriteByte((byte)'-');
|
WriteStream.WriteByte((byte)'-');
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CommandMessage {Command: var cmd}:
|
case CommandMessage { Command: var cmd }:
|
||||||
Logger.Debug?.Print(LogClass.GdbStub, $"Received Command: {cmd}");
|
Logger.Debug?.Print(LogClass.GdbStub, $"Received Command: {cmd}");
|
||||||
WriteStream.WriteByte((byte)'+');
|
WriteStream.WriteByte((byte)'+');
|
||||||
ProcessCommand(cmd);
|
ProcessCommand(cmd);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case ThreadBreakMessage {Context: var ctx}:
|
case ThreadBreakMessage { Context: var ctx }:
|
||||||
DebugProcess.DebugStop();
|
DebugProcess.DebugStop();
|
||||||
Reply($"T05thread:{ctx.ThreadUid:x};");
|
Reply($"T05thread:{ctx.ThreadUid:x};");
|
||||||
break;
|
break;
|
||||||
|
@ -353,7 +353,7 @@ namespace Ryujinx.HLE.Debugger
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
unknownCommand:
|
unknownCommand:
|
||||||
Logger.Notice.Print(LogClass.GdbStub, $"Unknown command: {cmd}");
|
Logger.Notice.Print(LogClass.GdbStub, $"Unknown command: {cmd}");
|
||||||
Reply("");
|
Reply("");
|
||||||
break;
|
break;
|
||||||
|
@ -654,7 +654,7 @@ namespace Ryujinx.HLE.Debugger
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
eof:
|
eof:
|
||||||
Logger.Notice.Print(LogClass.GdbStub, "GDB client lost connection");
|
Logger.Notice.Print(LogClass.GdbStub, "GDB client lost connection");
|
||||||
ReadStream.Close();
|
ReadStream.Close();
|
||||||
ReadStream = null;
|
ReadStream = null;
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
using Ryujinx.Memory;
|
using Ryujinx.HLE.HOS.Kernel.Threading;
|
||||||
using Ryujinx.HLE.HOS.Kernel.Threading;
|
using Ryujinx.Memory;
|
||||||
|
|
||||||
namespace Ryujinx.HLE.Debugger
|
namespace Ryujinx.HLE.Debugger
|
||||||
{
|
{
|
||||||
|
|
|
@ -106,4 +106,4 @@ namespace Ryujinx.HLE.Debugger
|
||||||
return Position >= Data.Length;
|
return Position >= Data.Length;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -964,4 +964,4 @@ namespace Ryujinx.HLE.FileSystem
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -169,7 +169,7 @@ namespace Ryujinx.HLE
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public Action RefreshInputConfig { internal get; set; }
|
public Action RefreshInputConfig { internal get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Enables gdbstub to allow for debugging of the guest .
|
/// Enables gdbstub to allow for debugging of the guest .
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool EnableGdbStub { get; internal set; }
|
public bool EnableGdbStub { get; internal set; }
|
||||||
|
@ -205,8 +205,8 @@ namespace Ryujinx.HLE
|
||||||
bool useHypervisor,
|
bool useHypervisor,
|
||||||
string multiplayerLanInterfaceId,
|
string multiplayerLanInterfaceId,
|
||||||
MultiplayerMode multiplayerMode,
|
MultiplayerMode multiplayerMode,
|
||||||
bool enableGdbStub,
|
bool enableGdbStub,
|
||||||
ushort gdbStubPort)
|
ushort gdbStubPort)
|
||||||
{
|
{
|
||||||
VirtualFileSystem = virtualFileSystem;
|
VirtualFileSystem = virtualFileSystem;
|
||||||
LibHacHorizonManager = libHacHorizonManager;
|
LibHacHorizonManager = libHacHorizonManager;
|
||||||
|
|
|
@ -14,4 +14,4 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
|
||||||
void Execute(IExecutionContext context, ulong codeAddress);
|
void Execute(IExecutionContext context, ulong codeAddress);
|
||||||
void InvalidateCacheRegion(ulong address, ulong size);
|
void InvalidateCacheRegion(ulong address, ulong size);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,4 +34,4 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,4 +36,4 @@ namespace Ryujinx.Tests.Cpu
|
||||||
_translator.InvalidateJitCacheRegion(address, size);
|
_translator.InvalidateJitCacheRegion(address, size);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -426,4 +426,4 @@ namespace Ryujinx.UI.Common.Configuration
|
||||||
JsonHelper.SerializeToFile(path, this, ConfigurationFileFormatSettings.SerializerContext.ConfigurationFileFormat);
|
JsonHelper.SerializeToFile(path, this, ConfigurationFileFormatSettings.SerializerContext.ConfigurationFileFormat);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1476,7 +1476,7 @@ namespace Ryujinx.UI.Common.Configuration
|
||||||
Ryujinx.Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 38.");
|
Ryujinx.Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 38.");
|
||||||
|
|
||||||
configurationFileFormat.EnableGdbStub = false;
|
configurationFileFormat.EnableGdbStub = false;
|
||||||
configurationFileFormat.GdbStubPort = 55555;
|
configurationFileFormat.GdbStubPort = 55555;
|
||||||
|
|
||||||
configurationFileUpdated = true;
|
configurationFileUpdated = true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -270,7 +270,7 @@ namespace Ryujinx.Ava.UI.ViewModels
|
||||||
ConfigurationState.Instance.Debug.EnableGdbStub.Value = _enableGDBStub;
|
ConfigurationState.Instance.Debug.EnableGdbStub.Value = _enableGDBStub;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public ushort GDBStubPort
|
public ushort GDBStubPort
|
||||||
{
|
{
|
||||||
get => _gdbStubPort;
|
get => _gdbStubPort;
|
||||||
|
@ -496,7 +496,7 @@ namespace Ryujinx.Ava.UI.ViewModels
|
||||||
|
|
||||||
// Multiplayer
|
// Multiplayer
|
||||||
MultiplayerModeIndex = (int)config.Multiplayer.Mode.Value;
|
MultiplayerModeIndex = (int)config.Multiplayer.Mode.Value;
|
||||||
|
|
||||||
// Debug
|
// Debug
|
||||||
EnableGdbStub = config.Debug.EnableGdbStub.Value;
|
EnableGdbStub = config.Debug.EnableGdbStub.Value;
|
||||||
GDBStubPort = config.Debug.GdbStubPort.Value;
|
GDBStubPort = config.Debug.GdbStubPort.Value;
|
||||||
|
|
Loading…
Reference in a new issue