diff options
author | bunnei <bunneidev@gmail.com> | 2020-04-08 23:39:58 +0200 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2020-04-17 06:59:31 +0200 |
commit | a040a152468bbd315781c3d50bea484c07e2e02a (patch) | |
tree | 2723c7160111f0328ce13aa09445c8badc02a3bb /src/core/device_memory.h | |
parent | common: Add VirtualBuffer class, to abstract memory virtualization. (diff) | |
download | yuzu-a040a152468bbd315781c3d50bea484c07e2e02a.tar yuzu-a040a152468bbd315781c3d50bea484c07e2e02a.tar.gz yuzu-a040a152468bbd315781c3d50bea484c07e2e02a.tar.bz2 yuzu-a040a152468bbd315781c3d50bea484c07e2e02a.tar.lz yuzu-a040a152468bbd315781c3d50bea484c07e2e02a.tar.xz yuzu-a040a152468bbd315781c3d50bea484c07e2e02a.tar.zst yuzu-a040a152468bbd315781c3d50bea484c07e2e02a.zip |
Diffstat (limited to 'src/core/device_memory.h')
-rw-r--r-- | src/core/device_memory.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/core/device_memory.h b/src/core/device_memory.h index a60a7238a..44458c2b5 100644 --- a/src/core/device_memory.h +++ b/src/core/device_memory.h @@ -6,7 +6,7 @@ #include "common/assert.h" #include "common/common_funcs.h" -#include "core/hle/kernel/physical_memory.h" +#include "common/virtual_buffer.h" namespace Core { @@ -24,24 +24,25 @@ constexpr u64 SlabHeapEnd = SlabHeapBase + SlapHeapSize; class DeviceMemory : NonCopyable { public: - DeviceMemory(Core::System& system); + explicit DeviceMemory(Core::System& system); ~DeviceMemory(); template <typename T> PAddr GetPhysicalAddr(T* ptr) { const auto ptr_addr{reinterpret_cast<uintptr_t>(ptr)}; - const auto base_addr{reinterpret_cast<uintptr_t>(base)}; + const auto base_addr{reinterpret_cast<uintptr_t>(buffer.data())}; ASSERT(ptr_addr >= base_addr); return ptr_addr - base_addr + DramMemoryMap::Base; } PAddr GetPhysicalAddr(VAddr addr); - u8* GetPointer(PAddr addr); + constexpr u8* GetPointer(PAddr addr) { + return buffer.data() + (addr - DramMemoryMap::Base); + } private: - u8* base{}; - Kernel::PhysicalMemory physical_memory; + Common::VirtualBuffer<u8> buffer; Core::System& system; }; |