From 5d2440532f8ffe80faa9b818fa0c1abff312486f Mon Sep 17 00:00:00 2001 From: Sirisha Gandikota Date: Tue, 13 Sep 2016 16:19:29 -0700 Subject: [PATCH] aubinator: Simplify print_dword_val() method Remove the float/dword union and use the iter->p[f->start / 32] directly as printf formatter %08x expects uint32_t (Ken) v2: Make the cleanup much more crispier (Ken) Signed-off-by: Sirisha Gandikota Reviewed-by: Kenneth Graunke --- src/intel/tools/aubinator.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/intel/tools/aubinator.c b/src/intel/tools/aubinator.c index 9d29b687cbb..89d29f288fa 100644 --- a/src/intel/tools/aubinator.c +++ b/src/intel/tools/aubinator.c @@ -91,18 +91,14 @@ print_dword_val(struct gen_field_iterator *iter, uint64_t offset, int *dword_num) { struct gen_field *f; - union { - uint32_t dw; - float f; - } v; f = iter->group->fields[iter->i - 1]; - v.dw = iter->p[f->start / 32]; + const int dword = f->start / 32; - if (*dword_num != (f->start / 32)) { + if (*dword_num != dword) { printf("0x%08lx: 0x%08x : Dword %d\n", - offset + 4 * (f->start / 32), v.dw, f->start / 32); - *dword_num = (f->start / 32); + offset + 4 * dword, iter->p[dword], dword); + *dword_num = dword; } } -- 2.30.2