From 15baf43a7c8a8ff223da543ec8713907b440f581 Mon Sep 17 00:00:00 2001
From: Emmanuel Hansen <emmausssss@gmail.com>
Date: Fri, 19 Jan 2024 12:45:58 +0000
Subject: [PATCH] fix rebase

---
 src/LibRyujinx/LibRyujinx.Device.cs        | 2 --
 src/LibRyujinx/LibRyujinx.Graphics.cs      | 3 +--
 src/Ryujinx.Cpu/Nce/NceCpuContext.cs       | 6 ++----
 src/Ryujinx.Cpu/Nce/NceExecutionContext.cs | 4 ++--
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/LibRyujinx/LibRyujinx.Device.cs b/src/LibRyujinx/LibRyujinx.Device.cs
index d6f90d2e0..032878d34 100644
--- a/src/LibRyujinx/LibRyujinx.Device.cs
+++ b/src/LibRyujinx/LibRyujinx.Device.cs
@@ -244,8 +244,6 @@ namespace LibRyujinx
                 return false;
             }
 
-            Translator.IsReadyForTranslation.Reset();
-
             return true;
         }
 
diff --git a/src/LibRyujinx/LibRyujinx.Graphics.cs b/src/LibRyujinx/LibRyujinx.Graphics.cs
index 24364a242..dbb6440bb 100644
--- a/src/LibRyujinx/LibRyujinx.Graphics.cs
+++ b/src/LibRyujinx/LibRyujinx.Graphics.cs
@@ -1,4 +1,4 @@
-using ARMeilleure.Translation;
+using ARMeilleure.Translation;
 using LibHac.Bcat;
 using LibRyujinx.Shared;
 using OpenTK.Graphics.OpenGL;
@@ -171,7 +171,6 @@ namespace LibRyujinx
                     _gpuDoneEvent.Reset();
                     device.Gpu.SetGpuThread();
                     device.Gpu.InitializeShaderCache(_gpuCancellationTokenSource.Token);
-                    Translator.IsReadyForTranslation.Set();
 
                     _isActive = true;
 
diff --git a/src/Ryujinx.Cpu/Nce/NceCpuContext.cs b/src/Ryujinx.Cpu/Nce/NceCpuContext.cs
index 0498a21eb..5cfddf7e7 100644
--- a/src/Ryujinx.Cpu/Nce/NceCpuContext.cs
+++ b/src/Ryujinx.Cpu/Nce/NceCpuContext.cs
@@ -1,6 +1,6 @@
-using ARMeilleure.Signal;
-using Ryujinx.Cpu.Jit;
 using Ryujinx.Common;
+using Ryujinx.Cpu.Jit;
+using Ryujinx.Cpu.Signal;
 using Ryujinx.Memory;
 using System;
 using System.Collections.Generic;
@@ -80,8 +80,6 @@ namespace Ryujinx.Cpu.Nce
 
             MemoryBlock codeBlock = null;
 
-            NativeSignalHandler.Initialize(new JitMemoryAllocator());
-
             NativeSignalHandler.InitializeSignalHandler(MemoryBlock.GetPageSize(), (IntPtr oldSignalHandlerSegfaultPtr, IntPtr signalHandlerPtr) =>
             {
                 uint[] ehWrapperCode = NcePatcher.GenerateWrapperExceptionHandler(oldSignalHandlerSegfaultPtr, signalHandlerPtr);
diff --git a/src/Ryujinx.Cpu/Nce/NceExecutionContext.cs b/src/Ryujinx.Cpu/Nce/NceExecutionContext.cs
index eafd7ff98..37069939e 100644
--- a/src/Ryujinx.Cpu/Nce/NceExecutionContext.cs
+++ b/src/Ryujinx.Cpu/Nce/NceExecutionContext.cs
@@ -1,5 +1,5 @@
-using ARMeilleure.Signal;
 using ARMeilleure.State;
+using Ryujinx.Cpu.Signal;
 using Ryujinx.Memory;
 using System;
 using System.Runtime.InteropServices;
@@ -171,4 +171,4 @@ namespace Ryujinx.Cpu.Nce
             _context.Dispose();
         }
     }
-}
\ No newline at end of file
+}