yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0

page_table: Allow page tables to be moved

Makes page tables and virtual buffers able to be moved, but not copied,
making the interface more flexible.

Previously, with the destructor specified, but no move assignment or
constructor specified, they wouldn't be implicitly generated.
This commit is contained in:
Lioncash 2020-11-17 19:58:41 -05:00
parent 3cfd962ef4
commit b3c8997829
4 changed files with 30 additions and 9 deletions

View File

@ -8,7 +8,7 @@ namespace Common {
PageTable::PageTable() = default; PageTable::PageTable() = default;
PageTable::~PageTable() = default; PageTable::~PageTable() noexcept = default;
void PageTable::Resize(std::size_t address_space_width_in_bits, std::size_t page_size_in_bits, void PageTable::Resize(std::size_t address_space_width_in_bits, std::size_t page_size_in_bits,
bool has_attribute) { bool has_attribute) {

View File

@ -4,6 +4,8 @@
#pragma once #pragma once
#include <tuple>
#include "common/common_types.h" #include "common/common_types.h"
#include "common/memory_hook.h" #include "common/memory_hook.h"
#include "common/virtual_buffer.h" #include "common/virtual_buffer.h"
@ -47,7 +49,13 @@ struct SpecialRegion {
*/ */
struct PageTable { struct PageTable {
PageTable(); PageTable();
~PageTable(); ~PageTable() noexcept;
PageTable(const PageTable&) = delete;
PageTable& operator=(const PageTable&) = delete;
PageTable(PageTable&&) noexcept = default;
PageTable& operator=(PageTable&&) noexcept = default;
/** /**
* Resizes the page table to be able to accomodate enough pages within * Resizes the page table to be able to accomodate enough pages within

View File

@ -13,7 +13,7 @@
namespace Common { namespace Common {
void* AllocateMemoryPages(std::size_t size) { void* AllocateMemoryPages(std::size_t size) noexcept {
#ifdef _WIN32 #ifdef _WIN32
void* base{VirtualAlloc(nullptr, size, MEM_COMMIT, PAGE_READWRITE)}; void* base{VirtualAlloc(nullptr, size, MEM_COMMIT, PAGE_READWRITE)};
#else #else
@ -29,7 +29,7 @@ void* AllocateMemoryPages(std::size_t size) {
return base; return base;
} }
void FreeMemoryPages(void* base, [[maybe_unused]] std::size_t size) { void FreeMemoryPages(void* base, [[maybe_unused]] std::size_t size) noexcept {
if (!base) { if (!base) {
return; return;
} }

View File

@ -4,25 +4,38 @@
#pragma once #pragma once
#include "common/common_funcs.h" #include <utility>
namespace Common { namespace Common {
void* AllocateMemoryPages(std::size_t size); void* AllocateMemoryPages(std::size_t size) noexcept;
void FreeMemoryPages(void* base, std::size_t size); void FreeMemoryPages(void* base, std::size_t size) noexcept;
template <typename T> template <typename T>
class VirtualBuffer final : NonCopyable { class VirtualBuffer final {
public: public:
constexpr VirtualBuffer() = default; constexpr VirtualBuffer() = default;
explicit VirtualBuffer(std::size_t count) : alloc_size{count * sizeof(T)} { explicit VirtualBuffer(std::size_t count) : alloc_size{count * sizeof(T)} {
base_ptr = reinterpret_cast<T*>(AllocateMemoryPages(alloc_size)); base_ptr = reinterpret_cast<T*>(AllocateMemoryPages(alloc_size));
} }
~VirtualBuffer() { ~VirtualBuffer() noexcept {
FreeMemoryPages(base_ptr, alloc_size); FreeMemoryPages(base_ptr, alloc_size);
} }
VirtualBuffer(const VirtualBuffer&) = delete;
VirtualBuffer& operator=(const VirtualBuffer&) = delete;
VirtualBuffer(VirtualBuffer&& other) noexcept
: alloc_size{std::exchange(other.alloc_size, 0)}, base_ptr{std::exchange(other.base_ptr),
nullptr} {}
VirtualBuffer& operator=(VirtualBuffer&& other) noexcept {
alloc_size = std::exchange(other.alloc_size, 0);
base_ptr = std::exchange(other.base_ptr, nullptr);
return *this;
}
void resize(std::size_t count) { void resize(std::size_t count) {
FreeMemoryPages(base_ptr, alloc_size); FreeMemoryPages(base_ptr, alloc_size);