summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel
diff options
context:
space:
mode:
authorGravatar bunnei2019-07-11 14:56:26 -0400
committerGravatar GitHub2019-07-11 14:56:26 -0400
commit521fb325aaabf46f1f1586120a1233dc2ad5df69 (patch)
tree0d17ea4ab98dbf2e9ed17faa022b689d858a752f /src/core/hle/kernel
parentMerge pull request #2724 from lioncash/sleep (diff)
parentyuzu: Remove setting for using Unicorn (diff)
downloadyuzu-521fb325aaabf46f1f1586120a1233dc2ad5df69.tar.gz
yuzu-521fb325aaabf46f1f1586120a1233dc2ad5df69.tar.xz
yuzu-521fb325aaabf46f1f1586120a1233dc2ad5df69.zip
Merge pull request #2723 from lioncash/mem
core/arm: Remove obsolete Unicorn memory mapping
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r--src/core/hle/kernel/vm_manager.cpp20
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 @@
8#include "common/assert.h" 8#include "common/assert.h"
9#include "common/logging/log.h" 9#include "common/logging/log.h"
10#include "common/memory_hook.h" 10#include "common/memory_hook.h"
11#include "core/arm/arm_interface.h"
12#include "core/core.h" 11#include "core/core.h"
13#include "core/file_sys/program_metadata.h" 12#include "core/file_sys/program_metadata.h"
14#include "core/hle/kernel/errors.h" 13#include "core/hle/kernel/errors.h"
@@ -109,15 +108,6 @@ ResultVal<VMManager::VMAHandle> VMManager::MapMemoryBlock(VAddr target,
109 VirtualMemoryArea& final_vma = vma_handle->second; 108 VirtualMemoryArea& final_vma = vma_handle->second;
110 ASSERT(final_vma.size == size); 109 ASSERT(final_vma.size == size);
111 110
112 system.ArmInterface(0).MapBackingMemory(target, size, block->data() + offset,
113 VMAPermission::ReadWriteExecute);
114 system.ArmInterface(1).MapBackingMemory(target, size, block->data() + offset,
115 VMAPermission::ReadWriteExecute);
116 system.ArmInterface(2).MapBackingMemory(target, size, block->data() + offset,
117 VMAPermission::ReadWriteExecute);
118 system.ArmInterface(3).MapBackingMemory(target, size, block->data() + offset,
119 VMAPermission::ReadWriteExecute);
120
121 final_vma.type = VMAType::AllocatedMemoryBlock; 111 final_vma.type = VMAType::AllocatedMemoryBlock;
122 final_vma.permissions = VMAPermission::ReadWrite; 112 final_vma.permissions = VMAPermission::ReadWrite;
123 final_vma.state = state; 113 final_vma.state = state;
@@ -137,11 +127,6 @@ ResultVal<VMManager::VMAHandle> VMManager::MapBackingMemory(VAddr target, u8* me
137 VirtualMemoryArea& final_vma = vma_handle->second; 127 VirtualMemoryArea& final_vma = vma_handle->second;
138 ASSERT(final_vma.size == size); 128 ASSERT(final_vma.size == size);
139 129
140 system.ArmInterface(0).MapBackingMemory(target, size, memory, VMAPermission::ReadWriteExecute);
141 system.ArmInterface(1).MapBackingMemory(target, size, memory, VMAPermission::ReadWriteExecute);
142 system.ArmInterface(2).MapBackingMemory(target, size, memory, VMAPermission::ReadWriteExecute);
143 system.ArmInterface(3).MapBackingMemory(target, size, memory, VMAPermission::ReadWriteExecute);
144
145 final_vma.type = VMAType::BackingMemory; 130 final_vma.type = VMAType::BackingMemory;
146 final_vma.permissions = VMAPermission::ReadWrite; 131 final_vma.permissions = VMAPermission::ReadWrite;
147 final_vma.state = state; 132 final_vma.state = state;
@@ -230,11 +215,6 @@ ResultCode VMManager::UnmapRange(VAddr target, u64 size) {
230 215
231 ASSERT(FindVMA(target)->second.size >= size); 216 ASSERT(FindVMA(target)->second.size >= size);
232 217
233 system.ArmInterface(0).UnmapMemory(target, size);
234 system.ArmInterface(1).UnmapMemory(target, size);
235 system.ArmInterface(2).UnmapMemory(target, size);
236 system.ArmInterface(3).UnmapMemory(target, size);
237
238 return RESULT_SUCCESS; 218 return RESULT_SUCCESS;
239} 219}
240 220