From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-sender-0.a4lg.com (mail-sender-0.a4lg.com [IPv6:2401:2500:203:30b:4000:6bfe:4757:0]) by sourceware.org (Postfix) with ESMTPS id B44B4385734D for ; Wed, 19 Oct 2022 13:13:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B44B4385734D Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=irq.a4lg.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=irq.a4lg.com Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id 19706300089; Wed, 19 Oct 2022 13:12:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=irq.a4lg.com; s=2017s01; t=1666185179; bh=OCiRm5w1kClYz2RLko63jQRql1zTjEmF0TGx0KbHghc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Mime-Version:Content-Transfer-Encoding; b=BfgSwneOHob0M6YngtA8jUp/hJPQpgzskB4GNWuPNdTB4JFpag6xpxxBziXRKrtOc oHV2C2aB/TKTCdwycgQ6pEWd4oWZkDvEKvHIlXbSC6mjinGoSN0x0VNSxxVYHX+by9 fdcG5sSnPqDJWtsi3QGV8y3c0j+Hug3U7QUZw/ZM= From: Tsukasa OI To: Tsukasa OI , Nelson Chu , Kito Cheng , Palmer Dabbelt Cc: binutils@sourceware.org Subject: [PATCH v2 5/8] RISC-V: Complete tidying up with SCALL and SBREAK Date: Wed, 19 Oct 2022 13:11:59 +0000 Message-Id: <8f226ee20d8a5ef6ad7b6c4408b44794a99d542a.1666185116.git.research_trasio@irq.a4lg.com> In-Reply-To: References: Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,GIT_PATCH_0,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This commit removes SCALL and SBREAK-related references except alias opcode entries because they are renamed to ECALL and EBREAK (respectively) in the RISC-V ISA, version 2.1. Note that related GDBsim part is addressed on the commit b9593cb70533 ("sim/riscv: Complete tidying up with SBREAK"). include/ChangeLog: * opcode/riscv-opc.h (MATCH_SCALL, MASK_SCALL, MATCH_SBREAK, MASK_SBREAK): Remove. Also remove corresponding DECLARE_INSN declarations. opcodes/ChangeLog: * riscv-opc.c (riscv_opcodes): Use "ebreak" instead of "sbreak". --- include/opcode/riscv-opc.h | 6 ------ opcodes/riscv-opc.c | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/include/opcode/riscv-opc.h b/include/opcode/riscv-opc.h index a30a21fe596..949f04d49e0 100644 --- a/include/opcode/riscv-opc.h +++ b/include/opcode/riscv-opc.h @@ -49,10 +49,6 @@ #define MASK_RDTIMEH 0xfffff07f #define MATCH_RDINSTRETH 0xc8202073 #define MASK_RDINSTRETH 0xfffff07f -#define MATCH_SCALL 0x73 -#define MASK_SCALL 0xffffffff -#define MATCH_SBREAK 0x100073 -#define MASK_SBREAK 0xffffffff #define MATCH_BEQ 0x63 #define MASK_BEQ 0x707f #define MATCH_BNE 0x1063 @@ -2727,8 +2723,6 @@ DECLARE_INSN(rdinstret, MATCH_RDINSTRET, MASK_RDINSTRET) DECLARE_INSN(rdcycleh, MATCH_RDCYCLEH, MASK_RDCYCLEH) DECLARE_INSN(rdtimeh, MATCH_RDTIMEH, MASK_RDTIMEH) DECLARE_INSN(rdinstreth, MATCH_RDINSTRETH, MASK_RDINSTRETH) -DECLARE_INSN(scall, MATCH_SCALL, MASK_SCALL) -DECLARE_INSN(sbreak, MATCH_SBREAK, MASK_SBREAK) DECLARE_INSN(beq, MATCH_BEQ, MASK_BEQ) DECLARE_INSN(bne, MATCH_BNE, MASK_BNE) DECLARE_INSN(blt, MATCH_BLT, MASK_BLT) diff --git a/opcodes/riscv-opc.c b/opcodes/riscv-opc.c index 83d34f62284..e3e7db20800 100644 --- a/opcodes/riscv-opc.c +++ b/opcodes/riscv-opc.c @@ -474,8 +474,8 @@ const struct riscv_opcode riscv_opcodes[] = {"rdcycleh", 32, INSN_CLASS_I, "d", MATCH_RDCYCLEH, MASK_RDCYCLEH, match_opcode, INSN_ALIAS }, {"rdinstreth", 32, INSN_CLASS_I, "d", MATCH_RDINSTRETH, MASK_RDINSTRETH, match_opcode, INSN_ALIAS }, {"rdtimeh", 32, INSN_CLASS_I, "d", MATCH_RDTIMEH, MASK_RDTIMEH, match_opcode, INSN_ALIAS }, -{"ecall", 0, INSN_CLASS_I, "", MATCH_SCALL, MASK_SCALL, match_opcode, 0 }, -{"scall", 0, INSN_CLASS_I, "", MATCH_SCALL, MASK_SCALL, match_opcode, 0 }, +{"ecall", 0, INSN_CLASS_I, "", MATCH_ECALL, MASK_ECALL, match_opcode, 0 }, +{"scall", 0, INSN_CLASS_I, "", MATCH_ECALL, MASK_ECALL, match_opcode, 0 }, {"xor", 0, INSN_CLASS_I, "d,s,j", MATCH_XORI, MASK_XORI, match_opcode, INSN_ALIAS }, {"xor", 0, INSN_CLASS_C, "Cs,Cw,Ct", MATCH_C_XOR, MASK_C_XOR, match_opcode, INSN_ALIAS }, {"xor", 0, INSN_CLASS_C, "Cs,Ct,Cw", MATCH_C_XOR, MASK_C_XOR, match_opcode, INSN_ALIAS }, -- 2.34.1