summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/shared_memory.cpp
diff options
context:
space:
mode:
authorSubv <subv2112@gmail.com>2016-05-09 00:10:53 +0200
committerSubv <subv2112@gmail.com>2016-05-13 03:01:59 +0200
commitac2de12ed8a7cc2759e25325f388db92b3f356a6 (patch)
treef679398a60a1d330b6ac38bfffa051631f99d6e7 /src/core/hle/kernel/shared_memory.cpp
parentKernel: Account for automatically-allocated shared memories in the amount of used linear heap memory. (diff)
downloadyuzu-ac2de12ed8a7cc2759e25325f388db92b3f356a6.tar
yuzu-ac2de12ed8a7cc2759e25325f388db92b3f356a6.tar.gz
yuzu-ac2de12ed8a7cc2759e25325f388db92b3f356a6.tar.bz2
yuzu-ac2de12ed8a7cc2759e25325f388db92b3f356a6.tar.lz
yuzu-ac2de12ed8a7cc2759e25325f388db92b3f356a6.tar.xz
yuzu-ac2de12ed8a7cc2759e25325f388db92b3f356a6.tar.zst
yuzu-ac2de12ed8a7cc2759e25325f388db92b3f356a6.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/kernel/shared_memory.cpp17
1 files changed, 17 insertions, 0 deletions
diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp
index 74947f023..6a22c8986 100644
--- a/src/core/hle/kernel/shared_memory.cpp
+++ b/src/core/hle/kernel/shared_memory.cpp
@@ -58,6 +58,7 @@ SharedPtr<SharedMemory> SharedMemory::Create(SharedPtr<Process> owner_process, u
// Copy it over to our own storage
shared_memory->backing_block = std::make_shared<std::vector<u8>>(vma.backing_block->data() + vma.offset,
vma.backing_block->data() + vma.offset + size);
+ shared_memory->backing_block_offset = 0;
// Unmap the existing pages
vm_manager.UnmapRange(address, size);
// Map our own block into the address space
@@ -70,6 +71,22 @@ SharedPtr<SharedMemory> SharedMemory::Create(SharedPtr<Process> owner_process, u
return shared_memory;
}
+SharedPtr<SharedMemory> SharedMemory::CreateForApplet(std::shared_ptr<std::vector<u8>> heap_block, u32 offset, u32 size,
+ MemoryPermission permissions, MemoryPermission other_permissions, std::string name) {
+ SharedPtr<SharedMemory> shared_memory(new SharedMemory);
+
+ shared_memory->owner_process = nullptr;
+ shared_memory->name = std::move(name);
+ shared_memory->size = size;
+ shared_memory->permissions = permissions;
+ shared_memory->other_permissions = other_permissions;
+ shared_memory->backing_block = heap_block;
+ shared_memory->backing_block_offset = offset;
+ shared_memory->base_address = Memory::HEAP_VADDR + offset;
+
+ return shared_memory;
+}
+
ResultCode SharedMemory::Map(Process* target_process, VAddr address, MemoryPermission permissions,
MemoryPermission other_permissions) {