From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-il1-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) by sourceware.org (Postfix) with ESMTPS id ACA9D3858C5F for ; Thu, 9 Feb 2023 20:50:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org ACA9D3858C5F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-il1-x133.google.com with SMTP id b9so1372455ilh.12 for ; Thu, 09 Feb 2023 12:50:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=O2UNI597D47qGLGB8LYu80F4OYdmJm2ZVcZ9rMS15u8=; b=Nt1yj9R/r0cmnz9BVlC0PiLRwmdEJVwma3OCYVGnYc+Pkjfd2FisBUJUkpldsesM9o /Rz7CjW9RRawuTafANxsHCHsOK0I5hO0J/ZlG91+wMs8a+HSO2opuS2u7coRnhUaPTgH l02xnHtt3fF5SGMItLQgmbRbsGqpONyDQAtI52KOWaNn6qnSKHNQlpOnRjqHrDmCevtW ffuLejKjKaPDAwXMGoemK6DilTVfjKLjzrvUAH3DLLrgyEGFjk4eprszlkhWCig2rni0 wgZRxCX1Plo3znTWhUvrcE7Yoe2nQ02ptGHa8NeNhooH/ZwVlIjChA/xoa9j/8lpHTEt 6/qA== 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=O2UNI597D47qGLGB8LYu80F4OYdmJm2ZVcZ9rMS15u8=; b=kJIXnDZcHpDAQtahEF5bTn64s04b8eakTw/cMIwgB/yjFJDzfevuRIhPMSPBiVbS3O U0n/ZwdC0n0rZW9k9y+BUJA2WvKXoxPaq13hc2Qj3DsQ6W+t86HWrxoe+FPI/S+/cVH0 Np99d7OpoSzImRoFR4Yp/VsLyVU7aU58b2DQW5c8DbuJ3wdgvFbSkxH9RGusvbJfmcdM uFARndV3bPYOv3S0uz+hTISH+PcR9kZclKZk9gBXQ8gpL9/a93gI5DNXFYR5glp+cVoc NPPb0MqkW8BxgFjtc/UjwgCSr6yYwiXcseA0woprucDHT/kB+gdPnF/Oo84lztQFWkiw sRsA== X-Gm-Message-State: AO0yUKVXJF92R5y559eNpqlZfxa/2ATwDmkCqRScj6xysvS2zDSXuz1h Bi6F46F9oXOCvAKiJDVcF6mS7EkhV/fdvvIu X-Google-Smtp-Source: AK7set+U03rYohyxtldK1iYXH3eE/29nAHSNtsyIhfwYAaKz1uNQ5NOlF9oPjoWKGj3COE7CAUuwUg== X-Received: by 2002:a05:6e02:20ef:b0:30b:e45c:3d1a with SMTP id q15-20020a056e0220ef00b0030be45c3d1amr14082494ilv.23.1675975853702; Thu, 09 Feb 2023 12:50:53 -0800 (PST) Received: from localhost.localdomain (75-166-130-93.hlrn.qwest.net. [75.166.130.93]) by smtp.gmail.com with ESMTPSA id g18-20020a0566380c5200b003b0692eb199sm766657jal.20.2023.02.09.12.50.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 12:50:53 -0800 (PST) From: Tom Tromey To: binutils@sourceware.org Cc: Tom Tromey Subject: [pushed] Add full display feature to dwarf-mode.el Date: Thu, 9 Feb 2023 13:50:40 -0700 Message-Id: <20230209205040.1286063-1-tromey@adacore.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,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: I've found that I often use dwarf-mode with relatively small test files. In this situation, it's handy to be able to expand all the DWARF, rather than moving to each "..." separately and using C-u C-m. This patch implements this feature. It also makes a couple of other minor changes: * I removed a stale FIXME from dwarf-mode. In practice I find I often use "g" to restore the buffer to a pristine state; checking the file mtime would work against this. * I tightened the regexp in dwarf-insert-substructure. This prevents the C-m binding from trying to re-read a DIE which has already been expanded. * Finally, I've bumped the dwarf-mode version number so that this version can easily be installed using package.el. 2023-02-09 Tom Tromey * dwarf-mode.el: Bump version to 1.8. (dwarf-insert-substructure): Tighten regexp. (dwarf-refresh-all): New defun. (dwarf-mode-map): Bind "A" to dwarf-refresh-all. (dwarf-mode): Remove old FIXME. --- binutils/ChangeLog | 8 ++++++++ binutils/dwarf-mode.el | 17 ++++++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/binutils/dwarf-mode.el b/binutils/dwarf-mode.el index 82f6753b1e5..3ab2e188478 100644 --- a/binutils/dwarf-mode.el +++ b/binutils/dwarf-mode.el @@ -1,6 +1,6 @@ ;;; dwarf-mode.el --- Browser for DWARF information. -*-lexical-binding:t-*- -;; Version: 1.7 +;; Version: 1.8 ;; Copyright (C) 2012-2023 Free Software Foundation, Inc. @@ -111,7 +111,7 @@ By default, expands just one level of children. A prefix argument means expand all children." (interactive "P") (beginning-of-line) - (unless (looking-at "^ <\\([0-9]+\\)><\\([0-9a-f]+\\)>") + (unless (looking-at "^ <\\([0-9]+\\)><\\([0-9a-f]+\\)>: \\.\\.\\.") (error "Unrecognized line.")) (let ((die (match-string 2))) (if arg @@ -185,6 +185,17 @@ A prefix argument means expand all children." (expand-file-name dwarf-file)) (set-buffer-modified-p nil))) +(defun dwarf-refresh-all () + "Refresh the current buffer without eliding substructure. +Note that this can result in very voluminous output." + (interactive) + (dwarf--check-running) + (let ((inhibit-read-only t)) + (dwarf--invoke (point-min) (point-max) + dwarf-objdump-program "-Wi" + (expand-file-name dwarf-file)) + (set-buffer-modified-p nil))) + (defvar dwarf-mode-syntax-table (let ((table (make-syntax-table))) ;; This at least makes it so mark-sexp on some hex digits inside @@ -198,6 +209,7 @@ A prefix argument means expand all children." (let ((map (make-sparse-keymap))) (set-keymap-parent map special-mode-map) (define-key map [(control ?m)] #'dwarf-insert-substructure) + (define-key map "A" #'dwarf-refresh-all) map) "Keymap for dwarf-mode buffers.") @@ -207,7 +219,6 @@ A prefix argument means expand all children." \\{dwarf-mode-map}" (set (make-local-variable 'font-lock-defaults) '(dwarf-font-lock-keywords)) - ;; FIXME: we could be smarter and check the file time. (set (make-local-variable 'revert-buffer-function) #'dwarf-do-refresh) (jit-lock-register #'dwarf-fontify-region)) -- 2.39.1