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 | 206f2e3436a2c1dddee7503edc4e142fb9a9dbd4 (patch) | |
| tree | 69c99523b435fe2c2bff9b022534035a9b4b4020 /src/core/loader/elf.cpp | |
| parent | d43dad001e8afa866eddc3d15bb5a6f47d797583 (diff) | |
| parent | e649db8c6bbb3e76f610fe9511e2dfc33bd6b322 (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 352938dcb..a7133f5a6 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); |