diff options
| author | TSRBerry <20988865+TSRBerry@users.noreply.github.com> | 2023-07-01 04:18:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-01 02:18:52 +0000 |
| commit | 79a1314ee45ea346efc0078d9338ae88e12d07a5 (patch) | |
| tree | 32a9d565db19399eaec1fc270a33726f8af55b8a /src/Ryujinx.Cpu/AppleHv/HvExecutionContext.cs | |
| parent | e9848339ddac3d6fe32a0ce0fbe6029c4ad40429 (diff) | |
[Ryujinx.Cpu] Address dotnet-format issues (#5365)1.1.944
* dotnet format style --severity info
Some changes were manually reverted.
* dotnet format analyzers --serverity info
Some changes have been minimally adapted.
* Restore a few unused methods and variables
* Silence dotnet format IDE0060 warnings
* Silence dotnet format IDE0052 warnings
* Silence dotnet format IDE0059 warnings
* Address or silence dotnet format IDE1006 warnings
* Address dotnet format CA1816 warnings
* Address most dotnet format whitespace warnings
* Run dotnet format after rebase and remove unused usings
- analyzers
- style
- whitespace
* Add comments to disabled warnings
* Remove a few unused parameters
* Adjust namespaces
* Simplify properties and array initialization, Use const when possible, Remove trailing commas
* Start working on disabled warnings
* Fix and silence a few dotnet-format warnings again
* Address a few disabled IDE0060 warnings
* Silence IDE0060 in .editorconfig
* Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas"
This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e.
* dotnet format whitespace after rebase
* Address review feedback
* Remove redundant unsafe modifiers
* Fix build issues
* Add GC.SuppressFinalize() call
* Add trailing commas and fix naming rule violations
* Remove unused members and assignments
Diffstat (limited to 'src/Ryujinx.Cpu/AppleHv/HvExecutionContext.cs')
| -rw-r--r-- | src/Ryujinx.Cpu/AppleHv/HvExecutionContext.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/Ryujinx.Cpu/AppleHv/HvExecutionContext.cs b/src/Ryujinx.Cpu/AppleHv/HvExecutionContext.cs index dc1f6f6d..2c9afdc4 100644 --- a/src/Ryujinx.Cpu/AppleHv/HvExecutionContext.cs +++ b/src/Ryujinx.Cpu/AppleHv/HvExecutionContext.cs @@ -125,17 +125,17 @@ namespace Ryujinx.Cpu.AppleHv { HvVcpu vcpu = HvVcpuPool.Instance.Create(memoryManager.AddressSpace, _shadowContext, SwapContext); - HvApi.hv_vcpu_set_reg(vcpu.Handle, hv_reg_t.HV_REG_PC, address).ThrowOnError(); + HvApi.hv_vcpu_set_reg(vcpu.Handle, HvReg.PC, address).ThrowOnError(); while (Running) { HvApi.hv_vcpu_run(vcpu.Handle).ThrowOnError(); - uint reason = vcpu.ExitInfo->reason; + uint reason = vcpu.ExitInfo->Reason; if (reason == 1) { - uint hvEsr = (uint)vcpu.ExitInfo->exception.syndrome; + uint hvEsr = (uint)vcpu.ExitInfo->Exception.Syndrome; ExceptionClass hvEc = (ExceptionClass)(hvEsr >> 26); if (hvEc != ExceptionClass.HvcAarch64) @@ -144,7 +144,7 @@ namespace Ryujinx.Cpu.AppleHv } address = SynchronousException(memoryManager, ref vcpu); - HvApi.hv_vcpu_set_reg(vcpu.Handle, hv_reg_t.HV_REG_PC, address).ThrowOnError(); + HvApi.hv_vcpu_set_reg(vcpu.Handle, HvReg.PC, address).ThrowOnError(); } else if (reason == 0) { @@ -168,8 +168,8 @@ namespace Ryujinx.Cpu.AppleHv { ulong vcpuHandle = vcpu.Handle; - HvApi.hv_vcpu_get_sys_reg(vcpuHandle, hv_sys_reg_t.HV_SYS_REG_ELR_EL1, out ulong elr).ThrowOnError(); - HvApi.hv_vcpu_get_sys_reg(vcpuHandle, hv_sys_reg_t.HV_SYS_REG_ESR_EL1, out ulong esr).ThrowOnError(); + HvApi.hv_vcpu_get_sys_reg(vcpuHandle, HvSysReg.ELR_EL1, out ulong elr).ThrowOnError(); + HvApi.hv_vcpu_get_sys_reg(vcpuHandle, HvSysReg.ESR_EL1, out ulong esr).ThrowOnError(); ExceptionClass ec = (ExceptionClass)((uint)esr >> 26); @@ -180,7 +180,7 @@ namespace Ryujinx.Cpu.AppleHv break; case ExceptionClass.TrappedMsrMrsSystem: InstructionTrap((uint)esr); - HvApi.hv_vcpu_set_sys_reg(vcpuHandle, hv_sys_reg_t.HV_SYS_REG_ELR_EL1, elr + 4UL).ThrowOnError(); + HvApi.hv_vcpu_set_sys_reg(vcpuHandle, HvSysReg.ELR_EL1, elr + 4UL).ThrowOnError(); break; case ExceptionClass.SvcAarch64: ReturnToPool(vcpu); @@ -204,7 +204,7 @@ namespace Ryujinx.Cpu.AppleHv } } - private void DataAbort(MemoryTracking tracking, ulong vcpu, uint esr) + private static void DataAbort(MemoryTracking tracking, ulong vcpu, uint esr) { bool write = (esr & (1u << 6)) != 0; bool farValid = (esr & (1u << 10)) == 0; @@ -212,7 +212,7 @@ namespace Ryujinx.Cpu.AppleHv if (farValid) { - HvApi.hv_vcpu_get_sys_reg(vcpu, hv_sys_reg_t.HV_SYS_REG_FAR_EL1, out ulong far).ThrowOnError(); + HvApi.hv_vcpu_get_sys_reg(vcpu, HvSysReg.FAR_EL1, out ulong far).ThrowOnError(); ulong size = 1UL << accessSizeLog2; @@ -281,4 +281,4 @@ namespace Ryujinx.Cpu.AppleHv { } } -}
\ No newline at end of file +} |