From: Ard Biesheuvel <[email protected]> Move some helpers around so they can be used from arch specific jump table code that is getting refactored in the next patch.
Signed-off-by: Ard Biesheuvel <[email protected]> --- tools/objtool/check.c | 22 ++++---------------- tools/objtool/include/objtool/check.h | 16 ++++++++++++++ 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/tools/objtool/check.c b/tools/objtool/check.c index b73e43b9b9e3..fbb05e973acc 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -61,8 +61,8 @@ struct instruction *next_insn_same_sec(struct objtool_file *file, return insn; } -static struct instruction *next_insn_same_func(struct objtool_file *file, - struct instruction *insn) +struct instruction *next_insn_same_func(struct objtool_file *file, + struct instruction *insn) { struct instruction *next = next_insn_same_sec(file, insn); struct symbol *func = insn_func(insn); @@ -93,8 +93,8 @@ static struct instruction *prev_insn_same_sec(struct objtool_file *file, return insn - 1; } -static struct instruction *prev_insn_same_sym(struct objtool_file *file, - struct instruction *insn) +struct instruction *prev_insn_same_sym(struct objtool_file *file, + struct instruction *insn) { struct instruction *prev = prev_insn_same_sec(file, insn); @@ -110,11 +110,6 @@ static struct instruction *prev_insn_same_sym(struct objtool_file *file, for_each_sec(file, __sec) \ sec_for_each_insn(file, __sec, insn) -#define func_for_each_insn(file, func, insn) \ - for (insn = find_insn(file, func->sec, func->offset); \ - insn; \ - insn = next_insn_same_func(file, insn)) - #define sym_for_each_insn(file, sym, insn) \ for (insn = find_insn(file, sym->sec, sym->offset); \ insn && insn->offset < sym->offset + sym->len; \ @@ -141,15 +136,6 @@ static inline struct symbol *insn_call_dest(struct instruction *insn) return insn->_call_dest; } -static inline struct reloc *insn_jump_table(struct instruction *insn) -{ - if (insn->type == INSN_JUMP_DYNAMIC || - insn->type == INSN_CALL_DYNAMIC) - return insn->_jump_table; - - return NULL; -} - static inline unsigned long insn_jump_table_size(struct instruction *insn) { if (insn->type == INSN_JUMP_DYNAMIC || diff --git a/tools/objtool/include/objtool/check.h b/tools/objtool/include/objtool/check.h index e1cd13cd28a3..e2f755484c4a 100644 --- a/tools/objtool/include/objtool/check.h +++ b/tools/objtool/include/objtool/check.h @@ -114,14 +114,30 @@ static inline bool is_jump(struct instruction *insn) return is_static_jump(insn) || is_dynamic_jump(insn); } +static inline struct reloc *insn_jump_table(struct instruction *insn) +{ + if (insn->type == INSN_JUMP_DYNAMIC || + insn->type == INSN_CALL_DYNAMIC) + return insn->_jump_table; + + return NULL; +} + struct instruction *find_insn(struct objtool_file *file, struct section *sec, unsigned long offset); +struct instruction *prev_insn_same_sym(struct objtool_file *file, struct instruction *insn); struct instruction *next_insn_same_sec(struct objtool_file *file, struct instruction *insn); +struct instruction *next_insn_same_func(struct objtool_file *file, struct instruction *insn); #define sec_for_each_insn(file, _sec, insn) \ for (insn = find_insn(file, _sec, 0); \ insn && insn->sec == _sec; \ insn = next_insn_same_sec(file, insn)) +#define func_for_each_insn(file, func, insn) \ + for (insn = find_insn(file, func->sec, func->offset); \ + insn; \ + insn = next_insn_same_func(file, insn)) + #endif /* _CHECK_H */ -- 2.47.0.rc1.288.g06298d1525-goog
