diff options
| author | bunnei <bunneidev@gmail.com> | 2018-08-04 02:17:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-04 02:17:25 -0400 |
| commit | 017fa55c0a7ca5e37fe772ec1ac0e9ec669f1bce (patch) | |
| tree | 69c99523b435fe2c2bff9b022534035a9b4b4020 /src/core/loader/elf.cpp | |
| parent | 26a909372612ee7407004882b88a8a3a47f7300f (diff) | |
| parent | 73e1be435072a191c00d7f4c511a9780aa720d75 (diff) | |
Merge pull request #914 from lioncash/codeset
kernel/process: Use accessors instead of class members for referencing segment array
Diffstat (limited to 'src/core/loader/elf.cpp')
| -rw-r--r-- | src/core/loader/elf.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp index 352938dcb4..a7133f5a63 100644 --- a/src/core/loader/elf.cpp +++ b/src/core/loader/elf.cpp @@ -311,11 +311,11 @@ SharedPtr<CodeSet> ElfReader::LoadInto(u32 vaddr) { CodeSet::Segment* codeset_segment; u32 permission_flags = p->p_flags & (PF_R | PF_W | PF_X); if (permission_flags == (PF_R | PF_X)) { - codeset_segment = &codeset->code; + codeset_segment = &codeset->CodeSegment(); } else if (permission_flags == (PF_R)) { - codeset_segment = &codeset->rodata; + codeset_segment = &codeset->RODataSegment(); } else if (permission_flags == (PF_R | PF_W)) { - codeset_segment = &codeset->data; + codeset_segment = &codeset->DataSegment(); } else { LOG_ERROR(Loader, "Unexpected ELF PT_LOAD segment id {} with flags {:X}", i, p->p_flags); |