[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: |
Mon, 28 Jun 2004 04:44:21 -0400 |
Index: emacs/lisp/progmodes/gdb-ui.el
diff -c emacs/lisp/progmodes/gdb-ui.el:1.7.2.1
emacs/lisp/progmodes/gdb-ui.el:1.7.2.2
*** emacs/lisp/progmodes/gdb-ui.el:1.7.2.1 Fri Apr 16 12:50:34 2004
--- emacs/lisp/progmodes/gdb-ui.el Mon Jun 28 07:29:43 2004
***************
*** 1,6 ****
;;; gdb-ui.el --- User Interface for running GDB
! ;; Author: Nick Roberts <address@hidden>
;; Maintainer: FSF
;; Keywords: unix, tools
--- 1,6 ----
;;; gdb-ui.el --- User Interface for running GDB
! ;; Author: Nick Roberts <address@hidden>
;; Maintainer: FSF
;; Keywords: unix, tools
***************
*** 40,47 ****
;; Kingdon and uses GDB's annotation interface. You don't need to know about
;; annotations to use this mode as a debugger, but if you are interested
;; developing the mode itself, then see the Annotations section in the GDB
! ;; info manual. Some GDB/MI commands are also used through th CLI command
! ;; 'interpreter mi <mi-command>'.
;;
;; Known Bugs:
;;
--- 40,54 ----
;; Kingdon and uses GDB's annotation interface. You don't need to know about
;; annotations to use this mode as a debugger, but if you are interested
;; developing the mode itself, then see the Annotations section in the GDB
! ;; info manual.
! ;;
! ;; GDB developers plan to make the annotation interface obsolete. A new
! ;; interface called GDB/MI (machine interface) has been designed to replace
! ;; it. Some GDB/MI commands are used in this file through the CLI command
! ;; 'interpreter mi <mi-command>'. A file called gdb-mi.el is included in the
! ;; GDB repository for future releases (6.2 onwards) that uses GDB/MI as the
! ;; primary interface to GDB. It is still under development and is part of a
! ;; process to migrate Emacs from annotations to GDB/MI.
;;
;; Known Bugs:
;;
***************
*** 53,59 ****
(defvar gdb-current-address "main" "Initialisation for Assembler buffer.")
(defvar gdb-previous-address nil)
(defvar gdb-previous-frame nil)
! (defvar gdb-current-frame "main")
(defvar gdb-current-language nil)
(defvar gdb-view-source t "Non-nil means that source code can be viewed.")
(defvar gdb-selected-view 'source "Code type that user wishes to view.")
--- 60,66 ----
(defvar gdb-current-address "main" "Initialisation for Assembler buffer.")
(defvar gdb-previous-address nil)
(defvar gdb-previous-frame nil)
! (defvar gdb-current-frame nil)
(defvar gdb-current-language nil)
(defvar gdb-view-source t "Non-nil means that source code can be viewed.")
(defvar gdb-selected-view 'source "Code type that user wishes to view.")
***************
*** 63,69 ****
(defvar gdb-overlay-arrow-position nil)
(defvar gdb-variables '()
"A list of variables that are local to the GUD buffer.")
!
;;;###autoload
(defun gdba (command-line)
"Run gdb on program FILE in buffer *gud-FILE*.
--- 70,77 ----
(defvar gdb-overlay-arrow-position nil)
(defvar gdb-variables '()
"A list of variables that are local to the GUD buffer.")
! (defvar gdb-server-prefix nil)
!
;;;###autoload
(defun gdba (command-line)
"Run gdb on program FILE in buffer *gud-FILE*.
***************
*** 73,95 ****
If `gdb-many-windows' is nil (the default value) then gdb just
pops up the GUD buffer unless `gdb-show-main' is t. In this case
it starts with two windows: one displaying the GUD buffer and the
! other with the source file with the main routine of the debugee.
! If `gdb-many-windows' is t the layout below will appear
! regardless of the value of `gdb-show-main' unless
`gdb-use-inferior-io-buffer' is nil when the source buffer
occupies the full width of the frame. Keybindings are given in
relevant buffer.
---------------------------------------------------------------------
GDB Toolbar
---------------------------------------------------------------------
! GUD buffer (I/O of GDB) | Locals buffer
|
|
|
---------------------------------------------------------------------
! Source buffer | Input/Output (of debugee) buffer
| (comint-mode)
|
|
--- 81,114 ----
If `gdb-many-windows' is nil (the default value) then gdb just
pops up the GUD buffer unless `gdb-show-main' is t. In this case
it starts with two windows: one displaying the GUD buffer and the
! other with the source file with the main routine of the inferior.
! If `gdb-many-windows' is t, regardless of the value of
! `gdb-show-main', the layout below will appear unless
`gdb-use-inferior-io-buffer' is nil when the source buffer
occupies the full width of the frame. Keybindings are given in
relevant buffer.
+ Watch expressions appear in the speedbar/slowbar.
+
+ The following interactive lisp functions help control operation :
+
+ `gdb-many-windows' - Toggle the number of windows gdb uses.
+ `gdb-restore-windows' - To restore the window layout.
+
+ See Info node `(emacs)GDB Graphical Interface' for a more
+ detailed description of this mode.
+
+
---------------------------------------------------------------------
GDB Toolbar
---------------------------------------------------------------------
! GUD buffer (I/O of GDB) | Locals buffer
|
|
|
---------------------------------------------------------------------
! Source buffer | Input/Output (of inferior) buffer
| (comint-mode)
|
|
***************
*** 98,125 ****
|
|
---------------------------------------------------------------------
! Stack buffer | Breakpoints buffer
RET gdb-frames-select | SPC gdb-toggle-breakpoint
| RET gdb-goto-breakpoint
| d gdb-delete-breakpoint
---------------------------------------------------------------------
!
! All the buffers share the toolbar and source should always display in the same
! window e.g after typing g on a breakpoint in the breakpoints buffer.
Breakpoint
! icons are displayed both by setting a break with gud-break and by typing break
! in the GUD buffer.
!
! This works best (depending on the size of your monitor) using most of the
! screen.
!
! Displayed expressions appear in separate frames. Arrays may be displayed
! as slices and visualised using the graph program from plotutils if installed.
! Pointers in structures may be followed in a tree-like fashion.
!
! The following interactive lisp functions help control operation :
!
! `gdb-many-windows' - Toggle the number of windows gdb uses.
! `gdb-restore-windows' - To restore the window layout."
;;
(interactive (list (gud-query-cmdline 'gdba)))
;;
--- 117,128 ----
|
|
---------------------------------------------------------------------
! Stack buffer | Breakpoints buffer
RET gdb-frames-select | SPC gdb-toggle-breakpoint
| RET gdb-goto-breakpoint
| d gdb-delete-breakpoint
---------------------------------------------------------------------
! "
;;
(interactive (list (gud-query-cmdline 'gdba)))
;;
***************
*** 179,190 ****
(setq gdb-current-address "main")
(setq gdb-previous-address nil)
(setq gdb-previous-frame nil)
! (setq gdb-current-frame "main")
(setq gdb-view-source t)
(setq gdb-selected-view 'source)
(setq gdb-var-list nil)
(setq gdb-var-changed nil)
(setq gdb-first-prompt nil)
;;
(mapc 'make-local-variable gdb-variables)
(setq gdb-buffer-type 'gdba)
--- 182,198 ----
(setq gdb-current-address "main")
(setq gdb-previous-address nil)
(setq gdb-previous-frame nil)
! (setq gdb-current-frame nil)
(setq gdb-view-source t)
(setq gdb-selected-view 'source)
(setq gdb-var-list nil)
(setq gdb-var-changed nil)
(setq gdb-first-prompt nil)
+ (setq gdb-prompting nil)
+ (setq gdb-current-item nil)
+ (setq gdb-pending-triggers nil)
+ (setq gdb-output-sink 'user)
+ (setq gdb-server-prefix "server ")
;;
(mapc 'make-local-variable gdb-variables)
(setq gdb-buffer-type 'gdba)
***************
*** 213,228 ****
(require 'tooltip)
(let ((expr (tooltip-identifier-from-point (point))))
(if (and (string-equal gdb-current-language "c")
! gdb-use-colon-colon-notation)
(setq expr (concat gdb-current-frame "::" expr)))
(catch 'already-watched
(dolist (var gdb-var-list)
(if (string-equal expr (car var)) (throw 'already-watched nil)))
(set-text-properties 0 (length expr) nil expr)
(gdb-enqueue-input
! (list (concat "server interpreter mi \"-var-create - * " expr "\"\n")
`(lambda () (gdb-var-create-handler ,expr))))))
! (select-window (get-buffer-window gud-comint-buffer)))
(defconst gdb-var-create-regexp
"name=\"\\(.*?\\)\",numchild=\"\\(.*?\\)\",type=\"\\(.*?\\)\"")
--- 221,246 ----
(require 'tooltip)
(let ((expr (tooltip-identifier-from-point (point))))
(if (and (string-equal gdb-current-language "c")
! gdb-use-colon-colon-notation gdb-current-frame)
(setq expr (concat gdb-current-frame "::" expr)))
(catch 'already-watched
(dolist (var gdb-var-list)
(if (string-equal expr (car var)) (throw 'already-watched nil)))
(set-text-properties 0 (length expr) nil expr)
(gdb-enqueue-input
! (list
! (if (eq gud-minor-mode 'gdba)
! (concat "server interpreter mi \"-var-create - * " expr "\"\n")
! (concat"-var-create - * " expr "\n"))
`(lambda () (gdb-var-create-handler ,expr))))))
! (select-window (get-buffer-window gud-comint-buffer 'visible)))
!
! (defun gdb-goto-info ()
! "Go to Emacs info node: GDB Graphical Interface."
! (interactive)
! (select-frame (make-frame))
! (require 'info)
! (Info-goto-node "(emacs)GDB Graphical Interface"))
(defconst gdb-var-create-regexp
"name=\"\\(.*?\\)\",numchild=\"\\(.*?\\)\",type=\"\\(.*?\\)\"")
***************
*** 306,317 ****
(setq gdb-var-list (nreverse var-list))))))
(defun gdb-var-update ()
! (if (not (member 'gdb-var-update (gdb-get-pending-triggers)))
(progn
! (gdb-enqueue-input (list "server interpreter mi \"-var-update *\"\n"
'gdb-var-update-handler))
! (gdb-set-pending-triggers (cons 'gdb-var-update
! (gdb-get-pending-triggers))))))
(defconst gdb-var-update-regexp "name=\"\\(.*?\\)\"")
--- 324,338 ----
(setq gdb-var-list (nreverse var-list))))))
(defun gdb-var-update ()
! (if (not (member 'gdb-var-update gdb-pending-triggers))
(progn
! (gdb-enqueue-input
! (list
! (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
! "server interpreter mi \"-var-update *\"\n"
! "-var-update *\n")
'gdb-var-update-handler))
! (push 'gdb-var-update gdb-pending-triggers))))
(defconst gdb-var-update-regexp "name=\"\\(.*?\\)\"")
***************
*** 321,332 ****
(while (re-search-forward gdb-var-update-regexp nil t)
(let ((varnum (match-string 1)))
(gdb-enqueue-input
! (list (concat "server interpreter mi \"-var-evaluate-expression "
! varnum "\"\n")
`(lambda () (gdb-var-evaluate-expression-handler
,varnum t)))))))
! (gdb-set-pending-triggers
! (delq 'gdb-var-update (gdb-get-pending-triggers))))
(defun gdb-var-delete ()
"Delete watched expression from the speedbar."
--- 342,356 ----
(while (re-search-forward gdb-var-update-regexp nil t)
(let ((varnum (match-string 1)))
(gdb-enqueue-input
! (list
! (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode
'gdba))
! (concat "server interpreter mi \"-var-evaluate-expression "
! varnum "\"\n")
! (concat "-var-evaluate-expression " varnum "\n"))
`(lambda () (gdb-var-evaluate-expression-handler
,varnum t)))))))
! (setq gdb-pending-triggers
! (delq 'gdb-var-update gdb-pending-triggers)))
(defun gdb-var-delete ()
"Delete watched expression from the speedbar."
***************
*** 339,346 ****
(varnum (cadr var)))
(unless (string-match "\\." varnum)
(gdb-enqueue-input
! (list (concat "server interpreter mi \"-var-delete "
! varnum "\"\n")
'ignore))
(setq gdb-var-list (delq var gdb-var-list))
(dolist (varchild gdb-var-list)
--- 363,373 ----
(varnum (cadr var)))
(unless (string-match "\\." varnum)
(gdb-enqueue-input
! (list
! (if (with-current-buffer gud-comint-buffer
! (eq gud-minor-mode 'gdba))
! (concat "server interpreter mi \"-var-delete " varnum "\"\n")
! (concat "-var-delete " varnum "\n"))
'ignore))
(setq gdb-var-list (delq var gdb-var-list))
(dolist (varchild gdb-var-list)
***************
*** 354,361 ****
(varnum (cadr var)) (value))
(setq value (read-string "New value: "))
(gdb-enqueue-input
! (list (concat "server interpreter mi \"-var-assign "
! varnum " " value "\"\n")
'ignore))))
(defcustom gdb-show-changed-values t
--- 381,391 ----
(varnum (cadr var)) (value))
(setq value (read-string "New value: "))
(gdb-enqueue-input
! (list
! (if (with-current-buffer gud-comint-buffer
! (eq gud-minor-mode 'gdba))
! (concat "server interpreter mi \"-var-assign " varnum " " value
"\"\n")
! (concat "-var-assign " varnum " " value "\n"))
'ignore))))
(defcustom gdb-show-changed-values t
***************
*** 370,418 ****
TOKEN is data related to this node.
INDENT is the current indentation depth."
(cond ((string-match "+" text) ;expand this node
! (gdb-var-list-children token))
((string-match "-" text) ;contract this node
(dolist (var gdb-var-list)
(if (string-match (concat token "\\.") (nth 1 var))
(setq gdb-var-list (delq var gdb-var-list))))
(setq gdb-var-changed t))))
-
! ;; ======================================================================
! ;;
! ;; In this world, there are gdb variables (of unspecified
! ;; representation) and buffers associated with those objects.
! ;; The list of variables is built up by the expansions of
! ;; def-gdb-variable
!
! (defmacro def-gdb-var (root-symbol &optional default doc)
! (let* ((root (symbol-name root-symbol))
! (accessor (intern (concat "gdb-get-" root)))
! (setter (intern (concat "gdb-set-" root)))
! (name (intern (concat "gdb-" root))))
! `(progn
! (defvar ,name ,default ,doc)
! (if (not (memq ',name gdb-variables))
! (push ',name gdb-variables))
! (defun ,accessor ()
! (buffer-local-value ',name gud-comint-buffer))
! (defun ,setter (val)
! (with-current-buffer gud-comint-buffer
! (setq ,name val))))))
!
! (def-gdb-var buffer-type nil
"One of the symbols bound in `gdb-buffer-rules'.")
! (def-gdb-var burst ""
! "A string of characters from gdb that have not yet been processed.")
!
! (def-gdb-var input-queue ()
"A list of gdb command objects.")
! (def-gdb-var prompting nil
"True when gdb is idle with no pending input.")
! (def-gdb-var output-sink 'user
"The disposition of the output of the current gdb command.
Possible values are these symbols:
--- 400,424 ----
TOKEN is data related to this node.
INDENT is the current indentation depth."
(cond ((string-match "+" text) ;expand this node
! (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
! (gdb-var-list-children token)
! (gdbmi-var-list-children token)))
((string-match "-" text) ;contract this node
(dolist (var gdb-var-list)
(if (string-match (concat token "\\.") (nth 1 var))
(setq gdb-var-list (delq var gdb-var-list))))
(setq gdb-var-changed t))))
! (defvar gdb-buffer-type nil
"One of the symbols bound in `gdb-buffer-rules'.")
! (defvar gdb-input-queue ()
"A list of gdb command objects.")
! (defvar gdb-prompting nil
"True when gdb is idle with no pending input.")
! (defvar gdb-output-sink 'user
"The disposition of the output of the current gdb command.
Possible values are these symbols:
***************
*** 430,441 ****
gdb mode sends to gdb on its own behalf.
post-emacs -- ignore output until the prompt annotation is
received, then go to USER disposition.
- ")
! (def-gdb-var current-item nil
"The most recent command item sent to gdb.")
! (def-gdb-var pending-triggers '()
"A list of trigger functions that have run later than their output
handlers.")
--- 436,449 ----
gdb mode sends to gdb on its own behalf.
post-emacs -- ignore output until the prompt annotation is
received, then go to USER disposition.
! gdba (gdb-ui.el) uses all five values, gdbmi (gdb-mi.el) only two
! (user and emacs).")
!
! (defvar gdb-current-item nil
"The most recent command item sent to gdb.")
! (defvar gdb-pending-triggers '()
"A list of trigger functions that have run later than their output
handlers.")
***************
*** 479,486 ****
(set (make-local-variable 'gdb-buffer-type) key)
(if (cdr (cdr rules))
(funcall (car (cdr (cdr rules)))))
! (set (make-local-variable 'gud-comint-buffer) gud-comint-buffer)
! (set (make-local-variable 'gud-minor-mode) 'gdba)
(set (make-local-variable 'tool-bar-map) gud-tool-bar-map)
new))))
--- 487,494 ----
(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))))
***************
*** 548,554 ****
(define-key map "\C-c\C-d" 'gdb-inferior-io-eof)
map))
! (define-derived-mode gdb-inferior-io-mode comint-mode "Debuggee I/O"
"Major mode for gdb inferior-io."
:syntax-table nil :abbrev-table nil
;; We want to use comint because it has various nifty and familiar
--- 556,562 ----
(define-key map "\C-c\C-d" 'gdb-inferior-io-eof)
map))
! (define-derived-mode gdb-inferior-io-mode comint-mode "Inferior I/O"
"Major mode for gdb inferior-io."
:syntax-table nil :abbrev-table nil
;; We want to use comint because it has various nifty and familiar
***************
*** 620,639 ****
;; is a query, or other non-top-level prompt.
(defun gdb-enqueue-input (item)
! (if (gdb-get-prompting)
(progn
(gdb-send-item item)
! (gdb-set-prompting nil))
! (gdb-set-input-queue
! (cons item (gdb-get-input-queue)))))
(defun gdb-dequeue-input ()
! (let ((queue (gdb-get-input-queue)))
(and queue
(let ((last (car (last queue))))
! (unless (nbutlast queue) (gdb-set-input-queue '()))
last))))
-
;;
;; output -- things gdb prints to emacs
--- 628,645 ----
;; is a query, or other non-top-level prompt.
(defun gdb-enqueue-input (item)
! (if gdb-prompting
(progn
(gdb-send-item item)
! (setq gdb-prompting nil))
! (push item gdb-input-queue)))
(defun gdb-dequeue-input ()
! (let ((queue gdb-input-queue))
(and queue
(let ((last (car (last queue))))
! (unless (nbutlast queue) (setq gdb-input-queue '()))
last))))
;;
;; output -- things gdb prints to emacs
***************
*** 662,667 ****
--- 668,675 ----
("commands" gdb-subprompt)
("overload-choice" gdb-subprompt)
("query" gdb-subprompt)
+ ;; Need this prompt for GDB 6.1
+ ("nquery" gdb-subprompt)
("prompt-for-continue" gdb-subprompt)
("post-prompt" gdb-post-prompt)
("source" gdb-source)
***************
*** 688,776 ****
(string-to-int (match-string 2 args))))
(setq gdb-current-address (match-string 3 args))
(setq gdb-view-source t)
! ;; cover for auto-display output which comes *before*
! ;; stopped annotation
! (if (eq (gdb-get-output-sink) 'inferior) (gdb-set-output-sink 'user)))
(defun gdb-send-item (item)
(if gdb-enable-debug-log (push (cons 'send item) gdb-debug-log))
! (gdb-set-current-item item)
! (if (stringp item)
! (progn
! (gdb-set-output-sink 'user)
! (process-send-string (get-buffer-process gud-comint-buffer) item))
! (progn
(gdb-clear-partial-output)
! (gdb-set-output-sink 'pre-emacs)
(process-send-string (get-buffer-process gud-comint-buffer)
! (car item)))))
(defun gdb-pre-prompt (ignored)
"An annotation handler for `pre-prompt'. This terminates the collection of
output from a previous command if that happens to be in effect."
! (let ((sink (gdb-get-output-sink)))
(cond
((eq sink 'user) t)
((eq sink 'emacs)
! (gdb-set-output-sink 'post-emacs))
(t
! (gdb-set-output-sink 'user)
(error "Phase error in gdb-pre-prompt (got %s)" sink)))))
(defun gdb-prompt (ignored)
"An annotation handler for `prompt'.
This sends the next command (if any) to gdb."
(when gdb-first-prompt (gdb-ann3))
! (let ((sink (gdb-get-output-sink)))
(cond
((eq sink 'user) t)
((eq sink 'post-emacs)
! (gdb-set-output-sink 'user)
(let ((handler
! (car (cdr (gdb-get-current-item)))))
(with-current-buffer (gdb-get-create-buffer 'gdb-partial-output-buffer)
(funcall handler))))
(t
! (gdb-set-output-sink 'user)
(error "Phase error in gdb-prompt (got %s)" sink))))
(let ((input (gdb-dequeue-input)))
(if input
(gdb-send-item input)
(progn
! (gdb-set-prompting t)
(gud-display-frame)))))
(defun gdb-subprompt (ignored)
"An annotation handler for non-top-level prompts."
! (gdb-set-prompting t))
(defun gdb-starting (ignored)
"An annotation handler for `starting'. This says that I/O for the
subprocess is now the program being debugged, not GDB."
! (let ((sink (gdb-get-output-sink)))
(cond
((eq sink 'user)
(progn
(setq gud-running t)
(if gdb-use-inferior-io-buffer
! (gdb-set-output-sink 'inferior))))
(t (error "Unexpected `starting' annotation")))))
(defun gdb-stopping (ignored)
"An annotation handler for `exited' and other annotations which say that I/O
for the subprocess is now GDB, not the program being debugged."
(if gdb-use-inferior-io-buffer
! (let ((sink (gdb-get-output-sink)))
(cond
((eq sink 'inferior)
! (gdb-set-output-sink 'user))
(t (error "Unexpected stopping annotation"))))))
(defun gdb-frame-begin (ignored)
! (let ((sink (gdb-get-output-sink)))
(cond
((eq sink 'inferior)
! (gdb-set-output-sink 'user))
((eq sink 'user) t)
((eq sink 'emacs) t)
(t (error "Unexpected frame-begin annotation (%S)" sink)))))
--- 696,792 ----
(string-to-int (match-string 2 args))))
(setq gdb-current-address (match-string 3 args))
(setq gdb-view-source t)
! ;; cover for auto-display output which comes *before*
! ;; stopped annotation
! (if (eq gdb-output-sink 'inferior) (setq gdb-output-sink 'user)))
(defun gdb-send-item (item)
(if gdb-enable-debug-log (push (cons 'send item) gdb-debug-log))
! (setq gdb-current-item item)
! (with-current-buffer gud-comint-buffer
! (if (eq gud-minor-mode 'gdba)
! (progn
! (if (stringp item)
! (progn
! (setq gdb-output-sink 'user)
! (process-send-string (get-buffer-process gud-comint-buffer)
item))
! (progn
! (gdb-clear-partial-output)
! (setq gdb-output-sink 'pre-emacs)
! (process-send-string (get-buffer-process gud-comint-buffer)
! (car item)))))
! ; case: eq gud-minor-mode 'gdbmi
(gdb-clear-partial-output)
! (setq gdb-output-sink 'emacs)
(process-send-string (get-buffer-process gud-comint-buffer)
! (car item)))))
(defun gdb-pre-prompt (ignored)
"An annotation handler for `pre-prompt'. This terminates the collection of
output from a previous command if that happens to be in effect."
! (let ((sink gdb-output-sink))
(cond
((eq sink 'user) t)
((eq sink 'emacs)
! (setq gdb-output-sink 'post-emacs))
(t
! (setq gdb-output-sink 'user)
(error "Phase error in gdb-pre-prompt (got %s)" sink)))))
(defun gdb-prompt (ignored)
"An annotation handler for `prompt'.
This sends the next command (if any) to gdb."
(when gdb-first-prompt (gdb-ann3))
! (let ((sink gdb-output-sink))
(cond
((eq sink 'user) t)
((eq sink 'post-emacs)
! (setq gdb-output-sink 'user)
(let ((handler
! (car (cdr gdb-current-item))))
(with-current-buffer (gdb-get-create-buffer 'gdb-partial-output-buffer)
(funcall handler))))
(t
! (setq gdb-output-sink 'user)
(error "Phase error in gdb-prompt (got %s)" sink))))
(let ((input (gdb-dequeue-input)))
(if input
(gdb-send-item input)
(progn
! (setq gdb-prompting t)
(gud-display-frame)))))
(defun gdb-subprompt (ignored)
"An annotation handler for non-top-level prompts."
! (setq gdb-prompting t))
(defun gdb-starting (ignored)
"An annotation handler for `starting'. This says that I/O for the
subprocess is now the program being debugged, not GDB."
! (let ((sink gdb-output-sink))
(cond
((eq sink 'user)
(progn
(setq gud-running t)
(if gdb-use-inferior-io-buffer
! (setq gdb-output-sink 'inferior))))
(t (error "Unexpected `starting' annotation")))))
(defun gdb-stopping (ignored)
"An annotation handler for `exited' and other annotations which say that I/O
for the subprocess is now GDB, not the program being debugged."
(if gdb-use-inferior-io-buffer
! (let ((sink gdb-output-sink))
(cond
((eq sink 'inferior)
! (setq gdb-output-sink 'user))
(t (error "Unexpected stopping annotation"))))))
(defun gdb-frame-begin (ignored)
! (let ((sink gdb-output-sink))
(cond
((eq sink 'inferior)
! (setq gdb-output-sink 'user))
((eq sink 'user) t)
((eq sink 'emacs) t)
(t (error "Unexpected frame-begin annotation (%S)" sink)))))
***************
*** 779,795 ****
"An annotation handler for `stopped'. It is just like gdb-stopping, except
that if we already set the output sink to 'user in gdb-stopping, that is
fine."
(setq gud-running nil)
! (let ((sink (gdb-get-output-sink)))
(cond
((eq sink 'inferior)
! (gdb-set-output-sink 'user))
((eq sink 'user) t)
(t (error "Unexpected stopped annotation")))))
(defun gdb-post-prompt (ignored)
"An annotation handler for `post-prompt'. This begins the collection of
output from the current command if that happens to be appropriate."
! (if (not (gdb-get-pending-triggers))
(progn
(gdb-get-current-frame)
(gdb-invalidate-frames)
--- 795,811 ----
"An annotation handler for `stopped'. It is just like gdb-stopping, except
that if we already set the output sink to 'user in gdb-stopping, that is
fine."
(setq gud-running nil)
! (let ((sink gdb-output-sink))
(cond
((eq sink 'inferior)
! (setq gdb-output-sink 'user))
((eq sink 'user) t)
(t (error "Unexpected stopped annotation")))))
(defun gdb-post-prompt (ignored)
"An annotation handler for `post-prompt'. This begins the collection of
output from the current command if that happens to be appropriate."
! (if (not gdb-pending-triggers)
(progn
(gdb-get-current-frame)
(gdb-invalidate-frames)
***************
*** 806,818 ****
(dolist (var gdb-var-list)
(setcar (nthcdr 5 var) nil))))
(gdb-var-update))))
! (let ((sink (gdb-get-output-sink)))
(cond
((eq sink 'user) t)
((eq sink 'pre-emacs)
! (gdb-set-output-sink 'emacs))
(t
! (gdb-set-output-sink 'user)
(error "Phase error in gdb-post-prompt (got %s)" sink)))))
(defun gud-gdba-marker-filter (string)
--- 822,834 ----
(dolist (var gdb-var-list)
(setcar (nthcdr 5 var) nil))))
(gdb-var-update))))
! (let ((sink gdb-output-sink))
(cond
((eq sink 'user) t)
((eq sink 'pre-emacs)
! (setq gdb-output-sink 'emacs))
(t
! (setq gdb-output-sink 'user)
(error "Phase error in gdb-post-prompt (got %s)" sink)))))
(defun gud-gdba-marker-filter (string)
***************
*** 874,880 ****
output))
(defun gdb-concat-output (so-far new)
! (let ((sink (gdb-get-output-sink )))
(cond
((eq sink 'user) (concat so-far new))
((or (eq sink 'pre-emacs) (eq sink 'post-emacs)) so-far)
--- 890,896 ----
output))
(defun gdb-concat-output (so-far new)
! (let ((sink gdb-output-sink))
(cond
((eq sink 'user) (concat so-far new))
((or (eq sink 'pre-emacs) (eq sink 'post-emacs)) so-far)
***************
*** 936,954 ****
`(defun ,name (&optional ignored)
(if (and (,demand-predicate)
(not (member ',name
! (gdb-get-pending-triggers))))
(progn
(gdb-enqueue-input
(list ,gdb-command ',output-handler))
! (gdb-set-pending-triggers
! (cons ',name
! (gdb-get-pending-triggers)))))))
(defmacro def-gdb-auto-update-handler (name trigger buf-key custom-defun)
`(defun ,name ()
! (gdb-set-pending-triggers
(delq ',trigger
! (gdb-get-pending-triggers)))
(let ((buf (gdb-get-buffer ',buf-key)))
(and buf
(with-current-buffer buf
--- 952,968 ----
`(defun ,name (&optional ignored)
(if (and (,demand-predicate)
(not (member ',name
! gdb-pending-triggers)))
(progn
(gdb-enqueue-input
(list ,gdb-command ',output-handler))
! (push ',name gdb-pending-triggers)))))
(defmacro def-gdb-auto-update-handler (name trigger buf-key custom-defun)
`(defun ,name ()
! (setq gdb-pending-triggers
(delq ',trigger
! gdb-pending-triggers))
(let ((buf (gdb-get-buffer ',buf-key)))
(and buf
(with-current-buffer buf
***************
*** 1080,1086 ****
(dolist (buffer (buffer-list))
(with-current-buffer buffer
(if (and (eq gud-minor-mode 'gdba)
! (not (string-match "^\*" (buffer-name))))
(gdb-remove-breakpoint-icons (point-min) (point-max)))))
(with-current-buffer (gdb-get-buffer 'gdb-breakpoints-buffer)
(save-excursion
--- 1094,1100 ----
(dolist (buffer (buffer-list))
(with-current-buffer buffer
(if (and (eq gud-minor-mode 'gdba)
! (not (string-match "\\`\\*.+\\*\\'" (buffer-name))))
(gdb-remove-breakpoint-icons (point-min) (point-max)))))
(with-current-buffer (gdb-get-buffer 'gdb-breakpoints-buffer)
(save-excursion
***************
*** 1112,1121 ****
(save-excursion
(goto-line (string-to-number line))
(gdb-put-breakpoint-icon (eq flag ?y)))))))))
! (end-of-line))))))
(defun gdb-mouse-toggle-breakpoint (event)
! "Toggle breakpoint with mouse click in left margin."
(interactive "e")
(mouse-minibuffer-check event)
(let ((posn (event-end event)))
--- 1126,1136 ----
(save-excursion
(goto-line (string-to-number line))
(gdb-put-breakpoint-icon (eq flag ?y)))))))))
! (end-of-line)))))
! (if (gdb-get-buffer 'gdb-assembler-buffer) (gdb-assembler-custom)))
(defun gdb-mouse-toggle-breakpoint (event)
! "Toggle breakpoint in left fringe/margin with mouse click"
(interactive "e")
(mouse-minibuffer-check event)
(let ((posn (event-end event)))
***************
*** 1135,1148 ****
(concat "*breakpoints of " (gdb-get-target-string) "*")))
(defun gdb-display-breakpoints-buffer ()
(interactive)
(gdb-display-buffer
(gdb-get-create-buffer 'gdb-breakpoints-buffer)))
(defun gdb-frame-breakpoints-buffer ()
(interactive)
! (switch-to-buffer-other-frame
! (gdb-get-create-buffer 'gdb-breakpoints-buffer)))
(defvar gdb-breakpoints-mode-map
(let ((map (make-sparse-keymap))
--- 1150,1173 ----
(concat "*breakpoints of " (gdb-get-target-string) "*")))
(defun gdb-display-breakpoints-buffer ()
+ "Display status of user-settable breakpoints."
(interactive)
(gdb-display-buffer
(gdb-get-create-buffer 'gdb-breakpoints-buffer)))
+ (defconst gdb-frame-parameters
+ '((height . 12) (width . 60)
+ (unsplittable . t)
+ (tool-bar-lines . nil)
+ (menu-bar-lines . nil)
+ (minibuffer . nil)))
+
(defun gdb-frame-breakpoints-buffer ()
+ "Display status of user-settable breakpoints in a new frame."
(interactive)
! (select-frame (make-frame gdb-frame-parameters))
! (switch-to-buffer (gdb-get-create-buffer 'gdb-breakpoints-buffer))
! (set-window-dedicated-p (selected-window) t))
(defvar gdb-breakpoints-mode-map
(let ((map (make-sparse-keymap))
***************
*** 1167,1173 ****
(setq mode-name "Breakpoints")
(use-local-map gdb-breakpoints-mode-map)
(setq buffer-read-only t)
! (gdb-invalidate-breakpoints))
(defun gdb-toggle-breakpoint ()
"Enable/disable the breakpoint at current line."
--- 1192,1200 ----
(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."
***************
*** 1180,1187 ****
(list
(concat
(if (eq ?y (char-after (match-beginning 2)))
! "server disable "
! "server enable ")
(match-string 1) "\n")
'ignore)))))
--- 1207,1214 ----
(list
(concat
(if (eq ?y (char-after (match-beginning 2)))
! gdb-server-prefix "disable "
! gdb-server-prefix "enable ")
(match-string 1) "\n")
'ignore)))))
***************
*** 1192,1219 ****
(if (not (looking-at "\\([0-9]+\\).*point\\s-*\\S-*\\s-*\\(.\\)"))
(error "Not recognized as break/watchpoint line")
(gdb-enqueue-input
! (list (concat "server delete " (match-string 1) "\n") 'ignore))))
(defun gdb-goto-breakpoint ()
! "Display the file in the source buffer at the breakpoint specified on the
! current line."
(interactive)
(save-excursion
(beginning-of-line 1)
! (re-search-forward "in\\s-+\\S-+\\s-+at\\s-+" nil t)
! (looking-at "\\(\\S-*\\):\\([0-9]+\\)"))
(if (match-string 2)
(let ((line (match-string 2))
(file (match-string 1)))
(save-selected-window
! (gdb-display-buffer (find-file-noselect
! (if (file-exists-p file)
! file
! (expand-file-name file gdb-cdir))))
! (goto-line (string-to-number line))))))
(defun gdb-mouse-goto-breakpoint (event)
! "Display the file in the source buffer at the selected breakpoint."
(interactive "e")
(mouse-set-point event)
(gdb-goto-breakpoint))
--- 1219,1249 ----
(if (not (looking-at "\\([0-9]+\\).*point\\s-*\\S-*\\s-*\\(.\\)"))
(error "Not recognized as break/watchpoint line")
(gdb-enqueue-input
! (list (concat gdb-server-prefix "delete " (match-string 1) "\n")
'ignore))))
(defun gdb-goto-breakpoint ()
! "Display the breakpoint location specified at current line."
(interactive)
(save-excursion
(beginning-of-line 1)
! (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdbmi))
! (looking-at
"[0-9]*\\s-*\\S-*\\s-*\\S-*\\s-*.\\s-*\\S-*\\s-*\\(\\S-*\\):\\([0-9]+\\)")
! (re-search-forward "in\\s-+\\S-+\\s-+at\\s-+" nil t)
! (looking-at "\\(\\S-*\\):\\([0-9]+\\)")))
(if (match-string 2)
(let ((line (match-string 2))
(file (match-string 1)))
(save-selected-window
! (let* ((buf (find-file-noselect (if (file-exists-p file)
! file
! (expand-file-name file gdb-cdir))))
! (window (gdb-display-buffer buf)))
! (with-current-buffer buf
! (goto-line (string-to-number line))
! (set-window-point window (point))))))))
(defun gdb-mouse-goto-breakpoint (event)
! "Display the breakpoint location that you click on."
(interactive "e")
(mouse-set-point event)
(gdb-goto-breakpoint))
***************
*** 1256,1269 ****
(concat "*stack frames of " (gdb-get-target-string) "*")))
(defun gdb-display-stack-buffer ()
(interactive)
(gdb-display-buffer
(gdb-get-create-buffer 'gdb-stack-buffer)))
(defun gdb-frame-stack-buffer ()
(interactive)
! (switch-to-buffer-other-frame
! (gdb-get-create-buffer 'gdb-stack-buffer)))
(defvar gdb-frames-mode-map
(let ((map (make-sparse-keymap)))
--- 1286,1302 ----
(concat "*stack frames of " (gdb-get-target-string) "*")))
(defun gdb-display-stack-buffer ()
+ "Display backtrace of current stack."
(interactive)
(gdb-display-buffer
(gdb-get-create-buffer 'gdb-stack-buffer)))
(defun gdb-frame-stack-buffer ()
+ "Display backtrace of current stack in a new frame."
(interactive)
! (select-frame (make-frame gdb-frame-parameters))
! (switch-to-buffer (gdb-get-create-buffer 'gdb-stack-buffer))
! (set-window-dedicated-p (selected-window) t))
(defvar gdb-frames-mode-map
(let ((map (make-sparse-keymap)))
***************
*** 1281,1305 ****
(setq buffer-read-only t)
(use-local-map gdb-frames-mode-map)
(font-lock-mode -1)
! (gdb-invalidate-frames))
(defun gdb-get-frame-number ()
(save-excursion
! (let* ((pos (re-search-backward "^#\\([0-9]*\\)" nil t))
(n (or (and pos (match-string-no-properties 1)) "0")))
n)))
(defun gdb-frames-select ()
! "Make the frame on the current line become the current frame and display the
! source in the source buffer."
(interactive)
(gdb-enqueue-input
! (list (concat "server frame " (gdb-get-frame-number) "\n") 'ignore))
(gud-display-frame))
(defun gdb-frames-mouse-select (event)
! "Make the selected frame become the current frame and display the source in
! the source buffer."
(interactive "e")
(mouse-set-point event)
(gdb-frames-select))
--- 1314,1338 ----
(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
! (let* ((pos (re-search-backward "^#*\\([0-9]*\\)" nil t))
(n (or (and pos (match-string-no-properties 1)) "0")))
n)))
(defun gdb-frames-select ()
! "Select the frame and display the relevant source."
(interactive)
(gdb-enqueue-input
! (list (concat gdb-server-prefix "frame " (gdb-get-frame-number) "\n")
'ignore))
(gud-display-frame))
(defun gdb-frames-mouse-select (event)
! "Select the frame you click on and display the relevant source."
(interactive "e")
(mouse-set-point event)
(gdb-frames-select))
***************
*** 1313,1319 ****
(def-gdb-auto-updated-buffer gdb-threads-buffer
gdb-invalidate-threads
! "server info threads\n"
gdb-info-threads-handler
gdb-info-threads-custom)
--- 1346,1352 ----
(def-gdb-auto-updated-buffer gdb-threads-buffer
gdb-invalidate-threads
! (concat gdb-server-prefix "info threads\n")
gdb-info-threads-handler
gdb-info-threads-custom)
***************
*** 1332,1345 ****
(concat "*threads of " (gdb-get-target-string) "*")))
(defun gdb-display-threads-buffer ()
(interactive)
(gdb-display-buffer
(gdb-get-create-buffer 'gdb-threads-buffer)))
(defun gdb-frame-threads-buffer ()
(interactive)
! (switch-to-buffer-other-frame
! (gdb-get-create-buffer 'gdb-threads-buffer)))
(defvar gdb-threads-mode-map
(let ((map (make-sparse-keymap)))
--- 1365,1381 ----
(concat "*threads of " (gdb-get-target-string) "*")))
(defun gdb-display-threads-buffer ()
+ "Display IDs of currently known threads."
(interactive)
(gdb-display-buffer
(gdb-get-create-buffer 'gdb-threads-buffer)))
(defun gdb-frame-threads-buffer ()
+ "Display IDs of currently known threads in a new frame."
(interactive)
! (select-frame (make-frame gdb-frame-parameters))
! (switch-to-buffer (gdb-get-create-buffer 'gdb-threads-buffer))
! (set-window-dedicated-p (selected-window) t))
(defvar gdb-threads-mode-map
(let ((map (make-sparse-keymap)))
***************
*** 1351,1357 ****
(defun gdb-threads-mode ()
"Major mode for gdb frames.
! \\{gdb-frames-mode-map}"
(setq major-mode 'gdb-threads-mode)
(setq mode-name "Threads")
(setq buffer-read-only t)
--- 1387,1393 ----
(defun gdb-threads-mode ()
"Major mode for gdb frames.
! \\{gdb-threads-mode-map}"
(setq major-mode 'gdb-threads-mode)
(setq mode-name "Threads")
(setq buffer-read-only t)
***************
*** 1364,1379 ****
(match-string-no-properties 1)))
(defun gdb-threads-select ()
! "Make the thread on the current line become the current thread and display
the
! source in the source buffer."
(interactive)
(gdb-enqueue-input
(list (concat "thread " (gdb-get-thread-number) "\n") 'ignore))
(gud-display-frame))
(defun gdb-threads-mouse-select (event)
! "Make the selected frame become the current frame and display the source in
! the source buffer."
(interactive "e")
(mouse-set-point event)
(gdb-threads-select))
--- 1400,1413 ----
(match-string-no-properties 1)))
(defun gdb-threads-select ()
! "Select the thread and display the relevant source."
(interactive)
(gdb-enqueue-input
(list (concat "thread " (gdb-get-thread-number) "\n") 'ignore))
(gud-display-frame))
(defun gdb-threads-mouse-select (event)
! "Select the thread you click on and display the relevant source."
(interactive "e")
(mouse-set-point event)
(gdb-threads-select))
***************
*** 1387,1393 ****
(def-gdb-auto-updated-buffer gdb-registers-buffer
gdb-invalidate-registers
! "server info registers\n"
gdb-info-registers-handler
gdb-info-registers-custom)
--- 1421,1427 ----
(def-gdb-auto-updated-buffer gdb-registers-buffer
gdb-invalidate-registers
! (concat gdb-server-prefix "info registers\n")
gdb-info-registers-handler
gdb-info-registers-custom)
***************
*** 1413,1426 ****
(concat "*registers of " (gdb-get-target-string) "*")))
(defun gdb-display-registers-buffer ()
(interactive)
(gdb-display-buffer
(gdb-get-create-buffer 'gdb-registers-buffer)))
(defun gdb-frame-registers-buffer ()
(interactive)
! (switch-to-buffer-other-frame
! (gdb-get-create-buffer 'gdb-registers-buffer)))
;;
;; Locals buffer.
--- 1447,1463 ----
(concat "*registers of " (gdb-get-target-string) "*")))
(defun gdb-display-registers-buffer ()
+ "Display integer register contents."
(interactive)
(gdb-display-buffer
(gdb-get-create-buffer 'gdb-registers-buffer)))
(defun gdb-frame-registers-buffer ()
+ "Display integer register contents in a new frame."
(interactive)
! (select-frame (make-frame gdb-frame-parameters))
! (switch-to-buffer (gdb-get-create-buffer 'gdb-registers-buffer))
! (set-window-dedicated-p (selected-window) t))
;;
;; Locals buffer.
***************
*** 1438,1445 ****
;; Abbreviate for arrays and structures.
;; These can be expanded using gud-display.
(defun gdb-info-locals-handler nil
! (gdb-set-pending-triggers (delq 'gdb-invalidate-locals
! (gdb-get-pending-triggers)))
(let ((buf (gdb-get-buffer 'gdb-partial-output-buffer)))
(with-current-buffer buf
(goto-char (point-min))
--- 1475,1482 ----
;; Abbreviate for arrays and structures.
;; These can be expanded using gud-display.
(defun gdb-info-locals-handler nil
! (setq gdb-pending-triggers (delq 'gdb-invalidate-locals
! gdb-pending-triggers))
(let ((buf (gdb-get-buffer 'gdb-partial-output-buffer)))
(with-current-buffer buf
(goto-char (point-min))
***************
*** 1474,1497 ****
\\{gdb-locals-mode-map}"
(setq major-mode 'gdb-locals-mode)
! (setq mode-name "Locals")
(setq buffer-read-only t)
(use-local-map gdb-locals-mode-map)
! (gdb-invalidate-locals))
(defun gdb-locals-buffer-name ()
(with-current-buffer gud-comint-buffer
(concat "*locals of " (gdb-get-target-string) "*")))
(defun gdb-display-locals-buffer ()
(interactive)
(gdb-display-buffer
(gdb-get-create-buffer 'gdb-locals-buffer)))
(defun gdb-frame-locals-buffer ()
(interactive)
! (switch-to-buffer-other-frame
! (gdb-get-create-buffer 'gdb-locals-buffer)))
;;;; Window management
--- 1511,1539 ----
\\{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
(concat "*locals of " (gdb-get-target-string) "*")))
(defun gdb-display-locals-buffer ()
+ "Display local variables of current stack and their values."
(interactive)
(gdb-display-buffer
(gdb-get-create-buffer 'gdb-locals-buffer)))
(defun gdb-frame-locals-buffer ()
+ "Display local variables of current stack and their values in a new frame."
(interactive)
! (select-frame (make-frame gdb-frame-parameters))
! (switch-to-buffer (gdb-get-create-buffer 'gdb-locals-buffer))
! (set-window-dedicated-p (selected-window) t))
;;;; Window management
***************
*** 1510,1518 ****
#'(lambda (win)
(if (eq gud-comint-buffer (window-buffer win))
(set-window-dedicated-p win t))))
! (setq answer (get-buffer-window buf))
(if (not answer)
! (let ((window (get-lru-window)))
(if window
(progn
(set-window-buffer window buf)
--- 1552,1560 ----
#'(lambda (win)
(if (eq gud-comint-buffer (window-buffer win))
(set-window-dedicated-p win t))))
! (setq answer (get-buffer-window buf 'visible))
(if (not answer)
! (let ((window (get-lru-window 'visible)))
(if window
(progn
(set-window-buffer window buf)
***************
*** 1523,1529 ****
(if (eq gud-comint-buffer (window-buffer win))
(set-window-dedicated-p win nil)))))
(if must-split
! (let* ((largest (get-largest-window))
(cur-size (window-height largest))
(new-size (and size (< size cur-size) (- cur-size size))))
(setq answer (split-window largest new-size))
--- 1565,1571 ----
(if (eq gud-comint-buffer (window-buffer win))
(set-window-dedicated-p win nil)))))
(if must-split
! (let* ((largest (get-largest-window 'visible))
(cur-size (window-height largest))
(new-size (and size (< size cur-size) (- cur-size size))))
(setq answer (split-window largest new-size))
***************
*** 1532,1542 ****
(defun gdb-display-source-buffer (buffer)
(if (eq gdb-selected-view 'source)
- (progn
(gdb-display-buffer buffer)
! (get-buffer-window buffer))
! (gdb-display-buffer (gdb-get-buffer 'gdb-assembler-buffer))
! nil))
;;; Shared keymap initialization:
--- 1574,1582 ----
(defun gdb-display-source-buffer (buffer)
(if (eq gdb-selected-view 'source)
(gdb-display-buffer buffer)
! (gdb-display-buffer (gdb-get-buffer 'gdb-assembler-buffer)))
! (get-buffer-window buffer 'visible))
;;; Shared keymap initialization:
***************
*** 1545,1569 ****
(define-key gud-menu-map [frames]
`(menu-item "GDB-Frames" ,menu :visible (eq gud-minor-mode 'gdba)))
(define-key menu [gdb] '("Gdb" . gdb-frame-gdb-buffer))
! (define-key menu [locals] '("Locals" . gdb-frame-locals-buffer))
(define-key menu [registers] '("Registers" . gdb-frame-registers-buffer))
(define-key menu [frames] '("Stack" . gdb-frame-stack-buffer))
! (define-key menu [breakpoints] '("Breakpoints" .
gdb-frame-breakpoints-buffer))
! (define-key menu [threads] '("Threads" . gdb-frame-threads-buffer))
! ; (define-key menu [assembler] '("Machine" . gdb-frame-assembler-buffer))
! )
(let ((menu (make-sparse-keymap "GDB-Windows")))
(define-key gud-menu-map [displays]
`(menu-item "GDB-Windows" ,menu :visible (eq gud-minor-mode 'gdba)))
(define-key menu [gdb] '("Gdb" . gdb-display-gdb-buffer))
! (define-key menu [locals] '("Locals" . gdb-display-locals-buffer))
(define-key menu [registers] '("Registers" . gdb-display-registers-buffer))
(define-key menu [frames] '("Stack" . gdb-display-stack-buffer))
! (define-key menu [breakpoints] '("Breakpoints" .
gdb-display-breakpoints-buffer))
! (define-key menu [threads] '("Threads" . gdb-display-threads-buffer))
! ; (define-key menu [assembler] '("Machine" . gdb-display-assembler-buffer))
! )
(let ((menu (make-sparse-keymap "View")))
(define-key gud-menu-map [view]
--- 1585,1607 ----
(define-key gud-menu-map [frames]
`(menu-item "GDB-Frames" ,menu :visible (eq gud-minor-mode 'gdba)))
(define-key menu [gdb] '("Gdb" . gdb-frame-gdb-buffer))
! (define-key menu [threads] '("Threads" . gdb-frame-threads-buffer))
! (define-key menu [assembler] '("Machine" . gdb-frame-assembler-buffer))
(define-key menu [registers] '("Registers" . gdb-frame-registers-buffer))
+ (define-key menu [locals] '("Locals" . gdb-frame-locals-buffer))
(define-key menu [frames] '("Stack" . gdb-frame-stack-buffer))
! (define-key menu [breakpoints] '("Breakpoints" .
gdb-frame-breakpoints-buffer)))
(let ((menu (make-sparse-keymap "GDB-Windows")))
(define-key gud-menu-map [displays]
`(menu-item "GDB-Windows" ,menu :visible (eq gud-minor-mode 'gdba)))
(define-key menu [gdb] '("Gdb" . gdb-display-gdb-buffer))
! (define-key menu [assembler] '("Machine" . gdb-display-assembler-buffer))
! (define-key menu [threads] '("Threads" . gdb-display-threads-buffer))
(define-key menu [registers] '("Registers" . gdb-display-registers-buffer))
+ (define-key menu [locals] '("Locals" . gdb-display-locals-buffer))
(define-key menu [frames] '("Stack" . gdb-display-stack-buffer))
! (define-key menu [breakpoints] '("Breakpoints" .
gdb-display-breakpoints-buffer)))
(let ((menu (make-sparse-keymap "View")))
(define-key gud-menu-map [view]
***************
*** 1589,1599 ****
"Display locals, stack and breakpoint information")))
(defun gdb-frame-gdb-buffer ()
(interactive)
! (switch-to-buffer-other-frame
! (gdb-get-create-buffer 'gdba)))
(defun gdb-display-gdb-buffer ()
(interactive)
(gdb-display-buffer
(gdb-get-create-buffer 'gdba)))
--- 1627,1640 ----
"Display locals, stack and breakpoint information")))
(defun gdb-frame-gdb-buffer ()
+ "Display GUD buffer in a new frame."
(interactive)
! (select-frame (make-frame gdb-frame-parameters))
! (switch-to-buffer (gdb-get-create-buffer 'gdba))
! (set-window-dedicated-p (selected-window) t))
(defun gdb-display-gdb-buffer ()
+ "Display GUD buffer."
(interactive)
(gdb-display-buffer
(gdb-get-create-buffer 'gdba)))
***************
*** 1601,1606 ****
--- 1642,1648 ----
(defvar gdb-main-file nil "Source file from which program execution begins.")
(defun gdb-view-source-function ()
+ "Select source view."
(interactive)
(if gdb-view-source
(gdb-display-buffer
***************
*** 1610,1617 ****
--- 1652,1661 ----
(setq gdb-selected-view 'source))
(defun gdb-view-assembler()
+ "Select disassembly view."
(interactive)
(gdb-display-buffer (gdb-get-create-buffer 'gdb-assembler-buffer))
+ (gdb-invalidate-assembler)
(setq gdb-selected-view 'assembler))
;(defun gdb-view-both()
***************
*** 1656,1665 ****
(other-window 1))
(defcustom gdb-many-windows nil
! "Nil (the default value) means just pops up the GUD buffer
unless `gdb-show-main' is t. In this case it starts with two
windows: one displaying the GUD buffer and the other with the
! source file with the main routine of the debugee. Non-nil means
display the layout shown for `gdba'."
:type 'boolean
:group 'gud)
--- 1700,1709 ----
(other-window 1))
(defcustom gdb-many-windows nil
! "Nil (the default value) means just pop up the GUD buffer
unless `gdb-show-main' is t. In this case it starts with two
windows: one displaying the GUD buffer and the other with the
! source file with the main routine of the inferior. Non-nil means
display the layout shown for `gdba'."
:type 'boolean
:group 'gud)
***************
*** 1701,1715 ****
"Exit a debugging session cleanly by killing the gdb buffers and resetting
the source buffers."
(dolist (buffer (buffer-list))
! (if (not (eq buffer gud-comint-buffer))
! (with-current-buffer buffer
! (if (memq gud-minor-mode '(gdba pdb))
! (if (string-match "^\*.+*$" (buffer-name))
! (kill-buffer nil)
! (gdb-remove-breakpoint-icons (point-min) (point-max) t)
! (setq gud-minor-mode nil)
! (kill-local-variable 'tool-bar-map)
! (setq gud-running nil))))))
(when (markerp gdb-overlay-arrow-position)
(move-marker gdb-overlay-arrow-position nil)
(setq gdb-overlay-arrow-position nil))
--- 1745,1759 ----
"Exit a debugging session cleanly by killing the gdb buffers and resetting
the source buffers."
(dolist (buffer (buffer-list))
! (unless (eq buffer gud-comint-buffer)
! (with-current-buffer buffer
! (if (memq gud-minor-mode '(gdbmi gdba))
! (if (string-match "\\`\\*.+\\*\\'" (buffer-name))
! (kill-buffer nil)
! (gdb-remove-breakpoint-icons (point-min) (point-max) t)
! (setq gud-minor-mode nil)
! (kill-local-variable 'tool-bar-map)
! (setq gud-running nil))))))
(when (markerp gdb-overlay-arrow-position)
(move-marker gdb-overlay-arrow-position nil)
(setq gdb-overlay-arrow-position nil))
***************
*** 1791,1801 ****
(when (< left-margin-width 2)
(save-current-buffer
(setq left-margin-width 2)
! (if (get-buffer-window (current-buffer))
! (set-window-margins (get-buffer-window
! (current-buffer))
! left-margin-width
! right-margin-width))))
(put-image
(if enabled
(or breakpoint-enabled-icon
--- 1835,1844 ----
(when (< left-margin-width 2)
(save-current-buffer
(setq left-margin-width 2)
! (if (get-buffer-window (current-buffer) 'visible)
! (set-window-margins
! (get-buffer-window (current-buffer) 'visible)
! left-margin-width right-margin-width))))
(put-image
(if enabled
(or breakpoint-enabled-icon
***************
*** 1819,1829 ****
(when (< left-margin-width 2)
(save-current-buffer
(setq left-margin-width 2)
! (if (get-buffer-window (current-buffer))
! (set-window-margins (get-buffer-window
! (current-buffer))
! left-margin-width
! right-margin-width))))
(gdb-put-string (if enabled "B" "b") (1+ start)))))
(defun gdb-remove-breakpoint-icons (start end &optional remove-margin)
--- 1862,1871 ----
(when (< left-margin-width 2)
(save-current-buffer
(setq left-margin-width 2)
! (if (get-buffer-window (current-buffer) 'visible)
! (set-window-margins
! (get-buffer-window (current-buffer) 'visible)
! left-margin-width right-margin-width))))
(gdb-put-string (if enabled "B" "b") (1+ start)))))
(defun gdb-remove-breakpoint-icons (start end &optional remove-margin)
***************
*** 1832,1842 ****
(remove-images start end))
(when remove-margin
(setq left-margin-width 0)
! (if (get-buffer-window (current-buffer))
! (set-window-margins (get-buffer-window
! (current-buffer))
! left-margin-width
! right-margin-width))))
;;
--- 1874,1883 ----
(remove-images start end))
(when remove-margin
(setq left-margin-width 0)
! (if (get-buffer-window (current-buffer) 'visible)
! (set-window-margins
! (get-buffer-window (current-buffer) 'visible)
! left-margin-width right-margin-width))))
;;
***************
*** 1848,1854 ****
(def-gdb-auto-updated-buffer gdb-assembler-buffer
gdb-invalidate-assembler
! (concat "server disassemble " gdb-current-address "\n")
gdb-assembler-handler
gdb-assembler-custom)
--- 1889,1895 ----
(def-gdb-auto-updated-buffer gdb-assembler-buffer
gdb-invalidate-assembler
! (concat gdb-server-prefix "disassemble " gdb-current-address "\n")
gdb-assembler-handler
gdb-assembler-custom)
***************
*** 1887,1893 ****
(if (re-search-forward address nil t)
(gdb-put-breakpoint-icon (eq flag ?y))))))))
(if (not (equal gdb-current-address "main"))
! (set-window-point (get-buffer-window buffer) pos))))
(defvar gdb-assembler-mode-map
(let ((map (make-sparse-keymap)))
--- 1928,1934 ----
(if (re-search-forward address nil t)
(gdb-put-breakpoint-icon (eq flag ?y))))))))
(if (not (equal gdb-current-address "main"))
! (set-window-point (get-buffer-window buffer 'visible) pos))))
(defvar gdb-assembler-mode-map
(let ((map (make-sparse-keymap)))
***************
*** 1913,1926 ****
(concat "*Machine Code " (gdb-get-target-string) "*")))
(defun gdb-display-assembler-buffer ()
(interactive)
(gdb-display-buffer
(gdb-get-create-buffer 'gdb-assembler-buffer)))
(defun gdb-frame-assembler-buffer ()
(interactive)
! (switch-to-buffer-other-frame
! (gdb-get-create-buffer 'gdb-assembler-buffer)))
;; modified because if gdb-current-address has changed value a new command
;; must be enqueued to update the buffer with the new output
--- 1954,1970 ----
(concat "*Machine Code " (gdb-get-target-string) "*")))
(defun gdb-display-assembler-buffer ()
+ "Display disassembly view."
(interactive)
(gdb-display-buffer
(gdb-get-create-buffer 'gdb-assembler-buffer)))
(defun gdb-frame-assembler-buffer ()
+ "Display disassembly view in a new frame."
(interactive)
! (select-frame (make-frame gdb-frame-parameters))
! (switch-to-buffer (gdb-get-create-buffer 'gdb-assembler-buffer))
! (set-window-dedicated-p (selected-window) t))
;; modified because if gdb-current-address has changed value a new command
;; must be enqueued to update the buffer with the new output
***************
*** 1929,1972 ****
(progn
(unless (string-equal gdb-current-frame gdb-previous-frame)
(if (or (not (member 'gdb-invalidate-assembler
! (gdb-get-pending-triggers)))
(not (string-equal gdb-current-address
gdb-previous-address)))
(progn
;; take previous disassemble command off the queue
(with-current-buffer gud-comint-buffer
! (let ((queue (gdb-get-input-queue)) (item))
(dolist (item queue)
(if (equal (cdr item) '(gdb-assembler-handler))
! (gdb-set-input-queue
! (delete item (gdb-get-input-queue)))))))
(gdb-enqueue-input
! (list (concat "server disassemble " gdb-current-address "\n")
'gdb-assembler-handler))
! (gdb-set-pending-triggers
! (cons 'gdb-invalidate-assembler
! (gdb-get-pending-triggers)))
(setq gdb-previous-address gdb-current-address)
(setq gdb-previous-frame gdb-current-frame)))))))
(defun gdb-get-current-frame ()
! (if (not (member 'gdb-get-current-frame (gdb-get-pending-triggers)))
(progn
(gdb-enqueue-input
! (list (concat "server info frame\n") 'gdb-frame-handler))
! (gdb-set-pending-triggers
! (cons 'gdb-get-current-frame
! (gdb-get-pending-triggers))))))
(defun gdb-frame-handler ()
! (gdb-set-pending-triggers
! (delq 'gdb-get-current-frame (gdb-get-pending-triggers)))
(with-current-buffer (gdb-get-create-buffer 'gdb-partial-output-buffer)
(goto-char (point-min))
(forward-line)
! (if (looking-at ".*=\\s-+0x\\(\\S-*\\)\\s-+in\\s-+\\(\\S-*\\)")
(progn
(setq gdb-current-frame (match-string 2))
(let ((address (match-string 1)))
;; remove leading 0s from output of info frame command.
(if (string-match "^0+\\(.*\\)" address)
--- 1973,2016 ----
(progn
(unless (string-equal gdb-current-frame gdb-previous-frame)
(if (or (not (member 'gdb-invalidate-assembler
! gdb-pending-triggers))
(not (string-equal gdb-current-address
gdb-previous-address)))
(progn
;; take previous disassemble command off the queue
(with-current-buffer gud-comint-buffer
! (let ((queue gdb-input-queue) (item))
(dolist (item queue)
(if (equal (cdr item) '(gdb-assembler-handler))
! (setq gdb-input-queue
! (delete item gdb-input-queue))))))
(gdb-enqueue-input
! (list (concat gdb-server-prefix "disassemble " gdb-current-address
"\n")
'gdb-assembler-handler))
! (push 'gdb-invalidate-assembler gdb-pending-triggers)
(setq gdb-previous-address gdb-current-address)
(setq gdb-previous-frame gdb-current-frame)))))))
(defun gdb-get-current-frame ()
! (if (not (member 'gdb-get-current-frame gdb-pending-triggers))
(progn
(gdb-enqueue-input
! (list (concat gdb-server-prefix "info frame\n") 'gdb-frame-handler))
! (push 'gdb-get-current-frame
! gdb-pending-triggers))))
(defun gdb-frame-handler ()
! (setq gdb-pending-triggers
! (delq 'gdb-get-current-frame gdb-pending-triggers))
(with-current-buffer (gdb-get-create-buffer 'gdb-partial-output-buffer)
(goto-char (point-min))
(forward-line)
! (if (looking-at ".*=\\s-+0x\\(\\S-*\\)\\s-+in\\s-+\\(\\S-*?\\);? ")
(progn
(setq gdb-current-frame (match-string 2))
+ (if (gdb-get-buffer 'gdb-locals-buffer)
+ (with-current-buffer (gdb-get-buffer 'gdb-locals-buffer)
+ (setq mode-name (concat "Locals:" gdb-current-frame))))
(let ((address (match-string 1)))
;; remove leading 0s from output of info frame command.
(if (string-match "^0+\\(.*\\)" address)
***************
*** 1986,1990 ****
(provide 'gdb-ui)
! ;;; arch-tag: e9fb00c5-74ef-469f-a088-37384caae352
;;; gdb-ui.el ends here
--- 2030,2034 ----
(provide 'gdb-ui)
! ;; arch-tag: e9fb00c5-74ef-469f-a088-37384caae352
;;; gdb-ui.el ends here
- [Emacs-diffs] Changes to emacs/lisp/progmodes/gdb-ui.el [emacs-unicode-2],
Miles Bader <=