[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/progmodes/gdb-ui.el [emacs-unicode-2
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/progmodes/gdb-ui.el [emacs-unicode-2] |
Date: |
Wed, 27 Oct 2004 02:06:10 -0400 |
Index: emacs/lisp/progmodes/gdb-ui.el
diff -c emacs/lisp/progmodes/gdb-ui.el:1.7.2.6
emacs/lisp/progmodes/gdb-ui.el:1.7.2.7
*** emacs/lisp/progmodes/gdb-ui.el:1.7.2.6 Thu Oct 14 08:50:06 2004
--- emacs/lisp/progmodes/gdb-ui.el Wed Oct 27 05:42:02 2004
***************
*** 177,183 ****
(setq comint-input-sender 'gdb-send)
;;
! ;; (re-)initialise
(setq gdb-current-address "main")
(setq gdb-previous-address nil)
(setq gdb-previous-frame nil)
--- 177,183 ----
(setq comint-input-sender 'gdb-send)
;;
! ;; (re-)initialize
(setq gdb-current-address "main")
(setq gdb-previous-address nil)
(setq gdb-previous-frame nil)
***************
*** 482,495 ****
(name (funcall (gdb-rules-name-maker rules)))
(new (get-buffer-create name)))
(with-current-buffer new
! ;; FIXME: This should be set after calling the function, since the
! ;; function should run kill-all-local-variables.
! (set (make-local-variable 'gdb-buffer-type) key)
! (if (cdr (cdr rules))
! (funcall (car (cdr (cdr rules)))))
! (set (make-local-variable 'gud-minor-mode)
! (with-current-buffer gud-comint-buffer gud-minor-mode))
! (set (make-local-variable 'tool-bar-map) gud-tool-bar-map)
new))))
(defun gdb-rules-name-maker (rules) (car (cdr rules)))
--- 482,495 ----
(name (funcall (gdb-rules-name-maker rules)))
(new (get-buffer-create name)))
(with-current-buffer new
! (let ((trigger))
! (if (cdr (cdr rules))
! (setq trigger (funcall (car (cdr (cdr rules))))))
! (set (make-local-variable 'gdb-buffer-type) key)
! (set (make-local-variable 'gud-minor-mode)
! (with-current-buffer gud-comint-buffer gud-minor-mode))
! (set (make-local-variable 'tool-bar-map) gud-tool-bar-map)
! (if trigger (funcall trigger)))
new))))
(defun gdb-rules-name-maker (rules) (car (cdr rules)))
***************
*** 1190,1202 ****
"Major mode for gdb breakpoints.
\\{gdb-breakpoints-mode-map}"
(setq major-mode 'gdb-breakpoints-mode)
(setq mode-name "Breakpoints")
(use-local-map gdb-breakpoints-mode-map)
(setq buffer-read-only t)
(if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
! (gdb-invalidate-breakpoints)
! (gdbmi-invalidate-breakpoints)))
(defun gdb-toggle-breakpoint ()
"Enable/disable the breakpoint at current line."
--- 1190,1204 ----
"Major mode for gdb breakpoints.
\\{gdb-breakpoints-mode-map}"
+ (kill-all-local-variables)
(setq major-mode 'gdb-breakpoints-mode)
(setq mode-name "Breakpoints")
(use-local-map gdb-breakpoints-mode-map)
(setq buffer-read-only t)
+ (run-mode-hooks 'gdb-breakpoints-mode-hook)
(if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
! 'gdb-invalidate-breakpoints
! 'gdbmi-invalidate-breakpoints))
(defun gdb-toggle-breakpoint ()
"Enable/disable the breakpoint at current line."
***************
*** 1317,1330 ****
"Major mode for gdb frames.
\\{gdb-frames-mode-map}"
(setq major-mode 'gdb-frames-mode)
(setq mode-name "Frames")
(setq buffer-read-only t)
(use-local-map gdb-frames-mode-map)
(font-lock-mode -1)
(if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
! (gdb-invalidate-frames)
! (gdbmi-invalidate-frames)))
(defun gdb-get-frame-number ()
(save-excursion
--- 1319,1334 ----
"Major mode for gdb frames.
\\{gdb-frames-mode-map}"
+ (kill-all-local-variables)
(setq major-mode 'gdb-frames-mode)
(setq mode-name "Frames")
(setq buffer-read-only t)
(use-local-map gdb-frames-mode-map)
(font-lock-mode -1)
+ (run-mode-hooks 'gdb-frames-mode-hook)
(if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
! 'gdb-invalidate-frames
! 'gdbmi-invalidate-frames))
(defun gdb-get-frame-number ()
(save-excursion
***************
*** 1396,1406 ****
"Major mode for gdb frames.
\\{gdb-threads-mode-map}"
(setq major-mode 'gdb-threads-mode)
(setq mode-name "Threads")
(setq buffer-read-only t)
(use-local-map gdb-threads-mode-map)
! (gdb-invalidate-threads))
(defun gdb-get-thread-number ()
(save-excursion
--- 1400,1412 ----
"Major mode for gdb frames.
\\{gdb-threads-mode-map}"
+ (kill-all-local-variables)
(setq major-mode 'gdb-threads-mode)
(setq mode-name "Threads")
(setq buffer-read-only t)
(use-local-map gdb-threads-mode-map)
! (run-mode-hooks 'gdb-threads-mode-hook)
! 'gdb-invalidate-threads)
(defun gdb-get-thread-number ()
(save-excursion
***************
*** 1444,1454 ****
"Major mode for gdb registers.
\\{gdb-registers-mode-map}"
(setq major-mode 'gdb-registers-mode)
(setq mode-name "Registers")
(setq buffer-read-only t)
(use-local-map gdb-registers-mode-map)
! (gdb-invalidate-registers))
(defun gdb-registers-buffer-name ()
(with-current-buffer gud-comint-buffer
--- 1450,1462 ----
"Major mode for gdb registers.
\\{gdb-registers-mode-map}"
+ (kill-all-local-variables)
(setq major-mode 'gdb-registers-mode)
(setq mode-name "Registers")
(setq buffer-read-only t)
(use-local-map gdb-registers-mode-map)
! (run-mode-hooks 'gdb-registers-mode-hook)
! 'gdb-invalidate-registers)
(defun gdb-registers-buffer-name ()
(with-current-buffer gud-comint-buffer
***************
*** 1518,1530 ****
"Major mode for gdb locals.
\\{gdb-locals-mode-map}"
(setq major-mode 'gdb-locals-mode)
(setq mode-name (concat "Locals:" gdb-current-frame))
(setq buffer-read-only t)
(use-local-map gdb-locals-mode-map)
(if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
! (gdb-invalidate-locals)
! (gdbmi-invalidate-locals)))
(defun gdb-locals-buffer-name ()
(with-current-buffer gud-comint-buffer
--- 1526,1540 ----
"Major mode for gdb locals.
\\{gdb-locals-mode-map}"
+ (kill-all-local-variables)
(setq major-mode 'gdb-locals-mode)
(setq mode-name (concat "Locals:" gdb-current-frame))
(setq buffer-read-only t)
(use-local-map gdb-locals-mode-map)
+ (run-mode-hooks 'gdb-locals-mode-hook)
(if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
! 'gdb-invalidate-locals
! 'gdbmi-invalidate-locals))
(defun gdb-locals-buffer-name ()
(with-current-buffer gud-comint-buffer
***************
*** 1939,1948 ****
--- 1949,1974 ----
(suppress-keymap map)
map))
+ (defvar gdb-assembler-font-lock-keywords
+ '(;; <__function.name+n>
+ ("<\\(\\(\\sw\\|[_.]\\)+\\)\\(\\+[0-9]+\\)?>"
+ (1 font-lock-function-name-face))
+ ;; 0xNNNNNNNN <__function.name+n>: opcode
+ ("^0x[0-9a-f]+ \\(<\\(\\(\\sw\\|[_.]\\)+\\)\\+[0-9]+>\\)?:[
\t]+\\(\\sw+\\)"
+ (4 font-lock-keyword-face))
+ ;; %register(at least i386)
+ ("%\\sw+" . font-lock-variable-name-face)
+ ("^\\(Dump of assembler code for function\\) \\(.+\\):"
+ (1 font-lock-comment-face)
+ (2 font-lock-function-name-face))
+ ("^\\(End of assembler dump\\.\\)" . font-lock-comment-face))
+ "Font lock keywords used in `gdb-assembler-mode'.")
+
(defun gdb-assembler-mode ()
"Major mode for viewing code assembler.
\\{gdb-assembler-mode-map}"
+ (kill-all-local-variables)
(setq major-mode 'gdb-assembler-mode)
(setq mode-name "Machine")
(setq gdb-overlay-arrow-position nil)
***************
*** 1951,1957 ****
(setq fringes-outside-margins t)
(setq buffer-read-only t)
(use-local-map gdb-assembler-mode-map)
! (gdb-invalidate-assembler))
(defun gdb-assembler-buffer-name ()
(with-current-buffer gud-comint-buffer
--- 1977,1987 ----
(setq fringes-outside-margins t)
(setq buffer-read-only t)
(use-local-map gdb-assembler-mode-map)
! (gdb-invalidate-assembler)
! (set (make-local-variable 'font-lock-defaults)
! '(gdb-assembler-font-lock-keywords))
! (run-mode-hooks 'gdb-assembler-mode-hook)
! 'gdb-invalidate-assembler)
(defun gdb-assembler-buffer-name ()
(with-current-buffer gud-comint-buffer