summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2019-07-19 17:14:47 +0200
committerFernandoS27 <fsahmkow27@gmail.com>2019-07-19 17:28:57 +0200
commit024b5fe91ad89820f64011ef2d37c8b956c94386 (patch)
tree7816cc9d561501784bb47915baf46455ad5da00d
parentCommon: Correct alignment allocator to work on C++14 or higher. (diff)
downloadyuzu-024b5fe91ad89820f64011ef2d37c8b956c94386.tar
yuzu-024b5fe91ad89820f64011ef2d37c8b956c94386.tar.gz
yuzu-024b5fe91ad89820f64011ef2d37c8b956c94386.tar.bz2
yuzu-024b5fe91ad89820f64011ef2d37c8b956c94386.tar.lz
yuzu-024b5fe91ad89820f64011ef2d37c8b956c94386.tar.xz
yuzu-024b5fe91ad89820f64011ef2d37c8b956c94386.tar.zst
yuzu-024b5fe91ad89820f64011ef2d37c8b956c94386.zip
-rw-r--r--src/common/alignment.h5
-rw-r--r--src/core/hle/kernel/physical_memory.h8
-rw-r--r--src/core/hle/kernel/shared_memory.cpp4
3 files changed, 11 insertions, 6 deletions
diff --git a/src/common/alignment.h b/src/common/alignment.h
index da2e61e10..0ce218c60 100644
--- a/src/common/alignment.h
+++ b/src/common/alignment.h
@@ -52,7 +52,6 @@ public:
using const_reference = const T&;
public:
-
pointer address(reference r) {
return std::addressof(r);
}
@@ -62,11 +61,11 @@ public:
}
pointer allocate(size_type n) {
- return static_cast<pointer>(::operator new(n, std::align_val_t{Align}));
+ return static_cast<pointer>(::operator new (n, std::align_val_t{Align}));
}
void deallocate(pointer p, size_type) {
- ::operator delete(p, std::align_val_t{Align});
+ ::operator delete (p, std::align_val_t{Align});
}
void construct(pointer p, const value_type& wert) {
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 @@
namespace Kernel {
+// This encapsulation serves 2 purposes:
+// - First, to encapsulate host physical memory under a single type and set an
+// standard for managing it.
+// - Second to ensure all host backing memory used is aligned to 256 bytes due
+// to strict alignment restrictions on GPU memory.
+
using PhysicalMemory = std::vector<u8, Common::AlignmentAllocator<u8, 256>>;
-}
+} // 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_
}
SharedPtr<SharedMemory> SharedMemory::CreateForApplet(
- KernelCore& kernel, std::shared_ptr<Kernel::PhysicalMemory> heap_block, std::size_t offset, u64 size,
- MemoryPermission permissions, MemoryPermission other_permissions, std::string name) {
+ KernelCore& kernel, std::shared_ptr<Kernel::PhysicalMemory> heap_block, std::size_t offset,
+ u64 size, MemoryPermission permissions, MemoryPermission other_permissions, std::string name) {
SharedPtr<SharedMemory> shared_memory(new SharedMemory(kernel));
shared_memory->owner_process = nullptr;