Imported Upstream version 3.10

[debian/elilo] / x86_64 / plain_loader.c

diff --git a/x86_64/plain_loader.c b/x86_64/plain_loader.c
index 13cc9e5b264aa7060f90fc6efebd5b8f2140bc63..0e1b5be66cbe8c902b8157a69008141239f2ff16 100644 (file)
--- a/x86_64/plain_loader.c
+++ b/x86_64/plain_loader.c
@@ -119,7 +119,7 @@ load_elf(fops_fd_t fd, kdesc_t *kd)
        }        
        VERB_PRT(3, {
                Print(L"ELF Header information: \n");
-               Print(L"\tEntry point 0x%x\n", (ehdr.e_entry & PADDR_MASK));
+               Print(L"\tEntry point "PTR_FMT"\n", (ehdr.e_entry & PADDR_MASK));
                Print(L"\t%d program headers\n", ehdr.e_phnum);
                Print(L"\t%d segment headers\n", ehdr.e_shnum);
        });
@@ -153,8 +153,8 @@ load_elf(fops_fd_t fd, kdesc_t *kd)
                paddr = (phdrs[i].p_paddr & PADDR_MASK);
                memsz = phdrs[i].p_memsz;
 
-               DBG_PRT((L"Phdr %d paddr [0x%x-0x%x] offset 0x%x"
-                       " filesz 0x%x memsz=0x%x bss_sz=0x%x p_type=0x%x\n",
+               DBG_PRT((L"Phdr %d paddr ["PTR_FMT"-"PTR_FMT"] offset "PTR_FMT""
+                       " filesz "PTR_FMT" memsz="PTR_FMT" bss_sz="PTR_FMT" p_type="PTR_FMT"\n",
                        1+i, paddr, paddr+phdrs[i].p_filesz, phdrs[i].p_offset, 
                        phdrs[i].p_filesz, memsz, 
                        (memsz - phdrs[i].p_filesz), phdrs[i].p_type));
@@ -168,7 +168,7 @@ load_elf(fops_fd_t fd, kdesc_t *kd)
        }
 
        if ((UINTN)low_addr & (EFI_PAGE_SIZE - 1)) {
-               ERR_PRT((L"%s : kernel low address 0x%x not page aligned\n", 
+               ERR_PRT((L"%s : kernel low address "PTR_FMT" not page aligned\n", 
                        LD_NAME, low_addr));
                goto out;
        }
@@ -184,9 +184,9 @@ load_elf(fops_fd_t fd, kdesc_t *kd)
        kd->kentry = (VOID *)(ehdr.e_entry & PADDR_MASK);
        
        VERB_PRT(3, {
-               Print(L"Lowest PhysAddr: 0x%x\nTotalMemSize:%d bytes (%d pages)\n",
+               Print(L"Lowest PhysAddr: "PTR_FMT"\nTotalMemSize:%d bytes (%d pages)\n",
                        low_addr, total_size, pages);
-               Print(L"Kernel entry @ 0x%x\n", kd->kentry);
+               Print(L"Kernel entry @ "PTR_FMT"\n", kd->kentry);
        });
        
        /* now allocate memory for the kernel at the exact requested spot */
@@ -213,7 +213,7 @@ load_elf(fops_fd_t fd, kdesc_t *kd)
                if (phdrs[i].p_type != PT_LOAD)
                        continue;
 
-               VERB_PRT(3, Print(L"poffs: 0x%x (phdrs[%d].p_offset)\n", 
+               VERB_PRT(3, Print(L"poffs: "PTR_FMT" (phdrs[%d].p_offset)\n", 
                        phdrs[i].p_offset, i));
 
                filesz = phdrs[i].p_filesz;
@@ -228,9 +228,9 @@ load_elf(fops_fd_t fd, kdesc_t *kd)
 
                VERB_PRT(4, {
                        Print(L"\nHeader #%d\n", i);
-                       Print(L"Offset in file 0x%x\n", phdrs[i].p_offset);
-                       Print(L"Physical addr 0x%x\n", low_addr);
-                       Print(L"BSS size 0x%x bytes\n", bss_sz);
+                       Print(L"Offset in file "PTR_FMT"\n", phdrs[i].p_offset);
+                       Print(L"Physical addr "PTR_FMT"\n", low_addr);
+                       Print(L"BSS size %d bytes\n", bss_sz);
                });
 
                /*