From 04f2e802576b914b913137cd1f47f23c93884733 Mon Sep 17 00:00:00 2001
From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Date: Sun, 2 Apr 2017 15:54:14 +0100
Subject: [PATCH] intel: gen_decoder: store pointer to current decoded field in
 iterator

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
---
 src/intel/common/gen_decoder.c | 50 +++++++++++++++++-----------------
 src/intel/common/gen_decoder.h |  1 +
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/src/intel/common/gen_decoder.c b/src/intel/common/gen_decoder.c
index 7b04ac051b6..9b587c344de 100644
--- a/src/intel/common/gen_decoder.c
+++ b/src/intel/common/gen_decoder.c
@@ -723,7 +723,6 @@ gen_get_enum_name(struct gen_enum *e, uint64_t value)
 bool
 gen_field_iterator_next(struct gen_field_iterator *iter)
 {
-   struct gen_field *f;
    union {
       uint64_t qw;
       float f;
@@ -732,39 +731,38 @@ gen_field_iterator_next(struct gen_field_iterator *iter)
    if (iter->i == iter->group->nfields)
       return false;
 
-   f = iter->group->fields[iter->i++];
-   iter->name = f->name;
-   iter->dword = f->start / 32;
+   iter->field = iter->group->fields[iter->i++];
+   iter->name = iter->field->name;
+   iter->dword = iter->field->start / 32;
    iter->struct_desc = NULL;
 
-   if ((f->end - f->start) > 32)
+   if ((iter->field->end - iter->field->start) > 32)
       v.qw = ((uint64_t) iter->p[iter->dword+1] << 32) | iter->p[iter->dword];
    else
       v.qw = iter->p[iter->dword];
 
    const char *enum_name = NULL;
 
-   switch (f->type.kind) {
+   switch (iter->field->type.kind) {
    case GEN_TYPE_UNKNOWN:
    case GEN_TYPE_INT: {
-      uint64_t value = field(v.qw, f->start, f->end);
-      snprintf(iter->value, sizeof(iter->value),
-               "%"PRId64, value);
-      enum_name = gen_get_enum_name(&f->inline_enum, value);
+      uint64_t value = field(v.qw, iter->field->start, iter->field->end);
+      snprintf(iter->value, sizeof(iter->value), "%"PRId64, value);
+      enum_name = gen_get_enum_name(&iter->field->inline_enum, value);
       break;
    }
    case GEN_TYPE_UINT: {
-      uint64_t value = field(v.qw, f->start, f->end);
-      snprintf(iter->value, sizeof(iter->value),
-               "%"PRIu64, value);
-      enum_name = gen_get_enum_name(&f->inline_enum, value);
+      uint64_t value = field(v.qw, iter->field->start, iter->field->end);
+      snprintf(iter->value, sizeof(iter->value), "%"PRIu64, value);
+      enum_name = gen_get_enum_name(&iter->field->inline_enum, value);
       break;
    }
    case GEN_TYPE_BOOL: {
       const char *true_string =
          iter->print_colors ? "\e[0;35mtrue\e[0m" : "true";
-      snprintf(iter->value, sizeof(iter->value),
-               "%s", field(v.qw, f->start, f->end) ? true_string : "false");
+      snprintf(iter->value, sizeof(iter->value), "%s",
+               field(v.qw, iter->field->start, iter->field->end) ?
+               true_string : "false");
       break;
    }
    case GEN_TYPE_FLOAT:
@@ -772,18 +770,20 @@ gen_field_iterator_next(struct gen_field_iterator *iter)
       break;
    case GEN_TYPE_ADDRESS:
    case GEN_TYPE_OFFSET:
-      snprintf(iter->value, sizeof(iter->value),
-               "0x%08"PRIx64, field_address(v.qw, f->start, f->end));
+      snprintf(iter->value, sizeof(iter->value), "0x%08"PRIx64,
+               field_address(v.qw, iter->field->start, iter->field->end));
       break;
    case GEN_TYPE_STRUCT:
-      snprintf(iter->value, sizeof(iter->value),
-               "<struct %s>", f->type.gen_struct->name);
+      snprintf(iter->value, sizeof(iter->value), "<struct %s>",
+               iter->field->type.gen_struct->name);
       iter->struct_desc =
-         gen_spec_find_struct(iter->group->spec, f->type.gen_struct->name);
+         gen_spec_find_struct(iter->group->spec,
+                              iter->field->type.gen_struct->name);
       break;
    case GEN_TYPE_UFIXED:
-      snprintf(iter->value, sizeof(iter->value),
-               "%f", (float) field(v.qw, f->start, f->end) / (1 << f->type.f));
+      snprintf(iter->value, sizeof(iter->value), "%f",
+               (float) field(v.qw, iter->field->start,
+                             iter->field->end) / (1 << iter->field->type.f));
       break;
    case GEN_TYPE_SFIXED:
       /* FIXME: Sign extend extracted field. */
@@ -792,10 +792,10 @@ gen_field_iterator_next(struct gen_field_iterator *iter)
    case GEN_TYPE_MBO:
        break;
    case GEN_TYPE_ENUM: {
-      uint64_t value = field(v.qw, f->start, f->end);
+      uint64_t value = field(v.qw, iter->field->start, iter->field->end);
       snprintf(iter->value, sizeof(iter->value),
                "%"PRId64, value);
-      enum_name = gen_get_enum_name(f->type.gen_enum, value);
+      enum_name = gen_get_enum_name(iter->field->type.gen_enum, value);
       break;
    }
    }
diff --git a/src/intel/common/gen_decoder.h b/src/intel/common/gen_decoder.h
index 1c41de80a4a..ab01d6dd8b5 100644
--- a/src/intel/common/gen_decoder.h
+++ b/src/intel/common/gen_decoder.h
@@ -58,6 +58,7 @@ struct gen_field_iterator {
    const uint32_t *p;
    int dword; /**< current field starts at &p[dword] */
    int i;
+   struct gen_field *field;
    bool print_colors;
 };
 
-- 
2.30.2