From 11963f2c6a6d1785a7f1d0ee969400704b990056 Mon Sep 17 00:00:00 2001 From: gdkchan Date: Sun, 17 Jun 2018 22:48:04 -0300 Subject: [PATCH] Remove some debug stuff --- ChocolArm64/Instruction/AInstEmitMemoryEx.cs | 5 ----- ChocolArm64/Memory/AMemory.cs | 2 +- Ryujinx.HLE/OsHle/Kernel/SvcThread.cs | 2 -- Ryujinx.HLE/OsHle/Kernel/SvcThreadSync.cs | 4 ++-- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/ChocolArm64/Instruction/AInstEmitMemoryEx.cs b/ChocolArm64/Instruction/AInstEmitMemoryEx.cs index d3b13f9567..ba8eeceb7b 100644 --- a/ChocolArm64/Instruction/AInstEmitMemoryEx.cs +++ b/ChocolArm64/Instruction/AInstEmitMemoryEx.cs @@ -166,11 +166,6 @@ namespace ChocolArm64.Instruction Context.EmitLdint(Rn); } - if (Name == nameof(AMemory.SetExclusive)) - { - Context.EmitLdc_I8(Context.CurrOp.Position); - } - Context.EmitCall(typeof(AMemory), Name); } diff --git a/ChocolArm64/Memory/AMemory.cs b/ChocolArm64/Memory/AMemory.cs index 91721ecb13..4b0c5ff5f5 100644 --- a/ChocolArm64/Memory/AMemory.cs +++ b/ChocolArm64/Memory/AMemory.cs @@ -61,7 +61,7 @@ namespace ChocolArm64.Memory } } - public void SetExclusive(AThreadState ThreadState, long Position, long oppos) + public void SetExclusive(AThreadState ThreadState, long Position) { Position &= ~ErgMask; diff --git a/Ryujinx.HLE/OsHle/Kernel/SvcThread.cs b/Ryujinx.HLE/OsHle/Kernel/SvcThread.cs index 99ae768ceb..4501867f42 100644 --- a/Ryujinx.HLE/OsHle/Kernel/SvcThread.cs +++ b/Ryujinx.HLE/OsHle/Kernel/SvcThread.cs @@ -81,8 +81,6 @@ namespace Ryujinx.HLE.OsHle.Kernel private void SvcSleepThread(AThreadState ThreadState) { - //Process.PrintStackTrace(ThreadState); - ulong TimeoutNs = ThreadState.X0; Ns.Log.PrintDebug(LogClass.KernelSvc, "Timeout = " + TimeoutNs.ToString("x16")); diff --git a/Ryujinx.HLE/OsHle/Kernel/SvcThreadSync.cs b/Ryujinx.HLE/OsHle/Kernel/SvcThreadSync.cs index 1a07edce57..30d8ae9e96 100644 --- a/Ryujinx.HLE/OsHle/Kernel/SvcThreadSync.cs +++ b/Ryujinx.HLE/OsHle/Kernel/SvcThreadSync.cs @@ -314,7 +314,7 @@ namespace Ryujinx.HLE.OsHle.Kernel long MutexAddress = WaitThread.MutexAddress; - Memory.SetExclusive(ThreadState, MutexAddress, 0); + Memory.SetExclusive(ThreadState, MutexAddress); int MutexValue = Process.Memory.ReadInt32(MutexAddress); @@ -332,7 +332,7 @@ namespace Ryujinx.HLE.OsHle.Kernel break; } - Memory.SetExclusive(ThreadState, MutexAddress, 0); + Memory.SetExclusive(ThreadState, MutexAddress); MutexValue = Process.Memory.ReadInt32(MutexAddress); }