summaryrefslogtreecommitdiff
path: root/src/core/loader
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2015-05-08 18:12:25 -0300
committerGravatar Yuri Kunde Schlesner2015-05-08 22:12:10 -0300
commit3cb19c95895ab151d64682e5cbe64e938f995f46 (patch)
treea3d14fcd598c7d55d2e5ef6d746613df916799ec /src/core/loader
parentProcess: Add more documentation to the class members (diff)
downloadyuzu-3cb19c95895ab151d64682e5cbe64e938f995f46.tar.gz
yuzu-3cb19c95895ab151d64682e5cbe64e938f995f46.tar.xz
yuzu-3cb19c95895ab151d64682e5cbe64e938f995f46.zip
Process: Rename StaticAddressMapping => AddressMapping
Diffstat (limited to 'src/core/loader')
-rw-r--r--src/core/loader/3dsx.cpp2
-rw-r--r--src/core/loader/elf.cpp2
-rw-r--r--src/core/loader/loader.cpp4
-rw-r--r--src/core/loader/loader.h2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/core/loader/3dsx.cpp b/src/core/loader/3dsx.cpp
index a0266a4e0..15527c5a6 100644
--- a/src/core/loader/3dsx.cpp
+++ b/src/core/loader/3dsx.cpp
@@ -232,7 +232,7 @@ ResultStatus AppLoader_THREEDSX::Load() {
232 232
233 Kernel::g_current_process = Kernel::Process::Create(filename, 0); 233 Kernel::g_current_process = Kernel::Process::Create(filename, 0);
234 Kernel::g_current_process->svc_access_mask.set(); 234 Kernel::g_current_process->svc_access_mask.set();
235 Kernel::g_current_process->static_address_mappings = default_address_mappings; 235 Kernel::g_current_process->address_mappings = default_address_mappings;
236 236
237 Load3DSXFile(*file, Memory::EXEFS_CODE_VADDR); 237 Load3DSXFile(*file, Memory::EXEFS_CODE_VADDR);
238 238
diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp
index 94d1c9fa4..f86a98b8c 100644
--- a/src/core/loader/elf.cpp
+++ b/src/core/loader/elf.cpp
@@ -352,7 +352,7 @@ ResultStatus AppLoader_ELF::Load() {
352 352
353 Kernel::g_current_process = Kernel::Process::Create(filename, 0); 353 Kernel::g_current_process = Kernel::Process::Create(filename, 0);
354 Kernel::g_current_process->svc_access_mask.set(); 354 Kernel::g_current_process->svc_access_mask.set();
355 Kernel::g_current_process->static_address_mappings = default_address_mappings; 355 Kernel::g_current_process->address_mappings = default_address_mappings;
356 356
357 ElfReader elf_reader(&buffer[0]); 357 ElfReader elf_reader(&buffer[0]);
358 elf_reader.LoadInto(Memory::EXEFS_CODE_VADDR); 358 elf_reader.LoadInto(Memory::EXEFS_CODE_VADDR);
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp
index 8976d0372..505e2d280 100644
--- a/src/core/loader/loader.cpp
+++ b/src/core/loader/loader.cpp
@@ -19,7 +19,7 @@
19 19
20namespace Loader { 20namespace Loader {
21 21
22const std::initializer_list<Kernel::StaticAddressMapping> default_address_mappings = { 22const std::initializer_list<Kernel::AddressMapping> default_address_mappings = {
23 { 0x1FF50000, 0x8000, true }, // part of DSP RAM 23 { 0x1FF50000, 0x8000, true }, // part of DSP RAM
24 { 0x1FF70000, 0x8000, true }, // part of DSP RAM 24 { 0x1FF70000, 0x8000, true }, // part of DSP RAM
25 { 0x1F000000, 0x600000, false }, // entire VRAM 25 { 0x1F000000, 0x600000, false }, // entire VRAM
@@ -142,7 +142,7 @@ ResultStatus LoadFile(const std::string& filename) {
142 { 142 {
143 Kernel::g_current_process = Kernel::Process::Create(filename_filename, 0); 143 Kernel::g_current_process = Kernel::Process::Create(filename_filename, 0);
144 Kernel::g_current_process->svc_access_mask.set(); 144 Kernel::g_current_process->svc_access_mask.set();
145 Kernel::g_current_process->static_address_mappings = default_address_mappings; 145 Kernel::g_current_process->address_mappings = default_address_mappings;
146 146
147 size_t size = (size_t)file->GetSize(); 147 size_t size = (size_t)file->GetSize();
148 if (file->ReadBytes(Memory::GetPointer(Memory::EXEFS_CODE_VADDR), size) != size) 148 if (file->ReadBytes(Memory::GetPointer(Memory::EXEFS_CODE_VADDR), size) != size)
diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h
index bf027a878..a56f67205 100644
--- a/src/core/loader/loader.h
+++ b/src/core/loader/loader.h
@@ -110,7 +110,7 @@ protected:
110 * Common address mappings found in most games, used for binary formats that don't have this 110 * Common address mappings found in most games, used for binary formats that don't have this
111 * information. 111 * information.
112 */ 112 */
113extern const std::initializer_list<Kernel::StaticAddressMapping> default_address_mappings; 113extern const std::initializer_list<Kernel::AddressMapping> default_address_mappings;
114 114
115/** 115/**
116 * Identifies and loads a bootable file 116 * Identifies and loads a bootable file