objtool: Rename func_for_each_insn()
authorPeter Zijlstra <peterz@infradead.org>
Tue, 10 Mar 2020 17:24:59 +0000 (18:24 +0100)
committerPeter Zijlstra <peterz@infradead.org>
Wed, 25 Mar 2020 17:28:27 +0000 (18:28 +0100)
There is func_for_each_insn() and func_for_each_insn_all(), the both
iterate the instructions, but the first uses symbol offset/length
while the second uses insn->func.

Rename func_for_each_insn() to sym_for_eac_insn() because it iterates
on symbol information.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Miroslav Benes <mbenes@suse.cz>
Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>
Link: https://lkml.kernel.org/r/20200324160924.024341229@infradead.org
tools/objtool/check.c

index da17b5acc50420b2f5751782cc5f492e45e09264..564ea1dcc85ee266b6e88290a8471fc8e117eabd 100644 (file)
@@ -77,17 +77,17 @@ static struct instruction *next_insn_same_func(struct objtool_file *file,
             insn;                                                      \
             insn = next_insn_same_func(file, insn))
 
-#define func_for_each_insn(file, func, insn)                           \
-       for (insn = find_insn(file, func->sec, func->offset);           \
+#define sym_for_each_insn(file, sym, insn)                             \
+       for (insn = find_insn(file, sym->sec, sym->offset);             \
             insn && &insn->list != &file->insn_list &&                 \
-               insn->sec == func->sec &&                               \
-               insn->offset < func->offset + func->len;                \
+               insn->sec == sym->sec &&                                \
+               insn->offset < sym->offset + sym->len;                  \
             insn = list_next_entry(insn, list))
 
-#define func_for_each_insn_continue_reverse(file, func, insn)          \
+#define sym_for_each_insn_continue_reverse(file, sym, insn)            \
        for (insn = list_prev_entry(insn, list);                        \
             &insn->list != &file->insn_list &&                         \
-               insn->sec == func->sec && insn->offset >= func->offset; \
+               insn->sec == sym->sec && insn->offset >= sym->offset;   \
             insn = list_prev_entry(insn, list))
 
 #define sec_for_each_insn_from(file, insn)                             \
@@ -286,7 +286,7 @@ static int decode_instructions(struct objtool_file *file)
                                return -1;
                        }
 
-                       func_for_each_insn(file, func, insn)
+                       sym_for_each_insn(file, func, insn)
                                insn->func = func;
                }
        }
@@ -2064,7 +2064,7 @@ static int validate_branch(struct objtool_file *file, struct symbol *func,
 
                                i = insn;
                                save_insn = NULL;
-                               func_for_each_insn_continue_reverse(file, func, i) {
+                               sym_for_each_insn_continue_reverse(file, func, i) {
                                        if (i->save) {
                                                save_insn = i;
                                                break;