diff options
| author | 2021-04-23 22:04:28 -0700 | |
|---|---|---|
| committer | 2021-05-05 16:40:52 -0700 | |
| commit | 2a7eff57a8048933a89c1a8f8d6dced7b5d604f2 (patch) | |
| tree | 757a2207ab4d29b39ee8d9ddfa79966283d4d24a /src/core/hle/service/ldr | |
| parent | hle: kernel: Remove deprecated Object class. (diff) | |
| download | yuzu-2a7eff57a8048933a89c1a8f8d6dced7b5d604f2.tar.gz yuzu-2a7eff57a8048933a89c1a8f8d6dced7b5d604f2.tar.xz yuzu-2a7eff57a8048933a89c1a8f8d6dced7b5d604f2.zip | |
hle: kernel: Rename Process to KProcess.
Diffstat (limited to 'src/core/hle/service/ldr')
| -rw-r--r-- | src/core/hle/service/ldr/ldr.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/service/ldr/ldr.cpp b/src/core/hle/service/ldr/ldr.cpp index c8bc60ad1..563916f29 100644 --- a/src/core/hle/service/ldr/ldr.cpp +++ b/src/core/hle/service/ldr/ldr.cpp | |||
| @@ -12,8 +12,8 @@ | |||
| 12 | #include "core/core.h" | 12 | #include "core/core.h" |
| 13 | #include "core/hle/ipc_helpers.h" | 13 | #include "core/hle/ipc_helpers.h" |
| 14 | #include "core/hle/kernel/k_page_table.h" | 14 | #include "core/hle/kernel/k_page_table.h" |
| 15 | #include "core/hle/kernel/k_process.h" | ||
| 15 | #include "core/hle/kernel/k_system_control.h" | 16 | #include "core/hle/kernel/k_system_control.h" |
| 16 | #include "core/hle/kernel/process.h" | ||
| 17 | #include "core/hle/kernel/svc_results.h" | 17 | #include "core/hle/kernel/svc_results.h" |
| 18 | #include "core/hle/service/ldr/ldr.h" | 18 | #include "core/hle/service/ldr/ldr.h" |
| 19 | #include "core/hle/service/service.h" | 19 | #include "core/hle/service/service.h" |
| @@ -321,7 +321,7 @@ public: | |||
| 321 | return addr; | 321 | return addr; |
| 322 | } | 322 | } |
| 323 | 323 | ||
| 324 | ResultVal<VAddr> MapProcessCodeMemory(Kernel::Process* process, VAddr baseAddress, | 324 | ResultVal<VAddr> MapProcessCodeMemory(Kernel::KProcess* process, VAddr baseAddress, |
| 325 | u64 size) const { | 325 | u64 size) const { |
| 326 | for (std::size_t retry = 0; retry < MAXIMUM_MAP_RETRIES; retry++) { | 326 | for (std::size_t retry = 0; retry < MAXIMUM_MAP_RETRIES; retry++) { |
| 327 | auto& page_table{process->PageTable()}; | 327 | auto& page_table{process->PageTable()}; |
| @@ -342,7 +342,7 @@ public: | |||
| 342 | return ERROR_INSUFFICIENT_ADDRESS_SPACE; | 342 | return ERROR_INSUFFICIENT_ADDRESS_SPACE; |
| 343 | } | 343 | } |
| 344 | 344 | ||
| 345 | ResultVal<VAddr> MapNro(Kernel::Process* process, VAddr nro_addr, std::size_t nro_size, | 345 | ResultVal<VAddr> MapNro(Kernel::KProcess* process, VAddr nro_addr, std::size_t nro_size, |
| 346 | VAddr bss_addr, std::size_t bss_size, std::size_t size) const { | 346 | VAddr bss_addr, std::size_t bss_size, std::size_t size) const { |
| 347 | for (std::size_t retry = 0; retry < MAXIMUM_MAP_RETRIES; retry++) { | 347 | for (std::size_t retry = 0; retry < MAXIMUM_MAP_RETRIES; retry++) { |
| 348 | auto& page_table{process->PageTable()}; | 348 | auto& page_table{process->PageTable()}; |
| @@ -378,7 +378,7 @@ public: | |||
| 378 | return ERROR_INSUFFICIENT_ADDRESS_SPACE; | 378 | return ERROR_INSUFFICIENT_ADDRESS_SPACE; |
| 379 | } | 379 | } |
| 380 | 380 | ||
| 381 | ResultCode LoadNro(Kernel::Process* process, const NROHeader& nro_header, VAddr nro_addr, | 381 | ResultCode LoadNro(Kernel::KProcess* process, const NROHeader& nro_header, VAddr nro_addr, |
| 382 | VAddr start) const { | 382 | VAddr start) const { |
| 383 | const VAddr text_start{start + nro_header.segment_headers[TEXT_INDEX].memory_offset}; | 383 | const VAddr text_start{start + nro_header.segment_headers[TEXT_INDEX].memory_offset}; |
| 384 | const VAddr ro_start{start + nro_header.segment_headers[RO_INDEX].memory_offset}; | 384 | const VAddr ro_start{start + nro_header.segment_headers[RO_INDEX].memory_offset}; |