|
From: <sv...@va...> - 2007-11-07 11:05:21
|
Author: sewardj
Date: 2007-11-07 11:05:23 +0000 (Wed, 07 Nov 2007)
New Revision: 7109
Log:
ppc64-linux format string fixes.
Modified:
branches/FORMATCHECK/coregrind/m_sigframe/sigframe-ppc64-linux.c
branches/FORMATCHECK/coregrind/m_syswrap/syswrap-ppc64-linux.c
Modified: branches/FORMATCHECK/coregrind/m_sigframe/sigframe-ppc64-linux.c
===================================================================
--- branches/FORMATCHECK/coregrind/m_sigframe/sigframe-ppc64-linux.c 2007-11-07 10:39:17 UTC (rev 7108)
+++ branches/FORMATCHECK/coregrind/m_sigframe/sigframe-ppc64-linux.c 2007-11-07 11:05:23 UTC (rev 7109)
@@ -139,14 +139,14 @@
if (VG_(extend_stack)(addr, tst->client_stack_szB)) {
stackseg = VG_(am_find_nsegment)(addr);
if (0 && stackseg)
- VG_(printf)("frame=%p seg=%p-%p\n",
+ VG_(printf)("frame=%#lx seg=%#lx-%#lx\n",
addr, stackseg->start, stackseg->end);
}
if (stackseg == NULL || !stackseg->hasR || !stackseg->hasW) {
VG_(message)(
Vg_UserMsg,
- "Can't extend stack to %p during signal delivery for thread %d:",
+ "Can't extend stack to %#lx during signal delivery for thread %d:",
addr, tid);
if (stackseg == NULL)
VG_(message)(Vg_UserMsg, " no stack segment");
@@ -302,8 +302,8 @@
priv->shadow = tst->arch.vex_shadow;
if (0)
- VG_(printf)("pushed signal frame; %R1 now = %p, "
- "next %%CIA = %p, status=%d\n",
+ VG_(printf)("pushed signal frame; %%R1 now = %#lx, "
+ "next %%CIA = %#llx, status=%d\n",
sp, tst->arch.vex.guest_CIA, tst->status);
}
@@ -369,7 +369,7 @@
if (VG_(clo_trace_signals))
VG_(message)(Vg_DebugMsg,
- "vg_pop_signal_frame (thread %d): isRT=%d valid magic; EIP=%p",
+ "vg_pop_signal_frame (thread %d): isRT=%d valid magic; EIP=%#lx",
tid, has_siginfo, tst->arch.vex.guest_CIA);
/* tell the tools */
Modified: branches/FORMATCHECK/coregrind/m_syswrap/syswrap-ppc64-linux.c
===================================================================
--- branches/FORMATCHECK/coregrind/m_syswrap/syswrap-ppc64-linux.c 2007-11-07 10:39:17 UTC (rev 7108)
+++ branches/FORMATCHECK/coregrind/m_syswrap/syswrap-ppc64-linux.c 2007-11-07 11:05:23 UTC (rev 7109)
@@ -333,17 +333,18 @@
ctst->client_stack_szB = ctst->client_stack_highest_word - seg->start;
if (debug)
- VG_(printf)("\ntid %d: guessed client stack range %p-%p\n",
+ VG_(printf)("\ntid %d: guessed client stack range %#lx-%#lx\n",
ctid, seg->start, VG_PGROUNDUP(sp));
} else {
- VG_(message)(Vg_UserMsg, "!? New thread %d starts with R1(%p) unmapped\n",
+ VG_(message)(Vg_UserMsg,
+ "!? New thread %d starts with R1(%#lx) unmapped\n",
ctid, sp);
ctst->client_stack_szB = 0;
}
if (flags & VKI_CLONE_SETTLS) {
if (debug)
- VG_(printf)("clone child has SETTLS: tls at %p\n", child_tls);
+ VG_(printf)("clone child has SETTLS: tls at %#lx\n", child_tls);
ctst->arch.vex.guest_GPR13 = child_tls;
}
@@ -433,7 +434,7 @@
# define ARG2_5 (((UWord*)ARG2)[5])
*flags |= SfMayBlock;
- PRINT("sys_socketcall ( %d, %p )",ARG1,ARG2);
+ PRINT("sys_socketcall ( %ld, %#lx )",ARG1,ARG2);
PRE_REG_READ2(long, "socketcall", int, call, unsigned long *, args);
switch (ARG1 /* request */) {
@@ -684,7 +685,7 @@
{
SysRes r;
- PRINT("sys_mmap ( %p, %llu, %d, %d, %d, %d )",
+ PRINT("sys_mmap ( %#lx, %llu, %ld, %ld, %ld, %ld )",
ARG1, (ULong)ARG2, ARG3, ARG4, ARG5, ARG6 );
PRE_REG_READ6(long, "mmap",
unsigned long, start, unsigned long, length,
@@ -769,7 +770,8 @@
PRE(sys_ipc)
{
- PRINT("sys_ipc ( %d, %d, %d, %d, %p, %d )", ARG1,ARG2,ARG3,ARG4,ARG5,ARG6);
+ PRINT("sys_ipc ( %ld, %ld, %ld, %ld, %#lx, %ld )",
+ ARG1,ARG2,ARG3,ARG4,ARG5,ARG6);
// XXX: this is simplistic -- some args are not used in all circumstances.
PRE_REG_READ6(int, "ipc",
vki_uint, call, int, first, int, second, int, third,
@@ -919,7 +921,8 @@
{
UInt cloneflags;
- PRINT("sys_clone ( %x, %p, %p, %p, %p )",ARG1,ARG2,ARG3,ARG4,ARG5);
+ PRINT("sys_clone ( %lx, %#lx, %#lx, %#lx, %#lx )",
+ ARG1,ARG2,ARG3,ARG4,ARG5);
PRE_REG_READ5(int, "clone",
unsigned long, flags,
void *, child_stack,
|