From 6eb04c8c4000e7d940c484388934799d3a797697 Mon Sep 17 00:00:00 2001 From: Jozef Nagy Date: Sat, 24 May 2025 21:15:57 +0200 Subject: [PATCH] Make use of log()/debug() --- boot/common/loader/elf.c | 8 ++++---- boot/common/loader/loader.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/boot/common/loader/elf.c b/boot/common/loader/elf.c index e0ce1a6..9ae909b 100644 --- a/boot/common/loader/elf.c +++ b/boot/common/loader/elf.c @@ -74,7 +74,7 @@ uintptr_t elf64_load(char *data, uintptr_t *addr, pagetable *pagemap) *addr = phys; } - log("elf64_load(): phys=0x%llx, virt=0x%llx, size=%lu\n", phys, ph[i].p_vaddr, ph[i].p_filesz); + debug("elf64_load(): phys=0x%llx, virt=0x%llx, size=%lu\n", phys, ph[i].p_vaddr, ph[i].p_filesz); map_page(pagemap, aligned_vaddr, phys, flags); memcpy((void*)(phys + ph[i].p_vaddr - aligned_vaddr), data + ph[i].p_offset, ph[i].p_filesz); @@ -89,12 +89,12 @@ uintptr_t elf_load(char *data, uintptr_t *addr, pagetable *pagemap) struct elf_header *header = (struct elf_header *)data; if (header->e_magic != ELF_MAGIC) { - log("Invalid ELF magic: 0x%x", header->e_magic); + log("elf_load(): Invalid ELF magic: 0x%x", header->e_magic); return 0; } if (header->e_class != 2) { - log("Unsupported ELF class: %u", header->e_class); + log("elf_load(): Unsupported ELF class: %u", header->e_class); return 0; } @@ -106,6 +106,6 @@ uintptr_t elf_load(char *data, uintptr_t *addr, pagetable *pagemap) return elf64_load(data, addr, pagemap); } - log("Unsupported ELF machine: %u", header->e_machine); + log("elf_load(): Unsupported ELF machine: %u", header->e_machine); return 0; } diff --git a/boot/common/loader/loader.c b/boot/common/loader/loader.c index 341e725..f91890d 100644 --- a/boot/common/loader/loader.c +++ b/boot/common/loader/loader.c @@ -49,7 +49,7 @@ void loader_load(struct axboot_entry *entry) break; } default: { - log("Entry doesn't have a supported protocol!\n"); + log("loader_load(): Entry doesn't have a supported protocol!\n"); break; } }