diff options
| author | bunnei <bunneidev@gmail.com> | 2020-04-08 17:39:58 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2020-04-17 00:59:31 -0400 |
| commit | a040a152468bbd315781c3d50bea484c07e2e02a (patch) | |
| tree | 2723c7160111f0328ce13aa09445c8badc02a3bb /src/core/device_memory.cpp | |
| parent | 4ba2428c86d95fdfe9c580dd62e4a94309a4661c (diff) | |
core: device_memory: Update to use VirtualBuffer class.
Diffstat (limited to 'src/core/device_memory.cpp')
| -rw-r--r-- | src/core/device_memory.cpp | 38 |
1 files changed, 5 insertions, 33 deletions
diff --git a/src/core/device_memory.cpp b/src/core/device_memory.cpp index 1e41875463..61429a6acf 100644 --- a/src/core/device_memory.cpp +++ b/src/core/device_memory.cpp @@ -2,49 +2,21 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#ifdef _WIN32 -#include <windows.h> -#endif - -#include "common/assert.h" #include "core/core.h" #include "core/device_memory.h" #include "core/memory.h" namespace Core { -constexpr u64 DramSize{4ULL * 1024 * 1024 * 1024}; - -DeviceMemory::DeviceMemory(System& system) : system{system} { -#ifdef _WIN32 - base = static_cast<u8*>( - VirtualAlloc(nullptr, // System selects address - DramSize, // Size of allocation - MEM_RESERVE | MEM_COMMIT | MEM_WRITE_WATCH, // Allocate reserved pages - PAGE_READWRITE)); // Protection = no access -#else - physical_memory.resize(DramSize); - base = physical_memory.data(); -#endif -} +DeviceMemory::DeviceMemory(System& system) : buffer{DramMemoryMap::Size}, system{system} {} -DeviceMemory::~DeviceMemory() { -#ifdef _WIN32 - ASSERT(VirtualFree(base, DramSize, MEM_RELEASE)); -#endif -} +DeviceMemory::~DeviceMemory() = default; PAddr DeviceMemory::GetPhysicalAddr(VAddr addr) { - u8* pointer{system.Memory().GetPointer(addr)}; - ASSERT(pointer); - const uintptr_t offset{static_cast<uintptr_t>(pointer - GetPointer(DramMemoryMap::Base))}; + const u8* const base{system.Memory().GetPointer(addr)}; + ASSERT(base); + const uintptr_t offset{static_cast<uintptr_t>(base - GetPointer(DramMemoryMap::Base))}; return DramMemoryMap::Base + offset; } -u8* DeviceMemory::GetPointer(PAddr addr) { - ASSERT(addr >= DramMemoryMap::Base); - ASSERT(addr < DramMemoryMap::Base + DramSize); - return base + (addr - DramMemoryMap::Base); -} - } // namespace Core |