UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

objtool: Convert insn type to enum 

This makes it easier to add new instruction types.  Also it's hopefully
more robust since the compiler should warn about out-of-range enums.

Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Nick Desaulniers <ndesaulniers@google.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/0740e96af0d40e54cfd6a07bf09db0fbd10793cd.1563413318.git.jpoimboe@redhat.com
This commit is contained in:
Josh Poimboeuf 2019-07-17 20:36:56 -05:00 committed by Thomas Gleixner
parent e65050b94d
commit 9fe7b7642f
4 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tools/objtool/arch.h
View File

@ -11,22 +11,23 @@
#include "elf.h" #include "elf.h"
#include "cfi.h" #include "cfi.h"
#define INSN_JUMP_CONDITIONAL 1 enum insn_type {
#define INSN_JUMP_UNCONDITIONAL 2 INSN_JUMP_CONDITIONAL,
#define INSN_JUMP_DYNAMIC 3 INSN_JUMP_UNCONDITIONAL,
#define INSN_CALL 4 INSN_JUMP_DYNAMIC,
#define INSN_CALL_DYNAMIC 5 INSN_CALL,
#define INSN_RETURN 6 INSN_CALL_DYNAMIC,
#define INSN_CONTEXT_SWITCH 7 INSN_RETURN,
#define INSN_STACK 8 INSN_CONTEXT_SWITCH,
#define INSN_BUG 9 INSN_STACK,
#define INSN_NOP 10 INSN_BUG,
#define INSN_STAC 11 INSN_NOP,
#define INSN_CLAC 12 INSN_STAC,
#define INSN_STD 13 INSN_CLAC,
#define INSN_CLD 14 INSN_STD,
#define INSN_OTHER 15 INSN_CLD,
#define INSN_LAST INSN_OTHER INSN_OTHER,
};
enum op_dest_type { enum op_dest_type {
OP_DEST_REG, OP_DEST_REG,
@ -68,7 +69,7 @@ void arch_initial_func_cfi_state(struct cfi_state *state);
int arch_decode_instruction(struct elf *elf, struct section *sec, int arch_decode_instruction(struct elf *elf, struct section *sec,
unsigned long offset, unsigned int maxlen, unsigned long offset, unsigned int maxlen,
unsigned int *len, unsigned char *type, unsigned int *len, enum insn_type *type,
unsigned long *immediate, struct stack_op *op); unsigned long *immediate, struct stack_op *op);
bool arch_callee_saved_reg(unsigned char reg); bool arch_callee_saved_reg(unsigned char reg);

2
tools/objtool/arch/x86/decode.c
View File

@ -68,7 +68,7 @@ bool arch_callee_saved_reg(unsigned char reg)
int arch_decode_instruction(struct elf *elf, struct section *sec, int arch_decode_instruction(struct elf *elf, struct section *sec,
unsigned long offset, unsigned int maxlen, unsigned long offset, unsigned int maxlen,
unsigned int *len, unsigned char *type, unsigned int *len, enum insn_type *type,
unsigned long *immediate, struct stack_op *op) unsigned long *immediate, struct stack_op *op)
{ {
struct insn insn; struct insn insn;

7
tools/objtool/check.c
View File

@ -267,13 +267,6 @@ static int decode_instructions(struct objtool_file *file)
if (ret) if (ret)
goto err; goto err;
if (!insn->type || insn->type > INSN_LAST) {
WARN_FUNC("invalid instruction type %d",
insn->sec, insn->offset, insn->type);
ret = -1;
goto err;
}
hash_add(file->insn_hash, &insn->hash, insn->offset); hash_add(file->insn_hash, &insn->hash, insn->offset);
list_add_tail(&insn->list, &file->insn_list); list_add_tail(&insn->list, &file->insn_list);
} }

2
tools/objtool/check.h
View File

@ -31,7 +31,7 @@ struct instruction {
struct section *sec; struct section *sec;
unsigned long offset; unsigned long offset;
unsigned int len; unsigned int len;
unsigned char type; enum insn_type type;
unsigned long immediate; unsigned long immediate;
bool alt_group, visited, dead_end, ignore, hint, save, restore, ignore_alts; bool alt_group, visited, dead_end, ignore, hint, save, restore, ignore_alts;
bool retpoline_safe; bool retpoline_safe;