diff options
| author |  Yuri Kunde Schlesner | 2015-05-08 18:12:25 -0300 |
|---|---|---|
| committer | Yuri Kunde Schlesner | 2015-05-08 22:12:10 -0300 |
| commit | 3cb19c95895ab151d64682e5cbe64e938f995f46 (patch) | |
| tree | a3d14fcd598c7d55d2e5ef6d746613df916799ec /src/core/loader/loader.cpp | |
| parent | Process: Add more documentation to the class members (diff) | |
| download | yuzu-3cb19c95895ab151d64682e5cbe64e938f995f46.tar.gz yuzu-3cb19c95895ab151d64682e5cbe64e938f995f46.tar.xz yuzu-3cb19c95895ab151d64682e5cbe64e938f995f46.zip | |
Process: Rename StaticAddressMapping => AddressMapping
Diffstat (limited to 'src/core/loader/loader.cpp')
| -rw-r--r-- | src/core/loader/loader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 | ||
| 20 | namespace Loader { | 20 | namespace Loader { |
| 21 | 21 | ||
| 22 | const std::initializer_list<Kernel::StaticAddressMapping> default_address_mappings = { | 22 | const 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) |