From dc25c86556c36dd23224d88234afc9ecbf780719 Mon Sep 17 00:00:00 2001 From: bunnei Date: Thu, 2 Apr 2020 22:00:41 -0400 Subject: core: device_manager: Add a simple class to manage device RAM. --- src/core/device_memory.cpp | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 src/core/device_memory.cpp (limited to 'src/core/device_memory.cpp') diff --git a/src/core/device_memory.cpp b/src/core/device_memory.cpp new file mode 100644 index 000000000..1e4187546 --- /dev/null +++ b/src/core/device_memory.cpp @@ -0,0 +1,50 @@ +// Copyright 2020 yuzu Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#ifdef _WIN32 +#include +#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( + 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() { +#ifdef _WIN32 + ASSERT(VirtualFree(base, DramSize, MEM_RELEASE)); +#endif +} + +PAddr DeviceMemory::GetPhysicalAddr(VAddr addr) { + u8* pointer{system.Memory().GetPointer(addr)}; + ASSERT(pointer); + const uintptr_t offset{static_cast(pointer - 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 -- cgit v1.2.3 From a040a152468bbd315781c3d50bea484c07e2e02a Mon Sep 17 00:00:00 2001 From: bunnei Date: Wed, 8 Apr 2020 17:39:58 -0400 Subject: core: device_memory: Update to use VirtualBuffer class. --- src/core/device_memory.cpp | 38 +++++--------------------------------- 1 file changed, 5 insertions(+), 33 deletions(-) (limited to 'src/core/device_memory.cpp') diff --git a/src/core/device_memory.cpp b/src/core/device_memory.cpp index 1e4187546..61429a6ac 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 -#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( - 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(pointer - GetPointer(DramMemoryMap::Base))}; + const u8* const base{system.Memory().GetPointer(addr)}; + ASSERT(base); + const uintptr_t offset{static_cast(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 -- cgit v1.2.3 From a8292f6cd9f8b4088ee85b59a87e5bf0ce387cf0 Mon Sep 17 00:00:00 2001 From: bunnei Date: Wed, 8 Apr 2020 23:37:24 -0400 Subject: kernel: memory: page_table: Simplify GetPhysicalAddr impl. --- src/core/device_memory.cpp | 7 ------- 1 file changed, 7 deletions(-) (limited to 'src/core/device_memory.cpp') diff --git a/src/core/device_memory.cpp b/src/core/device_memory.cpp index 61429a6ac..51097ced3 100644 --- a/src/core/device_memory.cpp +++ b/src/core/device_memory.cpp @@ -12,11 +12,4 @@ DeviceMemory::DeviceMemory(System& system) : buffer{DramMemoryMap::Size}, system DeviceMemory::~DeviceMemory() = default; -PAddr DeviceMemory::GetPhysicalAddr(VAddr addr) { - const u8* const base{system.Memory().GetPointer(addr)}; - ASSERT(base); - const uintptr_t offset{static_cast(base - GetPointer(DramMemoryMap::Base))}; - return DramMemoryMap::Base + offset; -} - } // namespace Core -- cgit v1.2.3