diff options
| author | neal <neal> | 2008-06-23 18:32:10 +0000 |
|---|---|---|
| committer | neal <neal> | 2008-06-23 18:32:10 +0000 |
| commit | fa7c6a09c3f6e063b74f01ce419f12ac1f5ef2f6 (patch) | |
| tree | 3210e24f49aa60078c298e9285bae46da52018bf /libhurd-mm/as-build.c | |
| parent | 6a2fb272af6cafd5fa19f3c28eb1fb7cc22c2ce6 (diff) | |
hurd/
2008-06-23 Neal H. Walfield <neal@gnu.org>
* stddef.h (panic_): Use gcc's format attribute.
libc-parts/
2008-06-23 Neal H. Walfield <neal@gnu.org>
* s-printf.h (s_printf): Use gcc's format attribute.
libhurd-mm/
2008-06-23 Neal H. Walfield <neal@gnu.org>
* as-build.c (as_build): Use %p, not %x, for printing a pointer.
When printing addresses, be sure to wrap them in ADDR_PRINTF.
Remove a gratuitous ADDR_FMT.
Diffstat (limited to 'libhurd-mm/as-build.c')
| -rw-r--r-- | libhurd-mm/as-build.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/libhurd-mm/as-build.c b/libhurd-mm/as-build.c index 12fc861..589799d 100644 --- a/libhurd-mm/as-build.c +++ b/libhurd-mm/as-build.c @@ -205,14 +205,14 @@ ID (as_build) (activity_t activity, { addr_t pte_addr = addr_chop (addr, remaining); - DEBUG (5, "Cap at " ADDR_FMT ": " CAP_FMT " -> " ADDR_FMT " (%x); " + DEBUG (5, "Cap at " ADDR_FMT ": " CAP_FMT " -> " ADDR_FMT " (%p); " "remaining: %d", ADDR_PRINTF (pte_addr), CAP_PRINTF (pte), ADDR_PRINTF (addr_chop (addr, remaining - CAP_GUARD_BITS (pte))), #ifdef RM_INTERN - 0, + NULL, #else cap_get_shadow (pte), #endif @@ -471,13 +471,15 @@ ID (as_build) (activity_t activity, addr_extend (pte_addr, pte_guard, pte_gbits))) { PANIC ("old pte target: " ADDR_FMT " != pivot target: " ADDR_FMT, - addr_extend (pte_addr, pte_guard, pte_gbits), - addr_extend (pivot_addr, pivot_guard, pivot_gbits)); + ADDR_PRINTF (addr_extend (pte_addr, + pte_guard, pte_gbits)), + ADDR_PRINTF (addr_extend (pivot_addr, + pivot_guard, pivot_gbits))); } DEBUG (5, ADDR_FMT ": indirecting pte at " ADDR_FMT " -> " ADDR_FMT " " CAP_FMT " with page table/%d at " - ADDR_FMT "(%x) " "common guard: %d, remaining: %d; " + ADDR_FMT "(%p) " "common guard: %d, remaining: %d; " "old target (need pivot: %d) now via pt[%d] " "(" ADDR_FMT "-> " DEBUG_BOLD (ADDR_FMT) ")", ADDR_PRINTF (addr), @@ -487,7 +489,7 @@ ID (as_build) (activity_t activity, CAP_PRINTF (pte), pt_width, ADDR_PRINTF (pt_addr), #ifdef RM_INTERN - 0, + NULL, #else cap_get_shadow (&pt_cap), #endif @@ -592,7 +594,7 @@ ID (as_build) (activity_t activity, default: AS_DUMP; PANIC ("Can't insert object at " ADDR_FMT ": " - ADDR_FMT ": " CAP_FMT " does translate address bits", + CAP_FMT " does translate address bits", ADDR_PRINTF (addr), CAP_PRINTF (pte)); } |