Messages in this thread | | | Date | Mon, 20 Jun 2016 11:19:31 +0200 | From | Jiri Olsa <> | Subject | Re: [PATCH v2] tools/perf: Fix the mask in regs_dump__printf and |
| |
On Mon, Jun 20, 2016 at 02:14:01PM +0530, Madhavan Srinivasan wrote:
SNIP
> diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c > index e3ce2f34d3ad..76d5006ebcc3 100644 > --- a/tools/perf/builtin-script.c > +++ b/tools/perf/builtin-script.c > @@ -412,11 +412,16 @@ static void print_sample_iregs(struct perf_sample *sample, > struct regs_dump *regs = &sample->intr_regs; > uint64_t mask = attr->sample_regs_intr; > unsigned i = 0, r; > + unsigned long _mask[sizeof(mask)/sizeof(unsigned long)]; > > if (!regs) > return; > > - for_each_set_bit(r, (unsigned long *) &mask, sizeof(mask) * 8) { > + _mask[0] = mask & ULONG_MAX; > + if (sizeof(mask) > sizeof(unsigned long)) > + _mask[1] = mask >> 32; > + > + for_each_set_bit(r, _mask, sizeof(mask) * 8) { > u64 val = regs->regs[i++]; > printf("%5s:0x%"PRIx64" ", perf_reg_name(r), val); > } > diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c > index 5214974e841a..2eaa42a4832a 100644 > --- a/tools/perf/util/session.c > +++ b/tools/perf/util/session.c > @@ -940,8 +940,13 @@ static void branch_stack__printf(struct perf_sample *sample) > static void regs_dump__printf(u64 mask, u64 *regs) > { > unsigned rid, i = 0; > + unsigned long _mask[sizeof(mask)/sizeof(unsigned long)]; > > - for_each_set_bit(rid, (unsigned long *) &mask, sizeof(mask) * 8) { > + _mask[0] = mask & ULONG_MAX; > + if (sizeof(mask) > sizeof(unsigned long)) > + _mask[1] = mask >> 32; > + > + for_each_set_bit(rid, _mask, sizeof(mask) * 8) { > u64 val = regs[i++];
could you please move the common code into the function?
thanks, jirka
| |