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