diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-11-25 09:09:27 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-11-25 09:09:27 +0100 |
| commit | ceb9e77324fa661b1001a0ae66f061b5fcb4e4e6 (patch) | |
| tree | dce8c1a21347cd12b44ed56af4aafc2a58c9ec08 /tools/arch/x86/include/asm/insn.h | |
| parent | c494cd6469ab0f4bdd663d1a2d396b0ec2f42103 (diff) | |
| parent | 004e8dce9c5595697951f7cd0e9f66b35c92265e (diff) | |
Merge branch 'x86/core' into perf/core, to resolve conflicts and to pick up completed topic tree
Conflicts:
tools/perf/check-headers.sh
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/arch/x86/include/asm/insn.h')
| -rw-r--r-- | tools/arch/x86/include/asm/insn.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/arch/x86/include/asm/insn.h b/tools/arch/x86/include/asm/insn.h index 37a4c390750b..568854b14d0a 100644 --- a/tools/arch/x86/include/asm/insn.h +++ b/tools/arch/x86/include/asm/insn.h @@ -45,6 +45,7 @@ struct insn { struct insn_field immediate2; /* for 64bit imm or seg16 */ }; + int emulate_prefix_size; insn_attr_t attr; unsigned char opnd_bytes; unsigned char addr_bytes; @@ -128,6 +129,11 @@ static inline int insn_is_evex(struct insn *insn) return (insn->vex_prefix.nbytes == 4); } +static inline int insn_has_emulate_prefix(struct insn *insn) +{ + return !!insn->emulate_prefix_size; +} + /* Ensure this instruction is decoded completely */ static inline int insn_complete(struct insn *insn) { |