diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-08 23:12:25 +0200 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-09 03:12:10 +0200 |
| commit | 3cb19c95895ab151d64682e5cbe64e938f995f46 (patch) | |
| tree | a3d14fcd598c7d55d2e5ef6d746613df916799ec /src/core/loader | |
| parent | Process: Add more documentation to the class members (diff) | |
| download | yuzu-3cb19c95895ab151d64682e5cbe64e938f995f46.tar yuzu-3cb19c95895ab151d64682e5cbe64e938f995f46.tar.gz yuzu-3cb19c95895ab151d64682e5cbe64e938f995f46.tar.bz2 yuzu-3cb19c95895ab151d64682e5cbe64e938f995f46.tar.lz yuzu-3cb19c95895ab151d64682e5cbe64e938f995f46.tar.xz yuzu-3cb19c95895ab151d64682e5cbe64e938f995f46.tar.zst yuzu-3cb19c95895ab151d64682e5cbe64e938f995f46.zip | |
Diffstat (limited to 'src/core/loader')
| -rw-r--r-- | src/core/loader/3dsx.cpp | 2 | ||||
| -rw-r--r-- | src/core/loader/elf.cpp | 2 | ||||
| -rw-r--r-- | src/core/loader/loader.cpp | 4 | ||||
| -rw-r--r-- | src/core/loader/loader.h | 2 |
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() { Kernel::g_current_process = Kernel::Process::Create(filename, 0); Kernel::g_current_process->svc_access_mask.set(); - Kernel::g_current_process->static_address_mappings = default_address_mappings; + Kernel::g_current_process->address_mappings = default_address_mappings; Load3DSXFile(*file, Memory::EXEFS_CODE_VADDR); 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() { Kernel::g_current_process = Kernel::Process::Create(filename, 0); Kernel::g_current_process->svc_access_mask.set(); - Kernel::g_current_process->static_address_mappings = default_address_mappings; + Kernel::g_current_process->address_mappings = default_address_mappings; ElfReader elf_reader(&buffer[0]); 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 @@ namespace Loader { -const std::initializer_list<Kernel::StaticAddressMapping> default_address_mappings = { +const std::initializer_list<Kernel::AddressMapping> default_address_mappings = { { 0x1FF50000, 0x8000, true }, // part of DSP RAM { 0x1FF70000, 0x8000, true }, // part of DSP RAM { 0x1F000000, 0x600000, false }, // entire VRAM @@ -142,7 +142,7 @@ ResultStatus LoadFile(const std::string& filename) { { Kernel::g_current_process = Kernel::Process::Create(filename_filename, 0); Kernel::g_current_process->svc_access_mask.set(); - Kernel::g_current_process->static_address_mappings = default_address_mappings; + Kernel::g_current_process->address_mappings = default_address_mappings; size_t size = (size_t)file->GetSize(); 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: * Common address mappings found in most games, used for binary formats that don't have this * information. */ -extern const std::initializer_list<Kernel::StaticAddressMapping> default_address_mappings; +extern const std::initializer_list<Kernel::AddressMapping> default_address_mappings; /** * Identifies and loads a bootable file |