From patchwork Mon Oct 3 10:43: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: 1643 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp885765wrs; Mon, 3 Oct 2022 03:44:53 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5ALiTOcgKU6hETSeZguIuHvDxBJn2A8FC8y6xjAezvZrw/pXJXw2unNu1AZJCgXvsiQ/sg X-Received: by 2002:a17:907:6e18:b0:783:87e0:4e2d with SMTP id sd24-20020a1709076e1800b0078387e04e2dmr14166053ejc.650.1664793893164; Mon, 03 Oct 2022 03:44:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664793893; cv=none; d=google.com; s=arc-20160816; b=tDSaTAzwpP/C5vstyWePKMXgAdM0666be1PsbPG+HaYiqUeO+/AcJI6XyKchE1d0U2 /ldPa5OQtRUvzdACxXgL1PoJB+bGJE5qnK4trgHi4PqZD152vJvDvfLG+q8R6p6G048S 9ucHc3ltmGWnG2fI0WRYXWza7LxqA1/d/POnaT6kuwTMDhOAbthwpUGYpvC8kUzMwjit 7TU0gpF4MT/QDDn2sSOoE606+5NfjTEjf1Fyzow6mXTZm0Uw5RRvA5Bj57wkUb/NJ1J3 /jIietiNfHl8ENI+iVai31QxRUFn0+jdFw6oNQUIoL7n4KyH/p2ZnkndTyP0zLtipatG CuYQ== 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=XhP0yFeHlXr+D43FVFxRhICNf12gZNGIM4evY+j5uVA=; b=ylrD3amn6QiYBU09qqxQ12+1Y+cbqXJDQZraLRc6Gm2h8Sir7nyy6bRH9513OVhzC3 ZLYB8G7z18ymGFoPrYTdtj6wFowRjW3ptXnvSLxpQMaGDgW1CN23R1e/QH0AQZDJDBj1 0I/o+Bvzxrdc621AjuCpcLhNh8iALvbkFiKuF2/X7Zh0Lbs/cOaDdVA1BgszRDa1yZ20 wmG4bYaMiND3MOaLh5QDFQGgcf4hak9blkcKaNh6XJ+VzwCalBXQOLO+7x8KF45kxzol W1b9OWTb6Bp7mfHpmWzffMmwotJ9dsqPLFVR7hagnORVU2ywvO9JI4wUOKQN/i3NVmGs EYQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=Fm15Sqtm; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c 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 (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id p13-20020a170906b20d00b0073dd3b9b271si6333093ejz.316.2022.10.03.03.44.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Oct 2022 03:44:53 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=Fm15Sqtm; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c 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 794B2385483B for ; Mon, 3 Oct 2022 10:44:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 794B2385483B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1664793890; bh=XhP0yFeHlXr+D43FVFxRhICNf12gZNGIM4evY+j5uVA=; 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=Fm15SqtmcQEeufs8RCm27wMkOKmBe63RwrDFGsgOrMtwiZwtFRgzi1/d66Pi9JLik dwtXuo0ArF5UoBv6UqeiInncA/EHRKARTS//8WLIU7R0bkPi4nW5Tpnp/7qeyuPtpR 4tmEW9fc6C/K/QpXxkdvJl0cjYPb0EFuevdU0luY= 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 81DEC3857022 for ; Mon, 3 Oct 2022 10:44:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 81DEC3857022 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id CA5F5300089; Mon, 3 Oct 2022 10:44:40 +0000 (UTC) To: Tsukasa OI , =?utf-8?q?Christoph_M=C3=BCll?= =?utf-8?q?ner?= , Nelson Chu , Kito Cheng , Palmer Dabbelt , Andrew Burgess Subject: [PATCH v3 1/6] RISC-V: Fix immediates to have "immediate" style Date: Mon, 3 Oct 2022 10:43:59 +0000 Message-Id: <7ba14fc4472ce97d4f7a4433cad8a571e89f82f4.1664793840.git.research_trasio@irq.a4lg.com> In-Reply-To: References: Mime-Version: 1.0 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, KAM_MANYTO, 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?1745662921194425624?= X-GMAIL-MSGID: =?utf-8?q?1745662921194425624?= This commit fixes certain print calls on immediate operands to have dis_style_immediate. opcodes/ChangeLog: * riscv-dis.c (print_insn_args): Fix immediates to have "immediate" style. (riscv_disassemble_data): Likewise. --- opcodes/riscv-dis.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/opcodes/riscv-dis.c b/opcodes/riscv-dis.c index 6ac69490b78..a5bfa97058a 100644 --- a/opcodes/riscv-dis.c +++ b/opcodes/riscv-dis.c @@ -480,7 +480,7 @@ print_insn_args (const char *oparg, insn_t l, bfd_vma pc, disassemble_info *info break; case 'y': - print (info->stream, dis_style_text, "0x%x", + print (info->stream, dis_style_immediate, "0x%x", (int)EXTRACT_OPERAND (BS, l)); break; @@ -549,17 +549,17 @@ print_insn_args (const char *oparg, insn_t l, bfd_vma pc, disassemble_info *info if (riscv_csr_hash[csr] != NULL) print (info->stream, dis_style_text, "%s", riscv_csr_hash[csr]); else - print (info->stream, dis_style_text, "0x%x", csr); + print (info->stream, dis_style_immediate, "0x%x", csr); break; } case 'Y': - print (info->stream, dis_style_text, "0x%x", + print (info->stream, dis_style_immediate, "0x%x", (int) EXTRACT_OPERAND (RNUM, l)); break; case 'Z': - print (info->stream, dis_style_text, "%d", rs1); + print (info->stream, dis_style_immediate, "%d", rs1); break; case 'X': /* Integer immediate. */ @@ -963,7 +963,7 @@ riscv_disassemble_data (bfd_vma memaddr ATTRIBUTE_UNUSED, (*info->fprintf_styled_func) (info->stream, dis_style_assembler_directive, ".byte\t"); (*info->fprintf_styled_func) - (info->stream, dis_style_assembler_directive, "0x%02llx", + (info->stream, dis_style_immediate, "0x%02llx", (unsigned long long) data); break; case 2: From patchwork Mon Oct 3 10:44:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tsukasa OI X-Patchwork-Id: 1644 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp885832wrs; Mon, 3 Oct 2022 03:45:08 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6d77Zy5haP7MXBpFu9UdC+mq3Z2Q5PoTFRJA1rx6aWCxhEvEmXoP7CNVe71d1pxDubafrn X-Received: by 2002:a05:6402:26d4:b0:451:280d:3533 with SMTP id x20-20020a05640226d400b00451280d3533mr17671812edd.316.1664793908730; Mon, 03 Oct 2022 03:45:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664793908; cv=none; d=google.com; s=arc-20160816; b=Dw6Vkt4wMNnRk8bpM1dVD8pdKz0/hsl/U+3Y/wRXS0I+5NPWpq0SGN9LMg5S065E7v hQcz9QxcUtlHdXOMC9XMvDnfhG6H2fqc3ewGnVZZd74W8k8jf5p03K7RzbRCzuwKv8Zf DIbEHtWRgEJuCCRrWTQYl5yQ7K7qqRnSATYcaxW9JrAyKxMIltg5UdV/xhtFlEv2GgUF baqSNfgfbbF7Zgdu4kYPPq61LBrv8dS8J9Nlo4ziNKgH20CkUdvTbwrCQiPa8Xydd7VZ sd9aX4sIuAgd2X1kO10CCHA4A0qfPV+20EFJkbqH3rxlPCnlFHvItDGZepk7npJfwCjt dU6g== 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=iyrbhmgYlTidHDPmRgPXWpz3k77eUUr5gQG9DxCES8w=; b=BSU/wjwPyc2hpBDlCV+HMeeejWYJ1DyXqGEEod5nFCAKFr/aP0peQfTB8j21/nXQ7q QgrIHTIuAsd0dKTKNj8VWw1wYT0eiL7FFQWnRI+FXogi8vHKG/f+PQ/QdXlP1app1oCR ptWvowIFfKyNQFEeC7Fhun5EK6d2leqOl75RJj0LRmY+PQWHqKPjjmGMB0lqj9KpBaNg bKHfCrINe6VajzPSDeY9AKw0HfuuVVUMpd2185M9JQNwtFF2bPOlsh0dTSrbFzixLWGn LgW4vduxBO6jhwNZPR9KG5eveseS8NudTYr09ExrMUARSx9JXijvd1JJRlZudNyuYCHD GjRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=K2T2AnoI; 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 (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id g9-20020a056402090900b004517955b673si9083560edz.124.2022.10.03.03.45.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Oct 2022 03:45:08 -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=K2T2AnoI; 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 89AB4385E012 for ; Mon, 3 Oct 2022 10:45:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 89AB4385E012 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1664793901; bh=iyrbhmgYlTidHDPmRgPXWpz3k77eUUr5gQG9DxCES8w=; 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=K2T2AnoIZjPJxWJlmVYhkZtG6MbDQNJErrdeZPaKF1B2uZ2eZNsFNasS7yLNTAYis DdNaWkQo0evK8Ji8jyOq4cV0o4gxMvaqtouV7xdcVqhwKIKxy2vgM9pUKFvsMls+wX b2A6PO/SdEk42TKGlb2Nv+/zH5eK/Z3VGUcUXCXE= 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 0F0F7385AC2C for ; Mon, 3 Oct 2022 10:44:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0F0F7385AC2C Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id 5DAF1300089; Mon, 3 Oct 2022 10:44:51 +0000 (UTC) To: Tsukasa OI , =?utf-8?q?Christoph_M=C3=BCll?= =?utf-8?q?ner?= , Nelson Chu , Kito Cheng , Palmer Dabbelt , Andrew Burgess Subject: [PATCH v3 2/6] RISC-V: Fix printf argument types corresponding %x Date: Mon, 3 Oct 2022 10:44:00 +0000 Message-Id: In-Reply-To: References: Mime-Version: 1.0 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, KAM_MANYTO, 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?1745662937585991005?= X-GMAIL-MSGID: =?utf-8?q?1745662937585991005?= "%x" format specifier requires unsigned type, not int. This commit fixes this issue on the RISC-V disassembler. opcodes/ChangeLog: * riscv-dis.c (print_insn_args): Fix printf argument types where the format specifier is "%x". --- opcodes/riscv-dis.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/opcodes/riscv-dis.c b/opcodes/riscv-dis.c index a5bfa97058a..503b839f19e 100644 --- a/opcodes/riscv-dis.c +++ b/opcodes/riscv-dis.c @@ -292,15 +292,15 @@ print_insn_args (const char *oparg, insn_t l, bfd_vma pc, disassemble_info *info break; case 'u': print (info->stream, dis_style_immediate, "0x%x", - (int)(EXTRACT_CITYPE_IMM (l) & (RISCV_BIGIMM_REACH-1))); + (unsigned)(EXTRACT_CITYPE_IMM (l) & (RISCV_BIGIMM_REACH-1))); break; case '>': print (info->stream, dis_style_immediate, "0x%x", - (int)EXTRACT_CITYPE_IMM (l) & 0x3f); + (unsigned)EXTRACT_CITYPE_IMM (l) & 0x3f); break; case '<': print (info->stream, dis_style_immediate, "0x%x", - (int)EXTRACT_CITYPE_IMM (l) & 0x1f); + (unsigned)EXTRACT_CITYPE_IMM (l) & 0x1f); break; case 'T': /* Floating-point RS2. */ print (info->stream, dis_style_register, "%s", @@ -481,7 +481,7 @@ print_insn_args (const char *oparg, insn_t l, bfd_vma pc, disassemble_info *info case 'y': print (info->stream, dis_style_immediate, "0x%x", - (int)EXTRACT_OPERAND (BS, l)); + (unsigned)EXTRACT_OPERAND (BS, l)); break; case 'z': @@ -490,12 +490,12 @@ print_insn_args (const char *oparg, insn_t l, bfd_vma pc, disassemble_info *info case '>': print (info->stream, dis_style_immediate, "0x%x", - (int)EXTRACT_OPERAND (SHAMT, l)); + (unsigned)EXTRACT_OPERAND (SHAMT, l)); break; case '<': print (info->stream, dis_style_immediate, "0x%x", - (int)EXTRACT_OPERAND (SHAMTW, l)); + (unsigned)EXTRACT_OPERAND (SHAMTW, l)); break; case 'S': @@ -555,7 +555,7 @@ print_insn_args (const char *oparg, insn_t l, bfd_vma pc, disassemble_info *info case 'Y': print (info->stream, dis_style_immediate, "0x%x", - (int) EXTRACT_OPERAND (RNUM, l)); + (unsigned) EXTRACT_OPERAND (RNUM, l)); break; case 'Z': From patchwork Mon Oct 3 10:44:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tsukasa OI X-Patchwork-Id: 1647 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp886422wrs; Mon, 3 Oct 2022 03:47:18 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5obwnFfnbE+NbcQJ4focov0JrqBTSwfNauhb7bRk8wEzXIRMVUSIXEXeSGGsO9Bi18rjJ+ X-Received: by 2002:a17:907:2bdd:b0:77d:e0f3:81e5 with SMTP id gv29-20020a1709072bdd00b0077de0f381e5mr14677637ejc.328.1664794038140; Mon, 03 Oct 2022 03:47:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664794038; cv=none; d=google.com; s=arc-20160816; b=V7+3KZKEY7OARd28P8aa8W6q9jryHKIjmzfcvdWJkpcVe3sTfq76Z+XkDE4/M4wQFC HZZ85XxZ3pc98m5UvOxDeaGHO+lF04hqC/dO9W9HsPu2hSv68jrQWxE/1aCucEdKPkdu XZUqstiwL+YlPRsTo/d4lxT3WgUufTecq/sd26a0q2TqTxpN0jgdtc5rWefBffJYKDP2 wNQbezZA7EJ15ft3aO9o+EP0FsPb+wKM9tACOLLeclIllJASgIKHUx4+KFsYutkkbCzn G93TpUoq2eomZLyBqTUOLc7BAe7FIaLeOLtyyc+Iraiy1YOcsIfW7FFAq64CoDXKe2fF 0iPw== 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=lMuw8ojelJl0YCR8WnpKmBtaB5yygTiimENEsWnbbyM=; b=rdFEStzteL9CqGxTAin14pl/AF5gxuDpRY0tb9o0M8DHcsXwOmErxdSYG0hc2PJFhi JhDpYhus7oE+RY8CNQLpVy66gSATz5I5+wqhtSVkWlOa8NrBfiSYyAO7NiFFCCD7pXbU nGXW5hEErtiSv0zUOILs7zDUN2YudSJa3MCE45RTXoQmfmLirJI+jFbwwNEAv7c0cMZI z69LcE8GZMmWc1hZy+kL2phcJluNiFFUpleLS11UV3B8hkIzTBuadUSSAju4wX13oG9m w2wlWbqFsmmXR3vtiOukLmkXMckBucLQKN8z2VPpW8CsSHI6ptGCmzKteLipgTU6Bk7u neIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=S5B9c5F0; 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 (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id hu8-20020a170907a08800b0078ae5192906si2925382ejc.193.2022.10.03.03.47.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Oct 2022 03:47:18 -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=S5B9c5F0; 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 3D7E7386191C for ; Mon, 3 Oct 2022 10:46:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3D7E7386191C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1664793963; bh=lMuw8ojelJl0YCR8WnpKmBtaB5yygTiimENEsWnbbyM=; 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=S5B9c5F0GfSJjGZmiKJwVpwsDS3KKYScPr3NqpbhAUGzPyii/wWjAqP8+PJIecqKR dVtICu05haSrJ+0e9/Rjajc24ELRW06dy32AyO8yGHHWD7A2fqgC7k0fJmMAzGUbhn UkBgr9dzWz0mlDb6p5tSadbvN/IsJ2nPUuvzDGZk= 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 972AE3857022 for ; Mon, 3 Oct 2022 10:45:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 972AE3857022 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id E04C6300089; Mon, 3 Oct 2022 10:45:01 +0000 (UTC) To: Tsukasa OI , =?utf-8?q?Christoph_M=C3=BCll?= =?utf-8?q?ner?= , Nelson Chu , Kito Cheng , Palmer Dabbelt , Andrew Burgess Subject: [PATCH v3 3/6] RISC-V: Optimize riscv_disassemble_data printf Date: Mon, 3 Oct 2022 10:44:01 +0000 Message-Id: <0002ea716713ace4998a33dde0b81f4f890d10bf.1664793840.git.research_trasio@irq.a4lg.com> In-Reply-To: References: Mime-Version: 1.0 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, KAM_MANYTO, 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?1745663073002867939?= X-GMAIL-MSGID: =?utf-8?q?1745663073002867939?= This commit makes types of printf arguments on riscv_disassemble_data as small as possible (as long as we can preserve the portability) to reduce the cost of printf (especially on 32-bit host). opcodes/ChangeLog: * riscv-dis.c (riscv_disassemble_data): Use smallest possible type to printing data. --- opcodes/riscv-dis.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/opcodes/riscv-dis.c b/opcodes/riscv-dis.c index 503b839f19e..70f484189f5 100644 --- a/opcodes/riscv-dis.c +++ b/opcodes/riscv-dis.c @@ -963,24 +963,22 @@ riscv_disassemble_data (bfd_vma memaddr ATTRIBUTE_UNUSED, (*info->fprintf_styled_func) (info->stream, dis_style_assembler_directive, ".byte\t"); (*info->fprintf_styled_func) - (info->stream, dis_style_immediate, "0x%02llx", - (unsigned long long) data); + (info->stream, dis_style_immediate, "0x%02x", (unsigned) data); break; case 2: info->bytes_per_line = 8; (*info->fprintf_styled_func) (info->stream, dis_style_assembler_directive, ".short\t"); (*info->fprintf_styled_func) - (info->stream, dis_style_immediate, "0x%04llx", - (unsigned long long) data); + (info->stream, dis_style_immediate, "0x%04x", (unsigned) data); break; case 4: info->bytes_per_line = 8; (*info->fprintf_styled_func) (info->stream, dis_style_assembler_directive, ".word\t"); (*info->fprintf_styled_func) - (info->stream, dis_style_immediate, "0x%08llx", - (unsigned long long) data); + (info->stream, dis_style_immediate, "0x%08lx", + (unsigned long) data); break; case 8: info->bytes_per_line = 8; From patchwork Mon Oct 3 10:44:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tsukasa OI X-Patchwork-Id: 1646 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp886070wrs; Mon, 3 Oct 2022 03:45:59 -0700 (PDT) X-Google-Smtp-Source: AMsMyM74Ak1BXMEaqVRKj8omaAcV3GXS5Vcb8k1tfygLYfq/jBmupKU8c7se5MhPDRoVq8JMaU6T X-Received: by 2002:a17:907:a0e:b0:780:72bb:5ce4 with SMTP id bb14-20020a1709070a0e00b0078072bb5ce4mr14986064ejc.234.1664793959474; Mon, 03 Oct 2022 03:45:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664793959; cv=none; d=google.com; s=arc-20160816; b=F18yiAWAlRPq1dGbu63fUCzv4HXjI5z94Vp821KG1bGhsFCH/+HvH6wz7fe+Y66G2X zRe3T+vQaT+6AQ9+drsOfXXfYckZ3y/lcSQLpELeTXmdAD/8qCf4++7AryXQkkJFgFJ8 YMIiy2xo605z500sHc9mivR4cMpbipVdPvuQkKGKJ5ZXtUgAZniTg80PT4JgS+DKc5Nt F3+fhJB9j9bPJqdTrzss4mH3lQfAYjfKB537Kk1SWdIS1DQRpIYJ7BsOqv96VvBnpnpX 7d59GasEzoBpvpPS3uv1brpNcufb29g09yJFGbfOt1IFp84MqGHoZeTj6cBMWFdJeRgK vwPA== 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=937DfzCxGAPLdB6iNXZ7TuzgkI0z51OCZ2M62+xvei0=; b=AXEeguXYsJG0k6rDqSKn2f0fNq6A3z/51twRwbzkpRFFU3N97mFhCo/6GTbsYHtryg m1mXT+3KvoximGVW71QhHVpyyWiMYIStdJB9VI25BYJ0BlnX6mw/bPg95V6HPNtVa0VJ xGG4KCizZ0sDgwRvamb+2Phqg+t6ihJ/ziCpc98nHMD1v2yt1TaKIlFnB7uGkAyi8jQP eUFBbXBiJ7NjwaPJbTXitZBT+Lz2bOcK8sINJmpcv1KT0B1zDzfCHj0DVPJIr3Hw6KKK naPIJZBDr0CPC5LI13o767iRkjfy2yMzjdC2LW+5FH9DRf+c1RJ8CJWMr1jydS5IP8xm 1SJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=up6qGVa3; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c 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 (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id ds9-20020a170907724900b0078331a3b123si8162194ejc.572.2022.10.03.03.45.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Oct 2022 03:45:59 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=up6qGVa3; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c 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 1E37F3851A9F for ; Mon, 3 Oct 2022 10:45:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1E37F3851A9F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1664793928; bh=937DfzCxGAPLdB6iNXZ7TuzgkI0z51OCZ2M62+xvei0=; 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=up6qGVa3OBVxDvGnctcQl0Nre1x7Eanpp3dLta4D3evHLFsWUb5x2+Je4W1+5pvmo KswIZCFai8Y5Jc/JHhCz+q/zSBpBrU4B3SOiWaJnsbkW99GxhM/PLnLNLh3T5ZgZT+ AC/XBTQJkZaOB3PvsBs4fR6zimuriEYVpf8aH8io= 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 696C13853570 for ; Mon, 3 Oct 2022 10:45:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 696C13853570 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id 7002D300089; Mon, 3 Oct 2022 10:45:12 +0000 (UTC) To: Tsukasa OI , =?utf-8?q?Christoph_M=C3=BCll?= =?utf-8?q?ner?= , Nelson Chu , Kito Cheng , Palmer Dabbelt , Andrew Burgess Subject: [PATCH v3 4/6] RISC-V: Print comma and tabs as the "text" style Date: Mon, 3 Oct 2022 10:44:02 +0000 Message-Id: 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, KAM_MANYTO, 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?1745662990855059447?= X-GMAIL-MSGID: =?utf-8?q?1745662990855059447?= On the RISC-V disassembler, some separators have non-text style when printed with another word with another style. This commit splits those, making sure that those comma and tabs are printed with the "text" style. opcodes/ChangeLog: * riscv-dis.c (print_insn_args): Split and print the comma as text. (riscv_disassemble_insn): Split and print tabs as text. (riscv_disassemble_data): Likewise. --- opcodes/riscv-dis.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/opcodes/riscv-dis.c b/opcodes/riscv-dis.c index 70f484189f5..7f5ca4dcb85 100644 --- a/opcodes/riscv-dis.c +++ b/opcodes/riscv-dis.c @@ -382,9 +382,12 @@ print_insn_args (const char *oparg, insn_t l, bfd_vma pc, disassemble_info *info (int)EXTRACT_RVV_OFFSET (l)); break; case 'm': - if (! EXTRACT_OPERAND (VMASK, l)) - print (info->stream, dis_style_register, ",%s", - riscv_vecm_names_numeric[0]); + if (!EXTRACT_OPERAND (VMASK, l)) + { + print (info->stream, dis_style_text, ","); + print (info->stream, dis_style_register, "%s", + riscv_vecm_names_numeric[0]); + } break; } break; @@ -765,7 +768,8 @@ riscv_disassemble_insn (bfd_vma memaddr, insn_t word, disassemble_info *info) case 4: case 8: (*info->fprintf_styled_func) - (info->stream, dis_style_assembler_directive, ".%dbyte\t", insnlen); + (info->stream, dis_style_assembler_directive, ".%dbyte", insnlen); + (*info->fprintf_styled_func) (info->stream, dis_style_text, "\t"); (*info->fprintf_styled_func) (info->stream, dis_style_immediate, "0x%llx", (unsigned long long) word); break; @@ -773,7 +777,8 @@ riscv_disassemble_insn (bfd_vma memaddr, insn_t word, disassemble_info *info) { int i; (*info->fprintf_styled_func) - (info->stream, dis_style_assembler_directive, ".byte\t"); + (info->stream, dis_style_assembler_directive, ".byte"); + (*info->fprintf_styled_func) (info->stream, dis_style_text, "\t"); for (i = 0; i < insnlen; ++i) { if (i > 0) @@ -961,21 +966,24 @@ riscv_disassemble_data (bfd_vma memaddr ATTRIBUTE_UNUSED, case 1: info->bytes_per_line = 6; (*info->fprintf_styled_func) - (info->stream, dis_style_assembler_directive, ".byte\t"); - (*info->fprintf_styled_func) - (info->stream, dis_style_immediate, "0x%02x", (unsigned) data); + (info->stream, dis_style_assembler_directive, ".byte"); + (*info->fprintf_styled_func) (info->stream, dis_style_text, "\t"); + (*info->fprintf_styled_func) (info->stream, dis_style_immediate, + "0x%02x", (unsigned)data); break; case 2: info->bytes_per_line = 8; (*info->fprintf_styled_func) - (info->stream, dis_style_assembler_directive, ".short\t"); + (info->stream, dis_style_assembler_directive, ".short"); + (*info->fprintf_styled_func) (info->stream, dis_style_text, "\t"); (*info->fprintf_styled_func) (info->stream, dis_style_immediate, "0x%04x", (unsigned) data); break; case 4: info->bytes_per_line = 8; (*info->fprintf_styled_func) - (info->stream, dis_style_assembler_directive, ".word\t"); + (info->stream, dis_style_assembler_directive, ".word"); + (*info->fprintf_styled_func) (info->stream, dis_style_text, "\t"); (*info->fprintf_styled_func) (info->stream, dis_style_immediate, "0x%08lx", (unsigned long) data); @@ -983,7 +991,8 @@ riscv_disassemble_data (bfd_vma memaddr ATTRIBUTE_UNUSED, case 8: info->bytes_per_line = 8; (*info->fprintf_styled_func) - (info->stream, dis_style_assembler_directive, ".dword\t"); + (info->stream, dis_style_assembler_directive, ".dword"); + (*info->fprintf_styled_func) (info->stream, dis_style_text, "\t"); (*info->fprintf_styled_func) (info->stream, dis_style_immediate, "0x%016llx", (unsigned long long) data); From patchwork Mon Oct 3 10:44:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tsukasa OI X-Patchwork-Id: 1648 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp886656wrs; Mon, 3 Oct 2022 03:48:05 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6NkSMOXhMUXTH7e9TavLa430ddkF7AqxBoN/0acQ30MMmuGcGg4i017omYEKGfJOF3t1xk X-Received: by 2002:a17:907:971c:b0:783:286f:152b with SMTP id jg28-20020a170907971c00b00783286f152bmr14807616ejc.479.1664794085361; Mon, 03 Oct 2022 03:48:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664794085; cv=none; d=google.com; s=arc-20160816; b=ppbN+jXD1B8J7GOWctR940KPSmky+YlGUO6+WPll/bz6Dm/Z5vO2szAbuDQrHSnalM QjMmMquF7cMNiY/IAWoMH5UWGiy1mu3hsKJVXOJcvnR5y62fA/E/NqSA+lDz09AkxYsU VKb3sCqknUS+ypONSbMQXmQ/7+S0VPHBh0xoHTB8XfvYbDBO2iDsRCxroU1wm8QakQw3 acYgsO8xXeRmoPUHIe0EHST33uHrkGdYvOEU7c29v29kGnysGqmz8X5GzUufvJnZ3XYJ AB8Iu4TFxMj+Lvu5di/j7Mj3nzoezAyEKft0V2oCEcSBBe+Ww2VxAJOT/2vtzOjI3vOE wVYQ== 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=bCHnXUqP57gpXEm2gWh52Az9tJul6rVte8okbk76V6A=; b=Xm5E+IXNIYgfTeK0PzrnA2Sb7AXZuoE6RpV2cb0fzSfKWOESIXJ5l/BwGb2wuT30GR J9K7NuVtzjHxwXoR0BKQZ9iGBOBHlVx0qbPL9Fw9jFDcFgx2m5TN5tmj7tnZBH6Vn9rw XR6JKMbyygs5R4wSIa7a9B/kRc7y/idyBaGL5oOohD4g+heBwLMd6WHb4fkacEqrgkG2 VZRD9wMaT3h5KjFI08b4MHHeTUeCNda+NSJseghmpIADv5U+hrDs+FDzCYgVzb9JA476 iuuxz7c9dKOuztVQWSklAhLkP7kX0OzHCEBZfwg92bYVtA0Ak1nfWu1VKnv2jHPSDpNi +/Jg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=aOUiiDGu; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c 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 (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id fj3-20020a1709069c8300b0078849a014e9si8504132ejc.196.2022.10.03.03.48.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Oct 2022 03:48:05 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=aOUiiDGu; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c 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 6689A384D159 for ; Mon, 3 Oct 2022 10:46:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6689A384D159 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1664793990; bh=bCHnXUqP57gpXEm2gWh52Az9tJul6rVte8okbk76V6A=; 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=aOUiiDGuKLTUc8ElyjmV62oM8FqBoD4EPHIdM93qk0QhDTGrRgaU2s0yvt4xpuQHX 2LvqlQbBwvlUht8KZFmdH+96tDnGtJxqdI4XXg8DXakxOllVYPwHlWflLs3ACzwoBd EZI97lZKlZmAaUSzYN3YlPAjsXXvKhcJ9fY6wRtY= 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 B8158385380A for ; Mon, 3 Oct 2022 10:45:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B8158385380A Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id 01F14300089; Mon, 3 Oct 2022 10:45:22 +0000 (UTC) To: Tsukasa OI , =?utf-8?q?Christoph_M=C3=BCll?= =?utf-8?q?ner?= , Nelson Chu , Kito Cheng , Palmer Dabbelt , Andrew Burgess Subject: [PATCH v3 5/6] RISC-V: Fix T-Head immediate types on printing Date: Mon, 3 Oct 2022 10:44:03 +0000 Message-Id: <5abe1d8a7694417b990e11d8f6cd6789573872e5.1664793840.git.research_trasio@irq.a4lg.com> In-Reply-To: References: Mime-Version: 1.0 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, KAM_MANYTO, 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?1745659941148807472?= X-GMAIL-MSGID: =?utf-8?q?1745663122483912620?= This commit fixes two minor typing-related issues for T-Head immediate operands. 1. A signed type must be specified when printing with %i. 2. unsigned/signed int is not portable enough for max 32-bit immediates. Instead, we should use unsigned/signed long. The format string is changed accordingly. opcodes/ChangeLog: * riscv-dis.c (print_insn_args): Fix T-Head immediate types on printing. --- opcodes/riscv-dis.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/opcodes/riscv-dis.c b/opcodes/riscv-dis.c index 7f5ca4dcb85..c0edc4c7d6b 100644 --- a/opcodes/riscv-dis.c +++ b/opcodes/riscv-dis.c @@ -596,11 +596,11 @@ print_insn_args (const char *oparg, insn_t l, bfd_vma pc, disassemble_info *info oparg--; if (!sign) - print (info->stream, dis_style_immediate, "%u", - (unsigned)EXTRACT_U_IMM (n, s, l)); + print (info->stream, dis_style_immediate, "%lu", + (unsigned long)EXTRACT_U_IMM (n, s, l)); else - print (info->stream, dis_style_immediate, "%i", - (unsigned)EXTRACT_S_IMM (n, s, l)); + print (info->stream, dis_style_immediate, "%li", + (signed long)EXTRACT_S_IMM (n, s, l)); break; default: goto undefined_modifier; From patchwork Mon Oct 3 10:44:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tsukasa OI X-Patchwork-Id: 1649 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp886829wrs; Mon, 3 Oct 2022 03:48:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5y9SIYozbZx+A8acfT+ws/Nk/bm4SOdTp3JAu+hGqjD+zRiVFrZuvdLBdi+CmBlX8KvbYa X-Received: by 2002:a17:907:94c1:b0:787:84c3:e98 with SMTP id dn1-20020a17090794c100b0078784c30e98mr14858510ejc.269.1664794124892; Mon, 03 Oct 2022 03:48:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664794124; cv=none; d=google.com; s=arc-20160816; b=NAPX3WrCSHhNEZANn3NsPRHk6Bo02lixTsJBr0vrwkJs5aQPMu7TylUiZTnVMIrNXM /JRaEQuXWFSDLTj69XzU+J3VuUXgRaqyHvy1/LKCZh6z2XLoTvninTVin08IoxMv10Qc 9vp6oQMo74ChT/8ZvYHHmi9wkL1hhWuSazsvO+EBJOWwCK5hKdn7UakJyEXb57Lnytbp 102WvOpw7nGxtZP1WG7JKAZ4DyINAwC+K0q+hEscv3FQkTuxujYwPjDfItFYglxIrRlT Mkc2NW+meLR++WPHmfuU1yT53Zhyg/CeOaedVjvptjSEh3apAUvbVl3VAnFNhl/4+kDo qptQ== 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=+wQ5M7xBeDVkp4hjFx9bOcDf/pLEQwTqN4LaSEWD+XE=; b=Y+8VzLv7Afa8QeYcviX4L2Fe8slm+r+6+sBU4RNZ5yfPEjcTwFxqVtWB5cXE2TmKvg f6PJW9i6iP1elLkvvQxdLFpwknTQpW/jjQkqrKQm0TB4MkhxvJFmeK1PDMDutCbF0OWL B++Sswqd27mF8KMGBvaBpJQs2t9qp06BSFAAwEvdVn7jKdtaRSzahU6povjynj6xqxqU m6MZR9REZ+2pp/BVulxIMPcfISEi4VO770ImW0IMXyjDPxTNbiX1QPOSJ018c3PCH1L5 RcOw3DnCU8ZZ6bPDPdvxOIWX34YG0MlwmIxuLSzgi56L7oJL8OROFqrYXr1MBj7cvtJ6 yh7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=Z1mMGTOk; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c 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 (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id l15-20020a1709067d4f00b00781dbeebeb1si6950015ejp.585.2022.10.03.03.48.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Oct 2022 03:48:44 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=Z1mMGTOk; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c 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 AEFD6384B81F for ; Mon, 3 Oct 2022 10:47:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AEFD6384B81F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1664794022; bh=+wQ5M7xBeDVkp4hjFx9bOcDf/pLEQwTqN4LaSEWD+XE=; 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=Z1mMGTOk6+H7PD5pvDP1QpYCt1AqKiVwb+vXM/CfNygQBKMCfFEwaH0fsrwwg4PxO jS7HazXYU4E/nDqNsQbVQSaveltP8Y4oZzpw/Xk4p8cZuCqFnnUdKK6QpyemZOpNl3 FEbRneB6Rerqa5Yh8N8upL1tHHPv1wojkIWxR0pU= 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 4EE2E3851AA6 for ; Mon, 3 Oct 2022 10:45:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4EE2E3851AA6 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id 97271300089; Mon, 3 Oct 2022 10:45:33 +0000 (UTC) To: Tsukasa OI , =?utf-8?q?Christoph_M=C3=BCll?= =?utf-8?q?ner?= , Nelson Chu , Kito Cheng , Palmer Dabbelt , Andrew Burgess Subject: [PATCH v3 6/6] RISC-V: Print XTheadMemPair literal as "immediate" Date: Mon, 3 Oct 2022 10:44:04 +0000 Message-Id: <0b68af932117258c908db62cf87c3a15d3cdec41.1664793840.git.research_trasio@irq.a4lg.com> In-Reply-To: References: Mime-Version: 1.0 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, KAM_MANYTO, 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?1745663164590256238?= X-GMAIL-MSGID: =?utf-8?q?1745663164590256238?= The operand type "Xl(...)" denotes that (...) is a literal. Specifically, they are intended to be a constant immediate value. This commit prints "Xl(...)" operand with dis_style_immediate style, not dis_style_text. opcodes/ChangeLog: * riscv-dis.c (print_insn_args): Use dis_style_immediate on the constant literal of the "Xl..." operand. --- opcodes/riscv-dis.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opcodes/riscv-dis.c b/opcodes/riscv-dis.c index c0edc4c7d6b..7da96e15b65 100644 --- a/opcodes/riscv-dis.c +++ b/opcodes/riscv-dis.c @@ -577,7 +577,7 @@ print_insn_args (const char *oparg, insn_t l, bfd_vma pc, disassemble_info *info oparg++; while (*oparg && *oparg != ',') { - print (info->stream, dis_style_text, "%c", *oparg); + print (info->stream, dis_style_immediate, "%c", *oparg); oparg++; } oparg--;