From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 021BA385E830 for ; Mon, 21 Mar 2022 14:34:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 021BA385E830 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-292--iT0wOO7PaGdZOaexxf0oQ-1; Mon, 21 Mar 2022 10:34:05 -0400 X-MC-Unique: -iT0wOO7PaGdZOaexxf0oQ-1 Received: by mail-wm1-f71.google.com with SMTP id 12-20020a05600c24cc00b0038c6caa95f7so5985237wmu.4 for ; Mon, 21 Mar 2022 07:34:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6tjgGtVtX9oLleAb4CRWCCX8xghQ7WWDQWAq0asULtw=; b=4D13+d0l7zFuYi2Y6LUzbV5B+VU700CAtbaZgl/jaiTf1eWEm77Mk7y5eBMH5bPMH7 51FPFT/RoHrJr/8cQhTDTjE/hqeMhjpeToN2MP8I1/bratGi9BoDrfCKq7Gh8HzhyUKm SkytSXjkN2qz8b+nrczjurVRut/yIAWtJgqcadUInshB3Ygu4jXtqkCw3IVSxubBEfpJ 8jI0MqOIyV6lgFkFnPIqH0SXb4JTXzMSZpR0o791F8hb6qbn3ptKPwyONZ5A5hOgo/SP E0ppTtRXn6jEOEZziwE7iJ9Q0crxMbGsNtpFsQuPW7JRyfqB3vHveTWk3MWSTTWxcrFZ mBOA== X-Gm-Message-State: AOAM533ilyMMpgzGnPa6tPp4FW3CFp3aKe5P70rzq+XN+BN2NOAioNLv zLdzlC5hdbRuyCgncx4Ari1t71f62LiJG2AavAhKCk0jzc3A7LVbFTw/kLi5eFlEHWBh8DADe4+ mIExeuLN0Gb5Nas18PF749xLoOgPG3ZjbjwrBpXIGLOHwtynP72d2Eww7//EskWB6AfTNWw== X-Received: by 2002:adf:e10e:0:b0:1f1:d9e2:a9d8 with SMTP id t14-20020adfe10e000000b001f1d9e2a9d8mr18506244wrz.708.1647873243659; Mon, 21 Mar 2022 07:34:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxJkycim9/SzBZjht6iZzmIBFyOkQaprLMh7a2XDU+WQJjt5fF8tOmb8HkgHJWH6ar0ur1k9A== X-Received: by 2002:adf:e10e:0:b0:1f1:d9e2:a9d8 with SMTP id t14-20020adfe10e000000b001f1d9e2a9d8mr18506225wrz.708.1647873243297; Mon, 21 Mar 2022 07:34:03 -0700 (PDT) Received: from localhost (host109-158-45-15.range109-158.btcentralplus.com. [109.158.45.15]) by smtp.gmail.com with ESMTPSA id v124-20020a1cac82000000b0037c3d08e0e7sm17044413wme.29.2022.03.21.07.34.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Mar 2022 07:34:02 -0700 (PDT) From: Andrew Burgess To: binutils@sourceware.org Cc: Andrew Burgess Subject: [PATCHv2 3/3] opcodes/i386: partially implement disassembler style support Date: Mon, 21 Mar 2022 14:33:52 +0000 Message-Id: <2d3d78272f8afd03e579af933f7b2173237564fd.1647873051.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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-List-Received-Date: Mon, 21 Mar 2022 14:34:08 -0000 This commit adds partial support for disassembler styling in the i386 disassembler. The i386 disassembler collects the instruction arguments into an array of strings, and then loops over the array printing the arguments out later on. The problem is that by the time we print the arguments out it's not obvious what the type of each argument is. Obviously this can be fixed, but I'd like to not do that as part of this commit, rather, I'd prefer to keep this commit as small as possible to get the basic infrastructure in place, then we can improve on this, to add additional styling, in later commits. For now then, I think this commit should correctly style mnemonics, some immediates, and comments. Everything else will be printed as plain text, which will include most instruction arguments, unless the argument is printed as a symbol, by calling the print_address_func callback. Ignoring colours, there should be no other user visible changes in the output of the disassembler in either objdump or gdb. opcodes/ChangeLog: * disassembler.c (disassemble_init_for_target): Set created_styled_output for i386 based targets. * i386-dis.c: Changed throughout to use fprintf_styled_func instead of fprintf_func. --- opcodes/disassemble.c | 9 ++++++- opcodes/i386-dis.c | 63 +++++++++++++++++++++++++++---------------- 2 files changed, 48 insertions(+), 24 deletions(-) diff --git a/opcodes/disassemble.c b/opcodes/disassemble.c index b8eed9695ea..81a90f20a9c 100644 --- a/opcodes/disassemble.c +++ b/opcodes/disassemble.c @@ -632,7 +632,14 @@ disassemble_init_for_target (struct disassemble_info * info) info->disassembler_needs_relocs = true; break; #endif - +#ifdef ARCH_i386 + case bfd_arch_i386: + case bfd_arch_iamcu: + case bfd_arch_l1om: + case bfd_arch_k1om: + info->created_styled_output = true; + break; +#endif #ifdef ARCH_ia64 case bfd_arch_ia64: info->skip_zeroes = 16; diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c index a30bda0633b..d12ef4514fd 100644 --- a/opcodes/i386-dis.c +++ b/opcodes/i386-dis.c @@ -9402,8 +9402,8 @@ print_insn (bfd_vma pc, instr_info *ins) if (ins->address_mode == mode_64bit && sizeof (bfd_vma) < 8) { - (*ins->info->fprintf_func) (ins->info->stream, - _("64-bit address is disabled")); + (*ins->info->fprintf_styled_func) (ins->info->stream, dis_style_text, + _("64-bit address is disabled")); return -1; } @@ -9456,12 +9456,16 @@ print_insn (bfd_vma pc, instr_info *ins) { name = prefix_name (ins, priv.the_buffer[0], priv.orig_sizeflag); if (name != NULL) - (*ins->info->fprintf_func) (ins->info->stream, "%s", name); + (*ins->info->fprintf_styled_func) + (ins->info->stream, dis_style_mnemonic, "%s", name); else { /* Just print the first byte as a .byte instruction. */ - (*ins->info->fprintf_func) (ins->info->stream, ".byte 0x%x", - (unsigned int) priv.the_buffer[0]); + (*ins->info->fprintf_styled_func) + (ins->info->stream, dis_style_assembler_directive, ".byte "); + (*ins->info->fprintf_styled_func) + (ins->info->stream, dis_style_immediate, "0x%x", + (unsigned int) priv.the_buffer[0]); } return 1; @@ -9479,10 +9483,10 @@ print_insn (bfd_vma pc, instr_info *ins) for (i = 0; i < (int) ARRAY_SIZE (ins->all_prefixes) && ins->all_prefixes[i]; i++) - (*ins->info->fprintf_func) (ins->info->stream, "%s%s", - i == 0 ? "" : " ", - prefix_name (ins, ins->all_prefixes[i], - sizeflag)); + (*ins->info->fprintf_styled_func) + (ins->info->stream, dis_style_mnemonic, "%s%s", + (i == 0 ? "" : " "), prefix_name (ins, ins->all_prefixes[i], + sizeflag)); return i; } @@ -9497,10 +9501,11 @@ print_insn (bfd_vma pc, instr_info *ins) /* Handle ins->prefixes before fwait. */ for (i = 0; i < ins->fwait_prefix && ins->all_prefixes[i]; i++) - (*ins->info->fprintf_func) (ins->info->stream, "%s ", - prefix_name (ins, ins->all_prefixes[i], - sizeflag)); - (*ins->info->fprintf_func) (ins->info->stream, "fwait"); + (*ins->info->fprintf_styled_func) + (ins->info->stream, dis_style_mnemonic, "%s ", + prefix_name (ins, ins->all_prefixes[i], sizeflag)); + (*ins->info->fprintf_styled_func) + (ins->info->stream, dis_style_mnemonic, "fwait"); return i + 1; } @@ -9649,14 +9654,16 @@ print_insn (bfd_vma pc, instr_info *ins) are all 0s in inverted form. */ if (ins->need_vex && ins->vex.register_specifier != 0) { - (*ins->info->fprintf_func) (ins->info->stream, "(bad)"); + (*ins->info->fprintf_styled_func) (ins->info->stream, dis_style_text, + "(bad)"); return ins->end_codep - priv.the_buffer; } /* If EVEX.z is set, there must be an actual mask register in use. */ if (ins->vex.zeroing && ins->vex.mask_register_specifier == 0) { - (*ins->info->fprintf_func) (ins->info->stream, "(bad)"); + (*ins->info->fprintf_styled_func) (ins->info->stream, dis_style_text, + "(bad)"); return ins->end_codep - priv.the_buffer; } @@ -9667,7 +9674,8 @@ print_insn (bfd_vma pc, instr_info *ins) the encoding invalid. Most other PREFIX_OPCODE rules still apply. */ if (ins->need_vex ? !ins->vex.prefix : !(ins->prefixes & PREFIX_DATA)) { - (*ins->info->fprintf_func) (ins->info->stream, "(bad)"); + (*ins->info->fprintf_styled_func) (ins->info->stream, + dis_style_text, "(bad)"); return ins->end_codep - priv.the_buffer; } ins->used_prefixes |= PREFIX_DATA; @@ -9694,7 +9702,8 @@ print_insn (bfd_vma pc, instr_info *ins) || (ins->vex.evex && dp->prefix_requirement != PREFIX_DATA && !ins->vex.w != !(ins->used_prefixes & PREFIX_DATA))) { - (*ins->info->fprintf_func) (ins->info->stream, "(bad)"); + (*ins->info->fprintf_styled_func) (ins->info->stream, + dis_style_text, "(bad)"); return ins->end_codep - priv.the_buffer; } break; @@ -9744,13 +9753,15 @@ print_insn (bfd_vma pc, instr_info *ins) if (name == NULL) abort (); prefix_length += strlen (name) + 1; - (*ins->info->fprintf_func) (ins->info->stream, "%s ", name); + (*ins->info->fprintf_styled_func) + (ins->info->stream, dis_style_mnemonic, "%s ", name); } /* Check maximum code length. */ if ((ins->codep - ins->start_codep) > MAX_CODE_LENGTH) { - (*ins->info->fprintf_func) (ins->info->stream, "(bad)"); + (*ins->info->fprintf_styled_func) + (ins->info->stream, dis_style_text, "(bad)"); return MAX_CODE_LENGTH; } @@ -9758,7 +9769,8 @@ print_insn (bfd_vma pc, instr_info *ins) for (i = strlen (ins->obuf) + prefix_length; i < 6; i++) oappend (ins, " "); oappend (ins, " "); - (*ins->info->fprintf_func) (ins->info->stream, "%s", ins->obuf); + (*ins->info->fprintf_styled_func) + (ins->info->stream, dis_style_mnemonic, "%s", ins->obuf); /* The enter and bound instructions are printed with operands in the same order as the intel book; everything else is printed in reverse order. */ @@ -9797,7 +9809,8 @@ print_insn (bfd_vma pc, instr_info *ins) if (*op_txt[i]) { if (needcomma) - (*ins->info->fprintf_func) (ins->info->stream, ","); + (*ins->info->fprintf_styled_func) (ins->info->stream, + dis_style_text, ","); if (ins->op_index[i] != -1 && !ins->op_riprel[i]) { bfd_vma target = (bfd_vma) ins->op_address[ins->op_index[i]]; @@ -9813,14 +9826,18 @@ print_insn (bfd_vma pc, instr_info *ins) (*ins->info->print_address_func) (target, ins->info); } else - (*ins->info->fprintf_func) (ins->info->stream, "%s", op_txt[i]); + (*ins->info->fprintf_styled_func) (ins->info->stream, + dis_style_text, "%s", + op_txt[i]); needcomma = 1; } for (i = 0; i < MAX_OPERANDS; i++) if (ins->op_index[i] != -1 && ins->op_riprel[i]) { - (*ins->info->fprintf_func) (ins->info->stream, " # "); + (*ins->info->fprintf_styled_func) (ins->info->stream, + dis_style_comment_start, + " # "); (*ins->info->print_address_func) ((bfd_vma) (ins->start_pc + (ins->codep - ins->start_codep) + ins->op_address[ins->op_index[i]]), ins->info); -- 2.25.4