]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
perf tools: Add missing 'abi' member to 'struct regs_dump'
authorAdrian Hunter <adrian.hunter@intel.com>
Tue, 27 Aug 2013 08:23:10 +0000 (11:23 +0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Thu, 29 Aug 2013 19:10:58 +0000 (16:10 -0300)
And store the parsed value there.  Note that the 'abi' is 0 (no
registers), 1 (32-bit registers) or 2 (64-bit registers), but the
registers are anyway copied one-by-one as 64-bit values onto the event
i.e. see 'perf_output_sample_regs()'

Acked-by: Jiri Olsa <jolsa@redhat.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1377591794-30553-9-git-send-email-adrian.hunter@intel.com
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/event.h
tools/perf/util/evsel.c

index 491333910cf1025cd08a97714a97d7824c91a615..f959801ac9e4bc602912bb163a9d539cf696bebd 100644 (file)
@@ -62,6 +62,7 @@ struct sample_event {
 };
 
 struct regs_dump {
+       u64 abi;
        u64 *regs;
 };
 
index db4e431cb6ca38f45844718542183eeb355d6e60..11841881cef971312d9b5fce4418e66845934875 100644 (file)
@@ -1416,13 +1416,12 @@ int perf_evsel__parse_sample(struct perf_evsel *evsel, union perf_event *event,
        }
 
        if (type & PERF_SAMPLE_REGS_USER) {
-               u64 avail;
-
                /* First u64 tells us if we have any regs in sample. */
                OVERFLOW_CHECK_u64(array);
-               avail = *array++;
+               data->user_regs.abi = *array;
+               array++;
 
-               if (avail) {
+               if (data->user_regs.abi) {
                        u64 regs_user = evsel->attr.sample_regs_user;
 
                        sz = hweight_long(regs_user) * sizeof(u64);