From patchwork Tue Nov 15 04:52:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tsukasa OI X-Patchwork-Id: 20193 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a40e:b0:83:7221:86ba with SMTP id ck14csp3425907dyb; Mon, 14 Nov 2022 21:04:08 -0800 (PST) X-Google-Smtp-Source: AA0mqf5OaTmz+mOGOlqojJztrWc/7mF8s1amLy95bL7iZMTq8EoBZs+VIx52LFF1qhpypLvSGjlQ X-Received: by 2002:aa7:cdc8:0:b0:463:f8aa:d2bf with SMTP id h8-20020aa7cdc8000000b00463f8aad2bfmr13704354edw.358.1668488648191; Mon, 14 Nov 2022 21:04:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668488648; cv=none; d=google.com; s=arc-20160816; b=OZd6OUshQlM+delcIz0ZWDlAV3GZOVeDB0uM1H6K+mY1lVYB8tQ26/ESSwPaJESzCJ oodHj44jMFOG7vYB0MOuwp0aaBYMHScP3/O1jXITI1zKYLBLNH3+iCvm73/gyWZl22n4 IjTgsj63svJif/YHIez4Hw1yY0D9JzOxQ4NnnAI0/du07djfYRqxcOBO1JiVoumBZ2TL ocKpbTrD4FkJ+UHI/wA6h9E8jI2ZNZ6mHnv7XlDQQN8t9aAkxKqQg6XFUJ7nhkqfW54H Z9u/RqwvUqQxQ0pxJB8E/OzlEQEKYoKraS8RFtU9mwTs5OLgvOpIENzyFEttjYI/J2Ig 0rUA== 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=6kSYCSmk24BBvknILrjTyXlbPsCkfQkwLlk6z02RMK8=; b=FQIit4MvkOfaP6G5G91llQx2E7kmey13uE0YReWrPKV9zI9PC3io21hKdm4kXGqvWj AQQWdqKmnMj+OWfhM0vhvIOJ6GctqvUk6Ys3TrMounmFFQRMuNnoHyW2QZFHk3BVU2wf sLOx6vb0o959hpHMk7iVfLJey9XFPQ+715AjSBM/Ld5QIn9mDMHkR0n0780WKUChJ7ui cFKZSWi9cYOIgt5v7zJfmsgcP+56Uwj08AEy5EJBz7JyzZhZs5edpXwLQFaHRBfq/Srw U26Sh2elXazlXNfgZDkFhG9zw/x8td/niwjl3EIVTYNd7DUQsQyU4sOSvx2+3IvT0XPo Xe0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=KkPwBNSV; 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 nd32-20020a17090762a000b007addff99f09si9775243ejc.1004.2022.11.14.21.04.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Nov 2022 21:04:08 -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=KkPwBNSV; 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 CB57E3887F47 for ; Tue, 15 Nov 2022 05:01:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CB57E3887F47 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1668488467; bh=6kSYCSmk24BBvknILrjTyXlbPsCkfQkwLlk6z02RMK8=; 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=KkPwBNSVTgyjtHdPaJDgl7xIBWAnMW1fGTE2639Yjivfy6UbEazN5cQhx0Yi/wmYc rn9XfDZHm3q/O2L2MsWR9PiJf1P/chB49U3tGOSsTpIba1XhGCkGKQBZtJspdh1aU3 hebyG7SHniMRy6EyNX4AHNw+oCInaQ4qY/LW8fnA= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-sender-0.a4lg.com (mail-sender.a4lg.com [153.120.152.154]) by sourceware.org (Postfix) with ESMTPS id F2BE43889E12 for ; Tue, 15 Nov 2022 04:58:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org F2BE43889E12 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id 54AF4300089; Tue, 15 Nov 2022 04:58:36 +0000 (UTC) To: Tsukasa OI , Nelson Chu , Kito Cheng , Palmer Dabbelt Cc: binutils@sourceware.org Subject: [PATCH 06/11] RISC-V: Use static xlen on ADDIW sequence Date: Tue, 15 Nov 2022 04:52:49 +0000 Message-Id: <9734125736efc8b63be17df87d38cf24bb14a156.1668487922.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?1749537152408723609?= 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 ec38bed747a..d4a6cdd4d4e 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",