summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorGravatar Fernando Sahmkow2019-07-19 11:14:47 -0400
committerGravatar FernandoS272019-07-19 11:28:57 -0400
commit024b5fe91ad89820f64011ef2d37c8b956c94386 (patch)
tree7816cc9d561501784bb47915baf46455ad5da00d /src/core
parentCommon: Correct alignment allocator to work on C++14 or higher. (diff)
downloadyuzu-024b5fe91ad89820f64011ef2d37c8b956c94386.tar.gz
yuzu-024b5fe91ad89820f64011ef2d37c8b956c94386.tar.xz
yuzu-024b5fe91ad89820f64011ef2d37c8b956c94386.zip
Kernel: Address Feedback
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/kernel/physical_memory.h8
-rw-r--r--src/core/hle/kernel/shared_memory.cpp4
2 files changed, 9 insertions, 3 deletions
diff --git a/src/core/hle/kernel/physical_memory.h b/src/core/hle/kernel/physical_memory.h
index dd49c75a2..090565310 100644
--- a/src/core/hle/kernel/physical_memory.h
+++ b/src/core/hle/kernel/physical_memory.h
@@ -8,6 +8,12 @@
8 8
9namespace Kernel { 9namespace Kernel {
10 10
11// This encapsulation serves 2 purposes:
12// - First, to encapsulate host physical memory under a single type and set an
13// standard for managing it.
14// - Second to ensure all host backing memory used is aligned to 256 bytes due
15// to strict alignment restrictions on GPU memory.
16
11using PhysicalMemory = std::vector<u8, Common::AlignmentAllocator<u8, 256>>; 17using PhysicalMemory = std::vector<u8, Common::AlignmentAllocator<u8, 256>>;
12 18
13} 19} // namespace Kernel
diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp
index 45a9e1942..a815c4eea 100644
--- a/src/core/hle/kernel/shared_memory.cpp
+++ b/src/core/hle/kernel/shared_memory.cpp
@@ -59,8 +59,8 @@ SharedPtr<SharedMemory> SharedMemory::Create(KernelCore& kernel, Process* owner_
59} 59}
60 60
61SharedPtr<SharedMemory> SharedMemory::CreateForApplet( 61SharedPtr<SharedMemory> SharedMemory::CreateForApplet(
62 KernelCore& kernel, std::shared_ptr<Kernel::PhysicalMemory> heap_block, std::size_t offset, u64 size, 62 KernelCore& kernel, std::shared_ptr<Kernel::PhysicalMemory> heap_block, std::size_t offset,
63 MemoryPermission permissions, MemoryPermission other_permissions, std::string name) { 63 u64 size, MemoryPermission permissions, MemoryPermission other_permissions, std::string name) {
64 SharedPtr<SharedMemory> shared_memory(new SharedMemory(kernel)); 64 SharedPtr<SharedMemory> shared_memory(new SharedMemory(kernel));
65 65
66 shared_memory->owner_process = nullptr; 66 shared_memory->owner_process = nullptr;