daniel/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android synced 2024-12-26 07:11:22 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

core: device_memory: Update to use VirtualBuffer class.

Browse Source
This commit is contained in:
bunnei 2020-04-08 17:39:58 -04:00
parent 4ba2428c86
commit a040a15246
2 changed files with 12 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/core/device_memory.cpp
View File

@ -2,49 +2,21 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#ifdef _WIN32
#include <windows.h>
#endif
#include "common/assert.h"
#include "core/core.h" #include "core/core.h"
#include "core/device_memory.h" #include "core/device_memory.h"
#include "core/memory.h" #include "core/memory.h"
namespace Core { namespace Core {
constexpr u64 DramSize{4ULL * 1024 * 1024 * 1024}; DeviceMemory::DeviceMemory(System& system) : buffer{DramMemoryMap::Size}, system{system} {}
DeviceMemory::DeviceMemory(System& system) : system{system} { DeviceMemory::~DeviceMemory() = default;
#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() {
#ifdef _WIN32
ASSERT(VirtualFree(base, DramSize, MEM_RELEASE));
#endif
}
PAddr DeviceMemory::GetPhysicalAddr(VAddr addr) { PAddr DeviceMemory::GetPhysicalAddr(VAddr addr) {
u8* pointer{system.Memory().GetPointer(addr)}; const u8* const base{system.Memory().GetPointer(addr)};
ASSERT(pointer); ASSERT(base);
const uintptr_t offset{static_cast<uintptr_t>(pointer - GetPointer(DramMemoryMap::Base))}; const uintptr_t offset{static_cast<uintptr_t>(base - GetPointer(DramMemoryMap::Base))};
return DramMemoryMap::Base + offset; 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 } // namespace Core

13
src/core/device_memory.h
View File

@ -6,7 +6,7 @@
#include "common/assert.h" #include "common/assert.h"
#include "common/common_funcs.h" #include "common/common_funcs.h"
#include "core/hle/kernel/physical_memory.h" #include "common/virtual_buffer.h"
namespace Core { namespace Core {
@ -24,24 +24,25 @@ constexpr u64 SlabHeapEnd = SlabHeapBase + SlapHeapSize;
class DeviceMemory : NonCopyable { class DeviceMemory : NonCopyable {
public: public:
DeviceMemory(Core::System& system); explicit DeviceMemory(Core::System& system);
~DeviceMemory(); ~DeviceMemory();
template <typename T> template <typename T>
PAddr GetPhysicalAddr(T* ptr) { PAddr GetPhysicalAddr(T* ptr) {
const auto ptr_addr{reinterpret_cast<uintptr_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); ASSERT(ptr_addr >= base_addr);
return ptr_addr - base_addr + DramMemoryMap::Base; return ptr_addr - base_addr + DramMemoryMap::Base;
} }
PAddr GetPhysicalAddr(VAddr addr); PAddr GetPhysicalAddr(VAddr addr);
u8* GetPointer(PAddr addr); constexpr u8* GetPointer(PAddr addr) {
return buffer.data() + (addr - DramMemoryMap::Base);
}
private: private:
u8* base{}; Common::VirtualBuffer<u8> buffer;
Kernel::PhysicalMemory physical_memory;
Core::System& system; Core::System& system;
}; };