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);