From 26de4bb521b1ace7af76eff4f6956cb23ac0d58c Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 2 Aug 2018 23:37:44 -0400 Subject: core/memory: Get rid of 3DS leftovers Removes leftover code from citra that isn't needed. --- src/tests/CMakeLists.txt | 1 - src/tests/core/memory/memory.cpp | 56 ---------------------------------------- 2 files changed, 57 deletions(-) delete mode 100644 src/tests/core/memory/memory.cpp (limited to 'src/tests') diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 6a0a62ecc..4d74bb395 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -3,7 +3,6 @@ add_executable(tests core/arm/arm_test_common.cpp core/arm/arm_test_common.h core/core_timing.cpp - core/memory/memory.cpp glad.cpp tests.cpp ) diff --git a/src/tests/core/memory/memory.cpp b/src/tests/core/memory/memory.cpp deleted file mode 100644 index 165496a54..000000000 --- a/src/tests/core/memory/memory.cpp +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright 2017 Citra Emulator Project -// Licensed under GPLv2 or any later version -// Refer to the license.txt file included. - -#include -#include "core/hle/kernel/memory.h" -#include "core/hle/kernel/process.h" -#include "core/memory.h" - -TEST_CASE("Memory::IsValidVirtualAddress", "[core][memory][!hide]") { - SECTION("these regions should not be mapped on an empty process") { - auto process = Kernel::Process::Create(""); - CHECK(Memory::IsValidVirtualAddress(*process, Memory::PROCESS_IMAGE_VADDR) == false); - CHECK(Memory::IsValidVirtualAddress(*process, Memory::HEAP_VADDR) == false); - CHECK(Memory::IsValidVirtualAddress(*process, Memory::LINEAR_HEAP_VADDR) == false); - CHECK(Memory::IsValidVirtualAddress(*process, Memory::VRAM_VADDR) == false); - CHECK(Memory::IsValidVirtualAddress(*process, Memory::CONFIG_MEMORY_VADDR) == false); - CHECK(Memory::IsValidVirtualAddress(*process, Memory::SHARED_PAGE_VADDR) == false); - CHECK(Memory::IsValidVirtualAddress(*process, Memory::TLS_AREA_VADDR) == false); - } - - SECTION("CONFIG_MEMORY_VADDR and SHARED_PAGE_VADDR should be valid after mapping them") { - auto process = Kernel::Process::Create(""); - Kernel::MapSharedPages(process->vm_manager); - CHECK(Memory::IsValidVirtualAddress(*process, Memory::CONFIG_MEMORY_VADDR) == true); - CHECK(Memory::IsValidVirtualAddress(*process, Memory::SHARED_PAGE_VADDR) == true); - } - - SECTION("special regions should be valid after mapping them") { - auto process = Kernel::Process::Create(""); - SECTION("VRAM") { - Kernel::HandleSpecialMapping(process->vm_manager, - {Memory::VRAM_VADDR, Memory::VRAM_SIZE, false, false}); - CHECK(Memory::IsValidVirtualAddress(*process, Memory::VRAM_VADDR) == true); - } - - SECTION("IO (Not yet implemented)") { - Kernel::HandleSpecialMapping( - process->vm_manager, {Memory::IO_AREA_VADDR, Memory::IO_AREA_SIZE, false, false}); - CHECK_FALSE(Memory::IsValidVirtualAddress(*process, Memory::IO_AREA_VADDR) == true); - } - - SECTION("DSP") { - Kernel::HandleSpecialMapping( - process->vm_manager, {Memory::DSP_RAM_VADDR, Memory::DSP_RAM_SIZE, false, false}); - CHECK(Memory::IsValidVirtualAddress(*process, Memory::DSP_RAM_VADDR) == true); - } - } - - SECTION("Unmapping a VAddr should make it invalid") { - auto process = Kernel::Process::Create(""); - Kernel::MapSharedPages(process->vm_manager); - process->vm_manager.UnmapRange(Memory::CONFIG_MEMORY_VADDR, Memory::CONFIG_MEMORY_SIZE); - CHECK(Memory::IsValidVirtualAddress(*process, Memory::CONFIG_MEMORY_VADDR) == false); - } -} -- cgit v1.2.3