summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel
diff options
context:
space:
mode:
authorGravatar bunnei2022-01-08 23:07:07 -0800
committerGravatar bunnei2022-01-11 16:28:11 -0800
commit081669c3349812eb308be03107541377ac2dbc11 (patch)
treeab022caa12d1989872a2f43ebcb45f9fe1081135 /src/core/hle/kernel
parentMerge pull request #7684 from bunnei/set-mem-perm-attr (diff)
downloadyuzu-081669c3349812eb308be03107541377ac2dbc11.tar.gz
yuzu-081669c3349812eb308be03107541377ac2dbc11.tar.xz
yuzu-081669c3349812eb308be03107541377ac2dbc11.zip
hle: kernel: k_page_table: Rename *ProcessCodeMemory -> *CodeMemory.
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r--src/core/hle/kernel/k_page_table.cpp4
-rw-r--r--src/core/hle/kernel/k_page_table.h4
-rw-r--r--src/core/hle/kernel/svc.cpp4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/core/hle/kernel/k_page_table.cpp b/src/core/hle/kernel/k_page_table.cpp
index 6077985b5..9be9f5e2b 100644
--- a/src/core/hle/kernel/k_page_table.cpp
+++ b/src/core/hle/kernel/k_page_table.cpp
@@ -298,7 +298,7 @@ ResultCode KPageTable::MapProcessCode(VAddr addr, std::size_t num_pages, KMemory
298 return ResultSuccess; 298 return ResultSuccess;
299} 299}
300 300
301ResultCode KPageTable::MapProcessCodeMemory(VAddr dst_addr, VAddr src_addr, std::size_t size) { 301ResultCode KPageTable::MapCodeMemory(VAddr dst_addr, VAddr src_addr, std::size_t size) {
302 std::lock_guard lock{page_table_lock}; 302 std::lock_guard lock{page_table_lock};
303 303
304 const std::size_t num_pages{size / PageSize}; 304 const std::size_t num_pages{size / PageSize};
@@ -335,7 +335,7 @@ ResultCode KPageTable::MapProcessCodeMemory(VAddr dst_addr, VAddr src_addr, std:
335 return ResultSuccess; 335 return ResultSuccess;
336} 336}
337 337
338ResultCode KPageTable::UnmapProcessCodeMemory(VAddr dst_addr, VAddr src_addr, std::size_t size) { 338ResultCode KPageTable::UnmapCodeMemory(VAddr dst_addr, VAddr src_addr, std::size_t size) {
339 std::lock_guard lock{page_table_lock}; 339 std::lock_guard lock{page_table_lock};
340 340
341 if (!size) { 341 if (!size) {
diff --git a/src/core/hle/kernel/k_page_table.h b/src/core/hle/kernel/k_page_table.h
index 9235b822a..a596bf381 100644
--- a/src/core/hle/kernel/k_page_table.h
+++ b/src/core/hle/kernel/k_page_table.h
@@ -31,8 +31,8 @@ public:
31 KMemoryManager::Pool pool); 31 KMemoryManager::Pool pool);
32 ResultCode MapProcessCode(VAddr addr, std::size_t pages_count, KMemoryState state, 32 ResultCode MapProcessCode(VAddr addr, std::size_t pages_count, KMemoryState state,
33 KMemoryPermission perm); 33 KMemoryPermission perm);
34 ResultCode MapProcessCodeMemory(VAddr dst_addr, VAddr src_addr, std::size_t size); 34 ResultCode MapCodeMemory(VAddr dst_addr, VAddr src_addr, std::size_t size);
35 ResultCode UnmapProcessCodeMemory(VAddr dst_addr, VAddr src_addr, std::size_t size); 35 ResultCode UnmapCodeMemory(VAddr dst_addr, VAddr src_addr, std::size_t size);
36 ResultCode UnmapProcessMemory(VAddr dst_addr, std::size_t size, KPageTable& src_page_table, 36 ResultCode UnmapProcessMemory(VAddr dst_addr, std::size_t size, KPageTable& src_page_table,
37 VAddr src_addr); 37 VAddr src_addr);
38 ResultCode MapPhysicalMemory(VAddr addr, std::size_t size); 38 ResultCode MapPhysicalMemory(VAddr addr, std::size_t size);
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index 4362508a3..55ce0236f 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -1626,7 +1626,7 @@ static ResultCode MapProcessCodeMemory(Core::System& system, Handle process_hand
1626 return ResultInvalidMemoryRegion; 1626 return ResultInvalidMemoryRegion;
1627 } 1627 }
1628 1628
1629 return page_table.MapProcessCodeMemory(dst_address, src_address, size); 1629 return page_table.MapCodeMemory(dst_address, src_address, size);
1630} 1630}
1631 1631
1632static ResultCode UnmapProcessCodeMemory(Core::System& system, Handle process_handle, 1632static ResultCode UnmapProcessCodeMemory(Core::System& system, Handle process_handle,
@@ -1694,7 +1694,7 @@ static ResultCode UnmapProcessCodeMemory(Core::System& system, Handle process_ha
1694 return ResultInvalidMemoryRegion; 1694 return ResultInvalidMemoryRegion;
1695 } 1695 }
1696 1696
1697 return page_table.UnmapProcessCodeMemory(dst_address, src_address, size); 1697 return page_table.UnmapCodeMemory(dst_address, src_address, size);
1698} 1698}
1699 1699
1700/// Exits the current process 1700/// Exits the current process