summaryrefslogtreecommitdiff
path: root/src/core/loader/elf.cpp
diff options
context:
space:
mode:
authorGravatar James Rowe2018-07-02 10:13:26 -0600
committerGravatar bunnei2018-07-02 21:45:47 -0400
commit638956aa81de255bf4bbd4e69a717eabf4ceadb9 (patch)
tree5783dda790575e047fa757d8c56e11f3fffe7646 /src/core/loader/elf.cpp
parentMerge pull request #608 from Subv/depth (diff)
downloadyuzu-638956aa81de255bf4bbd4e69a717eabf4ceadb9.tar.gz
yuzu-638956aa81de255bf4bbd4e69a717eabf4ceadb9.tar.xz
yuzu-638956aa81de255bf4bbd4e69a717eabf4ceadb9.zip
Rename logging macro back to LOG_*
Diffstat (limited to 'src/core/loader/elf.cpp')
-rw-r--r--src/core/loader/elf.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp
index e42d3a870..c984ef852 100644
--- a/src/core/loader/elf.cpp
+++ b/src/core/loader/elf.cpp
@@ -273,18 +273,18 @@ const char* ElfReader::GetSectionName(int section) const {
273} 273}
274 274
275SharedPtr<CodeSet> ElfReader::LoadInto(u32 vaddr) { 275SharedPtr<CodeSet> ElfReader::LoadInto(u32 vaddr) {
276 NGLOG_DEBUG(Loader, "String section: {}", header->e_shstrndx); 276 LOG_DEBUG(Loader, "String section: {}", header->e_shstrndx);
277 277
278 // Should we relocate? 278 // Should we relocate?
279 relocate = (header->e_type != ET_EXEC); 279 relocate = (header->e_type != ET_EXEC);
280 280
281 if (relocate) { 281 if (relocate) {
282 NGLOG_DEBUG(Loader, "Relocatable module"); 282 LOG_DEBUG(Loader, "Relocatable module");
283 entryPoint += vaddr; 283 entryPoint += vaddr;
284 } else { 284 } else {
285 NGLOG_DEBUG(Loader, "Prerelocated executable"); 285 LOG_DEBUG(Loader, "Prerelocated executable");
286 } 286 }
287 NGLOG_DEBUG(Loader, "{} segments:", header->e_phnum); 287 LOG_DEBUG(Loader, "{} segments:", header->e_phnum);
288 288
289 // First pass : Get the bits into RAM 289 // First pass : Get the bits into RAM
290 u32 base_addr = relocate ? vaddr : 0; 290 u32 base_addr = relocate ? vaddr : 0;
@@ -304,7 +304,7 @@ SharedPtr<CodeSet> ElfReader::LoadInto(u32 vaddr) {
304 304
305 for (unsigned int i = 0; i < header->e_phnum; ++i) { 305 for (unsigned int i = 0; i < header->e_phnum; ++i) {
306 Elf32_Phdr* p = &segments[i]; 306 Elf32_Phdr* p = &segments[i];
307 NGLOG_DEBUG(Loader, "Type: {} Vaddr: {:08X} Filesz: {:08X} Memsz: {:08X} ", p->p_type, 307 LOG_DEBUG(Loader, "Type: {} Vaddr: {:08X} Filesz: {:08X} Memsz: {:08X} ", p->p_type,
308 p->p_vaddr, p->p_filesz, p->p_memsz); 308 p->p_vaddr, p->p_filesz, p->p_memsz);
309 309
310 if (p->p_type == PT_LOAD) { 310 if (p->p_type == PT_LOAD) {
@@ -317,13 +317,13 @@ SharedPtr<CodeSet> ElfReader::LoadInto(u32 vaddr) {
317 } else if (permission_flags == (PF_R | PF_W)) { 317 } else if (permission_flags == (PF_R | PF_W)) {
318 codeset_segment = &codeset->data; 318 codeset_segment = &codeset->data;
319 } else { 319 } else {
320 NGLOG_ERROR(Loader, "Unexpected ELF PT_LOAD segment id {} with flags {:X}", i, 320 LOG_ERROR(Loader, "Unexpected ELF PT_LOAD segment id {} with flags {:X}", i,
321 p->p_flags); 321 p->p_flags);
322 continue; 322 continue;
323 } 323 }
324 324
325 if (codeset_segment->size != 0) { 325 if (codeset_segment->size != 0) {
326 NGLOG_ERROR(Loader, 326 LOG_ERROR(Loader,
327 "ELF has more than one segment of the same type. Skipping extra " 327 "ELF has more than one segment of the same type. Skipping extra "
328 "segment (id {})", 328 "segment (id {})",
329 i); 329 i);
@@ -345,7 +345,7 @@ SharedPtr<CodeSet> ElfReader::LoadInto(u32 vaddr) {
345 codeset->entrypoint = base_addr + header->e_entry; 345 codeset->entrypoint = base_addr + header->e_entry;
346 codeset->memory = std::make_shared<std::vector<u8>>(std::move(program_image)); 346 codeset->memory = std::make_shared<std::vector<u8>>(std::move(program_image));
347 347
348 NGLOG_DEBUG(Loader, "Done loading."); 348 LOG_DEBUG(Loader, "Done loading.");
349 349
350 return codeset; 350 return codeset;
351} 351}