mirror of
https://git.h3cjp.net/H3cJP/citra.git
synced 2024-11-24 12:02:50 +00:00
kernel: Rename memory page table set function
This commit is contained in:
parent
ed095f3bff
commit
79b837afa7
|
@ -48,10 +48,10 @@ std::shared_ptr<Process> KernelSystem::GetCurrentProcess() const {
|
||||||
|
|
||||||
void KernelSystem::SetCurrentProcess(std::shared_ptr<Process> process) {
|
void KernelSystem::SetCurrentProcess(std::shared_ptr<Process> process) {
|
||||||
current_process = process;
|
current_process = process;
|
||||||
SetCurrentMemPageTable(&process->vm_manager.page_table);
|
SetCurrentMemoryPageTable(&process->vm_manager.page_table);
|
||||||
}
|
}
|
||||||
|
|
||||||
void KernelSystem::SetCurrentMemPageTable(Memory::PageTable* page_table) {
|
void KernelSystem::SetCurrentMemoryPageTable(Memory::PageTable* page_table) {
|
||||||
memory.SetCurrentPageTable(page_table);
|
memory.SetCurrentPageTable(page_table);
|
||||||
if (current_cpu != nullptr) {
|
if (current_cpu != nullptr) {
|
||||||
current_cpu->PageTableChanged(); // notify the CPU the page table in memory has changed
|
current_cpu->PageTableChanged(); // notify the CPU the page table in memory has changed
|
||||||
|
|
|
@ -207,7 +207,7 @@ public:
|
||||||
std::shared_ptr<Process> GetCurrentProcess() const;
|
std::shared_ptr<Process> GetCurrentProcess() const;
|
||||||
void SetCurrentProcess(std::shared_ptr<Process> process);
|
void SetCurrentProcess(std::shared_ptr<Process> process);
|
||||||
|
|
||||||
void SetCurrentMemPageTable(Memory::PageTable* page_table);
|
void SetCurrentMemoryPageTable(Memory::PageTable* page_table);
|
||||||
|
|
||||||
void SetCPU(std::shared_ptr<ARM_Interface> cpu);
|
void SetCPU(std::shared_ptr<ARM_Interface> cpu);
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@ TestEnvironment::TestEnvironment(bool mutable_memory_)
|
||||||
memory->MapIoRegion(*page_table, 0x00000000, 0x80000000, test_memory);
|
memory->MapIoRegion(*page_table, 0x00000000, 0x80000000, test_memory);
|
||||||
memory->MapIoRegion(*page_table, 0x80000000, 0x80000000, test_memory);
|
memory->MapIoRegion(*page_table, 0x80000000, 0x80000000, test_memory);
|
||||||
|
|
||||||
kernel->SetCurrentMemPageTable(page_table);
|
kernel->SetCurrentMemoryPageTable(page_table);
|
||||||
}
|
}
|
||||||
|
|
||||||
TestEnvironment::~TestEnvironment() {
|
TestEnvironment::~TestEnvironment() {
|
||||||
|
|
Loading…
Reference in a new issue