diff options
| author | bunnei <bunneidev@gmail.com> | 2019-07-11 14:56:26 -0400 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-11 14:56:26 -0400 | 
| commit | 521fb325aaabf46f1f1586120a1233dc2ad5df69 (patch) | |
| tree | 0d17ea4ab98dbf2e9ed17faa022b689d858a752f /src/core/hle | |
| parent | 2a94745500ea3fc7634b2118ab3b9ec1cb4f4327 (diff) | |
| parent | 8fc806e88acb69db6cfa84ad7252a4530b67c55f (diff) | |
Merge pull request #2723 from lioncash/mem
core/arm: Remove obsolete Unicorn memory mapping
Diffstat (limited to 'src/core/hle')
| -rw-r--r-- | src/core/hle/kernel/vm_manager.cpp | 20 | 
1 files changed, 0 insertions, 20 deletions
| diff --git a/src/core/hle/kernel/vm_manager.cpp b/src/core/hle/kernel/vm_manager.cpp index 501544090..7bc925a5f 100644 --- a/src/core/hle/kernel/vm_manager.cpp +++ b/src/core/hle/kernel/vm_manager.cpp @@ -8,7 +8,6 @@  #include "common/assert.h"  #include "common/logging/log.h"  #include "common/memory_hook.h" -#include "core/arm/arm_interface.h"  #include "core/core.h"  #include "core/file_sys/program_metadata.h"  #include "core/hle/kernel/errors.h" @@ -109,15 +108,6 @@ ResultVal<VMManager::VMAHandle> VMManager::MapMemoryBlock(VAddr target,      VirtualMemoryArea& final_vma = vma_handle->second;      ASSERT(final_vma.size == size); -    system.ArmInterface(0).MapBackingMemory(target, size, block->data() + offset, -                                            VMAPermission::ReadWriteExecute); -    system.ArmInterface(1).MapBackingMemory(target, size, block->data() + offset, -                                            VMAPermission::ReadWriteExecute); -    system.ArmInterface(2).MapBackingMemory(target, size, block->data() + offset, -                                            VMAPermission::ReadWriteExecute); -    system.ArmInterface(3).MapBackingMemory(target, size, block->data() + offset, -                                            VMAPermission::ReadWriteExecute); -      final_vma.type = VMAType::AllocatedMemoryBlock;      final_vma.permissions = VMAPermission::ReadWrite;      final_vma.state = state; @@ -137,11 +127,6 @@ ResultVal<VMManager::VMAHandle> VMManager::MapBackingMemory(VAddr target, u8* me      VirtualMemoryArea& final_vma = vma_handle->second;      ASSERT(final_vma.size == size); -    system.ArmInterface(0).MapBackingMemory(target, size, memory, VMAPermission::ReadWriteExecute); -    system.ArmInterface(1).MapBackingMemory(target, size, memory, VMAPermission::ReadWriteExecute); -    system.ArmInterface(2).MapBackingMemory(target, size, memory, VMAPermission::ReadWriteExecute); -    system.ArmInterface(3).MapBackingMemory(target, size, memory, VMAPermission::ReadWriteExecute); -      final_vma.type = VMAType::BackingMemory;      final_vma.permissions = VMAPermission::ReadWrite;      final_vma.state = state; @@ -230,11 +215,6 @@ ResultCode VMManager::UnmapRange(VAddr target, u64 size) {      ASSERT(FindVMA(target)->second.size >= size); -    system.ArmInterface(0).UnmapMemory(target, size); -    system.ArmInterface(1).UnmapMemory(target, size); -    system.ArmInterface(2).UnmapMemory(target, size); -    system.ArmInterface(3).UnmapMemory(target, size); -      return RESULT_SUCCESS;  } | 
