diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2021-11-20 20:05:02 -0500 | 
|---|---|---|
| committer | Morph <39850852+Morph1984@users.noreply.github.com> | 2021-11-20 22:18:56 -0500 | 
| commit | 281437c811847adbc38b69ef3638996c666f65c3 (patch) | |
| tree | 81b7eb955b632bd40a2556e4df7c36ae8cab0485 /src/core | |
| parent | ea6fa044f3e55de3b542c6c1b7ca581cbf76d77e (diff) | |
kernel: KPageTable: Rename SetCodeMemoryPermission to SetProcessMemoryPermission
Diffstat (limited to 'src/core')
| -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,      return ResultSuccess;  } -ResultCode KPageTable::SetCodeMemoryPermission(VAddr addr, std::size_t size, -                                               KMemoryPermission perm) { +ResultCode KPageTable::SetProcessMemoryPermission(VAddr addr, std::size_t size, +                                                  KMemoryPermission perm) {      std::lock_guard lock{page_table_lock}; 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:      ResultCode MapPages(VAddr addr, KPageLinkedList& page_linked_list, KMemoryState state,                          KMemoryPermission perm);      ResultCode UnmapPages(VAddr addr, KPageLinkedList& page_linked_list, KMemoryState state); -    ResultCode SetCodeMemoryPermission(VAddr addr, std::size_t size, KMemoryPermission perm); +    ResultCode SetProcessMemoryPermission(VAddr addr, std::size_t size, KMemoryPermission perm);      KMemoryInfo QueryInfo(VAddr addr);      ResultCode ReserveTransferMemory(VAddr addr, std::size_t size, KMemoryPermission perm);      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) {      std::lock_guard lock{HLE::g_hle_lock};      const auto ReprotectSegment = [&](const CodeSet::Segment& segment,                                        KMemoryPermission permission) { -        page_table->SetCodeMemoryPermission(segment.addr + base_addr, segment.size, permission); +        page_table->SetProcessMemoryPermission(segment.addr + base_addr, segment.size, permission);      };      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:          CopyCode(nro_addr + nro_header.segment_headers[DATA_INDEX].memory_offset, data_start,                   nro_header.segment_headers[DATA_INDEX].memory_size); -        CASCADE_CODE(process->PageTable().SetCodeMemoryPermission( +        CASCADE_CODE(process->PageTable().SetProcessMemoryPermission(              text_start, ro_start - text_start, Kernel::KMemoryPermission::ReadAndExecute)); -        CASCADE_CODE(process->PageTable().SetCodeMemoryPermission(ro_start, data_start - ro_start, -                                                                  Kernel::KMemoryPermission::Read)); +        CASCADE_CODE(process->PageTable().SetProcessMemoryPermission( +            ro_start, data_start - ro_start, Kernel::KMemoryPermission::Read)); -        return process->PageTable().SetCodeMemoryPermission( +        return process->PageTable().SetProcessMemoryPermission(              data_start, bss_end_addr - data_start, Kernel::KMemoryPermission::ReadAndWrite);      }  | 
