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/loader | |
| 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/loader')
| -rw-r--r-- | src/core/loader/deconstructed_rom_directory.cpp | 4 | ||||
| -rw-r--r-- | src/core/loader/deconstructed_rom_directory.h | 2 | ||||
| -rw-r--r-- | src/core/loader/elf.cpp | 4 | ||||
| -rw-r--r-- | src/core/loader/elf.h | 2 | ||||
| -rw-r--r-- | src/core/loader/kip.cpp | 4 | ||||
| -rw-r--r-- | src/core/loader/kip.h | 2 | ||||
| -rw-r--r-- | src/core/loader/loader.cpp | 2 | ||||
| -rw-r--r-- | src/core/loader/loader.h | 4 | ||||
| -rw-r--r-- | src/core/loader/nax.cpp | 4 | ||||
| -rw-r--r-- | src/core/loader/nax.h | 2 | ||||
| -rw-r--r-- | src/core/loader/nca.cpp | 4 | ||||
| -rw-r--r-- | src/core/loader/nca.h | 2 | ||||
| -rw-r--r-- | src/core/loader/nro.cpp | 8 | ||||
| -rw-r--r-- | src/core/loader/nro.h | 6 | ||||
| -rw-r--r-- | src/core/loader/nso.cpp | 6 | ||||
| -rw-r--r-- | src/core/loader/nso.h | 6 | ||||
| -rw-r--r-- | src/core/loader/nsp.cpp | 4 | ||||
| -rw-r--r-- | src/core/loader/nsp.h | 2 | ||||
| -rw-r--r-- | src/core/loader/xci.cpp | 4 | ||||
| -rw-r--r-- | src/core/loader/xci.h | 2 |
20 files changed, 37 insertions, 37 deletions
diff --git a/src/core/loader/deconstructed_rom_directory.cpp b/src/core/loader/deconstructed_rom_directory.cpp index fed47ecda..42f023258 100644 --- a/src/core/loader/deconstructed_rom_directory.cpp +++ b/src/core/loader/deconstructed_rom_directory.cpp | |||
| @@ -13,8 +13,8 @@ | |||
| 13 | #include "core/file_sys/patch_manager.h" | 13 | #include "core/file_sys/patch_manager.h" |
| 14 | #include "core/file_sys/romfs_factory.h" | 14 | #include "core/file_sys/romfs_factory.h" |
| 15 | #include "core/hle/kernel/k_page_table.h" | 15 | #include "core/hle/kernel/k_page_table.h" |
| 16 | #include "core/hle/kernel/k_process.h" | ||
| 16 | #include "core/hle/kernel/kernel.h" | 17 | #include "core/hle/kernel/kernel.h" |
| 17 | #include "core/hle/kernel/process.h" | ||
| 18 | #include "core/hle/service/filesystem/filesystem.h" | 18 | #include "core/hle/service/filesystem/filesystem.h" |
| 19 | #include "core/loader/deconstructed_rom_directory.h" | 19 | #include "core/loader/deconstructed_rom_directory.h" |
| 20 | #include "core/loader/nso.h" | 20 | #include "core/loader/nso.h" |
| @@ -88,7 +88,7 @@ FileType AppLoader_DeconstructedRomDirectory::IdentifyType(const FileSys::Virtua | |||
| 88 | } | 88 | } |
| 89 | 89 | ||
| 90 | AppLoader_DeconstructedRomDirectory::LoadResult AppLoader_DeconstructedRomDirectory::Load( | 90 | AppLoader_DeconstructedRomDirectory::LoadResult AppLoader_DeconstructedRomDirectory::Load( |
| 91 | Kernel::Process& process, Core::System& system) { | 91 | Kernel::KProcess& process, Core::System& system) { |
| 92 | if (is_loaded) { | 92 | if (is_loaded) { |
| 93 | return {ResultStatus::ErrorAlreadyLoaded, {}}; | 93 | return {ResultStatus::ErrorAlreadyLoaded, {}}; |
| 94 | } | 94 | } |
diff --git a/src/core/loader/deconstructed_rom_directory.h b/src/core/loader/deconstructed_rom_directory.h index 22a4ec5a6..a49a8b001 100644 --- a/src/core/loader/deconstructed_rom_directory.h +++ b/src/core/loader/deconstructed_rom_directory.h | |||
| @@ -44,7 +44,7 @@ public: | |||
| 44 | return IdentifyType(file); | 44 | return IdentifyType(file); |
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | LoadResult Load(Kernel::Process& process, Core::System& system) override; | 47 | LoadResult Load(Kernel::KProcess& process, Core::System& system) override; |
| 48 | 48 | ||
| 49 | ResultStatus ReadRomFS(FileSys::VirtualFile& out_dir) override; | 49 | ResultStatus ReadRomFS(FileSys::VirtualFile& out_dir) override; |
| 50 | ResultStatus ReadIcon(std::vector<u8>& out_buffer) override; | 50 | ResultStatus ReadIcon(std::vector<u8>& out_buffer) override; |
diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp index 627c18c7e..c062a4259 100644 --- a/src/core/loader/elf.cpp +++ b/src/core/loader/elf.cpp | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | #include "common/logging/log.h" | 11 | #include "common/logging/log.h" |
| 12 | #include "core/hle/kernel/code_set.h" | 12 | #include "core/hle/kernel/code_set.h" |
| 13 | #include "core/hle/kernel/k_page_table.h" | 13 | #include "core/hle/kernel/k_page_table.h" |
| 14 | #include "core/hle/kernel/process.h" | 14 | #include "core/hle/kernel/k_process.h" |
| 15 | #include "core/loader/elf.h" | 15 | #include "core/loader/elf.h" |
| 16 | #include "core/memory.h" | 16 | #include "core/memory.h" |
| 17 | 17 | ||
| @@ -386,7 +386,7 @@ FileType AppLoader_ELF::IdentifyType(const FileSys::VirtualFile& elf_file) { | |||
| 386 | return FileType::Error; | 386 | return FileType::Error; |
| 387 | } | 387 | } |
| 388 | 388 | ||
| 389 | AppLoader_ELF::LoadResult AppLoader_ELF::Load(Kernel::Process& process, | 389 | AppLoader_ELF::LoadResult AppLoader_ELF::Load(Kernel::KProcess& process, |
| 390 | [[maybe_unused]] Core::System& system) { | 390 | [[maybe_unused]] Core::System& system) { |
| 391 | if (is_loaded) { | 391 | if (is_loaded) { |
| 392 | return {ResultStatus::ErrorAlreadyLoaded, {}}; | 392 | return {ResultStatus::ErrorAlreadyLoaded, {}}; |
diff --git a/src/core/loader/elf.h b/src/core/loader/elf.h index 2b86c0b49..890299a20 100644 --- a/src/core/loader/elf.h +++ b/src/core/loader/elf.h | |||
| @@ -32,7 +32,7 @@ public: | |||
| 32 | return IdentifyType(file); | 32 | return IdentifyType(file); |
| 33 | } | 33 | } |
| 34 | 34 | ||
| 35 | LoadResult Load(Kernel::Process& process, Core::System& system) override; | 35 | LoadResult Load(Kernel::KProcess& process, Core::System& system) override; |
| 36 | }; | 36 | }; |
| 37 | 37 | ||
| 38 | } // namespace Loader | 38 | } // namespace Loader |
diff --git a/src/core/loader/kip.cpp b/src/core/loader/kip.cpp index 9b447da2a..3ae9e6e0e 100644 --- a/src/core/loader/kip.cpp +++ b/src/core/loader/kip.cpp | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | #include "core/file_sys/program_metadata.h" | 7 | #include "core/file_sys/program_metadata.h" |
| 8 | #include "core/hle/kernel/code_set.h" | 8 | #include "core/hle/kernel/code_set.h" |
| 9 | #include "core/hle/kernel/k_page_table.h" | 9 | #include "core/hle/kernel/k_page_table.h" |
| 10 | #include "core/hle/kernel/process.h" | 10 | #include "core/hle/kernel/k_process.h" |
| 11 | #include "core/loader/kip.h" | 11 | #include "core/loader/kip.h" |
| 12 | #include "core/memory.h" | 12 | #include "core/memory.h" |
| 13 | 13 | ||
| @@ -42,7 +42,7 @@ FileType AppLoader_KIP::GetFileType() const { | |||
| 42 | : FileType::Error; | 42 | : FileType::Error; |
| 43 | } | 43 | } |
| 44 | 44 | ||
| 45 | AppLoader::LoadResult AppLoader_KIP::Load(Kernel::Process& process, | 45 | AppLoader::LoadResult AppLoader_KIP::Load(Kernel::KProcess& process, |
| 46 | [[maybe_unused]] Core::System& system) { | 46 | [[maybe_unused]] Core::System& system) { |
| 47 | if (is_loaded) { | 47 | if (is_loaded) { |
| 48 | return {ResultStatus::ErrorAlreadyLoaded, {}}; | 48 | return {ResultStatus::ErrorAlreadyLoaded, {}}; |
diff --git a/src/core/loader/kip.h b/src/core/loader/kip.h index 2fe636f01..5f914b4a8 100644 --- a/src/core/loader/kip.h +++ b/src/core/loader/kip.h | |||
| @@ -32,7 +32,7 @@ public: | |||
| 32 | 32 | ||
| 33 | FileType GetFileType() const override; | 33 | FileType GetFileType() const override; |
| 34 | 34 | ||
| 35 | LoadResult Load(Kernel::Process& process, Core::System& system) override; | 35 | LoadResult Load(Kernel::KProcess& process, Core::System& system) override; |
| 36 | 36 | ||
| 37 | private: | 37 | private: |
| 38 | std::unique_ptr<FileSys::KIP> kip; | 38 | std::unique_ptr<FileSys::KIP> kip; |
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp index e4f5fd40c..11b2d0837 100644 --- a/src/core/loader/loader.cpp +++ b/src/core/loader/loader.cpp | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | #include "common/logging/log.h" | 11 | #include "common/logging/log.h" |
| 12 | #include "common/string_util.h" | 12 | #include "common/string_util.h" |
| 13 | #include "core/core.h" | 13 | #include "core/core.h" |
| 14 | #include "core/hle/kernel/process.h" | 14 | #include "core/hle/kernel/k_process.h" |
| 15 | #include "core/loader/deconstructed_rom_directory.h" | 15 | #include "core/loader/deconstructed_rom_directory.h" |
| 16 | #include "core/loader/elf.h" | 16 | #include "core/loader/elf.h" |
| 17 | #include "core/loader/kip.h" | 17 | #include "core/loader/kip.h" |
diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h index bf6db1ab1..9eac11dec 100644 --- a/src/core/loader/loader.h +++ b/src/core/loader/loader.h | |||
| @@ -25,7 +25,7 @@ class NACP; | |||
| 25 | 25 | ||
| 26 | namespace Kernel { | 26 | namespace Kernel { |
| 27 | struct AddressMapping; | 27 | struct AddressMapping; |
| 28 | class Process; | 28 | class KProcess; |
| 29 | } // namespace Kernel | 29 | } // namespace Kernel |
| 30 | 30 | ||
| 31 | namespace Loader { | 31 | namespace Loader { |
| @@ -165,7 +165,7 @@ public: | |||
| 165 | * | 165 | * |
| 166 | * @return The status result of the operation. | 166 | * @return The status result of the operation. |
| 167 | */ | 167 | */ |
| 168 | virtual LoadResult Load(Kernel::Process& process, Core::System& system) = 0; | 168 | virtual LoadResult Load(Kernel::KProcess& process, Core::System& system) = 0; |
| 169 | 169 | ||
| 170 | /** | 170 | /** |
| 171 | * Get the code (typically .code section) of the application | 171 | * Get the code (typically .code section) of the application |
diff --git a/src/core/loader/nax.cpp b/src/core/loader/nax.cpp index f53c3a72c..aceb66414 100644 --- a/src/core/loader/nax.cpp +++ b/src/core/loader/nax.cpp | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | #include "core/file_sys/content_archive.h" | 6 | #include "core/file_sys/content_archive.h" |
| 7 | #include "core/file_sys/romfs.h" | 7 | #include "core/file_sys/romfs.h" |
| 8 | #include "core/file_sys/xts_archive.h" | 8 | #include "core/file_sys/xts_archive.h" |
| 9 | #include "core/hle/kernel/process.h" | 9 | #include "core/hle/kernel/k_process.h" |
| 10 | #include "core/loader/nax.h" | 10 | #include "core/loader/nax.h" |
| 11 | #include "core/loader/nca.h" | 11 | #include "core/loader/nca.h" |
| 12 | 12 | ||
| @@ -41,7 +41,7 @@ FileType AppLoader_NAX::GetFileType() const { | |||
| 41 | return IdentifyTypeImpl(*nax); | 41 | return IdentifyTypeImpl(*nax); |
| 42 | } | 42 | } |
| 43 | 43 | ||
| 44 | AppLoader_NAX::LoadResult AppLoader_NAX::Load(Kernel::Process& process, Core::System& system) { | 44 | AppLoader_NAX::LoadResult AppLoader_NAX::Load(Kernel::KProcess& process, Core::System& system) { |
| 45 | if (is_loaded) { | 45 | if (is_loaded) { |
| 46 | return {ResultStatus::ErrorAlreadyLoaded, {}}; | 46 | return {ResultStatus::ErrorAlreadyLoaded, {}}; |
| 47 | } | 47 | } |
diff --git a/src/core/loader/nax.h b/src/core/loader/nax.h index 68427c1cf..b3a50894f 100644 --- a/src/core/loader/nax.h +++ b/src/core/loader/nax.h | |||
| @@ -37,7 +37,7 @@ public: | |||
| 37 | 37 | ||
| 38 | FileType GetFileType() const override; | 38 | FileType GetFileType() const override; |
| 39 | 39 | ||
| 40 | LoadResult Load(Kernel::Process& process, Core::System& system) override; | 40 | LoadResult Load(Kernel::KProcess& process, Core::System& system) override; |
| 41 | 41 | ||
| 42 | ResultStatus ReadRomFS(FileSys::VirtualFile& dir) override; | 42 | ResultStatus ReadRomFS(FileSys::VirtualFile& dir) override; |
| 43 | u64 ReadRomFSIVFCOffset() const override; | 43 | u64 ReadRomFSIVFCOffset() const override; |
diff --git a/src/core/loader/nca.cpp b/src/core/loader/nca.cpp index 47e7a77a9..418cbf61b 100644 --- a/src/core/loader/nca.cpp +++ b/src/core/loader/nca.cpp | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | #include "core/core.h" | 9 | #include "core/core.h" |
| 10 | #include "core/file_sys/content_archive.h" | 10 | #include "core/file_sys/content_archive.h" |
| 11 | #include "core/file_sys/romfs_factory.h" | 11 | #include "core/file_sys/romfs_factory.h" |
| 12 | #include "core/hle/kernel/process.h" | 12 | #include "core/hle/kernel/k_process.h" |
| 13 | #include "core/hle/service/filesystem/filesystem.h" | 13 | #include "core/hle/service/filesystem/filesystem.h" |
| 14 | #include "core/loader/deconstructed_rom_directory.h" | 14 | #include "core/loader/deconstructed_rom_directory.h" |
| 15 | #include "core/loader/nca.h" | 15 | #include "core/loader/nca.h" |
| @@ -32,7 +32,7 @@ FileType AppLoader_NCA::IdentifyType(const FileSys::VirtualFile& nca_file) { | |||
| 32 | return FileType::Error; | 32 | return FileType::Error; |
| 33 | } | 33 | } |
| 34 | 34 | ||
| 35 | AppLoader_NCA::LoadResult AppLoader_NCA::Load(Kernel::Process& process, Core::System& system) { | 35 | AppLoader_NCA::LoadResult AppLoader_NCA::Load(Kernel::KProcess& process, Core::System& system) { |
| 36 | if (is_loaded) { | 36 | if (is_loaded) { |
| 37 | return {ResultStatus::ErrorAlreadyLoaded, {}}; | 37 | return {ResultStatus::ErrorAlreadyLoaded, {}}; |
| 38 | } | 38 | } |
diff --git a/src/core/loader/nca.h b/src/core/loader/nca.h index c9792f390..f2ff080bb 100644 --- a/src/core/loader/nca.h +++ b/src/core/loader/nca.h | |||
| @@ -39,7 +39,7 @@ public: | |||
| 39 | return IdentifyType(file); | 39 | return IdentifyType(file); |
| 40 | } | 40 | } |
| 41 | 41 | ||
| 42 | LoadResult Load(Kernel::Process& process, Core::System& system) override; | 42 | LoadResult Load(Kernel::KProcess& process, Core::System& system) override; |
| 43 | 43 | ||
| 44 | ResultStatus ReadRomFS(FileSys::VirtualFile& dir) override; | 44 | ResultStatus ReadRomFS(FileSys::VirtualFile& dir) override; |
| 45 | u64 ReadRomFSIVFCOffset() const override; | 45 | u64 ReadRomFSIVFCOffset() const override; |
diff --git a/src/core/loader/nro.cpp b/src/core/loader/nro.cpp index 0597cfa60..ef54fa574 100644 --- a/src/core/loader/nro.cpp +++ b/src/core/loader/nro.cpp | |||
| @@ -17,8 +17,8 @@ | |||
| 17 | #include "core/file_sys/vfs_offset.h" | 17 | #include "core/file_sys/vfs_offset.h" |
| 18 | #include "core/hle/kernel/code_set.h" | 18 | #include "core/hle/kernel/code_set.h" |
| 19 | #include "core/hle/kernel/k_page_table.h" | 19 | #include "core/hle/kernel/k_page_table.h" |
| 20 | #include "core/hle/kernel/k_process.h" | ||
| 20 | #include "core/hle/kernel/k_thread.h" | 21 | #include "core/hle/kernel/k_thread.h" |
| 21 | #include "core/hle/kernel/process.h" | ||
| 22 | #include "core/hle/service/filesystem/filesystem.h" | 22 | #include "core/hle/service/filesystem/filesystem.h" |
| 23 | #include "core/loader/nro.h" | 23 | #include "core/loader/nro.h" |
| 24 | #include "core/loader/nso.h" | 24 | #include "core/loader/nso.h" |
| @@ -130,7 +130,7 @@ static constexpr u32 PageAlignSize(u32 size) { | |||
| 130 | return static_cast<u32>((size + Core::Memory::PAGE_MASK) & ~Core::Memory::PAGE_MASK); | 130 | return static_cast<u32>((size + Core::Memory::PAGE_MASK) & ~Core::Memory::PAGE_MASK); |
| 131 | } | 131 | } |
| 132 | 132 | ||
| 133 | static bool LoadNroImpl(Kernel::Process& process, const std::vector<u8>& data) { | 133 | static bool LoadNroImpl(Kernel::KProcess& process, const std::vector<u8>& data) { |
| 134 | if (data.size() < sizeof(NroHeader)) { | 134 | if (data.size() < sizeof(NroHeader)) { |
| 135 | return {}; | 135 | return {}; |
| 136 | } | 136 | } |
| @@ -199,11 +199,11 @@ static bool LoadNroImpl(Kernel::Process& process, const std::vector<u8>& data) { | |||
| 199 | return true; | 199 | return true; |
| 200 | } | 200 | } |
| 201 | 201 | ||
| 202 | bool AppLoader_NRO::LoadNro(Kernel::Process& process, const FileSys::VfsFile& nro_file) { | 202 | bool AppLoader_NRO::LoadNro(Kernel::KProcess& process, const FileSys::VfsFile& nro_file) { |
| 203 | return LoadNroImpl(process, nro_file.ReadAllBytes()); | 203 | return LoadNroImpl(process, nro_file.ReadAllBytes()); |
| 204 | } | 204 | } |
| 205 | 205 | ||
| 206 | AppLoader_NRO::LoadResult AppLoader_NRO::Load(Kernel::Process& process, Core::System& system) { | 206 | AppLoader_NRO::LoadResult AppLoader_NRO::Load(Kernel::KProcess& process, Core::System& system) { |
| 207 | if (is_loaded) { | 207 | if (is_loaded) { |
| 208 | return {ResultStatus::ErrorAlreadyLoaded, {}}; | 208 | return {ResultStatus::ErrorAlreadyLoaded, {}}; |
| 209 | } | 209 | } |
diff --git a/src/core/loader/nro.h b/src/core/loader/nro.h index 20bbaeb0e..fd453b402 100644 --- a/src/core/loader/nro.h +++ b/src/core/loader/nro.h | |||
| @@ -19,7 +19,7 @@ class NACP; | |||
| 19 | } | 19 | } |
| 20 | 20 | ||
| 21 | namespace Kernel { | 21 | namespace Kernel { |
| 22 | class Process; | 22 | class KProcess; |
| 23 | } | 23 | } |
| 24 | 24 | ||
| 25 | namespace Loader { | 25 | namespace Loader { |
| @@ -43,7 +43,7 @@ public: | |||
| 43 | return IdentifyType(file); | 43 | return IdentifyType(file); |
| 44 | } | 44 | } |
| 45 | 45 | ||
| 46 | LoadResult Load(Kernel::Process& process, Core::System& system) override; | 46 | LoadResult Load(Kernel::KProcess& process, Core::System& system) override; |
| 47 | 47 | ||
| 48 | ResultStatus ReadIcon(std::vector<u8>& buffer) override; | 48 | ResultStatus ReadIcon(std::vector<u8>& buffer) override; |
| 49 | ResultStatus ReadProgramId(u64& out_program_id) override; | 49 | ResultStatus ReadProgramId(u64& out_program_id) override; |
| @@ -53,7 +53,7 @@ public: | |||
| 53 | bool IsRomFSUpdatable() const override; | 53 | bool IsRomFSUpdatable() const override; |
| 54 | 54 | ||
| 55 | private: | 55 | private: |
| 56 | bool LoadNro(Kernel::Process& process, const FileSys::VfsFile& nro_file); | 56 | bool LoadNro(Kernel::KProcess& process, const FileSys::VfsFile& nro_file); |
| 57 | 57 | ||
| 58 | std::vector<u8> icon_data; | 58 | std::vector<u8> icon_data; |
| 59 | std::unique_ptr<FileSys::NACP> nacp; | 59 | std::unique_ptr<FileSys::NACP> nacp; |
diff --git a/src/core/loader/nso.cpp b/src/core/loader/nso.cpp index f671afe02..df59412cf 100644 --- a/src/core/loader/nso.cpp +++ b/src/core/loader/nso.cpp | |||
| @@ -17,8 +17,8 @@ | |||
| 17 | #include "core/file_sys/patch_manager.h" | 17 | #include "core/file_sys/patch_manager.h" |
| 18 | #include "core/hle/kernel/code_set.h" | 18 | #include "core/hle/kernel/code_set.h" |
| 19 | #include "core/hle/kernel/k_page_table.h" | 19 | #include "core/hle/kernel/k_page_table.h" |
| 20 | #include "core/hle/kernel/k_process.h" | ||
| 20 | #include "core/hle/kernel/k_thread.h" | 21 | #include "core/hle/kernel/k_thread.h" |
| 21 | #include "core/hle/kernel/process.h" | ||
| 22 | #include "core/loader/nso.h" | 22 | #include "core/loader/nso.h" |
| 23 | #include "core/memory.h" | 23 | #include "core/memory.h" |
| 24 | 24 | ||
| @@ -71,7 +71,7 @@ FileType AppLoader_NSO::IdentifyType(const FileSys::VirtualFile& in_file) { | |||
| 71 | return FileType::NSO; | 71 | return FileType::NSO; |
| 72 | } | 72 | } |
| 73 | 73 | ||
| 74 | std::optional<VAddr> AppLoader_NSO::LoadModule(Kernel::Process& process, Core::System& system, | 74 | std::optional<VAddr> AppLoader_NSO::LoadModule(Kernel::KProcess& process, Core::System& system, |
| 75 | const FileSys::VfsFile& nso_file, VAddr load_base, | 75 | const FileSys::VfsFile& nso_file, VAddr load_base, |
| 76 | bool should_pass_arguments, bool load_into_process, | 76 | bool should_pass_arguments, bool load_into_process, |
| 77 | std::optional<FileSys::PatchManager> pm) { | 77 | std::optional<FileSys::PatchManager> pm) { |
| @@ -162,7 +162,7 @@ std::optional<VAddr> AppLoader_NSO::LoadModule(Kernel::Process& process, Core::S | |||
| 162 | return load_base + image_size; | 162 | return load_base + image_size; |
| 163 | } | 163 | } |
| 164 | 164 | ||
| 165 | AppLoader_NSO::LoadResult AppLoader_NSO::Load(Kernel::Process& process, Core::System& system) { | 165 | AppLoader_NSO::LoadResult AppLoader_NSO::Load(Kernel::KProcess& process, Core::System& system) { |
| 166 | if (is_loaded) { | 166 | if (is_loaded) { |
| 167 | return {ResultStatus::ErrorAlreadyLoaded, {}}; | 167 | return {ResultStatus::ErrorAlreadyLoaded, {}}; |
| 168 | } | 168 | } |
diff --git a/src/core/loader/nso.h b/src/core/loader/nso.h index 195149b55..f7b61bc2d 100644 --- a/src/core/loader/nso.h +++ b/src/core/loader/nso.h | |||
| @@ -17,7 +17,7 @@ class System; | |||
| 17 | } | 17 | } |
| 18 | 18 | ||
| 19 | namespace Kernel { | 19 | namespace Kernel { |
| 20 | class Process; | 20 | class KProcess; |
| 21 | } | 21 | } |
| 22 | 22 | ||
| 23 | namespace Loader { | 23 | namespace Loader { |
| @@ -86,12 +86,12 @@ public: | |||
| 86 | return IdentifyType(file); | 86 | return IdentifyType(file); |
| 87 | } | 87 | } |
| 88 | 88 | ||
| 89 | static std::optional<VAddr> LoadModule(Kernel::Process& process, Core::System& system, | 89 | static std::optional<VAddr> LoadModule(Kernel::KProcess& process, Core::System& system, |
| 90 | const FileSys::VfsFile& nso_file, VAddr load_base, | 90 | const FileSys::VfsFile& nso_file, VAddr load_base, |
| 91 | bool should_pass_arguments, bool load_into_process, | 91 | bool should_pass_arguments, bool load_into_process, |
| 92 | std::optional<FileSys::PatchManager> pm = {}); | 92 | std::optional<FileSys::PatchManager> pm = {}); |
| 93 | 93 | ||
| 94 | LoadResult Load(Kernel::Process& process, Core::System& system) override; | 94 | LoadResult Load(Kernel::KProcess& process, Core::System& system) override; |
| 95 | 95 | ||
| 96 | ResultStatus ReadNSOModules(Modules& out_modules) override; | 96 | ResultStatus ReadNSOModules(Modules& out_modules) override; |
| 97 | 97 | ||
diff --git a/src/core/loader/nsp.cpp b/src/core/loader/nsp.cpp index d7e590f1c..d815a7cd3 100644 --- a/src/core/loader/nsp.cpp +++ b/src/core/loader/nsp.cpp | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | #include "core/file_sys/patch_manager.h" | 13 | #include "core/file_sys/patch_manager.h" |
| 14 | #include "core/file_sys/registered_cache.h" | 14 | #include "core/file_sys/registered_cache.h" |
| 15 | #include "core/file_sys/submission_package.h" | 15 | #include "core/file_sys/submission_package.h" |
| 16 | #include "core/hle/kernel/process.h" | 16 | #include "core/hle/kernel/k_process.h" |
| 17 | #include "core/hle/service/filesystem/filesystem.h" | 17 | #include "core/hle/service/filesystem/filesystem.h" |
| 18 | #include "core/loader/deconstructed_rom_directory.h" | 18 | #include "core/loader/deconstructed_rom_directory.h" |
| 19 | #include "core/loader/nca.h" | 19 | #include "core/loader/nca.h" |
| @@ -79,7 +79,7 @@ FileType AppLoader_NSP::IdentifyType(const FileSys::VirtualFile& nsp_file) { | |||
| 79 | return FileType::Error; | 79 | return FileType::Error; |
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | AppLoader_NSP::LoadResult AppLoader_NSP::Load(Kernel::Process& process, Core::System& system) { | 82 | AppLoader_NSP::LoadResult AppLoader_NSP::Load(Kernel::KProcess& process, Core::System& system) { |
| 83 | if (is_loaded) { | 83 | if (is_loaded) { |
| 84 | return {ResultStatus::ErrorAlreadyLoaded, {}}; | 84 | return {ResultStatus::ErrorAlreadyLoaded, {}}; |
| 85 | } | 85 | } |
diff --git a/src/core/loader/nsp.h b/src/core/loader/nsp.h index 1660f1b94..644c0ff58 100644 --- a/src/core/loader/nsp.h +++ b/src/core/loader/nsp.h | |||
| @@ -45,7 +45,7 @@ public: | |||
| 45 | return IdentifyType(file); | 45 | return IdentifyType(file); |
| 46 | } | 46 | } |
| 47 | 47 | ||
| 48 | LoadResult Load(Kernel::Process& process, Core::System& system) override; | 48 | LoadResult Load(Kernel::KProcess& process, Core::System& system) override; |
| 49 | 49 | ||
| 50 | ResultStatus ReadRomFS(FileSys::VirtualFile& out_file) override; | 50 | ResultStatus ReadRomFS(FileSys::VirtualFile& out_file) override; |
| 51 | u64 ReadRomFSIVFCOffset() const override; | 51 | u64 ReadRomFSIVFCOffset() const override; |
diff --git a/src/core/loader/xci.cpp b/src/core/loader/xci.cpp index 0125ddf33..635d6ae15 100644 --- a/src/core/loader/xci.cpp +++ b/src/core/loader/xci.cpp | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | #include "core/file_sys/registered_cache.h" | 13 | #include "core/file_sys/registered_cache.h" |
| 14 | #include "core/file_sys/romfs.h" | 14 | #include "core/file_sys/romfs.h" |
| 15 | #include "core/file_sys/submission_package.h" | 15 | #include "core/file_sys/submission_package.h" |
| 16 | #include "core/hle/kernel/process.h" | 16 | #include "core/hle/kernel/k_process.h" |
| 17 | #include "core/hle/service/filesystem/filesystem.h" | 17 | #include "core/hle/service/filesystem/filesystem.h" |
| 18 | #include "core/loader/nca.h" | 18 | #include "core/loader/nca.h" |
| 19 | #include "core/loader/xci.h" | 19 | #include "core/loader/xci.h" |
| @@ -56,7 +56,7 @@ FileType AppLoader_XCI::IdentifyType(const FileSys::VirtualFile& xci_file) { | |||
| 56 | return FileType::Error; | 56 | return FileType::Error; |
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | AppLoader_XCI::LoadResult AppLoader_XCI::Load(Kernel::Process& process, Core::System& system) { | 59 | AppLoader_XCI::LoadResult AppLoader_XCI::Load(Kernel::KProcess& process, Core::System& system) { |
| 60 | if (is_loaded) { | 60 | if (is_loaded) { |
| 61 | return {ResultStatus::ErrorAlreadyLoaded, {}}; | 61 | return {ResultStatus::ErrorAlreadyLoaded, {}}; |
| 62 | } | 62 | } |
diff --git a/src/core/loader/xci.h b/src/core/loader/xci.h index 7ea8179af..708155c30 100644 --- a/src/core/loader/xci.h +++ b/src/core/loader/xci.h | |||
| @@ -45,7 +45,7 @@ public: | |||
| 45 | return IdentifyType(file); | 45 | return IdentifyType(file); |
| 46 | } | 46 | } |
| 47 | 47 | ||
| 48 | LoadResult Load(Kernel::Process& process, Core::System& system) override; | 48 | LoadResult Load(Kernel::KProcess& process, Core::System& system) override; |
| 49 | 49 | ||
| 50 | ResultStatus ReadRomFS(FileSys::VirtualFile& out_file) override; | 50 | ResultStatus ReadRomFS(FileSys::VirtualFile& out_file) override; |
| 51 | u64 ReadRomFSIVFCOffset() const override; | 51 | u64 ReadRomFSIVFCOffset() const override; |