summaryrefslogtreecommitdiffstats
path: root/src/tests/core
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2019-03-02 21:20:28 +0100
committerbunnei <bunneidev@gmail.com>2019-03-17 03:05:40 +0100
commit93da8e0abfcdcc6e3cb5488a0db12373429f1377 (patch)
tree2d2cbe82cfa779add5b77025c04b19361dcbe981 /src/tests/core
parentMerge pull request #2244 from bunnei/gpu-mem-refactor (diff)
downloadyuzu-93da8e0abfcdcc6e3cb5488a0db12373429f1377.tar
yuzu-93da8e0abfcdcc6e3cb5488a0db12373429f1377.tar.gz
yuzu-93da8e0abfcdcc6e3cb5488a0db12373429f1377.tar.bz2
yuzu-93da8e0abfcdcc6e3cb5488a0db12373429f1377.tar.lz
yuzu-93da8e0abfcdcc6e3cb5488a0db12373429f1377.tar.xz
yuzu-93da8e0abfcdcc6e3cb5488a0db12373429f1377.tar.zst
yuzu-93da8e0abfcdcc6e3cb5488a0db12373429f1377.zip
Diffstat (limited to '')
-rw-r--r--src/tests/core/arm/arm_test_common.cpp3
-rw-r--r--src/tests/core/arm/arm_test_common.h8
2 files changed, 6 insertions, 5 deletions
diff --git a/src/tests/core/arm/arm_test_common.cpp b/src/tests/core/arm/arm_test_common.cpp
index 6fe56833d..3e1a735c3 100644
--- a/src/tests/core/arm/arm_test_common.cpp
+++ b/src/tests/core/arm/arm_test_common.cpp
@@ -4,6 +4,7 @@
#include <algorithm>
+#include "common/page_table.h"
#include "core/core.h"
#include "core/hle/kernel/process.h"
#include "core/memory.h"
@@ -22,7 +23,7 @@ TestEnvironment::TestEnvironment(bool mutable_memory_)
std::fill(page_table->pointers.begin(), page_table->pointers.end(), nullptr);
page_table->special_regions.clear();
std::fill(page_table->attributes.begin(), page_table->attributes.end(),
- Memory::PageType::Unmapped);
+ Common::PageType::Unmapped);
Memory::MapIoRegion(*page_table, 0x00000000, 0x80000000, test_memory);
Memory::MapIoRegion(*page_table, 0x80000000, 0x80000000, test_memory);
diff --git a/src/tests/core/arm/arm_test_common.h b/src/tests/core/arm/arm_test_common.h
index 0b7539601..d145dbfcc 100644
--- a/src/tests/core/arm/arm_test_common.h
+++ b/src/tests/core/arm/arm_test_common.h
@@ -9,10 +9,10 @@
#include <vector>
#include "common/common_types.h"
+#include "common/memory_hook.h"
#include "core/hle/kernel/kernel.h"
-#include "core/memory_hook.h"
-namespace Memory {
+namespace Common {
struct PageTable;
}
@@ -58,7 +58,7 @@ public:
private:
friend struct TestMemory;
- struct TestMemory final : Memory::MemoryHook {
+ struct TestMemory final : Common::MemoryHook {
explicit TestMemory(TestEnvironment* env_) : env(env_) {}
TestEnvironment* env;
@@ -86,7 +86,7 @@ private:
bool mutable_memory;
std::shared_ptr<TestMemory> test_memory;
std::vector<WriteRecord> write_records;
- Memory::PageTable* page_table = nullptr;
+ Common::PageTable* page_table = nullptr;
Kernel::KernelCore kernel;
};