diff options
Diffstat (limited to '')
| -rw-r--r-- | src/core/hle/kernel/k_page_table.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/kernel/k_page_table.h | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/k_process.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/ldr/ldr.cpp | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/core/hle/kernel/k_page_table.cpp b/src/core/hle/kernel/k_page_table.cpp index 526b87241..9bda5c5b2 100644 --- a/src/core/hle/kernel/k_page_table.cpp +++ b/src/core/hle/kernel/k_page_table.cpp | |||
| @@ -685,8 +685,8 @@ ResultCode KPageTable::UnmapPages(VAddr addr, KPageLinkedList& page_linked_list, | |||
| 685 | return ResultSuccess; | 685 | return ResultSuccess; |
| 686 | } | 686 | } |
| 687 | 687 | ||
| 688 | ResultCode KPageTable::SetCodeMemoryPermission(VAddr addr, std::size_t size, | 688 | ResultCode KPageTable::SetProcessMemoryPermission(VAddr addr, std::size_t size, |
| 689 | KMemoryPermission perm) { | 689 | KMemoryPermission perm) { |
| 690 | 690 | ||
| 691 | std::lock_guard lock{page_table_lock}; | 691 | std::lock_guard lock{page_table_lock}; |
| 692 | 692 | ||
diff --git a/src/core/hle/kernel/k_page_table.h b/src/core/hle/kernel/k_page_table.h index 770c4841c..b7ec38f06 100644 --- a/src/core/hle/kernel/k_page_table.h +++ b/src/core/hle/kernel/k_page_table.h | |||
| @@ -41,7 +41,7 @@ public: | |||
| 41 | ResultCode MapPages(VAddr addr, KPageLinkedList& page_linked_list, KMemoryState state, | 41 | ResultCode MapPages(VAddr addr, KPageLinkedList& page_linked_list, KMemoryState state, |
| 42 | KMemoryPermission perm); | 42 | KMemoryPermission perm); |
| 43 | ResultCode UnmapPages(VAddr addr, KPageLinkedList& page_linked_list, KMemoryState state); | 43 | ResultCode UnmapPages(VAddr addr, KPageLinkedList& page_linked_list, KMemoryState state); |
| 44 | ResultCode SetCodeMemoryPermission(VAddr addr, std::size_t size, KMemoryPermission perm); | 44 | ResultCode SetProcessMemoryPermission(VAddr addr, std::size_t size, KMemoryPermission perm); |
| 45 | KMemoryInfo QueryInfo(VAddr addr); | 45 | KMemoryInfo QueryInfo(VAddr addr); |
| 46 | ResultCode ReserveTransferMemory(VAddr addr, std::size_t size, KMemoryPermission perm); | 46 | ResultCode ReserveTransferMemory(VAddr addr, std::size_t size, KMemoryPermission perm); |
| 47 | ResultCode ResetTransferMemory(VAddr addr, std::size_t size); | 47 | ResultCode ResetTransferMemory(VAddr addr, std::size_t size); |
diff --git a/src/core/hle/kernel/k_process.cpp b/src/core/hle/kernel/k_process.cpp index 76fd8c285..1aad061e1 100644 --- a/src/core/hle/kernel/k_process.cpp +++ b/src/core/hle/kernel/k_process.cpp | |||
| @@ -528,7 +528,7 @@ void KProcess::LoadModule(CodeSet code_set, VAddr base_addr) { | |||
| 528 | std::lock_guard lock{HLE::g_hle_lock}; | 528 | std::lock_guard lock{HLE::g_hle_lock}; |
| 529 | const auto ReprotectSegment = [&](const CodeSet::Segment& segment, | 529 | const auto ReprotectSegment = [&](const CodeSet::Segment& segment, |
| 530 | KMemoryPermission permission) { | 530 | KMemoryPermission permission) { |
| 531 | page_table->SetCodeMemoryPermission(segment.addr + base_addr, segment.size, permission); | 531 | page_table->SetProcessMemoryPermission(segment.addr + base_addr, segment.size, permission); |
| 532 | }; | 532 | }; |
| 533 | 533 | ||
| 534 | kernel.System().Memory().WriteBlock(*this, base_addr, code_set.memory.data(), | 534 | kernel.System().Memory().WriteBlock(*this, base_addr, code_set.memory.data(), |
diff --git a/src/core/hle/service/ldr/ldr.cpp b/src/core/hle/service/ldr/ldr.cpp index 32eff3b2a..3782703d2 100644 --- a/src/core/hle/service/ldr/ldr.cpp +++ b/src/core/hle/service/ldr/ldr.cpp | |||
| @@ -396,12 +396,12 @@ public: | |||
| 396 | CopyCode(nro_addr + nro_header.segment_headers[DATA_INDEX].memory_offset, data_start, | 396 | CopyCode(nro_addr + nro_header.segment_headers[DATA_INDEX].memory_offset, data_start, |
| 397 | nro_header.segment_headers[DATA_INDEX].memory_size); | 397 | nro_header.segment_headers[DATA_INDEX].memory_size); |
| 398 | 398 | ||
| 399 | CASCADE_CODE(process->PageTable().SetCodeMemoryPermission( | 399 | CASCADE_CODE(process->PageTable().SetProcessMemoryPermission( |
| 400 | text_start, ro_start - text_start, Kernel::KMemoryPermission::ReadAndExecute)); | 400 | text_start, ro_start - text_start, Kernel::KMemoryPermission::ReadAndExecute)); |
| 401 | CASCADE_CODE(process->PageTable().SetCodeMemoryPermission(ro_start, data_start - ro_start, | 401 | CASCADE_CODE(process->PageTable().SetProcessMemoryPermission( |
| 402 | Kernel::KMemoryPermission::Read)); | 402 | ro_start, data_start - ro_start, Kernel::KMemoryPermission::Read)); |
| 403 | 403 | ||
| 404 | return process->PageTable().SetCodeMemoryPermission( | 404 | return process->PageTable().SetProcessMemoryPermission( |
| 405 | data_start, bss_end_addr - data_start, Kernel::KMemoryPermission::ReadAndWrite); | 405 | data_start, bss_end_addr - data_start, Kernel::KMemoryPermission::ReadAndWrite); |
| 406 | } | 406 | } |
| 407 | 407 | ||