Fix alignment from last commit's renaming
This commit is contained in:
parent
c34588db60
commit
05a3b480b4
9 changed files with 46 additions and 46 deletions
|
@ -27,7 +27,7 @@ namespace ChocolArm64
|
||||||
//when both ISAs are implemented with the interpreter and JIT.
|
//when both ISAs are implemented with the interpreter and JIT.
|
||||||
//As of now, A32 only has a interpreter and A64 a JIT.
|
//As of now, A32 only has a interpreter and A64 a JIT.
|
||||||
CpuThreadState state = thread.ThreadState;
|
CpuThreadState state = thread.ThreadState;
|
||||||
MemoryManager memory = thread.Memory;
|
MemoryManager memory = thread.Memory;
|
||||||
|
|
||||||
if (state.ExecutionMode == ExecutionMode.AArch32)
|
if (state.ExecutionMode == ExecutionMode.AArch32)
|
||||||
{
|
{
|
||||||
|
|
|
@ -29,7 +29,7 @@ namespace Ryujinx.Graphics.Texture
|
||||||
|
|
||||||
public static (MemoryManager Memory, long Position) GetMemoryAndPosition(
|
public static (MemoryManager Memory, long Position) GetMemoryAndPosition(
|
||||||
IMemory Memory,
|
IMemory Memory,
|
||||||
long Position)
|
long Position)
|
||||||
{
|
{
|
||||||
if (Memory is NvGpuVmm Vmm)
|
if (Memory is NvGpuVmm Vmm)
|
||||||
{
|
{
|
||||||
|
|
|
@ -32,11 +32,11 @@ namespace Ryujinx.HLE.HOS
|
||||||
|
|
||||||
private static void WriteConfigEntry(
|
private static void WriteConfigEntry(
|
||||||
MemoryManager Memory,
|
MemoryManager Memory,
|
||||||
ref long Position,
|
ref long Position,
|
||||||
int Key,
|
int Key,
|
||||||
int Flags = 0,
|
int Flags = 0,
|
||||||
long Value0 = 0,
|
long Value0 = 0,
|
||||||
long Value1 = 0)
|
long Value1 = 0)
|
||||||
{
|
{
|
||||||
Memory.WriteInt32(Position + 0x00, Key);
|
Memory.WriteInt32(Position + 0x00, Key);
|
||||||
Memory.WriteInt32(Position + 0x04, Flags);
|
Memory.WriteInt32(Position + 0x04, Flags);
|
||||||
|
|
|
@ -8,12 +8,12 @@ namespace Ryujinx.HLE.HOS.Ipc
|
||||||
static class IpcHandler
|
static class IpcHandler
|
||||||
{
|
{
|
||||||
public static long IpcCall(
|
public static long IpcCall(
|
||||||
Switch Ns,
|
Switch Ns,
|
||||||
Process Process,
|
Process Process,
|
||||||
MemoryManager Memory,
|
MemoryManager Memory,
|
||||||
KSession Session,
|
KSession Session,
|
||||||
IpcMessage Request,
|
IpcMessage Request,
|
||||||
long CmdPtr)
|
long CmdPtr)
|
||||||
{
|
{
|
||||||
IpcMessage Response = new IpcMessage();
|
IpcMessage Response = new IpcMessage();
|
||||||
|
|
||||||
|
|
|
@ -24,11 +24,11 @@ namespace Ryujinx.HLE.HOS.Kernel
|
||||||
}
|
}
|
||||||
|
|
||||||
public long ArbitrateLock(
|
public long ArbitrateLock(
|
||||||
Process Process,
|
Process Process,
|
||||||
MemoryManager Memory,
|
MemoryManager Memory,
|
||||||
int OwnerHandle,
|
int OwnerHandle,
|
||||||
long MutexAddress,
|
long MutexAddress,
|
||||||
int RequesterHandle)
|
int RequesterHandle)
|
||||||
{
|
{
|
||||||
System.CriticalSectionLock.Lock();
|
System.CriticalSectionLock.Lock();
|
||||||
|
|
||||||
|
@ -101,10 +101,10 @@ namespace Ryujinx.HLE.HOS.Kernel
|
||||||
|
|
||||||
public long WaitProcessWideKeyAtomic(
|
public long WaitProcessWideKeyAtomic(
|
||||||
MemoryManager Memory,
|
MemoryManager Memory,
|
||||||
long MutexAddress,
|
long MutexAddress,
|
||||||
long CondVarAddress,
|
long CondVarAddress,
|
||||||
int ThreadHandle,
|
int ThreadHandle,
|
||||||
long Timeout)
|
long Timeout)
|
||||||
{
|
{
|
||||||
System.CriticalSectionLock.Lock();
|
System.CriticalSectionLock.Lock();
|
||||||
|
|
||||||
|
@ -374,10 +374,10 @@ namespace Ryujinx.HLE.HOS.Kernel
|
||||||
|
|
||||||
public long WaitForAddressIfLessThan(
|
public long WaitForAddressIfLessThan(
|
||||||
MemoryManager Memory,
|
MemoryManager Memory,
|
||||||
long Address,
|
long Address,
|
||||||
int Value,
|
int Value,
|
||||||
bool ShouldDecrement,
|
bool ShouldDecrement,
|
||||||
long Timeout)
|
long Timeout)
|
||||||
{
|
{
|
||||||
KThread CurrentThread = System.Scheduler.GetCurrentThread();
|
KThread CurrentThread = System.Scheduler.GetCurrentThread();
|
||||||
|
|
||||||
|
|
|
@ -14,9 +14,9 @@ namespace Ryujinx.HLE.HOS.Kernel
|
||||||
|
|
||||||
private Dictionary<int, SvcFunc> SvcFuncs;
|
private Dictionary<int, SvcFunc> SvcFuncs;
|
||||||
|
|
||||||
private Switch Device;
|
private Switch Device;
|
||||||
private Process Process;
|
private Process Process;
|
||||||
private Horizon System;
|
private Horizon System;
|
||||||
private MemoryManager Memory;
|
private MemoryManager Memory;
|
||||||
|
|
||||||
private struct HleIpcMessage
|
private struct HleIpcMessage
|
||||||
|
|
|
@ -7,24 +7,24 @@ namespace Ryujinx.HLE.HOS
|
||||||
{
|
{
|
||||||
class ServiceCtx
|
class ServiceCtx
|
||||||
{
|
{
|
||||||
public Switch Device { get; private set; }
|
public Switch Device { get; private set; }
|
||||||
public Process Process { get; private set; }
|
public Process Process { get; private set; }
|
||||||
public MemoryManager Memory { get; private set; }
|
public MemoryManager Memory { get; private set; }
|
||||||
public KSession Session { get; private set; }
|
public KSession Session { get; private set; }
|
||||||
public IpcMessage Request { get; private set; }
|
public IpcMessage Request { get; private set; }
|
||||||
public IpcMessage Response { get; private set; }
|
public IpcMessage Response { get; private set; }
|
||||||
public BinaryReader RequestData { get; private set; }
|
public BinaryReader RequestData { get; private set; }
|
||||||
public BinaryWriter ResponseData { get; private set; }
|
public BinaryWriter ResponseData { get; private set; }
|
||||||
|
|
||||||
public ServiceCtx(
|
public ServiceCtx(
|
||||||
Switch Device,
|
Switch Device,
|
||||||
Process Process,
|
Process Process,
|
||||||
MemoryManager Memory,
|
MemoryManager Memory,
|
||||||
KSession Session,
|
KSession Session,
|
||||||
IpcMessage Request,
|
IpcMessage Request,
|
||||||
IpcMessage Response,
|
IpcMessage Response,
|
||||||
BinaryReader RequestData,
|
BinaryReader RequestData,
|
||||||
BinaryWriter ResponseData)
|
BinaryWriter ResponseData)
|
||||||
{
|
{
|
||||||
this.Device = Device;
|
this.Device = Device;
|
||||||
this.Process = Process;
|
this.Process = Process;
|
||||||
|
|
|
@ -42,7 +42,7 @@ namespace Ryujinx.HLE.HOS.Services.Aud.AudioRenderer
|
||||||
|
|
||||||
public IAudioRenderer(
|
public IAudioRenderer(
|
||||||
Horizon System,
|
Horizon System,
|
||||||
MemoryManager Memory,
|
MemoryManager Memory,
|
||||||
IAalOutput AudioOut,
|
IAalOutput AudioOut,
|
||||||
AudioRendererParameter Params)
|
AudioRendererParameter Params)
|
||||||
{
|
{
|
||||||
|
|
|
@ -25,7 +25,7 @@ namespace Ryujinx.Tests.Cpu
|
||||||
private IntPtr RamPointer;
|
private IntPtr RamPointer;
|
||||||
|
|
||||||
private MemoryManager Memory;
|
private MemoryManager Memory;
|
||||||
private CpuThread Thread;
|
private CpuThread Thread;
|
||||||
|
|
||||||
private static bool UnicornAvailable;
|
private static bool UnicornAvailable;
|
||||||
private UnicornAArch64 UnicornEmu;
|
private UnicornAArch64 UnicornEmu;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue