mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-11-20 02:46:35 +00:00
Fix tests
This commit is contained in:
parent
e5ee097e49
commit
814ece1270
3 changed files with 12 additions and 3 deletions
|
@ -1,3 +1,4 @@
|
||||||
|
using ARMeilleure.Common;
|
||||||
using ARMeilleure.Memory;
|
using ARMeilleure.Memory;
|
||||||
using ARMeilleure.State;
|
using ARMeilleure.State;
|
||||||
using ARMeilleure.Translation;
|
using ARMeilleure.Translation;
|
||||||
|
@ -12,7 +13,7 @@ namespace Ryujinx.Tests.Cpu
|
||||||
|
|
||||||
public CpuContext(IMemoryManager memory, bool for64Bit)
|
public CpuContext(IMemoryManager memory, bool for64Bit)
|
||||||
{
|
{
|
||||||
_translator = new Translator(new JitMemoryAllocator(), memory, for64Bit);
|
_translator = new Translator(new JitMemoryAllocator(), memory, AddressTable<ulong>.CreateForArm(for64Bit, memory.Type));
|
||||||
memory.UnmapEvent += UnmapHandler;
|
memory.UnmapEvent += UnmapHandler;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
using ARMeilleure.Common;
|
||||||
using ARMeilleure.Translation;
|
using ARMeilleure.Translation;
|
||||||
using NUnit.Framework;
|
using NUnit.Framework;
|
||||||
using Ryujinx.Cpu.Jit;
|
using Ryujinx.Cpu.Jit;
|
||||||
|
@ -17,7 +18,10 @@ namespace Ryujinx.Tests.Cpu
|
||||||
private static void EnsureTranslator()
|
private static void EnsureTranslator()
|
||||||
{
|
{
|
||||||
// Create a translator, as one is needed to register the signal handler or emit methods.
|
// Create a translator, as one is needed to register the signal handler or emit methods.
|
||||||
_translator ??= new Translator(new JitMemoryAllocator(), new MockMemoryManager(), true);
|
_translator ??= new Translator(
|
||||||
|
new JitMemoryAllocator(),
|
||||||
|
new MockMemoryManager(),
|
||||||
|
AddressTable<ulong>.CreateForArm(true, ARMeilleure.Memory.MemoryManagerType.SoftwarePageTable));
|
||||||
}
|
}
|
||||||
|
|
||||||
[MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.NoOptimization)]
|
[MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.NoOptimization)]
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
using ARMeilleure.Common;
|
||||||
using ARMeilleure.Signal;
|
using ARMeilleure.Signal;
|
||||||
using ARMeilleure.Translation;
|
using ARMeilleure.Translation;
|
||||||
using NUnit.Framework;
|
using NUnit.Framework;
|
||||||
|
@ -53,7 +54,10 @@ namespace Ryujinx.Tests.Memory
|
||||||
private static void EnsureTranslator()
|
private static void EnsureTranslator()
|
||||||
{
|
{
|
||||||
// Create a translator, as one is needed to register the signal handler or emit methods.
|
// Create a translator, as one is needed to register the signal handler or emit methods.
|
||||||
_translator ??= new Translator(new JitMemoryAllocator(), new MockMemoryManager(), true);
|
_translator ??= new Translator(
|
||||||
|
new JitMemoryAllocator(),
|
||||||
|
new MockMemoryManager(),
|
||||||
|
AddressTable<ulong>.CreateForArm(true, ARMeilleure.Memory.MemoryManagerType.SoftwarePageTable));
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
|
|
Loading…
Reference in a new issue