From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-x52a.google.com (mail-pg1-x52a.google.com [IPv6:2607:f8b0:4864:20::52a]) by sourceware.org (Postfix) with ESMTPS id 1370A3858D1E for ; Tue, 3 Jan 2023 21:57:40 +0000 (GMT) Received: by mail-pg1-x52a.google.com with SMTP id v3so21020344pgh.4 for ; Tue, 03 Jan 2023 13:57:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=xBk0ZJ+WZ/cbjKLGGD+yMtW79Msg7e8riN4klY/iGvA=; b=B1uOSy+BPadKrP27Dj0QTyzmyOwZf1XdAU+GvSX4W9ycJncPi2gL0AhLMpAO8hjhnY 4tBfusRrGdpR184XRa+nq/nuDuRl3Ohzm50Y70dkgbAMHgCZ1YHhrW5bSz9tOzzN7Q7d 2xRTW43jI8siJ+Q7yDeDy0liLKvytfKHbiPoJgalTgjW05QD9gAiNr9EOpVeA8zuyK1L zs9ENRhUDZwYhmnvohFGAmQ3p/SUXdOITAMlnW4YX/NtgaHSV+/FhMLUfZsmAlBtmNQx 4Boz9zM6P2TShDdJshWfBq6jSkkpjaKXSQrMxrJLDb9iDE7w+gdcvAqgvAlT5o3ZDF/S tQUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=xBk0ZJ+WZ/cbjKLGGD+yMtW79Msg7e8riN4klY/iGvA=; b=qDPttfPm363o0TcW/841c/gt0rJ8Yot8eVkFVOSmLMa74JT8HRbUIoYYoWXjeZ+vOE 933phSqzoBSd12qHPixOHKrxLJW0QdYjQhsEkQ691VfrxyK6CDwbUYce849dq0a1Xpyd /fgFDBc/wforSll+hrWrKqxTnnKU/A9S15lXYw1aklyZIbCSSnkEMhMOfPUHJpjbS5b+ vvIgs6OTk0PxDsthRCHHH8mlzGzexQ60+5BFAa0dAjGa6UPnklmlJ4zEQ7jJTSqMj5ay OYff7vaCFYWBUIxUcqikh5Z0NCfgCpIEX7pSdcY0noB96Z3W3PoWlRhjYmUpzOLCiP16 1Azw== X-Gm-Message-State: AFqh2krY3OYbcWSjy2317c2dIJveKKiN7MXvIUVAerGt/sCtJLh3mJFO 8z0LbU/8E61/A3hwu0HSndTFpf/2kMg= X-Google-Smtp-Source: AMrXdXuKrtf/umc5H/4rZoyLgnJ+EnZ6oLt5e19iBI7y7FvMNgYprRpQA2vWnHB5fK89TDmc8HfiLw== X-Received: by 2002:a62:1dc1:0:b0:582:16a6:82d1 with SMTP id d184-20020a621dc1000000b0058216a682d1mr14664056pfd.30.1672783058939; Tue, 03 Jan 2023 13:57:38 -0800 (PST) Received: from octofox.hsd1.ca.comcast.net ([2601:641:401:1d20:7cd7:ac9c:cd02:f32d]) by smtp.gmail.com with ESMTPSA id e62-20020a621e41000000b005810c4286d6sm16427567pfe.0.2023.01.03.13.57.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Jan 2023 13:57:38 -0800 (PST) From: Max Filippov To: binutils@sourceware.org Cc: Max Filippov Subject: [COMMITTED] opcodes: xtensa: implement styled disassembly Date: Tue, 3 Jan 2023 13:57:22 -0800 Message-Id: <20230103215722.616744-1-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,FROM_LOCAL_NOVOWEL,GIT_PATCH_0,HK_RANDOM_ENVFROM,HK_RANDOM_FROM,RCVD_IN_DNSWL_NONE,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 List-Id: opcodes/ * xtensa-dis.c (print_xtensa_operand) (print_insn_xtensa): Replace fprintf_func with fprintf_styled_func. --- opcodes/xtensa-dis.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/opcodes/xtensa-dis.c b/opcodes/xtensa-dis.c index 8a26fd7c1239..3631f7fad715 100644 --- a/opcodes/xtensa-dis.c +++ b/opcodes/xtensa-dis.c @@ -238,24 +238,28 @@ print_xtensa_operand (bfd_vma memaddr, else { if ((signed_operand_val > -256) && (signed_operand_val < 256)) - (*info->fprintf_func) (info->stream, "%d", signed_operand_val); + (*info->fprintf_styled_func) (info->stream, dis_style_immediate, + "%d", signed_operand_val); else - (*info->fprintf_func) (info->stream, "0x%x", signed_operand_val); + (*info->fprintf_styled_func) (info->stream, dis_style_immediate, + "0x%x", signed_operand_val); } } else { int i = 1; xtensa_regfile opnd_rf = xtensa_operand_regfile (isa, opc, opnd); - (*info->fprintf_func) (info->stream, "%s%u", - xtensa_regfile_shortname (isa, opnd_rf), - operand_val); + (*info->fprintf_styled_func) (info->stream, dis_style_register, + "%s%u", + xtensa_regfile_shortname (isa, opnd_rf), + operand_val); while (i < xtensa_operand_num_regs (isa, opc, opnd)) { operand_val++; - (*info->fprintf_func) (info->stream, ":%s%u", - xtensa_regfile_shortname (isa, opnd_rf), - operand_val); + (*info->fprintf_styled_func) (info->stream, dis_style_register, + ":%s%u", + xtensa_regfile_shortname (isa, opnd_rf), + operand_val); i++; } } @@ -404,7 +408,13 @@ print_insn_xtensa (bfd_vma memaddr, struct disassemble_info *info) } else { - (*info->fprintf_func) (info->stream, ".byte %#02x", priv.byte_buf[0]); + (*info->fprintf_styled_func) (info->stream, + dis_style_assembler_directive, + ".byte"); + (*info->fprintf_func) (info->stream, "\t"); + (*info->fprintf_styled_func) (info->stream, + dis_style_immediate, + "%#02x", priv.byte_buf[0]); return 1; } } @@ -425,8 +435,9 @@ print_insn_xtensa (bfd_vma memaddr, struct disassemble_info *info) xtensa_format_get_slot (isa, fmt, n, insn_buffer, slot_buffer); opc = xtensa_opcode_decode (isa, fmt, n, slot_buffer); - (*info->fprintf_func) (info->stream, "%s", - xtensa_opcode_name (isa, opc)); + (*info->fprintf_styled_func) (info->stream, + dis_style_mnemonic, "%s", + xtensa_opcode_name (isa, opc)); if (xtensa_opcode_is_branch (isa, opc)) info->insn_type = dis_condbranch; -- 2.30.2