summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel
diff options
context:
space:
mode:
authorMichael Scire <SciresM@gmail.com>2019-07-12 00:12:33 +0200
committerMichael Scire <SciresM@gmail.com>2019-07-12 00:12:33 +0200
commitd4fc560c0539e5ba1d5cfcd03c92658699f20e5b (patch)
treee7883dad246fff91a162ca096c03d34bc1e5923e /src/core/hle/kernel
parentprefer system reference over global accessor (diff)
downloadyuzu-d4fc560c0539e5ba1d5cfcd03c92658699f20e5b.tar
yuzu-d4fc560c0539e5ba1d5cfcd03c92658699f20e5b.tar.gz
yuzu-d4fc560c0539e5ba1d5cfcd03c92658699f20e5b.tar.bz2
yuzu-d4fc560c0539e5ba1d5cfcd03c92658699f20e5b.tar.lz
yuzu-d4fc560c0539e5ba1d5cfcd03c92658699f20e5b.tar.xz
yuzu-d4fc560c0539e5ba1d5cfcd03c92658699f20e5b.tar.zst
yuzu-d4fc560c0539e5ba1d5cfcd03c92658699f20e5b.zip
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r--src/core/hle/kernel/vm_manager.cpp19
1 files changed, 0 insertions, 19 deletions
diff --git a/src/core/hle/kernel/vm_manager.cpp b/src/core/hle/kernel/vm_manager.cpp
index 72a9d7717..02170d548 100644
--- a/src/core/hle/kernel/vm_manager.cpp
+++ b/src/core/hle/kernel/vm_manager.cpp
@@ -796,25 +796,6 @@ void VMManager::MergeAdjacentVMA(VirtualMemoryArea& left, const VirtualMemoryAre
// Page table update is needed, because backing memory changed.
left.size += right.size;
UpdatePageTableForVMA(left);
-
- // Update mappings for unicorn.
- system.ArmInterface(0).UnmapMemory(left.base, left.size);
- system.ArmInterface(1).UnmapMemory(left.base, left.size);
- system.ArmInterface(2).UnmapMemory(left.base, left.size);
- system.ArmInterface(3).UnmapMemory(left.base, left.size);
-
- system.ArmInterface(0).MapBackingMemory(left.base, left.size,
- left.backing_block->data() + left.offset,
- VMAPermission::ReadWriteExecute);
- system.ArmInterface(1).MapBackingMemory(left.base, left.size,
- left.backing_block->data() + left.offset,
- VMAPermission::ReadWriteExecute);
- system.ArmInterface(2).MapBackingMemory(left.base, left.size,
- left.backing_block->data() + left.offset,
- VMAPermission::ReadWriteExecute);
- system.ArmInterface(3).MapBackingMemory(left.base, left.size,
- left.backing_block->data() + left.offset,
- VMAPermission::ReadWriteExecute);
} else {
// Just update the size.
left.size += right.size;