diff options
| -rw-r--r-- | src/core/loader/deconstructed_rom_directory.cpp | 1 | ||||
| -rw-r--r-- | src/core/loader/elf.cpp | 1 | ||||
| -rw-r--r-- | src/core/loader/loader.cpp | 6 | ||||
| -rw-r--r-- | src/core/loader/loader.h | 7 | ||||
| -rw-r--r-- | src/core/loader/nro.cpp | 1 | ||||
| -rw-r--r-- | src/core/loader/nso.cpp | 1 |
6 files changed, 0 insertions, 17 deletions
diff --git a/src/core/loader/deconstructed_rom_directory.cpp b/src/core/loader/deconstructed_rom_directory.cpp index de05f21d8..d575a9bea 100644 --- a/src/core/loader/deconstructed_rom_directory.cpp +++ b/src/core/loader/deconstructed_rom_directory.cpp | |||
| @@ -118,7 +118,6 @@ ResultStatus AppLoader_DeconstructedRomDirectory::Load( | |||
| 118 | 118 | ||
| 119 | process->program_id = metadata.GetTitleID(); | 119 | process->program_id = metadata.GetTitleID(); |
| 120 | process->svc_access_mask.set(); | 120 | process->svc_access_mask.set(); |
| 121 | process->address_mappings = default_address_mappings; | ||
| 122 | process->resource_limit = | 121 | process->resource_limit = |
| 123 | Kernel::ResourceLimit::GetForCategory(Kernel::ResourceLimitCategory::APPLICATION); | 122 | Kernel::ResourceLimit::GetForCategory(Kernel::ResourceLimitCategory::APPLICATION); |
| 124 | process->Run(Memory::PROCESS_IMAGE_VADDR, metadata.GetMainThreadPriority(), | 123 | process->Run(Memory::PROCESS_IMAGE_VADDR, metadata.GetMainThreadPriority(), |
diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp index 401cad3ab..6420a7f11 100644 --- a/src/core/loader/elf.cpp +++ b/src/core/loader/elf.cpp | |||
| @@ -398,7 +398,6 @@ ResultStatus AppLoader_ELF::Load(Kernel::SharedPtr<Kernel::Process>& process) { | |||
| 398 | 398 | ||
| 399 | process->LoadModule(codeset, codeset->entrypoint); | 399 | process->LoadModule(codeset, codeset->entrypoint); |
| 400 | process->svc_access_mask.set(); | 400 | process->svc_access_mask.set(); |
| 401 | process->address_mappings = default_address_mappings; | ||
| 402 | 401 | ||
| 403 | // Attach the default resource limit (APPLICATION) to the process | 402 | // Attach the default resource limit (APPLICATION) to the process |
| 404 | process->resource_limit = | 403 | process->resource_limit = |
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp index 1f2f31535..b143f043c 100644 --- a/src/core/loader/loader.cpp +++ b/src/core/loader/loader.cpp | |||
| @@ -17,12 +17,6 @@ | |||
| 17 | 17 | ||
| 18 | namespace Loader { | 18 | namespace Loader { |
| 19 | 19 | ||
| 20 | const std::initializer_list<Kernel::AddressMapping> default_address_mappings = { | ||
| 21 | {0x1FF50000, 0x8000, true}, // part of DSP RAM | ||
| 22 | {0x1FF70000, 0x8000, true}, // part of DSP RAM | ||
| 23 | {0x1F000000, 0x600000, false}, // entire VRAM | ||
| 24 | }; | ||
| 25 | |||
| 26 | FileType IdentifyFile(FileSys::VirtualFile file) { | 20 | FileType IdentifyFile(FileSys::VirtualFile file) { |
| 27 | FileType type; | 21 | FileType type; |
| 28 | 22 | ||
diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h index 285363549..6dffe451a 100644 --- a/src/core/loader/loader.h +++ b/src/core/loader/loader.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include <algorithm> | 7 | #include <algorithm> |
| 8 | #include <initializer_list> | ||
| 9 | #include <memory> | 8 | #include <memory> |
| 10 | #include <string> | 9 | #include <string> |
| 11 | #include <utility> | 10 | #include <utility> |
| @@ -208,12 +207,6 @@ protected: | |||
| 208 | }; | 207 | }; |
| 209 | 208 | ||
| 210 | /** | 209 | /** |
| 211 | * Common address mappings found in most games, used for binary formats that don't have this | ||
| 212 | * information. | ||
| 213 | */ | ||
| 214 | extern const std::initializer_list<Kernel::AddressMapping> default_address_mappings; | ||
| 215 | |||
| 216 | /** | ||
| 217 | * Identifies a bootable file and return a suitable loader | 210 | * Identifies a bootable file and return a suitable loader |
| 218 | * @param file The bootable file | 211 | * @param file The bootable file |
| 219 | * @return the best loader for this file | 212 | * @return the best loader for this file |
diff --git a/src/core/loader/nro.cpp b/src/core/loader/nro.cpp index 908d91eab..2179cf2ea 100644 --- a/src/core/loader/nro.cpp +++ b/src/core/loader/nro.cpp | |||
| @@ -186,7 +186,6 @@ ResultStatus AppLoader_NRO::Load(Kernel::SharedPtr<Kernel::Process>& process) { | |||
| 186 | } | 186 | } |
| 187 | 187 | ||
| 188 | process->svc_access_mask.set(); | 188 | process->svc_access_mask.set(); |
| 189 | process->address_mappings = default_address_mappings; | ||
| 190 | process->resource_limit = | 189 | process->resource_limit = |
| 191 | Kernel::ResourceLimit::GetForCategory(Kernel::ResourceLimitCategory::APPLICATION); | 190 | Kernel::ResourceLimit::GetForCategory(Kernel::ResourceLimitCategory::APPLICATION); |
| 192 | process->Run(base_addr, THREADPRIO_DEFAULT, Memory::DEFAULT_STACK_SIZE); | 191 | process->Run(base_addr, THREADPRIO_DEFAULT, Memory::DEFAULT_STACK_SIZE); |
diff --git a/src/core/loader/nso.cpp b/src/core/loader/nso.cpp index fee7d58c6..a94558ac5 100644 --- a/src/core/loader/nso.cpp +++ b/src/core/loader/nso.cpp | |||
| @@ -152,7 +152,6 @@ ResultStatus AppLoader_NSO::Load(Kernel::SharedPtr<Kernel::Process>& process) { | |||
| 152 | LOG_DEBUG(Loader, "loaded module {} @ 0x{:X}", file->GetName(), Memory::PROCESS_IMAGE_VADDR); | 152 | LOG_DEBUG(Loader, "loaded module {} @ 0x{:X}", file->GetName(), Memory::PROCESS_IMAGE_VADDR); |
| 153 | 153 | ||
| 154 | process->svc_access_mask.set(); | 154 | process->svc_access_mask.set(); |
| 155 | process->address_mappings = default_address_mappings; | ||
| 156 | process->resource_limit = | 155 | process->resource_limit = |
| 157 | Kernel::ResourceLimit::GetForCategory(Kernel::ResourceLimitCategory::APPLICATION); | 156 | Kernel::ResourceLimit::GetForCategory(Kernel::ResourceLimitCategory::APPLICATION); |
| 158 | process->Run(Memory::PROCESS_IMAGE_VADDR, THREADPRIO_DEFAULT, Memory::DEFAULT_STACK_SIZE); | 157 | process->Run(Memory::PROCESS_IMAGE_VADDR, THREADPRIO_DEFAULT, Memory::DEFAULT_STACK_SIZE); |