From patchwork Mon Nov 28 04:43:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tsukasa OI X-Patchwork-Id: 26499 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp5433492wrr; Sun, 27 Nov 2022 20:48:48 -0800 (PST) X-Google-Smtp-Source: AA0mqf49g6120rbKwSI0NiaNNr0pk3dJuga3/cAWhp/ea4+bt8WSl0cFZxgyolAfwils1Us0rgiQ X-Received: by 2002:a17:906:b809:b0:7be:71f5:3183 with SMTP id dv9-20020a170906b80900b007be71f53183mr6075678ejb.547.1669610928289; Sun, 27 Nov 2022 20:48:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669610928; cv=none; d=google.com; s=arc-20160816; b=hle1HQrFF0os/AWl9LlP3tlus1awe8cjkhL3iz8SkjOTsC/RhF+XKQOOVMgjaOfSiy SIvtEenaWAsbmN2WOuKNHfZDycaqua2c5Xb8iXusIvtnrQa5W920dPHY1c4owbMA53hi nVSG1s+ryKJ538bmGvT6+v9zSG9zuhl+DmUuDbbxE6Bi5Y/bJaI0d5A+EMUXlVPCBOBV ZwkCe/ExnM8mQh7QIpaAJrQNdrpgN7Nw/8hwLbcQK82pb0Coj8oNa+7cY5idepOA89vO 3Y7etEUeKL5ZJDnfLF2gnggBDs6HmpLlncxN9CcO25gWayrG6TIaWlrHcadQD+LOCsKi /KBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=KIqW8yPMFeAwnYpHVCBfAMQwGd4JwRwD5QyvnWMU1e4=; b=Dt18YCG9kxFGpDXema/jlafuwbQ2woihDi5cRzCGBZP1OUa4qIazLQaBIBBCke8442 evfZtEWz9SiP0nDFJJOFXbixRocgigxIejsxBuRXshD5npem36oJdE/+Nz5Fz/OEiJME Dk/pK6veUitbgpx8wag2Ppl6/UcFtKZevjv+5rRwjmIqHhCjT0FdUt6jCxERRnW7NyYN uOE9v4KY+Mfxx1XKoQClp1HQxf/rOwEYsQfEwJ2/byFDHweRIAow0CCKApQluxCLLeUj XeAXmQAwssIxAoE3aoDa7yuGeqnEfKW2M6/OO+eW+eLoo2A/t9ymvaDXbJOVu4/KpEAC M7UQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=AVmtnDTo; 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 mp9-20020a1709071b0900b007b43ef7c08fsi8622513ejc.501.2022.11.27.20.48.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Nov 2022 20:48:48 -0800 (PST) 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=AVmtnDTo; 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 AF96338A8157 for ; Mon, 28 Nov 2022 04:46:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AF96338A8157 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669610799; bh=KIqW8yPMFeAwnYpHVCBfAMQwGd4JwRwD5QyvnWMU1e4=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=AVmtnDTodDT20Y1GfGqNWKgfvbqZQY0Cc8FZUNVQDmlow8qtqnxXUzY/VMCA92yl8 Ob6qFhdH9MuvJrpGZfMeAEFb1UunvH/YxsgqEL9qQfy9HZtJsNtluoY5bTdqobuMJy ocpRWQmaTx93iqXviJfLPdnnJCSXJcsr6xq7kbtA= 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 B0498384F884 for ; Mon, 28 Nov 2022 04:45:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B0498384F884 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id 0BB77300089; Mon, 28 Nov 2022 04:45:08 +0000 (UTC) To: Tsukasa OI , Nelson Chu , Kito Cheng , Palmer Dabbelt Cc: binutils@sourceware.org Subject: [PATCH v2 06/11] RISC-V: Use static xlen on ADDIW sequence Date: Mon, 28 Nov 2022 04:43:41 +0000 Message-Id: <072cb269b90f85fdfd880a6513080a18ddde015d.1669610611.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 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?1749537152408723609?= X-GMAIL-MSGID: =?utf-8?q?1750713948925169487?= From: Tsukasa OI Because XLEN for the disassembler is computed and stored in the xlen variable, this commit replaces uses of info->mach with xlen (when testing for ADDIW / C.ADDIW address sequence). Not just we used two ways to determine current XLEN, info->mach and xlen, xlen is going to be more important in the future commits. opcodes/ChangeLog: * riscv-dis.c (print_insn_args): Use xlen variable to determine whether XLEN is larger than 32. --- opcodes/riscv-dis.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opcodes/riscv-dis.c b/opcodes/riscv-dis.c index 51a08d847b10..4c193624039e 100644 --- a/opcodes/riscv-dis.c +++ b/opcodes/riscv-dis.c @@ -261,7 +261,7 @@ print_insn_args (const char *oparg, insn_t l, bfd_vma pc, disassemble_info *info case 'j': if (((l & MASK_C_ADDI) == MATCH_C_ADDI) && rd != 0) maybe_print_address (pd, rd, EXTRACT_CITYPE_IMM (l), 0); - if (info->mach == bfd_mach_riscv64 + if (xlen > 32 && ((l & MASK_C_ADDIW) == MATCH_C_ADDIW) && rd != 0) maybe_print_address (pd, rd, EXTRACT_CITYPE_IMM (l), 1); print (info->stream, dis_style_immediate, "%d", @@ -461,7 +461,7 @@ print_insn_args (const char *oparg, insn_t l, bfd_vma pc, disassemble_info *info if (((l & MASK_ADDI) == MATCH_ADDI && rs1 != 0) || (l & MASK_JALR) == MATCH_JALR) maybe_print_address (pd, rs1, EXTRACT_ITYPE_IMM (l), 0); - if (info->mach == bfd_mach_riscv64 + if (xlen > 32 && ((l & MASK_ADDIW) == MATCH_ADDIW) && rs1 != 0) maybe_print_address (pd, rs1, EXTRACT_ITYPE_IMM (l), 1); print (info->stream, dis_style_immediate, "%d",