1 files changed, 34 insertions, 5 deletions

diff --git a/src/core/hle/kernel/process.h b/src/core/hle/kernel/process.h
index 83d3aceae..60e17f251 100644
--- a/src/core/hle/kernel/process.h
+++ b/src/core/hle/kernel/process.h
@@ -15,6 +15,7 @@
 #include "common/common_types.h"
 
 #include "core/hle/kernel/kernel.h"
+#include "core/hle/kernel/vm_manager.h"
 
 namespace Kernel {
 
@@ -48,7 +49,7 @@ union ProcessFlags {
 };
 
 class ResourceLimit;
-class VMManager;
+struct MemoryRegionInfo;
 
 struct CodeSet final : public Object {
     static SharedPtr<CodeSet> Create(std::string name, u64 program_id);
@@ -104,14 +105,12 @@ public:
     /// processes access to specific I/O regions and device memory.
     boost::container::static_vector<AddressMapping, 8> address_mappings;
     ProcessFlags flags;
+    /// Kernel compatibility version for this process
+    u16 kernel_version = 0;
 
     /// The id of this process
     u32 process_id = next_process_id++;
 
-    /// Bitmask of the used TLS slots
-    std::bitset<300> used_tls_slots;
-    std::unique_ptr<VMManager> address_space;
-
     /**
      * Parses a list of kernel capability descriptors (as found in the ExHeader) and applies them
      * to this process.
@@ -123,6 +122,36 @@ public:
      */
     void Run(s32 main_thread_priority, u32 stack_size);
 
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////
+    // Memory Management
+
+    VMManager vm_manager;
+
+    // Memory used to back the allocations in the regular heap. A single vector is used to cover
+    // the entire virtual address space extents that bound the allocations, including any holes.
+    // This makes deallocation and reallocation of holes fast and keeps process memory contiguous
+    // in the emulator address space, allowing Memory::GetPointer to be reasonably safe.
+    std::shared_ptr<std::vector<u8>> heap_memory;
+    // The left/right bounds of the address space covered by heap_memory.
+    VAddr heap_start = 0, heap_end = 0;
+
+    u32 heap_used = 0, linear_heap_used = 0, misc_memory_used = 0;
+
+    MemoryRegionInfo* memory_region = nullptr;
+
+    /// Bitmask of the used TLS slots
+    std::bitset<300> used_tls_slots;
+
+    VAddr GetLinearHeapBase() const;
+    VAddr GetLinearHeapLimit() const;
+
+    ResultVal<VAddr> HeapAllocate(VAddr target, u32 size, VMAPermission perms);
+    ResultCode HeapFree(VAddr target, u32 size);
+
+    ResultVal<VAddr> LinearAllocate(VAddr target, u32 size, VMAPermission perms);
+    ResultCode LinearFree(VAddr target, u32 size);
+
 private:
     Process();
     ~Process() override;