summaryrefslogtreecommitdiffstats
path: root/src/core/memory.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-07-19 01:02:47 +0200
committerLioncash <mathew1800@gmail.com>2018-07-19 01:34:31 +0200
commit46458e72846f2611f738e41ece6336472f5288d5 (patch)
treedf865f3749a15b3c7079d12d8e66df0fbb7ed05a /src/core/memory.cpp
parentMerge pull request #681 from lioncash/const (diff)
downloadyuzu-46458e72846f2611f738e41ece6336472f5288d5.tar
yuzu-46458e72846f2611f738e41ece6336472f5288d5.tar.gz
yuzu-46458e72846f2611f738e41ece6336472f5288d5.tar.bz2
yuzu-46458e72846f2611f738e41ece6336472f5288d5.tar.lz
yuzu-46458e72846f2611f738e41ece6336472f5288d5.tar.xz
yuzu-46458e72846f2611f738e41ece6336472f5288d5.tar.zst
yuzu-46458e72846f2611f738e41ece6336472f5288d5.zip
Diffstat (limited to '')
-rw-r--r--src/core/memory.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index 190ccc25c..86075249c 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -5,6 +5,8 @@
#include <algorithm>
#include <array>
#include <cstring>
+#include <utility>
+
#include <boost/optional.hpp>
#include "common/assert.h"
#include "common/common_types.h"
@@ -74,7 +76,7 @@ void MapIoRegion(PageTable& page_table, VAddr base, u64 size, MemoryHookPointer
MapPages(page_table, base / PAGE_SIZE, size / PAGE_SIZE, nullptr, PageType::Special);
auto interval = boost::icl::discrete_interval<VAddr>::closed(base, base + size - 1);
- SpecialRegion region{SpecialRegion::Type::IODevice, mmio_handler};
+ SpecialRegion region{SpecialRegion::Type::IODevice, std::move(mmio_handler)};
page_table.special_regions.add(std::make_pair(interval, std::set<SpecialRegion>{region}));
}
@@ -89,13 +91,13 @@ void UnmapRegion(PageTable& page_table, VAddr base, u64 size) {
void AddDebugHook(PageTable& page_table, VAddr base, u64 size, MemoryHookPointer hook) {
auto interval = boost::icl::discrete_interval<VAddr>::closed(base, base + size - 1);
- SpecialRegion region{SpecialRegion::Type::DebugHook, hook};
+ SpecialRegion region{SpecialRegion::Type::DebugHook, std::move(hook)};
page_table.special_regions.add(std::make_pair(interval, std::set<SpecialRegion>{region}));
}
void RemoveDebugHook(PageTable& page_table, VAddr base, u64 size, MemoryHookPointer hook) {
auto interval = boost::icl::discrete_interval<VAddr>::closed(base, base + size - 1);
- SpecialRegion region{SpecialRegion::Type::DebugHook, hook};
+ SpecialRegion region{SpecialRegion::Type::DebugHook, std::move(hook)};
page_table.special_regions.subtract(std::make_pair(interval, std::set<SpecialRegion>{region}));
}