Module Name: src
Committed By: christos
Date: Sat Aug 13 22:25:20 UTC 2011
Modified Files:
src/libexec/ld.elf_so: map_object.c
Log Message:
consistent debugging info for program headers
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/libexec/ld.elf_so/map_object.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/map_object.c
diff -u src/libexec/ld.elf_so/map_object.c:1.42 src/libexec/ld.elf_so/map_object.c:1.43
--- src/libexec/ld.elf_so/map_object.c:1.42 Wed Mar 9 18:10:07 2011
+++ src/libexec/ld.elf_so/map_object.c Sat Aug 13 18:25:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: map_object.c,v 1.42 2011/03/09 23:10:07 joerg Exp $ */
+/* $NetBSD: map_object.c,v 1.43 2011/08/13 22:25:20 christos Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: map_object.c,v 1.42 2011/03/09 23:10:07 joerg Exp $");
+__RCSID("$NetBSD: map_object.c,v 1.43 2011/08/13 22:25:20 christos Exp $");
#endif /* not lint */
#include <errno.h>
@@ -185,24 +185,28 @@
if (nsegs < 2)
segs[nsegs] = phdr;
++nsegs;
- dbg(("%s: PT_LOAD %p", obj->path, phdr));
+ dbg(("%s: %s %p phsize %zu", obj->path, "PT_LOAD",
+ (void *)(uintptr_t)phdr->p_vaddr, phdr->p_memsz));
break;
case PT_PHDR:
phdr_vaddr = phdr->p_vaddr;
phdr_memsz = phdr->p_memsz;
- dbg(("%s: PT_PHDR %p phsize %zu", obj->path,
- (void *)(uintptr_t)phdr_vaddr, phdr_memsz));
+ dbg(("%s: %s %p phsize %zu", obj->path, "PT_PHDR",
+ (void *)(uintptr_t)phdr->p_vaddr, phdr->p_memsz));
break;
case PT_DYNAMIC:
obj->dynamic = (void *)(uintptr_t)phdr->p_vaddr;
- dbg(("%s: PT_DYNAMIC %p", obj->path, obj->dynamic));
+ dbg(("%s: %s %p phsize %zu", obj->path, "PT_DYNAMIC",
+ (void *)(uintptr_t)phdr->p_vaddr, phdr->p_memsz));
break;
#if defined(__HAVE_TLS_VARIANT_I) || defined(__HAVE_TLS_VARIANT_II)
case PT_TLS:
phtls = phdr;
+ dbg(("%s: %s %p phsize %zu", obj->path, "PT_TLS",
+ (void *)(uintptr_t)phdr->p_vaddr, phdr->p_memsz));
break;
#endif
}
