Merge branch 'binutils-2_25-branch' of ssh://sourceware.org/git/binutils-gdb into...

[platform/upstream/binutils.git] / binutils / dwarf-mode.el

diff --git a/binutils/dwarf-mode.el b/binutils/dwarf-mode.el
index 3362bc4..30c3722 100644 (file)
--- a/binutils/dwarf-mode.el
+++ b/binutils/dwarf-mode.el
@@ -1,6 +1,8 @@
 ;;; dwarf-mode.el --- Browser for DWARF information.
 
-;; Version: 1.0
+;; Version: 1.2
+
+;; Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 ;; This file is not part of GNU Emacs, but is distributed under the
 ;; same terms:
@@ -47,7 +49,7 @@
     (save-excursion
       (apply #'call-process dwarf-objdump-program nil (current-buffer) nil
             "-Wi" (concat "--dwarf-start=0x" die)
-            dwarf-file
+            (expand-file-name dwarf-file)
             (if new-depth (list (concat "--dwarf-depth="
                                         (int-to-string new-depth))))))
     (set-buffer-modified-p nil)))
@@ -56,7 +58,7 @@
   (beginning-of-line)
   (unless (looking-at "^ <\\([0-9]+\\)>")
     (error "Unrecognized line."))
-  (let ((new-depth (1+ (string-to-int (match-string 1)))))
+  (let ((new-depth (1+ (string-to-number (match-string 1)))))
     (dwarf-do-insert-substructure new-depth die)))
 
 (defun dwarf-insert-substructure (arg)
@@ -96,7 +98,7 @@ A prefix argument means expand all children."
   'action #'dwarf-die-button-action)
 
 ;; Helper regexp to match a DIE reference.
-(defconst dwarf-die-reference ": \\(<0x\\([0-9a-f]+\\)>\\)\\s *$")
+(defconst dwarf-die-reference "\\(<0x\\([0-9a-f]+\\)>\\)")
 
 ;; Helper regexp to match a `...' indicating that there are hidden
 ;; children.
@@ -136,10 +138,9 @@ A prefix argument means expand all children."
       (call-process dwarf-objdump-program
                    nil (current-buffer) nil
                    "-Wi" "--dwarf-depth=1"
-                   dwarf-file))
+                   (expand-file-name dwarf-file)))
     (set-buffer-modified-p nil)))
 
-;;;###autoload
 (define-derived-mode dwarf-mode special-mode "DWARF"
   "Major mode for browsing DWARF output.
 
@@ -152,7 +153,7 @@ A prefix argument means expand all children."
 
 (define-key dwarf-mode-map [(control ?m)] #'dwarf-insert-substructure)
 
-;;:###autoload
+;;;###autoload
 (defun dwarf-browse (file)
   "Invoke `objdump' and put output into a `dwarf-mode' buffer.
 This is the main interface to `dwarf-mode'."
@@ -165,3 +166,5 @@ This is the main interface to `dwarf-mode'."
     (dwarf-do-refresh)))
 
 (provide 'dwarf-mode)
+
+;;; dwarf-mode.el ends here