From patchwork Wed Jun 22 15:48:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Zhongjin X-Patchwork-Id: 12891101 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 31202C43334 for ; Wed, 22 Jun 2022 16:07:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=cK2hxKeC3zXTr/1UtC578+VMwWPV8SUc9d7i/3zkLgU=; b=ERs5hiT1Mcmblu 8nRZwdqqsb/NUMU4kai4pTMwz3QiihEihJM+CxvvtAKxIiTB7dECrdf6mmoqhdkmuYzqAC79dKNDL XssYR59EDrEpJaea5zdiwuaAlCJRAlI0pifklIRuTwc+4FmEayh3A4L7/JGj+IVQLyrwx5joRSvgd 1OqiNlUOMXD4FI20x7SOtuhPptzoJSoriGqfHae6fUzb3Pr2RL132lOJUgAmaZzyuCdw3K8z1aBI9 V+zdC7duTp9mue9lYIlWMndDApR/FklERq39WXRcTROnS6/MpdMhBaeikjFCyPCoNgrXnP4Q4eDJs 2rV4k4EoeUxzPfRqRJ3A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o42sG-00BNMn-3l; Wed, 22 Jun 2022 16:06:36 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o42fT-00BHy9-3u for linux-arm-kernel@bombadil.infradead.org; Wed, 22 Jun 2022 15:53:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:CC:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=PAdIVDGuI5ak8gqS0838nqabsGZ21XsSHmcPQuV2C2k=; b=e7/4IHNeLpa2+W2sbiirGmCdIw sndO34fDPBCtTYfbSQWXivV+C6ruMrjRZUw/ZV9CwtVoqqJplEgcXYRmEniIprfDv4Hrsb0Oypx+d 0zdbRiEkwi/rwinVwg1ZxIZMjMJtFWkrn07LT6ZaY7n92l5JZd659VRcFFIubE5H7QOAddIillST1 6uHl93P12PNZn83lx6mlj8uZim/tn+JrnFIdXcZkWmXscutS2bl2Td6YdGYln0tSu+vIT9wKp3CMp 7UmxsZ/V0TSOLGCpsD/ze/HZzyOlZV3t7IfaOeNzpJLEVJ21R004w3sFFYR53RTSMsehkW1ZVeP27 3OlRRcjA==; Received: from szxga01-in.huawei.com ([45.249.212.187]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o42ev-00B8ha-HI for linux-arm-kernel@lists.infradead.org; Wed, 22 Jun 2022 15:53:19 +0000 Received: from dggpemm500022.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4LSnsR0dKlzhYWB; Wed, 22 Jun 2022 23:50:35 +0800 (CST) Received: from dggpemm500013.china.huawei.com (7.185.36.172) by dggpemm500022.china.huawei.com (7.185.36.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 22 Jun 2022 23:52:42 +0800 Received: from ubuntu1804.huawei.com (10.67.175.36) by dggpemm500013.china.huawei.com (7.185.36.172) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 22 Jun 2022 23:52:42 +0800 From: Chen Zhongjin To: , , , , , CC: , , , , , , , , , , , , , Subject: [PATCH v5 05/33] objtool: arm64: Decode other system instructions Date: Wed, 22 Jun 2022 23:48:52 +0800 Message-ID: <20220622154920.95075-6-chenzhongjin@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220622154920.95075-1-chenzhongjin@huawei.com> References: <20220622154920.95075-1-chenzhongjin@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.175.36] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpemm500013.china.huawei.com (7.185.36.172) X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220622_165318_170093_4BD90539 X-CRM114-Status: UNSURE ( 7.74 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Decode ERET, BRK and NOPs Signed-off-by: Julien Thierry Signed-off-by: Chen Zhongjin --- tools/objtool/arch/arm64/decode.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/objtool/arch/arm64/decode.c b/tools/objtool/arch/arm64/decode.c index 40ada17d0842..19840862f3aa 100644 --- a/tools/objtool/arch/arm64/decode.c +++ b/tools/objtool/arch/arm64/decode.c @@ -231,6 +231,14 @@ int arch_decode_instruction(struct objtool_file *file, const struct section *sec /* Remaining branch opcodes are conditional */ *type = INSN_JUMP_CONDITIONAL; *immediate = aarch64_get_branch_offset(insn); + } else if (aarch64_insn_is_eret(insn)) { + *type = INSN_CONTEXT_SWITCH; + } else if (aarch64_insn_is_hint(insn) || + aarch64_insn_is_barrier(insn)) { + *type = INSN_NOP; + } else if (aarch64_insn_is_brk(insn)) { + *type = INSN_BUG; + *immediate = aarch64_insn_decode_immediate(AARCH64_INSN_IMM_16, insn); } break; default: