From patchwork Tue Jun 18 15:02:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schwab X-Patchwork-Id: 92376 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9092A3882AF2 for ; Tue, 18 Jun 2024 15:03:08 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2a07:de40:b251:101:10:150:64:2]) by sourceware.org (Postfix) with ESMTPS id 8EEA33882AC6 for ; Tue, 18 Jun 2024 15:02:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8EEA33882AC6 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 8EEA33882AC6 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:2 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718722963; cv=none; b=hMaLyyLGH/71LT3KBHekA55SbHs1ZzHnrM+iU+iSDqGb7i1fCCGYVzWBbCdCrh6CPhvl/zxPsUpoAQJGKKr6iGCEOz8YooGWXbmVsMz92Qv9oanopXvfRjoSbIgFxC+Ci6NcuFxd+7syZ7YEA0Mj9mUqA2g6FkK7PVFFoqh0B3k= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718722963; c=relaxed/simple; bh=AHA5kAm/mmrurALSw5suM05J+CTTbhGe4/3MtktzTq0=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=WNVyRdMZDTywnhg3BWmsMVn1fd8pElW2d8JRSNb4TBUh8D+Tj0U9B6NsFsBGBFAz1x+4XdgIjOXanBj3z/l2b7rn8rd7R4q7hBMW8geyC2N1HZ9QXdiIdwAfHLOR+pvbcTKj+znXK+l/uISYQ4qiERPz1AqUbLHvgNtOgQDQWss= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from hawking.nue2.suse.org (unknown [IPv6:2a07:de40:a101:3:10:168:4:11]) by smtp-out2.suse.de (Postfix) with ESMTP id 572D91F45E for ; Tue, 18 Jun 2024 15:02:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1718722950; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=Ta7SKEBcGkKWDplr3Bh+sjBOTEg1Duj5dOLiSRuaMMs=; b=HsYbHr3tVSBl68E8cRuwVp7iDE92fBPbDzKB35R1xsUT2tDkkey9cKInOSWbvbaUwCwI85 jZOf7u2ANp/PLqPQoKgPiMnxkCjlcAZbbaWHI9q6UiSVLUvdhXLdL9Ufs5QKu1EOQE4Y1o AOe5G4bVQLylJQKSHkdc6lG1415XIiw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1718722950; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=Ta7SKEBcGkKWDplr3Bh+sjBOTEg1Duj5dOLiSRuaMMs=; b=mQkUZc3o3/iCaN5KSWeITgHF7dera7bxeDCqZaEEDmfe7IZFwxUgRvXGob0AtQVYQ0wJkw A9bkKqt9VDNnwfBA== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=HsYbHr3t; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=mQkUZc3o DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1718722950; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=Ta7SKEBcGkKWDplr3Bh+sjBOTEg1Duj5dOLiSRuaMMs=; b=HsYbHr3tVSBl68E8cRuwVp7iDE92fBPbDzKB35R1xsUT2tDkkey9cKInOSWbvbaUwCwI85 jZOf7u2ANp/PLqPQoKgPiMnxkCjlcAZbbaWHI9q6UiSVLUvdhXLdL9Ufs5QKu1EOQE4Y1o AOe5G4bVQLylJQKSHkdc6lG1415XIiw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1718722950; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=Ta7SKEBcGkKWDplr3Bh+sjBOTEg1Duj5dOLiSRuaMMs=; b=mQkUZc3o3/iCaN5KSWeITgHF7dera7bxeDCqZaEEDmfe7IZFwxUgRvXGob0AtQVYQ0wJkw A9bkKqt9VDNnwfBA== Received: by hawking.nue2.suse.org (Postfix, from userid 17005) id D835D4AAD71; Tue, 18 Jun 2024 17:02:29 +0200 (CEST) From: Andreas Schwab To: binutils@sourceware.org Subject: [PATCH] m68k: Support for jump visualization in disassembly X-Yow: I know th'MAMBO!! I have a TWO-TONE CHEMISTRY SET!! Date: Tue, 18 Jun 2024 17:02:29 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-Spamd-Result: default: False [1.75 / 50.00]; BAYES_HAM(-3.00)[100.00%]; HFILTER_HOSTNAME_UNKNOWN(2.50)[]; ONCE_RECEIVED(1.20)[]; RDNS_NONE(1.00)[]; HFILTER_HELO_IP_A(1.00)[hawking.nue2.suse.org]; NEURAL_HAM_LONG(-0.89)[-0.889]; HFILTER_HELO_NORES_A_OR_MX(0.30)[hawking.nue2.suse.org]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.15)[-0.767]; RCVD_NO_TLS_LAST(0.10)[]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DIRECT_TO_MX(0.00)[Gnus/5.13 (Gnus v5.13)]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; DKIM_TRACE(0.00)[suse.de:+]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_COUNT_ONE(0.00)[1]; MID_RHS_MATCH_FROM(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email,suse.de:dkim] X-Spamd-Bar: + X-Rspamd-Queue-Id: 572D91F45E X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spam-Score: 1.75 X-Rspamd-Action: no action X-Spam-Status: No, score=-9.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+patchwork=sourceware.org@sourceware.org opcodes/ * m68k-dis.c (m68k_opcode_to_insn_type): Define. (match_insn_m68k): Call it to set insn_type. (print_insn_arg) [case 'B']: Set branch target address. (print_insn_m68k): Set insn_info_valid. --- opcodes/m68k-dis.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/opcodes/m68k-dis.c b/opcodes/m68k-dis.c index bc2f82031c8..7e9b087951e 100644 --- a/opcodes/m68k-dis.c +++ b/opcodes/m68k-dis.c @@ -991,6 +991,8 @@ print_insn_arg (const char *d, else return PRINT_INSN_ARG_INVALID_OP_TABLE; + info->target = addr + disp; + (*info->print_address_func) (addr + disp, info); break; @@ -1442,6 +1444,27 @@ print_insn_arg (const char *d, return p - p0; } +/* Return the insn type determined from the opcode information. */ + +static enum dis_insn_type +m68k_opcode_to_insn_type (const struct m68k_opcode *opc) +{ + /* All branches have an operand in 'B' format (the 'B' place only comes + with the 'B' format). */ + if (strchr (opc->args, 'B') == NULL) + return dis_nonbranch; + + /* Most branches are conditional branches, detect the ones that aren't + from the opcode name. */ + if (strncmp (opc->name, "bra", 3) == 0) + return dis_branch; + + if (strncmp (opc->name, "bsr", 3) == 0) + return dis_jsr; + + return dis_condbranch; +} + /* Try to match the current instruction to best and if so, return the number of bytes consumed from the instruction stream, else zero. Return -1 on memory error. */ @@ -1573,6 +1596,7 @@ match_insn_m68k (bfd_vma memaddr, p = save_p; info->fprintf_styled_func = save_printer; info->print_address_func = save_print_address; + info->insn_type = m68k_opcode_to_insn_type (best); d = args; @@ -1730,6 +1754,7 @@ print_insn_m68k (bfd_vma memaddr, disassemble_info *info) bfd_byte *buffer = priv.the_buffer; + info->insn_info_valid = 1; info->private_data = & priv; /* Tell objdump to use two bytes per chunk and six bytes per line for displaying raw data. */ @@ -1761,6 +1786,8 @@ print_insn_m68k (bfd_vma memaddr, disassemble_info *info) info->fprintf_styled_func (info->stream, dis_style_text, " "); info->fprintf_styled_func (info->stream, dis_style_immediate, "0x%04x", (buffer[0] << 8) + buffer[1]); + + info->insn_type = dis_noninsn; } return val ? val : 2;