From patchwork Wed Oct 19 13:11:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tsukasa OI X-Patchwork-Id: 5440 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp322334wrs; Wed, 19 Oct 2022 06:18:27 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5xx1Q/gHsHUUyQh/AbbPRLfkq25TADhPJe6Js/xHdR2fMc0HXh8/aHhMzMRGbYTr02/USk X-Received: by 2002:a17:907:7ba4:b0:78e:281d:91ef with SMTP id ne36-20020a1709077ba400b0078e281d91efmr6750375ejc.288.1666185507209; Wed, 19 Oct 2022 06:18:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666185507; cv=none; d=google.com; s=arc-20160816; b=wXvEjNd2vY9tADqBEJ/x3UTZKw6TBbZji/LP791vIad3P6JlCcoqGq8NHgTgmbeXcB ieRtK4wNclmo70CnCGDuFqlMd1MFRMXLADhF6J6P8E+Osjx2lG7ujclBPDVWRBxq96dB c2vJBJLJkeekWK5I8ONt2B2XOveDsNEhPRNDV5XUIW5nR/MvfiTetR9dhjTTqE1N4qos Dks37NruZ2N+e7MjTRV/N/KS7SePQbrSTLaDSrKpoAhFrMaJ7z/a+bY5bZIdqV1iWbCO ldUYxadnCPON2377FDgEq0o/9XkYiV/hSp6qN6s/zow7Jen+6AqwzzFxuQUh6x+ADiWz uKag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:reply-to:from:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=OCiRm5w1kClYz2RLko63jQRql1zTjEmF0TGx0KbHghc=; b=F7xbJ51BoLrKZJzCHHk14Mdqb6V+VlQAyaM83q0XFAlKYvcuqXVk350Mae6k/JaIvI QctimLwnbDsWUEqyorxr0B+9MAxNOkJVDK/wzgghv3H6CJi8M2AVTdmRF+dzQqG7XgAQ 2UeBC7VC3QBa4yNYVzZy2XAaiwaGMrYZnbW1xSJR3+gjrMN0x7v+worsj8Mu+SkiXwZP 2b/ApdU2StuXRr/7xxxMA0WJq6kzqScDv5u4FCyIuhNbMuJoELbOALD35lA2lQ5p6mxI 4GFk+M2FN6yyQu33A8OjTa7zqME/pXAQMt07tWDtReeSuF093xZlHHaF8+JKKo1UxKW8 8pQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=qRK9AyCD; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id e13-20020a1709062c0d00b0073d80d8b631si11569064ejh.268.2022.10.19.06.18.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Oct 2022 06:18:27 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=qRK9AyCD; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A5C57385117A for ; Wed, 19 Oct 2022 13:15:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A5C57385117A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666185329; bh=OCiRm5w1kClYz2RLko63jQRql1zTjEmF0TGx0KbHghc=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=qRK9AyCDGuGYGXmgKLzktOjYa3PhFPWMVE26jRD8Evu6uFXOsauTej4b1RvM9tYT0 sWehzCoilzlg9GfnmoRnyPEs24I+qQgDlWf0bL2VUoPw29wS6VF4x40H5we6FLKNzl dB+DMJVMniaU0UgOK4TJox0TyTpdBY+gLfN+lnqk= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org 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 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) To: Tsukasa OI , Nelson Chu , Kito Cheng , Palmer Dabbelt 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 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 X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tsukasa OI via Binutils From: Tsukasa OI Reply-To: Tsukasa OI Cc: binutils@sourceware.org Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747122134306333001?= X-GMAIL-MSGID: =?utf-8?q?1747122134306333001?= 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 },