Merge pull request #1075 from yuriks/ControlMem-fixes

Fix heap-management regressions

1 files changed, 25 insertions, 2 deletions

diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp
index 4137683b5..1f477664b 100644
--- a/src/core/hle/kernel/shared_memory.cpp
+++ b/src/core/hle/kernel/shared_memory.cpp
@@ -20,6 +20,7 @@ SharedPtr<SharedMemory> SharedMemory::Create(u32 size, MemoryPermission permissi
 
     shared_memory->name = std::move(name);
     shared_memory->base_address = 0x0;
+    shared_memory->fixed_address = 0x0;
     shared_memory->size = size;
     shared_memory->permissions = permissions;
     shared_memory->other_permissions = other_permissions;
@@ -30,9 +31,31 @@ SharedPtr<SharedMemory> SharedMemory::Create(u32 size, MemoryPermission permissi
 ResultCode SharedMemory::Map(VAddr address, MemoryPermission permissions,
         MemoryPermission other_permissions) {
 
+    if (base_address != 0) {
+        LOG_ERROR(Kernel, "cannot map id=%u, address=0x%08X name=%s: already mapped at 0x%08X!",
+            GetObjectId(), address, name.c_str(), base_address);
+        // TODO: Verify error code with hardware
+        return ResultCode(ErrorDescription::InvalidAddress, ErrorModule::Kernel,
+            ErrorSummary::InvalidArgument, ErrorLevel::Permanent);
+    }
+
+    if (fixed_address != 0) {
+         if (address != 0 && address != fixed_address) {
+            LOG_ERROR(Kernel, "cannot map id=%u, address=0x%08X name=%s: fixed_addres is 0x%08X!",
+                    GetObjectId(), address, name.c_str(), fixed_address);
+            // TODO: Verify error code with hardware
+            return ResultCode(ErrorDescription::InvalidAddress, ErrorModule::Kernel,
+                ErrorSummary::InvalidArgument, ErrorLevel::Permanent);
+        }
+
+        // HACK(yuriks): This is only here to support the APT shared font mapping right now.
+        // Later, this should actually map the memory block onto the address space.
+        return RESULT_SUCCESS;
+    }
+
     if (address < Memory::SHARED_MEMORY_VADDR || address + size >= Memory::SHARED_MEMORY_VADDR_END) {
-        LOG_ERROR(Kernel, "cannot map id=%u, address=0x%08X outside of shared mem bounds!",
-                GetObjectId(), address);
+        LOG_ERROR(Kernel, "cannot map id=%u, address=0x%08X name=%s outside of shared mem bounds!",
+                GetObjectId(), address, name.c_str());
         // TODO: Verify error code with hardware
         return ResultCode(ErrorDescription::InvalidAddress, ErrorModule::Kernel,
                 ErrorSummary::InvalidArgument, ErrorLevel::Permanent);