1 files changed, 20 insertions, 3 deletions
diff --git a/Ryujinx.HLE/HOS/ArmProcessContextFactory.cs b/Ryujinx.HLE/HOS/ArmProcessContextFactory.cs
index 050d3690..14617cf2 100644
--- a/Ryujinx.HLE/HOS/ArmProcessContextFactory.cs
+++ b/Ryujinx.HLE/HOS/ArmProcessContextFactory.cs
@@ -1,14 +1,31 @@
-using Ryujinx.Cpu;
+using Ryujinx.Common.Configuration;
+using Ryujinx.Cpu;
+using Ryujinx.HLE.HOS.Kernel;
 using Ryujinx.HLE.HOS.Kernel.Process;
 using Ryujinx.Memory;
+using System;
 
 namespace Ryujinx.HLE.HOS
 {
     class ArmProcessContextFactory : IProcessContextFactory
     {
-        public IProcessContext Create(MemoryBlock backingMemory, ulong addressSpaceSize, InvalidAccessHandler invalidAccessHandler)
+        public IProcessContext Create(KernelContext context, ulong addressSpaceSize, InvalidAccessHandler invalidAccessHandler)
         {
-            return new ArmProcessContext(new MemoryManager(backingMemory, addressSpaceSize, invalidAccessHandler));
+            MemoryManagerMode mode = context.Device.Configuration.MemoryManagerMode;
+
+            switch (mode)
+            {
+                case MemoryManagerMode.SoftwarePageTable:
+                    return new ArmProcessContext<MemoryManager>(new MemoryManager(addressSpaceSize, invalidAccessHandler));
+
+                case MemoryManagerMode.HostMapped:
+                case MemoryManagerMode.HostMappedUnsafe:
+                    bool unsafeMode = mode == MemoryManagerMode.HostMappedUnsafe;
+                    return new ArmProcessContext<MemoryManagerHostMapped>(new MemoryManagerHostMapped(addressSpaceSize, unsafeMode, invalidAccessHandler));
+
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
         }
     }
 }