From: Jiri Slaby <jslaby@suse.cz>
To: jpoimboe@redhat.com
Cc: linux-kernel@vger.kernel.org, Jiri Slaby <jslaby@suse.cz>
Subject: [PATCH] objtool: fix build
Date: Mon, 5 Dec 2016 13:41:37 +0100 [thread overview]
Message-ID: <20161205124137.343-2-jslaby@suse.cz> (raw)
In-Reply-To: <20161205124137.343-1-jslaby@suse.cz>
0x8d opcode was handled twice. Fixed.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
tools/objtool/arch/x86/decode.c | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/tools/objtool/arch/x86/decode.c b/tools/objtool/arch/x86/decode.c
index ca4ede5ddd8c..6011ccbf9384 100644
--- a/tools/objtool/arch/x86/decode.c
+++ b/tools/objtool/arch/x86/decode.c
@@ -291,6 +291,20 @@ int arch_decode_instruction(struct elf *elf, struct section *sec,
break;
}
+ if (insn.rex_prefix.nbytes &&
+ insn.rex_prefix.bytes[0] == 0x48 &&
+ insn.modrm.nbytes && insn.modrm.bytes[0] == 0x2c &&
+ insn.sib.nbytes && insn.sib.bytes[0] == 0x24) {
+ /* lea %(rsp), %rbp */
+ *type = INSN_STACK;
+ op->dest.type = OP_DEST_REG;
+ op->dest.reg = CFI_BP;
+ op->src.type = OP_SRC_ADD;
+ op->src.reg = CFI_SP;
+ op->src.offset = 0;
+ break;
+ }
+
if (insn.rex_prefix.nbytes && insn.modrm.nbytes &&
insn.sib.nbytes && insn.rex_prefix.bytes[0] == 0x4c &&
insn.modrm.bytes[0] == 0x54 && insn.sib.bytes[0] == 0x24 &&
@@ -342,15 +356,6 @@ int arch_decode_instruction(struct elf *elf, struct section *sec,
op->src.type = OP_SRC_POP;
break;
- case 0x8d:
- if (insn.rex_prefix.nbytes &&
- insn.rex_prefix.bytes[0] == 0x48 &&
- insn.modrm.nbytes && insn.modrm.bytes[0] == 0x2c &&
- insn.sib.nbytes && insn.sib.bytes[0] == 0x24)
- /* lea %(rsp), %rbp */
- *type = INSN_FP_SETUP;
- break;
-
case 0x90:
*type = INSN_NOP;
break;
--
2.11.0
next prev parent reply other threads:[~2016-12-05 12:42 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-05 12:41 [PATCH] objtool fix bytes check Jiri Slaby
2016-12-05 12:41 ` Jiri Slaby [this message]
2016-12-05 20:40 ` [PATCH] objtool: fix build Josh Poimboeuf
2016-12-14 10:48 ` Jiri Slaby
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161205124137.343-2-jslaby@suse.cz \
--to=jslaby@suse.cz \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).