Author: sewardj
Date: 2007-11-07 03:09:53 +0000 (Wed, 07 Nov 2007)
New Revision: 7107
Log:
Format string changes to shut gcc up on amd64-linux (opensuse 10.2).
Modified:
branches/FORMATCHECK/callgrind/context.c
branches/FORMATCHECK/callgrind/dump.c
branches/FORMATCHECK/coregrind/m_debuginfo/readdwarf.c
branches/FORMATCHECK/coregrind/m_debuginfo/readelf.c
branches/FORMATCHECK/coregrind/m_debuglog.c
branches/FORMATCHECK/coregrind/m_sigframe/sigframe-amd64-linux.c
branches/FORMATCHECK/coregrind/m_stacktrace.c
branches/FORMATCHECK/coregrind/m_syswrap/syswrap-amd64-linux.c
branches/FORMATCHECK/massif/ms_main.c
branches/FORMATCHECK/memcheck/mc_leakcheck.c
Modified: branches/FORMATCHECK/callgrind/context.c
===================================================================
--- branches/FORMATCHECK/callgrind/context.c 2007-11-07 01:10:42 UTC (rev
7106)
+++ branches/FORMATCHECK/callgrind/context.c 2007-11-07 03:09:53 UTC (rev
7107)
@@ -326,10 +326,10 @@
*(CLG_(current_fn_stack).top) = fn;
CLG_(current_state).cxt = CLG_(get_cxt)(CLG_(current_fn_stack).top);
- CLG_DEBUG(5, "- push_cxt(fn '%s'): new cxt %d, fn_sp %d\n",
+ CLG_DEBUG(5, "- push_cxt(fn '%s'): new cxt %d, fn_sp %ld\n",
fn ? fn->name : (Char*)"0x0",
CLG_(current_state).cxt ?
CLG_(current_state).cxt->base_number : -1,
- CLG_(current_fn_stack).top - CLG_(current_fn_stack).bottom);
+ (Word)(CLG_(current_fn_stack).top - CLG_(current_fn_stack).bottom));
}
Modified: branches/FORMATCHECK/callgrind/dump.c
===================================================================
--- branches/FORMATCHECK/callgrind/dump.c 2007-11-07 01:10:42 UTC (rev
7106)
+++ branches/FORMATCHECK/callgrind/dump.c 2007-11-07 03:09:53 UTC (rev
7107)
@@ -1018,7 +1018,7 @@
int s, r;
BBCC* v;
- CLG_DEBUG(8, " qsort(%d,%d)\n", a-qsort_start, n);
+ CLG_DEBUG(8, " qsort(%ld,%d)\n", (Word)(a-qsort_start), n);
if (n < 7) { /* Insertion sort on smallest arrays */
for (pm = a+1; pm < a+n; pm++)
@@ -1027,7 +1027,8 @@
CLG_DEBUGIF(8) {
for (pm = a; pm < a+n; pm++) {
- VG_(printf)(" %3d BB %#lx, ", pm - qsort_start,
+ VG_(printf)(" %3ld BB %#lx, ",
+ (Word)(pm - qsort_start),
bb_addr((*pm)->bb));
CLG_(print_cxt)(9, (*pm)->cxt, (*pm)->rec_index);
}
@@ -1085,21 +1086,22 @@
CLG_(print_cxt)(9, (*pv)->cxt, (*pv)->rec_index);
s = pb-pa+1;
- VG_(printf)(" Lower %d - %d:\n", a-qsort_start,
a+s-1-qsort_start);
+ VG_(printf)(" Lower %ld - %ld:\n",
+ (Word)(a-qsort_start), (Word)(a+s-1-qsort_start));
for (r=0;r<s;r++) {
pm = a+r;
- VG_(printf)(" %3d BB %#lx, ",
- pm-qsort_start,bb_addr((*pm)->bb));
+ VG_(printf)(" %3ld BB %#lx, ",
+ (Word)(pm-qsort_start),bb_addr((*pm)->bb));
CLG_(print_cxt)(9, (*pm)->cxt, (*pm)->rec_index);
}
s = pd-pc+1;
- VG_(printf)(" Upper %d - %d:\n",
- a+n-s-qsort_start, a+n-1-qsort_start);
+ VG_(printf)(" Upper %ld - %ld:\n",
+ (Word)(a+n-s-qsort_start), (Word)(a+n-1-qsort_start));
for (r=0;r<s;r++) {
pm = a+n-s+r;
- VG_(printf)(" %3d BB %#lx, ",
- pm-qsort_start,bb_addr((*pm)->bb));
+ VG_(printf)(" %3ld BB %#lx, ",
+ (Word)(pm-qsort_start),bb_addr((*pm)->bb));
CLG_(print_cxt)(9, (*pm)->cxt, (*pm)->rec_index);
}
}
Modified: branches/FORMATCHECK/coregrind/m_debuginfo/readdwarf.c
===================================================================
--- branches/FORMATCHECK/coregrind/m_debuginfo/readdwarf.c 2007-11-07
01:10:42 UTC (rev 7106)
+++ branches/FORMATCHECK/coregrind/m_debuginfo/readdwarf.c 2007-11-07
03:09:53 UTC (rev 7107)
@@ -1125,8 +1125,8 @@
/* Fill ui with offset in .debug_line and compdir */
if (0)
- VG_(printf)( "Reading UnitInfo at 0x%x.....\n",
- block_img - debuginfo_img );
+ VG_(printf)( "Reading UnitInfo at 0x%lx.....\n",
+ (Word)(block_img - debuginfo_img) );
read_unitinfo_dwarf2( &ui, block_img, debugabbrev_img, debugstr_img, si
);
if (0)
VG_(printf)( " => LINES=0x%llx NAME=%s DIR=%s\n",
Modified: branches/FORMATCHECK/coregrind/m_debuginfo/readelf.c
===================================================================
--- branches/FORMATCHECK/coregrind/m_debuginfo/readelf.c 2007-11-07
01:10:42 UTC (rev 7106)
+++ branches/FORMATCHECK/coregrind/m_debuginfo/readelf.c 2007-11-07
03:09:53 UTC (rev 7107)
@@ -159,8 +159,8 @@
case STT_HIPROC: VG_(printf)("hip "); break;
default: VG_(printf)("??? "); break;
}
- VG_(printf)(": val %#10lx, %ssz %4d %s\n",
- sym_addr, space, sym->st_size,
+ VG_(printf)(": val %#10lx, %ssz %4lld %s\n",
+ sym_addr, space, (Long)sym->st_size,
( sym->st_name ? sym_name : (Char*)"NONAME" ) );
}
@@ -410,8 +410,8 @@
return;
}
- TRACE_SYMTAB("\nReading (ELF, standard) %s (%d entries)\n", tab_name,
- o_symtab_sz/sizeof(ElfXX_Sym) );
+ TRACE_SYMTAB("\nReading (ELF, standard) %s (%ld entries)\n", tab_name,
+ (Word)(o_symtab_sz/sizeof(ElfXX_Sym)) );
/* Perhaps should start at i = 1; ELF docs suggest that entry
0 always denotes 'unknown symbol'. */
@@ -513,8 +513,8 @@
return;
}
- TRACE_SYMTAB("\nReading (ELF, ppc64-linux) %s (%d entries)\n", tab_name,
- o_symtab_sz/sizeof(ElfXX_Sym) );
+ TRACE_SYMTAB("\nReading (ELF, ppc64-linux) %s (%ld entries)\n", tab_name,
+ (Word)(o_symtab_sz/sizeof(ElfXX_Sym)) );
oset = VG_(OSetGen_Create)( offsetof(TempSym,key),
(OSetCmp_t)cmp_TempSymKey,
@@ -996,8 +996,9 @@
si->soname = "NONE";
}
- TRACE_SYMTAB("shoff = %d, shnum = %d, size = %d, n_vg_oimage = %d\n",
- ehdr->e_shoff, ehdr->e_shnum, sizeof(ElfXX_Shdr), n_oimage );
+ TRACE_SYMTAB("shoff = %lld, shnum = %d, size = %ld, n_vg_oimage = %d\n",
+ (Long)ehdr->e_shoff, ehdr->e_shnum,
+ (Word)sizeof(ElfXX_Shdr), n_oimage );
if (ehdr->e_shoff + ehdr->e_shnum*sizeof(ElfXX_Shdr) > n_oimage) {
ML_(symerr)("ELF section header is beyond image end?!");
Modified: branches/FORMATCHECK/coregrind/m_debuglog.c
===================================================================
--- branches/FORMATCHECK/coregrind/m_debuglog.c 2007-11-07 01:10:42 UTC (rev
7106)
+++ branches/FORMATCHECK/coregrind/m_debuglog.c 2007-11-07 03:09:53 UTC (rev
7107)
@@ -672,7 +672,7 @@
}
i++;
}
-parse_fieldwidth:
+ parse_fieldwidth:
/* Compute the field length. */
while (format[i] >= '0' && format[i] <= '9') {
width *= 10;
@@ -748,24 +748,6 @@
ret += myvprintf_str_XML_simplistic(send, send_arg2, str);
break;
}
-
-// case 'y': { /* %y - print symbol */
-// Char buf[100];
-// Char *cp = buf;
-// Addr a = va_arg(vargs, Addr);
-//
-// if (flags & VG_MSG_PAREN)
-// *cp++ = '(';
-// if (VG_(get_fnname_w_offset)(a, cp, sizeof(buf)-4)) {
-// if (flags & VG_MSG_PAREN) {
-// cp += VG_(strlen)(cp);
-// *cp++ = ')';
-// *cp = '\0';
-// }
-// ret += myvprintf_str(send, send_arg2, flags, width, buf, 0);
-// }
-// break;
-// }
default:
break;
}
Modified: branches/FORMATCHECK/coregrind/m_sigframe/sigframe-amd64-linux.c
===================================================================
--- branches/FORMATCHECK/coregrind/m_sigframe/sigframe-amd64-linux.c
2007-11-07 01:10:42 UTC (rev 7106)
+++ branches/FORMATCHECK/coregrind/m_sigframe/sigframe-amd64-linux.c
2007-11-07 03:09:53 UTC (rev 7107)
@@ -380,14 +380,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");
@@ -498,7 +498,7 @@
VG_(set_SP)(tid, rsp);
VG_TRACK( post_reg_write, Vg_CoreSignal, tid, VG_O_STACK_PTR, sizeof(Addr));
- //VG_(printf)("handler = %p\n", handler);
+ //VG_(printf)("handler = %#lx\n", handler);
tst->arch.vex.guest_RIP = (Addr) handler;
tst->arch.vex.guest_RDI = (ULong) siginfo->si_signo;
tst->arch.vex.guest_RSI = (Addr) &frame->sigInfo;
@@ -507,8 +507,8 @@
caller to do. */
if (0)
- VG_(printf)("pushed signal frame; %%RSP now = %p, "
- "next %%RIP = %p, status=%d\n",
+ VG_(printf)("pushed signal frame; %%RSP now = %#lx, "
+ "next %%RIP = %#llx, status=%d\n",
rsp, tst->arch.vex.guest_RIP, tst->status);
}
@@ -608,7 +608,7 @@
if (VG_(clo_trace_signals))
VG_(message)(
Vg_DebugMsg,
- "VG_(signal_return) (thread %d): isRT=%d valid magic; RIP=%p",
+ "VG_(signal_return) (thread %d): isRT=%d valid magic; RIP=%#lx",
tid, isRT, tst->arch.vex.guest_RIP);
/* tell the tools */
Modified: branches/FORMATCHECK/coregrind/m_stacktrace.c
===================================================================
--- branches/FORMATCHECK/coregrind/m_stacktrace.c 2007-11-07 01:10:42 UTC
(rev 7106)
+++ branches/FORMATCHECK/coregrind/m_stacktrace.c 2007-11-07 03:09:53 UTC
(rev 7107)
@@ -214,7 +214,7 @@
if ( VG_(use_CF_info)( &ip, &sp, &fp, fp_min, fp_max ) ) {
ips[i++] = ip;
if (debug)
- VG_(printf)(" ipsC[%d]=%08p\n", i-1, ips[i-1]);
+ VG_(printf)(" ipsC[%d]=%#08lx\n", i-1, ips[i-1]);
ip = ip - 1;
continue;
}
@@ -235,7 +235,7 @@
fp = (((UWord*)fp)[0]);
ips[i++] = ip;
if (debug)
- VG_(printf)(" ipsF[%d]=%08p\n", i-1, ips[i-1]);
+ VG_(printf)(" ipsF[%d]=%#08lx\n", i-1, ips[i-1]);
ip = ip - 1;
continue;
}
Modified: branches/FORMATCHECK/coregrind/m_syswrap/syswrap-amd64-linux.c
===================================================================
--- branches/FORMATCHECK/coregrind/m_syswrap/syswrap-amd64-linux.c
2007-11-07 01:10:42 UTC (rev 7106)
+++ branches/FORMATCHECK/coregrind/m_syswrap/syswrap-amd64-linux.c
2007-11-07 03:09:53 UTC (rev 7107)
@@ -259,17 +259,18 @@
ctst->client_stack_szB = ctst->client_stack_highest_word - seg->start;
if (debug)
- VG_(printf)("tid %d: guessed client stack range %p-%p\n",
+ VG_(printf)("tid %d: guessed client stack range %#lx-%#lx\n",
ctid, seg->start, VG_PGROUNDUP(rsp));
} else {
- VG_(message)(Vg_UserMsg, "!? New thread %d starts with RSP(%p)
unmapped\n",
+ VG_(message)(Vg_UserMsg,
+ "!? New thread %d starts with RSP(%p) unmapped\n",
ctid, rsp);
ctst->client_stack_szB = 0;
}
if (flags & VKI_CLONE_SETTLS) {
if (debug)
- VG_(printf)("clone child has SETTLS: tls at %p\n", tlsaddr);
+ VG_(printf)("clone child has SETTLS: tls at %#lx\n", tlsaddr);
ctst->arch.vex.guest_FS_ZERO = tlsaddr;
}
@@ -370,7 +371,8 @@
{
ULong 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,
@@ -494,7 +496,7 @@
PRE(sys_arch_prctl)
{
ThreadState* tst;
- PRINT( "arch_prctl ( %d, %llx )", ARG1, ARG2 );
+ PRINT( "arch_prctl ( %ld, %lx )", ARG1, ARG2 );
vg_assert(VG_(is_valid_tid)(tid));
vg_assert(tid >= 1 && tid < VG_N_THREADS);
@@ -535,7 +537,7 @@
// space, and we should therefore not check anything it points to.
PRE(sys_ptrace)
{
- PRINT("sys_ptrace ( %d, %d, %p, %p )", ARG1,ARG2,ARG3,ARG4);
+ PRINT("sys_ptrace ( %ld, %ld, %#lx, %#lx )", ARG1,ARG2,ARG3,ARG4);
PRE_REG_READ4(int, "ptrace",
long, request, long, pid, long, addr, long, data);
switch (ARG1) {
@@ -605,7 +607,7 @@
PRE(sys_socket)
{
- PRINT("sys_socket ( %d, %d, %d )",ARG1,ARG2,ARG3);
+ PRINT("sys_socket ( %ld, %ld, %ld )",ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "socket", int, domain, int, type, int, protocol);
}
POST(sys_socket)
@@ -618,7 +620,8 @@
PRE(sys_setsockopt)
{
- PRINT("sys_setsockopt ( %d, %d, %d, %p, %d )",ARG1,ARG2,ARG3,ARG4,ARG5);
+ PRINT("sys_setsockopt ( %ld, %ld, %ld, %#lx, %ld )",
+ ARG1,ARG2,ARG3,ARG4,ARG5);
PRE_REG_READ5(long, "setsockopt",
int, s, int, level, int, optname,
const void *, optval, int, optlen);
@@ -627,7 +630,8 @@
PRE(sys_getsockopt)
{
- PRINT("sys_getsockopt ( %d, %d, %d, %p, %p )",ARG1,ARG2,ARG3,ARG4,ARG5);
+ PRINT("sys_getsockopt ( %ld, %ld, %ld, %#lx, %#lx )",
+ ARG1,ARG2,ARG3,ARG4,ARG5);
PRE_REG_READ5(long, "getsockopt",
int, s, int, level, int, optname,
void *, optval, int, *optlen);
@@ -643,7 +647,7 @@
PRE(sys_connect)
{
*flags |= SfMayBlock;
- PRINT("sys_connect ( %d, %p, %d )",ARG1,ARG2,ARG3);
+ PRINT("sys_connect ( %ld, %#lx, %ld )",ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "connect",
int, sockfd, struct sockaddr *, serv_addr, int, addrlen);
ML_(generic_PRE_sys_connect)(tid, ARG1,ARG2,ARG3);
@@ -652,7 +656,7 @@
PRE(sys_accept)
{
*flags |= SfMayBlock;
- PRINT("sys_accept ( %d, %p, %d )",ARG1,ARG2,ARG3);
+ PRINT("sys_accept ( %ld, %#lx, %ld )",ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "accept",
int, s, struct sockaddr *, addr, int, *addrlen);
ML_(generic_PRE_sys_accept)(tid, ARG1,ARG2,ARG3);
@@ -669,7 +673,8 @@
PRE(sys_sendto)
{
*flags |= SfMayBlock;
- PRINT("sys_sendto ( %d, %p, %d, %u, %p, %d
)",ARG1,ARG2,ARG3,ARG4,ARG5,ARG6);
+ PRINT("sys_sendto ( %ld, %#lx, %ld, %lu, %#lx, %ld )",
+ ARG1,ARG2,ARG3,ARG4,ARG5,ARG6);
PRE_REG_READ6(long, "sendto",
int, s, const void *, msg, int, len,
unsigned int, flags,
@@ -680,7 +685,8 @@
PRE(sys_recvfrom)
{
*flags |= SfMayBlock;
- PRINT("sys_recvfrom ( %d, %p, %d, %u, %p, %p
)",ARG1,ARG2,ARG3,ARG4,ARG5,ARG6);
+ PRINT("sys_recvfrom ( %ld, %#lx, %ld, %lu, %#lx, %#lx )",
+ ARG1,ARG2,ARG3,ARG4,ARG5,ARG6);
PRE_REG_READ6(long, "recvfrom",
int, s, void *, buf, int, len, unsigned int, flags,
struct sockaddr *, from, int *, fromlen);
@@ -696,7 +702,7 @@
PRE(sys_sendmsg)
{
*flags |= SfMayBlock;
- PRINT("sys_sendmsg ( %d, %p, %d )",ARG1,ARG2,ARG3);
+ PRINT("sys_sendmsg ( %ld, %#lx, %ld )",ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "sendmsg",
int, s, const struct msghdr *, msg, int, flags);
ML_(generic_PRE_sys_sendmsg)(tid, ARG1,ARG2);
@@ -705,7 +711,7 @@
PRE(sys_recvmsg)
{
*flags |= SfMayBlock;
- PRINT("sys_recvmsg ( %d, %p, %d )",ARG1,ARG2,ARG3);
+ PRINT("sys_recvmsg ( %ld, %#lx, %ld )",ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "recvmsg", int, s, struct msghdr *, msg, int, flags);
ML_(generic_PRE_sys_recvmsg)(tid, ARG1,ARG2);
}
@@ -717,13 +723,13 @@
PRE(sys_shutdown)
{
*flags |= SfMayBlock;
- PRINT("sys_shutdown ( %d, %d )",ARG1,ARG2);
+ PRINT("sys_shutdown ( %ld, %ld )",ARG1,ARG2);
PRE_REG_READ2(int, "shutdown", int, s, int, how);
}
PRE(sys_bind)
{
- PRINT("sys_bind ( %d, %p, %d )",ARG1,ARG2,ARG3);
+ PRINT("sys_bind ( %ld, %#lx, %ld )",ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "bind",
int, sockfd, struct sockaddr *, my_addr, int, addrlen);
ML_(generic_PRE_sys_bind)(tid, ARG1,ARG2,ARG3);
@@ -731,13 +737,13 @@
PRE(sys_listen)
{
- PRINT("sys_listen ( %d, %d )",ARG1,ARG2);
+ PRINT("sys_listen ( %ld, %ld )",ARG1,ARG2);
PRE_REG_READ2(long, "listen", int, s, int, backlog);
}
PRE(sys_getsockname)
{
- PRINT("sys_getsockname ( %d, %p, %p )",ARG1,ARG2,ARG3);
+ PRINT("sys_getsockname ( %ld, %#lx, %#lx )",ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "getsockname",
int, s, struct sockaddr *, name, int *, namelen);
ML_(generic_PRE_sys_getsockname)(tid, ARG1,ARG2,ARG3);
@@ -751,7 +757,7 @@
PRE(sys_getpeername)
{
- PRINT("sys_getpeername ( %d, %p, %p )",ARG1,ARG2,ARG3);
+ PRINT("sys_getpeername ( %ld, %#lx, %#lx )",ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "getpeername",
int, s, struct sockaddr *, name, int *, namelen);
ML_(generic_PRE_sys_getpeername)(tid, ARG1,ARG2,ARG3);
@@ -765,7 +771,7 @@
PRE(sys_socketpair)
{
- PRINT("sys_socketpair ( %d, %d, %d, %p )",ARG1,ARG2,ARG3,ARG4);
+ PRINT("sys_socketpair ( %ld, %ld, %ld, %#lx )",ARG1,ARG2,ARG3,ARG4);
PRE_REG_READ4(long, "socketpair",
int, d, int, type, int, protocol, int [2], sv);
ML_(generic_PRE_sys_socketpair)(tid, ARG1,ARG2,ARG3,ARG4);
@@ -779,14 +785,14 @@
PRE(sys_semget)
{
- PRINT("sys_semget ( %d, %d, %d )",ARG1,ARG2,ARG3);
+ PRINT("sys_semget ( %ld, %ld, %ld )",ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "semget", vki_key_t, key, int, nsems, int, semflg);
}
PRE(sys_semop)
{
*flags |= SfMayBlock;
- PRINT("sys_semop ( %d, %p, %u )",ARG1,ARG2,ARG3);
+ PRINT("sys_semop ( %ld, %#lx, %lu )",ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "semop",
int, semid, struct sembuf *, sops, unsigned, nsoops);
ML_(generic_PRE_sys_semop)(tid, ARG1,ARG2,ARG3);
@@ -795,7 +801,7 @@
PRE(sys_semtimedop)
{
*flags |= SfMayBlock;
- PRINT("sys_semtimedop ( %d, %p, %u, %p )",ARG1,ARG2,ARG3,ARG4);
+ PRINT("sys_semtimedop ( %ld, %#lx, %lu, %#lx )",ARG1,ARG2,ARG3,ARG4);
PRE_REG_READ4(long, "semtimedop",
int, semid, struct sembuf *, sops, unsigned, nsoops,
struct timespec *, timeout);
@@ -807,25 +813,25 @@
switch (ARG3 & ~VKI_IPC_64) {
case VKI_IPC_INFO:
case VKI_SEM_INFO:
- PRINT("sys_semctl ( %d, %d, %d, %p )",ARG1,ARG2,ARG3,ARG4);
+ PRINT("sys_semctl ( %ld, %ld, %ld, %#lx )",ARG1,ARG2,ARG3,ARG4);
PRE_REG_READ4(long, "semctl",
int, semid, int, semnum, int, cmd, struct seminfo *, arg);
break;
case VKI_IPC_STAT:
case VKI_SEM_STAT:
case VKI_IPC_SET:
- PRINT("sys_semctl ( %d, %d, %d, %p )",ARG1,ARG2,ARG3,ARG4);
+ PRINT("sys_semctl ( %ld, %ld, %ld, %#lx )",ARG1,ARG2,ARG3,ARG4);
PRE_REG_READ4(long, "semctl",
int, semid, int, semnum, int, cmd, struct semid_ds *, arg);
break;
case VKI_GETALL:
case VKI_SETALL:
- PRINT("sys_semctl ( %d, %d, %d, %p )",ARG1,ARG2,ARG3,ARG4);
+ PRINT("sys_semctl ( %ld, %ld, %ld, %#lx )",ARG1,ARG2,ARG3,ARG4);
PRE_REG_READ4(long, "semctl",
int, semid, int, semnum, int, cmd, unsigned short *, arg);
break;
default:
- PRINT("sys_semctl ( %d, %d, %d )",ARG1,ARG2,ARG3);
+ PRINT("sys_semctl ( %ld, %ld, %ld )",ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "semctl",
int, semid, int, semnum, int, cmd);
break;
@@ -839,13 +845,13 @@
PRE(sys_msgget)
{
- PRINT("sys_msgget ( %d, %d )",ARG1,ARG2);
+ PRINT("sys_msgget ( %ld, %ld )",ARG1,ARG2);
PRE_REG_READ2(long, "msgget", vki_key_t, key, int, msgflg);
}
PRE(sys_msgsnd)
{
- PRINT("sys_msgsnd ( %d, %p, %d, %d )",ARG1,ARG2,ARG3,ARG4);
+ PRINT("sys_msgsnd ( %ld, %#lx, %ld, %ld )",ARG1,ARG2,ARG3,ARG4);
PRE_REG_READ4(long, "msgsnd",
int, msqid, struct msgbuf *, msgp, vki_size_t, msgsz, int,
msgflg);
ML_(linux_PRE_sys_msgsnd)(tid, ARG1,ARG2,ARG3,ARG4);
@@ -855,7 +861,7 @@
PRE(sys_msgrcv)
{
- PRINT("sys_msgrcv ( %d, %p, %d, %d, %d )",ARG1,ARG2,ARG3,ARG4,ARG5);
+ PRINT("sys_msgrcv ( %ld, %#lx, %ld, %ld, %ld )",ARG1,ARG2,ARG3,ARG4,ARG5);
PRE_REG_READ5(long, "msgrcv",
int, msqid, struct msgbuf *, msgp, vki_size_t, msgsz,
long, msgytp, int, msgflg);
@@ -870,7 +876,7 @@
PRE(sys_msgctl)
{
- PRINT("sys_msgctl ( %d, %d, %p )",ARG1,ARG2,ARG3);
+ PRINT("sys_msgctl ( %ld, %ld, %#lx )",ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "msgctl",
int, msqid, int, cmd, struct msqid_ds *, buf);
ML_(linux_PRE_sys_msgctl)(tid, ARG1,ARG2,ARG3);
@@ -882,14 +888,14 @@
PRE(sys_shmget)
{
- PRINT("sys_shmget ( %d, %d, %d )",ARG1,ARG2,ARG3);
+ PRINT("sys_shmget ( %ld, %ld, %ld )",ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "shmget", vki_key_t, key, vki_size_t, size, int,
shmflg);
}
PRE(wrap_sys_shmat)
{
UWord arg2tmp;
- PRINT("wrap_sys_shmat ( %d, %p, %d )",ARG1,ARG2,ARG3);
+ PRINT("wrap_sys_shmat ( %ld, %#lx, %ld )",ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "shmat",
int, shmid, const void *, shmaddr, int, shmflg);
arg2tmp = ML_(generic_PRE_sys_shmat)(tid, ARG1,ARG2,ARG3);
@@ -905,7 +911,7 @@
PRE(sys_shmdt)
{
- PRINT("sys_shmdt ( %p )",ARG1);
+ PRINT("sys_shmdt ( %#lx )",ARG1);
PRE_REG_READ1(long, "shmdt", const void *, shmaddr);
if (!ML_(generic_PRE_sys_shmdt)(tid, ARG1))
SET_STATUS_Failure( VKI_EINVAL );
@@ -917,7 +923,7 @@
PRE(sys_shmctl)
{
- PRINT("sys_shmctl ( %d, %d, %p )",ARG1,ARG2,ARG3);
+ PRINT("sys_shmctl ( %ld, %ld, %#lx )",ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "shmctl",
int, shmid, int, cmd, struct shmid_ds *, buf);
ML_(generic_PRE_sys_shmctl)(tid, ARG1,ARG2,ARG3);
@@ -930,7 +936,7 @@
PRE(sys_pread64)
{
*flags |= SfMayBlock;
- PRINT("sys_pread64 ( %d, %p, %llu, %lld )",
+ PRINT("sys_pread64 ( %ld, %#lx, %llu, %ld )",
ARG1, ARG2, (ULong)ARG3, ARG4);
PRE_REG_READ4(ssize_t, "pread64",
unsigned int, fd, char *, buf,
@@ -948,7 +954,7 @@
PRE(sys_pwrite64)
{
*flags |= SfMayBlock;
- PRINT("sys_pwrite64 ( %d, %p, %llu, %lld )",
+ PRINT("sys_pwrite64 ( %ld, %#lx, %llu, %ld )",
ARG1, ARG2, (ULong)ARG3, ARG4);
PRE_REG_READ4(ssize_t, "pwrite64",
unsigned int, fd, const char *, buf,
@@ -958,7 +964,7 @@
PRE(sys_fadvise64)
{
- PRINT("sys_fadvise64 ( %d, %lld, %llu, %d )", ARG1,ARG2,ARG3,ARG4);
+ PRINT("sys_fadvise64 ( %ld, %ld, %lu, %ld )", ARG1,ARG2,ARG3,ARG4);
PRE_REG_READ4(long, "fadvise64",
int, fd, vki_loff_t, offset, vki_size_t, len, int, advice);
}
@@ -967,7 +973,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,
Modified: branches/FORMATCHECK/massif/ms_main.c
===================================================================
--- branches/FORMATCHECK/massif/ms_main.c 2007-11-07 01:10:42 UTC (rev
7106)
+++ branches/FORMATCHECK/massif/ms_main.c 2007-11-07 03:09:53 UTC (rev
7107)
@@ -985,8 +985,8 @@
census->xtree_snapshots[i] =
VG_(calloc)(xtree_size+1, sizeof(XPtSnapshot));
if (0 && VG_(clo_verbosity) > 1)
- VG_(printf)("calloc: %d (%d B)\n", xtree_size+1,
- (xtree_size+1) * sizeof(XPtSnapshot));
+ VG_(printf)("calloc: %d (%ld B)\n", xtree_size+1,
+ (Word)((xtree_size+1) * sizeof(XPtSnapshot)));
// Take space-snapshot: copy 'curr_space' for every XPt in the
// XTree into the snapshot array, along with pointers to the XPts.
Modified: branches/FORMATCHECK/memcheck/mc_leakcheck.c
===================================================================
--- branches/FORMATCHECK/memcheck/mc_leakcheck.c 2007-11-07 01:10:42 UTC
(rev 7106)
+++ branches/FORMATCHECK/memcheck/mc_leakcheck.c 2007-11-07 03:09:53 UTC
(rev 7107)
@@ -273,12 +273,14 @@
if (sh_no != clique) {
if (VG_DEBUG_CLIQUE) {
if (lc_markstack[sh_no].indirect)
- VG_(printf)(" clique %d joining clique %d adding %u+%lu
bytes\n",
- sh_no, clique,
- lc_shadows[sh_no]->szB,
lc_markstack[sh_no].indirect);
+ VG_(printf)(
+ " clique %d joining clique %d adding %lu+%lu bytes\n",
+ sh_no, clique,
+ (UWord)lc_shadows[sh_no]->szB,
+ lc_markstack[sh_no].indirect);
else
- VG_(printf)(" %d joining %d adding %u\n",
- sh_no, clique, lc_shadows[sh_no]->szB);
+ VG_(printf)(" %d joining %d adding %lu\n",
+ sh_no, clique, (UWord)lc_shadows[sh_no]->szB);
}
lc_markstack[clique].indirect += lc_shadows[sh_no]->szB;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Valgrind-developers mailing list
Valgrind-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/valgrind-developers
