[PATCH v6 13/22] dyndbg: add for_each_boxed_vector

[Jim Cromie]

Add a for_each iterator to walk a counted vector member in a struct
(ie the box), and use it to replace 8 open-coded loops.

Signed-off-by: Jim Cromie <jim.cro...@gmail.com>
---
v5- parens-on-box-force-precedence
---
 lib/dynamic_debug.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index 018578923897..851e7f9de085 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -158,6 +158,9 @@ static void vpr_info_dq(const struct ddebug_query *query, 
const char *msg)
                  _dt->num_class_users);                                \
        })
 
+#define for_each_boxed_vector(_box, _vec, _len, _ct, _curs)            \
+       for (_ct = 0, _curs = (_box)->_vec; _ct < (_box)->_len; _ct++, _curs++)
+
 #define __outvar /* filled by callee */
 static struct ddebug_class_map *ddebug_find_valid_class(struct ddebug_table 
const *dt,
                                                        const char 
*class_string,
@@ -167,7 +170,7 @@ static struct ddebug_class_map 
*ddebug_find_valid_class(struct ddebug_table cons
        struct ddebug_class_user *cli;
        int i, idx;
 
-       for (i = 0, map = dt->classes; i < dt->num_classes; i++, map++) {
+       for_each_boxed_vector(dt, classes, num_classes, i, map) {
                idx = match_string(map->class_names, map->length, class_string);
                if (idx >= 0) {
                        *class_id = idx + map->base;
@@ -175,7 +178,7 @@ static struct ddebug_class_map 
*ddebug_find_valid_class(struct ddebug_table cons
                        return map;
                }
        }
-       for (i = 0, cli = dt->class_users; i < dt->num_class_users; i++, cli++) 
{
+       for_each_boxed_vector(dt, class_users, num_class_users, i, cli) {
                idx = match_string(cli->map->class_names, cli->map->length, 
class_string);
                if (idx >= 0) {
                        *class_id = idx + cli->map->base;
@@ -1058,11 +1061,11 @@ static const char *ddebug_class_name(struct 
ddebug_table *dt, struct _ddebug *dp
        struct ddebug_class_user *cli = dt->class_users;
        int i;
 
-       for (i = 0; i < dt->num_classes; i++, map++)
+       for_each_boxed_vector(dt, classes, num_classes, i, map)
                if (class_in_range(dp->class_id, map))
                        return map->class_names[dp->class_id - map->base];
 
-       for (i = 0; i < dt->num_class_users; i++, cli++)
+       for_each_boxed_vector(dt, class_users, num_class_users, i, cli)
                if (class_in_range(dp->class_id, cli->map))
                        return cli->map->class_names[dp->class_id - 
cli->map->base];
 
@@ -1216,7 +1219,7 @@ static void ddebug_attach_module_classes(struct 
ddebug_table *dt, struct _ddebug
        struct ddebug_class_map *cm;
        int i, nc = 0;
 
-       for (i = 0, cm = di->classes; i < di->num_classes; i++, cm++) {
+       for_each_boxed_vector(di, classes, num_classes, i, cm) {
 
                if (!strcmp(cm->mod_name, dt->mod_name)) {
                        vpr_cm_info(cm, "classes[%d]:", i);
@@ -1229,7 +1232,7 @@ static void ddebug_attach_module_classes(struct 
ddebug_table *dt, struct _ddebug
                vpr_info("module:%s attached %d classes\n", dt->mod_name, nc);
 
        /* now iterate dt */
-       for (i = 0, cm = dt->classes; i < dt->num_classes; i++, cm++)
+       for_each_boxed_vector(di, classes, num_classes, i, cm)
                ddebug_apply_params(cm, cm->mod_name);
 }
 
@@ -1249,7 +1252,7 @@ static void ddebug_attach_user_module_classes(struct 
ddebug_table *dt,
         * module's refs, save to dt.  For loadables, this is the
         * whole array.
         */
-       for (i = 0, cli = di->class_users; i < di->num_class_users; i++, cli++) 
{
+       for_each_boxed_vector(di, class_users, num_class_users, i, cli) {
 
                if (WARN_ON(!cli || !cli->map || !cli->user_mod_name))
                        continue;
@@ -1264,8 +1267,7 @@ static void ddebug_attach_user_module_classes(struct 
ddebug_table *dt,
        }
        dt->num_class_users = nc;
 
-       /* now iterate dt */
-       for (i = 0, cli = dt->class_users; i < dt->num_class_users; i++, cli++)
+       for_each_boxed_vector(di, class_users, num_class_users, i, cli)
                ddebug_apply_params(cli->map, cli->user_mod_name);
 
        vpr_dt_info(dt, "attach-client-module: ");
-- 
2.41.0