perf tools: Don't cast RIP to pointers

Since they can come from another architecture with bigger
pointers, i.e. processing a 64-bit perf.data on a 32-bit arch.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1263478990-8200-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

8 files changed, 21 insertions, 40 deletions

diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index 117bbae844bf..73c202ee0882 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -132,8 +132,8 @@ static int process_sample_event(event_t *event, struct perf_session *session)
 {
         struct addr_location al;
 
-        dump_printf("(IP, %d): %d: %p\n", event->header.misc,
-                    event->ip.pid, (void *)(long)event->ip.ip);
+        dump_printf("(IP, %d): %d: %#Lx\n", event->header.misc,
+                    event->ip.pid, event->ip.ip);
 
         if (event__preprocess_sample(event, session, &al, symbol_filter) < 0) {
                 fprintf(stderr, "problem processing %d event, skipping it.\n",
diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c
index 924bfb77a6ab..18b3f505f9db 100644
--- a/tools/perf/builtin-diff.c
+++ b/tools/perf/builtin-diff.c
@@ -42,8 +42,8 @@ static int diff__process_sample_event(event_t *event, struct perf_session *sessi
         struct addr_location al;
         struct sample_data data = { .period = 1, };
 
-        dump_printf("(IP, %d): %d: %p\n", event->header.misc,
-                    event->ip.pid, (void *)(long)event->ip.ip);
+        dump_printf("(IP, %d): %d: %#Lx\n", event->header.misc,
+                    event->ip.pid, event->ip.ip);
 
         if (event__preprocess_sample(event, session, &al, NULL) < 0) {
                 pr_warning("problem processing %d event, skipping it.\n",
diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
index 4af7199c5af7..7323d9dfbce8 100644
--- a/tools/perf/builtin-kmem.c
+++ b/tools/perf/builtin-kmem.c
@@ -316,11 +316,8 @@ static int process_sample_event(event_t *event, struct perf_session *session)
 
         event__parse_sample(event, session->sample_type, &data);
 
-        dump_printf("(IP, %d): %d/%d: %p period: %Ld\n",
-                event->header.misc,
-                data.pid, data.tid,
-                (void *)(long)data.ip,
-                (long long)data.period);
+        dump_printf("(IP, %d): %d/%d: %#Lx period: %Ld\n", event->header.misc,
+                    data.pid, data.tid, data.ip, data.period);
 
         thread = perf_session__findnew(session, event->ip.pid);
         if (thread == NULL) {
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 80d691a4191f..4c3d6997995b 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -93,11 +93,8 @@ static int process_sample_event(event_t *event, struct perf_session *session)
 
         event__parse_sample(event, session->sample_type, &data);
 
-        dump_printf("(IP, %d): %d/%d: %p period: %Ld\n",
-                event->header.misc,
-                data.pid, data.tid,
-                (void *)(long)data.ip,
-                (long long)data.period);
+        dump_printf("(IP, %d): %d/%d: %#Lx period: %Ld\n", event->header.misc,
+                    data.pid, data.tid, data.ip, data.period);
 
         if (session->sample_type & PERF_SAMPLE_CALLCHAIN) {
                 unsigned int i;
diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
index 702322f8fec1..4f5a03e43444 100644
--- a/tools/perf/builtin-sched.c
+++ b/tools/perf/builtin-sched.c
@@ -1621,11 +1621,8 @@ static int process_sample_event(event_t *event, struct perf_session *session)
 
         event__parse_sample(event, session->sample_type, &data);
 
-        dump_printf("(IP, %d): %d/%d: %p period: %Ld\n",
-                event->header.misc,
-                data.pid, data.tid,
-                (void *)(long)data.ip,
-                (long long)data.period);
+        dump_printf("(IP, %d): %d/%d: %#Lx period: %Ld\n", event->header.misc,
+                    data.pid, data.tid, data.ip, data.period);
 
         thread = perf_session__findnew(session, data.pid);
         if (thread == NULL) {
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 1831434aa938..8e9cbfe608d6 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -75,11 +75,8 @@ static int process_sample_event(event_t *event, struct perf_session *session)
 
         event__parse_sample(event, session->sample_type, &data);
 
-        dump_printf("(IP, %d): %d/%d: %p period: %Ld\n",
-                event->header.misc,
-                data.pid, data.tid,
-                (void *)(long)data.ip,
-                (long long)data.period);
+        dump_printf("(IP, %d): %d/%d: %#Lx period: %Ld\n", event->header.misc,
+                    data.pid, data.tid, data.ip, data.period);
 
         thread = perf_session__findnew(session, event->ip.pid);
         if (thread == NULL) {
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 4f3e7ef33b83..24ec5be4a1c0 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -313,12 +313,9 @@ int event__process_mmap(event_t *self, struct perf_session *session)
         struct thread *thread;
         struct map *map;
 
-        dump_printf(" %d/%d: [%p(%p) @ %p]: %s\n",
-                    self->mmap.pid, self->mmap.tid,
-                    (void *)(long)self->mmap.start,
-                    (void *)(long)self->mmap.len,
-                    (void *)(long)self->mmap.pgoff,
-                    self->mmap.filename);
+        dump_printf(" %d/%d: [%#Lx(%#Lx) @ %#Lx]: %s\n",
+                    self->mmap.pid, self->mmap.tid, self->mmap.start,
+                    self->mmap.len, self->mmap.pgoff, self->mmap.filename);
 
         if (self->mmap.pid == 0) {
                 static const char kmmap_prefix[] = "[kernel.kallsyms.";
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index fd1c5a39a5bb..e3ccdb46d6c4 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -209,9 +209,8 @@ static int perf_session__process_event(struct perf_session *self,
         trace_event(event);
 
         if (event->header.type < PERF_RECORD_MAX) {
-                dump_printf("%p [%p]: PERF_RECORD_%s",
-                            (void *)(offset + head),
-                            (void *)(long)(event->header.size),
+                dump_printf("%#lx [%#x]: PERF_RECORD_%s",
+                            offset + head, event->header.size,
                             event__name[event->header.type]);
                 ++event__total[0];
                 ++event__total[event->header.type];
@@ -362,16 +361,13 @@ more:
 
         size = event->header.size;
 
-        dump_printf("\n%p [%p]: event: %d\n",
-                        (void *)(offset + head),
-                        (void *)(long)event->header.size,
-                        event->header.type);
+        dump_printf("\n%#lx [%#x]: event: %d\n",
+                    offset + head, event->header.size, event->header.type);
 
         if (size == 0 ||
             perf_session__process_event(self, event, ops, offset, head) < 0) {
-                dump_printf("%p [%p]: skipping unknown header type: %d\n",
-                            (void *)(offset + head),
-                            (void *)(long)(event->header.size),
+                dump_printf("%#lx [%#x]: skipping unknown header type: %d\n",
+                            offset + head, event->header.size,
                             event->header.type);
                 /*
                  * assume we lost track of the stream, check alignment, and