summaryrefslogtreecommitdiffstats
path: root/tools/objtool/arch/x86/decode.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2020-07-03 08:05:59 -0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2020-07-03 08:05:59 -0300
commit9434628fcee63b1f3c6a6881b70e8f69a1f68e88 (patch)
tree255d093aeda6c125f0158e883eb2bf400bb7f737 /tools/objtool/arch/x86/decode.c
parentc42ad5d4358230be166fc36c87bae0dd1680c570 (diff)
parentcdd3bb54332f82295ed90cd0c09c78cd0c0ee822 (diff)
downloadlinux-9434628fcee63b1f3c6a6881b70e8f69a1f68e88.tar.bz2
Merge remote-tracking branch 'torvalds/master' into perf/urgent
To synchronize UAPI headers. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/objtool/arch/x86/decode.c')
-rw-r--r--tools/objtool/arch/x86/decode.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/tools/objtool/arch/x86/decode.c b/tools/objtool/arch/x86/decode.c
index 4b504fc90bbb..9872195f998b 100644
--- a/tools/objtool/arch/x86/decode.c
+++ b/tools/objtool/arch/x86/decode.c
@@ -565,3 +565,21 @@ void arch_initial_func_cfi_state(struct cfi_init_state *state)
state->regs[16].base = CFI_CFA;
state->regs[16].offset = -8;
}
+
+const char *arch_nop_insn(int len)
+{
+ static const char nops[5][5] = {
+ /* 1 */ { 0x90 },
+ /* 2 */ { 0x66, 0x90 },
+ /* 3 */ { 0x0f, 0x1f, 0x00 },
+ /* 4 */ { 0x0f, 0x1f, 0x40, 0x00 },
+ /* 5 */ { 0x0f, 0x1f, 0x44, 0x00, 0x00 },
+ };
+
+ if (len < 1 || len > 5) {
+ WARN("invalid NOP size: %d\n", len);
+ return NULL;
+ }
+
+ return nops[len-1];
+}