;;; Commentary:
-;; This mode acts as a graphical user interface to GDB. You can interact with
+;; This mode acts as a graphical user interface to GDB. You can interact with
;; GDB through the GUD buffer in the usual way, but there are also further
;; buffers which control the execution and describe the state of your program.
;; It separates the input/output of your program from that of GDB, if
-;; required, and displays expressions and their current values in their own
-;; buffers. It also uses features of Emacs 21 such as the display margin for
-;; breakpoints, and the toolbar (see the GDB Graphical Interface section in
-;; the Emacs info manual).
+;; required, and watches expressions in the speedbar. It also uses features of
+;; Emacs 21 such as the fringe/display margin for breakpoints, and the toolbar
+;; (see the GDB Graphical Interface section in the Emacs info manual).
;; Start the debugger with M-x gdba.
;; This file has evolved from gdba.el from GDB 5.0 written by Tom Lord and Jim
-;; Kingdon and uses GDB's annotation interface. You don't need to know about
+;; 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>'.
+;; 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:
;;
(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-frame nil)
+(defvar gdb-current-stack-level 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.")
-(defvar gdb-var-list nil "List of variables in watch window")
+(defvar gdb-var-list nil "List of variables in watch window.")
(defvar gdb-var-changed nil "Non-nil means that gdb-var-list has changed.")
(defvar gdb-buffer-type nil)
(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)
-
+(defvar gdb-flush-pending-output nil)
+
+(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:
+
+ `user' -- gdb output should be copied to the GUD buffer
+ for the user to see.
+
+ `inferior' -- gdb output should be copied to the inferior-io buffer
+
+ `pre-emacs' -- output should be ignored util the post-prompt
+ annotation is received. Then the output-sink
+ becomes:...
+ `emacs' -- output should be collected in the partial-output-buffer
+ for subsequent processing by a command. This is the
+ disposition of output generated by commands that
+ 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.")
+
+;; end of gdb variables
+
;;;###autoload
(defun gdba (command-line)
"Run gdb on program FILE in buffer *gud-FILE*.
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
+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 :
+The following commands help control operation :
`gdb-many-windows' - Toggle the number of windows gdb uses.
`gdb-restore-windows' - To restore the window layout.
RET gdb-frames-select | SPC gdb-toggle-breakpoint
| RET gdb-goto-breakpoint
| d gdb-delete-breakpoint
----------------------------------------------------------------------
-"
+---------------------------------------------------------------------"
;;
(interactive (list (gud-query-cmdline 'gdba)))
;;
(defcustom gdb-enable-debug-log nil
"Non-nil means record the process input and output in `gdb-debug-log'."
:type 'boolean
- :group 'gud)
+ :group 'gud
+ :version "21.4")
(defcustom gdb-use-inferior-io-buffer nil
"Non-nil means display output from the inferior in a separate buffer."
:type 'boolean
- :group 'gud)
+ :group 'gud
+ :version "21.4")
(defun gdb-ann3 ()
(setq gdb-debug-log nil)
(setq comint-input-sender 'gdb-send)
;;
- ;; (re-)initialise
+ ;; (re-)initialize
(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-current-frame nil)
+ (setq gdb-current-stack-level nil)
(setq gdb-var-list nil)
(setq gdb-var-changed nil)
(setq gdb-first-prompt nil)
(setq gdb-prompting nil)
+ (setq gdb-input-queue nil)
(setq gdb-current-item nil)
(setq gdb-pending-triggers nil)
(setq gdb-output-sink 'user)
(setq gdb-server-prefix "server ")
+ (setq gdb-flush-pending-output nil)
;;
- (mapc 'make-local-variable gdb-variables)
(setq gdb-buffer-type 'gdba)
;;
(if gdb-use-inferior-io-buffer (gdb-clear-inferior-io))
(run-hooks 'gdba-mode-hook))
(defcustom gdb-use-colon-colon-notation nil
- "Non-nil means use FUNCTION::VARIABLE format to display variables in the
-speedbar."
+ "If non-nil use FUN::VAR format to display variables in the speedbar." ;
:type 'boolean
- :group 'gud)
+ :group 'gud
+ :version "21.4")
(defun gud-watch ()
"Watch expression at point."
(require 'tooltip)
(let ((expr (tooltip-identifier-from-point (point))))
(if (and (string-equal gdb-current-language "c")
- gdb-use-colon-colon-notation)
+ 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
+ (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)))
+ (select-window (get-buffer-window gud-comint-buffer 0)))
(defun gdb-goto-info ()
"Go to Emacs info node: GDB Graphical Interface."
(goto-char (point-min))
(re-search-forward ".*value=\"\\(.*?\\)\"" nil t)
(catch 'var-found
- (let ((var-list nil) (num 0))
+ (let ((num 0))
(dolist (var gdb-var-list)
(if (string-equal varnum (cadr var))
(progn
(defun gdb-var-update ()
(if (not (member 'gdb-var-update gdb-pending-triggers))
(progn
- (gdb-enqueue-input (list "server interpreter mi \"-var-update *\"\n"
+ (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))))
(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")
+ (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
(varnum (cadr var)))
(unless (string-match "\\." varnum)
(gdb-enqueue-input
- (list (concat "server interpreter mi \"-var-delete "
- varnum "\"\n")
+ (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)
(setq gdb-var-changed t))))))
(defun gdb-edit-value (text token indent)
- "Assign a value to a variable displayed in the speedbar"
+ "Assign a value to a variable displayed in the speedbar."
(let* ((var (nth (- (count-lines (point-min) (point)) 2) gdb-var-list))
(varnum (cadr var)) (value))
(setq value (read-string "New value: "))
(gdb-enqueue-input
- (list (concat "server interpreter mi \"-var-assign "
- varnum " " value "\"\n")
+ (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
- "Non-nil means use font-lock-warning-face to display values that have
-recently changed in the speedbar."
+ "If non-nil highlight values that have recently changed in the speedbar.
+The highlighting is done with `font-lock-warning-face'."
:type 'boolean
- :group 'gud)
+ :group 'gud
+ :version "21.4")
(defun gdb-speedbar-expand-node (text token indent)
"Expand the node the user clicked on.
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))
+ (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))))
-\f
-(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:
-
- user -- gdb output should be copied to the GUD buffer
- for the user to see.
-
- inferior -- gdb output should be copied to the inferior-io buffer
-
- pre-emacs -- output should be ignored util the post-prompt
- annotation is received. Then the output-sink
- becomes:...
- emacs -- output should be collected in the partial-output-buffer
- for subsequent processing by a command. This is the
- disposition of output generated by commands that
- 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.")
-
-;; end of gdb variables
(defun gdb-get-target-string ()
(with-current-buffer gud-comint-buffer
(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)
+ (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)))
(defun gdb-send (proc string)
"A comint send filter for gdb.
-This filter may simply queue output for a later time."
+This filter may simply queue input for a later time."
(if gud-running
(process-send-string proc (concat string "\n"))
(gdb-enqueue-input (concat string "\n"))))
(let ((last (car (last queue))))
(unless (nbutlast queue) (setq gdb-input-queue '()))
last))))
+
+(defun gdb-send-item (item)
+ (setq gdb-flush-pending-output nil)
+ (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)
+ (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)))))
\f
;;
;; output -- things gdb prints to emacs
(defcustom gud-gdba-command-name "gdb -annotate=3"
"Default command to execute an executable under the GDB-UI debugger."
:type 'string
- :group 'gud)
+ :group 'gud
+ :version "21.4")
(defvar gdb-annotation-rules
'(("pre-prompt" gdb-pre-prompt)
("stopped" gdb-stopped)
) "An assoc mapping annotation tags to functions which process them.")
+(defun gdb-resync()
+ (setq gdb-flush-pending-output t)
+ (setq gud-running nil)
+ (setq gdb-output-sink 'user)
+ (setq gdb-input-queue nil)
+ (setq gdb-pending-triggers nil)
+ (setq gdb-prompting t))
+
(defconst gdb-source-spec-regexp
"\\(.*\\):\\([0-9]*\\):[0-9]*:[a-z]*:\\(0x[a-f0-9]*\\)")
(match-string 1 args)
(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."
+ "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)
+ (gdb-resync)
(error "Phase error in gdb-pre-prompt (got %s)" sink)))))
(defun gdb-prompt (ignored)
(with-current-buffer (gdb-get-create-buffer 'gdb-partial-output-buffer)
(funcall handler))))
(t
- (setq gdb-output-sink 'user)
+ (gdb-resync)
(error "Phase error in gdb-prompt (got %s)" sink))))
(let ((input (gdb-dequeue-input)))
(if input
(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."
+ "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)
(setq gud-running t)
(if gdb-use-inferior-io-buffer
(setq gdb-output-sink 'inferior))))
- (t (error "Unexpected `starting' annotation")))))
+ (t
+ (gdb-resync)
+ (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."
+ "An annotation handler for `exited' and other annotations.
+They 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"))))))
+ (t
+ (gdb-resync)
+ (error "Unexpected stopping annotation"))))))
(defun gdb-frame-begin (ignored)
(let ((sink gdb-output-sink))
(setq gdb-output-sink 'user))
((eq sink 'user) t)
((eq sink 'emacs) t)
- (t (error "Unexpected frame-begin annotation (%S)" sink)))))
+ (t
+ (gdb-resync)
+ (error "Unexpected frame-begin annotation (%S)" sink)))))
(defun gdb-stopped (ignored)
- "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."
+ "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")))))
+ (t
+ (gdb-resync)
+ (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."
+ "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)
((eq sink 'pre-emacs)
(setq gdb-output-sink 'emacs))
(t
- (setq gdb-output-sink 'user)
+ (gdb-resync)
(error "Phase error in gdb-post-prompt (got %s)" sink)))))
(defun gud-gdba-marker-filter (string)
- "A gud marker filter for gdb. Handle a burst of output from GDB."
- (if gdb-enable-debug-log (push (cons 'recv string) gdb-debug-log))
- ;; Recall the left over gud-marker-acc from last time
- (setq gud-marker-acc (concat gud-marker-acc string))
- ;; Start accumulating output for the GUD buffer
- (let ((output ""))
- ;;
- ;; Process all the complete markers in this chunk.
- (while (string-match "\n\032\032\\(.*\\)\n" gud-marker-acc)
- (let ((annotation (match-string 1 gud-marker-acc)))
- ;;
- ;; Stuff prior to the match is just ordinary output.
- ;; It is either concatenated to OUTPUT or directed
- ;; elsewhere.
- (setq output
- (gdb-concat-output
- output
- (substring gud-marker-acc 0 (match-beginning 0))))
- ;;
- ;; Take that stuff off the gud-marker-acc.
- (setq gud-marker-acc (substring gud-marker-acc (match-end 0)))
- ;;
- ;; Parse the tag from the annotation, and maybe its arguments.
- (string-match "\\(\\S-*\\) ?\\(.*\\)" annotation)
- (let* ((annotation-type (match-string 1 annotation))
- (annotation-arguments (match-string 2 annotation))
- (annotation-rule (assoc annotation-type
- gdb-annotation-rules)))
- ;; Call the handler for this annotation.
- (if annotation-rule
- (funcall (car (cdr annotation-rule))
- annotation-arguments)
- ;; Else the annotation is not recognized. Ignore it silently,
- ;; so that GDB can add new annotations without causing
- ;; us to blow up.
- ))))
- ;;
- ;; Does the remaining text end in a partial line?
- ;; If it does, then keep part of the gud-marker-acc until we get more.
- (if (string-match "\n\\'\\|\n\032\\'\\|\n\032\032.*\\'"
- gud-marker-acc)
- (progn
- ;; Everything before the potential marker start can be output.
+ "A gud marker filter for gdb. Handle a burst of output from GDB."
+ (if gdb-flush-pending-output
+ nil
+ (if gdb-enable-debug-log (push (cons 'recv string) gdb-debug-log))
+ ;; Recall the left over gud-marker-acc from last time
+ (setq gud-marker-acc (concat gud-marker-acc string))
+ ;; Start accumulating output for the GUD buffer
+ (let ((output ""))
+ ;;
+ ;; Process all the complete markers in this chunk.
+ (while (string-match "\n\032\032\\(.*\\)\n" gud-marker-acc)
+ (let ((annotation (match-string 1 gud-marker-acc)))
+ ;;
+ ;; Stuff prior to the match is just ordinary output.
+ ;; It is either concatenated to OUTPUT or directed
+ ;; elsewhere.
(setq output
- (gdb-concat-output output
- (substring gud-marker-acc 0
- (match-beginning 0))))
+ (gdb-concat-output
+ output
+ (substring gud-marker-acc 0 (match-beginning 0))))
+ ;;
+ ;; Take that stuff off the gud-marker-acc.
+ (setq gud-marker-acc (substring gud-marker-acc (match-end 0)))
;;
- ;; Everything after, we save, to combine with later input.
- (setq gud-marker-acc (substring gud-marker-acc (match-beginning 0))))
+ ;; Parse the tag from the annotation, and maybe its arguments.
+ (string-match "\\(\\S-*\\) ?\\(.*\\)" annotation)
+ (let* ((annotation-type (match-string 1 annotation))
+ (annotation-arguments (match-string 2 annotation))
+ (annotation-rule (assoc annotation-type
+ gdb-annotation-rules)))
+ ;; Call the handler for this annotation.
+ (if annotation-rule
+ (funcall (car (cdr annotation-rule))
+ annotation-arguments)
+ ;; Else the annotation is not recognized. Ignore it silently,
+ ;; so that GDB can add new annotations without causing
+ ;; us to blow up.
+ ))))
;;
- ;; In case we know the gud-marker-acc contains no partial annotations:
- (progn
- (setq output (gdb-concat-output output gud-marker-acc))
- (setq gud-marker-acc "")))
- output))
+ ;; Does the remaining text end in a partial line?
+ ;; If it does, then keep part of the gud-marker-acc until we get more.
+ (if (string-match "\n\\'\\|\n\032\\'\\|\n\032\032.*\\'"
+ gud-marker-acc)
+ (progn
+ ;; Everything before the potential marker start can be output.
+ (setq output
+ (gdb-concat-output output
+ (substring gud-marker-acc 0
+ (match-beginning 0))))
+ ;;
+ ;; Everything after, we save, to combine with later input.
+ (setq gud-marker-acc (substring gud-marker-acc (match-beginning 0))))
+ ;;
+ ;; In case we know the gud-marker-acc contains no partial annotations:
+ (progn
+ (setq output (gdb-concat-output output gud-marker-acc))
+ (setq gud-marker-acc "")))
+ output)))
(defun gdb-concat-output (so-far new)
(let ((sink gdb-output-sink))
((eq sink 'inferior)
(gdb-append-to-inferior-io new)
so-far)
- (t (error "Bogon output sink %S" sink)))))
+ (t
+ (gdb-resync)
+ (error "Bogon output sink %S" sink)))))
(defun gdb-append-to-partial-output (string)
(with-current-buffer (gdb-get-create-buffer 'gdb-partial-output-buffer)
"PBM data used for disabled breakpoint icon.")
(defvar breakpoint-enabled-icon nil
- "Icon for enabled breakpoint in display margin")
+ "Icon for enabled breakpoint in display margin.")
(defvar breakpoint-disabled-icon nil
- "Icon for disabled breakpoint in display margin")
+ "Icon for disabled breakpoint in display margin.")
-(defvar breakpoint-bitmap nil
- "Bitmap for breakpoint in fringe")
+;; Bitmap for breakpoint in fringe
+(when (fboundp 'define-fringe-bitmap)
+ (define-fringe-bitmap 'breakpoint
+ "\x3c\x7e\xff\xff\xff\xff\x7e\x3c"))
(defface breakpoint-enabled-bitmap-face
'((t
:inherit fringe
:foreground "red"))
- "Face for enabled breakpoint icon in fringe.")
+ "Face for enabled breakpoint icon in fringe."
+ :group 'gud)
(defface breakpoint-disabled-bitmap-face
'((t
:inherit fringe
:foreground "grey60"))
- "Face for disabled breakpoint icon in fringe.")
+ "Face for disabled breakpoint icon in fringe."
+ :group 'gud)
;;-put breakpoint icons in relevant margins (even those set in the GUD buffer)
(defun gdb-info-breakpoints-custom ()
- (let ((flag)(address))
+ (let ((flag))
;;
;; remove all breakpoint-icons in source buffers but not assembler buffer
(dolist (buffer (buffer-list))
(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"
+ "Toggle breakpoint in left fringe/margin with mouse click."
(interactive "e")
(mouse-minibuffer-check event)
(let ((posn (event-end event)))
(save-excursion
(goto-char (posn-point posn))
(if (or (posn-object posn)
- (and breakpoint-bitmap
- (eq (car (fringe-bitmaps-at-pos (posn-point posn)))
- breakpoint-bitmap)))
+ (eq (car (fringe-bitmaps-at-pos (posn-point posn)))
+ 'breakpoint))
(gud-remove nil)
(gud-break nil)))))))
(gdb-get-create-buffer 'gdb-breakpoints-buffer)))
(defconst gdb-frame-parameters
- '((height . 12) (width . 60)
+ '((height . 14) (width . 80)
(unsplittable . t)
(tool-bar-lines . nil)
(menu-bar-lines . 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))
+ (let ((special-display-regexps (append special-display-regexps '(".*")))
+ (special-display-frame-alist gdb-frame-parameters))
+ (display-buffer (gdb-get-create-buffer 'gdb-breakpoints-buffer))))
(defvar gdb-breakpoints-mode-map
(let ((map (make-sparse-keymap))
(define-key map [menu-bar breakpoints] (cons "Breakpoints" menu))
(define-key map " " 'gdb-toggle-breakpoint)
(define-key map "d" 'gdb-delete-breakpoint)
+ (define-key map "q" 'kill-this-buffer)
(define-key map "\r" 'gdb-goto-breakpoint)
(define-key map [mouse-2] 'gdb-mouse-goto-breakpoint)
map))
"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)))
+ 'gdb-invalidate-breakpoints
+ 'gdbmi-invalidate-breakpoints))
(defun gdb-toggle-breakpoint ()
"Enable/disable the breakpoint at current line."
(interactive)
(save-excursion
(beginning-of-line 1)
- (if (not (looking-at "\\([0-9]+\\).*point\\s-*\\S-*\\s-*\\(.\\)"))
- (error "Not recognized as break/watchpoint line")
- (gdb-enqueue-input
- (list
- (concat
- (if (eq ?y (char-after (match-beginning 2)))
- gdb-server-prefix "disable "
- gdb-server-prefix "enable ")
- (match-string 1) "\n")
- 'ignore)))))
+ (if (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
+ (looking-at "\\([0-9]+\\).*point\\s-*\\S-*\\s-*\\(.\\)")
+ (looking-at
+ "\\([0-9]+\\)\\s-*\\S-*\\s-*\\S-*\\s-*\\(.\\)\\s-*\\S-*\\s-*\\S-*:[0-9]+"))
+ (gdb-enqueue-input
+ (list
+ (concat gdb-server-prefix
+ (if (eq ?y (char-after (match-beginning 2)))
+ "disable "
+ "enable ")
+ (match-string 1) "\n") 'ignore))
+ (error "Not recognized as break/watchpoint line"))))
(defun gdb-delete-breakpoint ()
"Delete the breakpoint at current line."
(interactive)
(beginning-of-line 1)
- (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))))
+ (if (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
+ (looking-at "\\([0-9]+\\).*point\\s-*\\S-*\\s-*\\(.\\)")
+ (looking-at
+ "\\([0-9]+\\)\\s-*\\S-*\\s-*\\S-*\\s-*.\\s-*\\S-*\\s-*\\S-*:[0-9]+"))
+ (gdb-enqueue-input
+ (list
+ (concat gdb-server-prefix "delete " (match-string 1) "\n") 'ignore))
+ (error "Not recognized as break/watchpoint line")))
(defun gdb-goto-breakpoint ()
"Display the breakpoint location specified at 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
- (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))))))))
+ (if (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
+ (looking-at ".*in\\s-+\\S-+\\s-+at\\s-+\\(\\S-*\\):\\([0-9]+\\)")
+ (looking-at
+ "[0-9]+\\s-*\\S-*\\s-*\\S-*\\s-*.\\s-*\\S-*\\s-*\\(\\S-*\\):\\([0-9]+\\)"))
+ (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 (display-buffer buf)))
+ (with-current-buffer buf
+ (goto-line (string-to-number line))
+ (set-window-point window (point))))))
+ (error "Not recognized as break/watchpoint line"))))
(defun gdb-mouse-goto-breakpoint (event)
"Display the breakpoint location that you click on."
'(mouse-face highlight
help-echo "mouse-2, RET: Select frame"))
(beginning-of-line)
- (when (and (or (looking-at "^#[0-9]*\\s-*\\S-* in \\(\\S-*\\)")
- (looking-at "^#[0-9]*\\s-*\\(\\S-*\\)"))
- (equal (match-string 1) gdb-current-frame))
+ (when (and (looking-at "^#\\([0-9]+\\)")
+ (equal (match-string 1) gdb-current-stack-level))
(put-text-property (point-at-bol) (point-at-eol)
'face '(:inverse-video t)))
(forward-line 1))))))
(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))
+ (let ((special-display-regexps (append special-display-regexps '(".*")))
+ (special-display-frame-alist gdb-frame-parameters))
+ (display-buffer (gdb-get-create-buffer 'gdb-stack-buffer))))
(defvar gdb-frames-mode-map
(let ((map (make-sparse-keymap)))
(suppress-keymap map)
+ (define-key map "q" 'kill-this-buffer)
(define-key map "\r" 'gdb-frames-select)
(define-key map [mouse-2] 'gdb-frames-mouse-select)
map))
"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)))
+ 'gdb-invalidate-frames
+ 'gdbmi-invalidate-frames))
(defun gdb-get-frame-number ()
(save-excursion
- (let* ((pos (re-search-backward "^#\\([0-9]*\\)" nil t))
+ (let* ((pos (re-search-backward "^#*\\([0-9]*\\)" nil t))
(n (or (and pos (match-string-no-properties 1)) "0")))
n)))
(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))
+ (let ((special-display-regexps (append special-display-regexps '(".*")))
+ (special-display-frame-alist gdb-frame-parameters))
+ (display-buffer (gdb-get-create-buffer 'gdb-threads-buffer))))
(defvar gdb-threads-mode-map
(let ((map (make-sparse-keymap)))
(suppress-keymap map)
+ (define-key map "q" 'kill-this-buffer)
(define-key map "\r" 'gdb-threads-select)
(define-key map [mouse-2] 'gdb-threads-mouse-select)
map))
"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)
- (gdb-invalidate-threads))
+ (run-mode-hooks 'gdb-threads-mode-hook)
+ 'gdb-invalidate-threads)
(defun gdb-get-thread-number ()
(save-excursion
(defvar gdb-registers-mode-map
(let ((map (make-sparse-keymap)))
(suppress-keymap map)
- map))
+ (define-key map "q" 'kill-this-buffer)
+ map))
(defun gdb-registers-mode ()
"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)
- (gdb-invalidate-registers))
+ (run-mode-hooks 'gdb-registers-mode-hook)
+ 'gdb-invalidate-registers)
(defun gdb-registers-buffer-name ()
(with-current-buffer gud-comint-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))
+ (let ((special-display-regexps (append special-display-regexps '(".*")))
+ (special-display-frame-alist gdb-frame-parameters))
+ (display-buffer (gdb-get-create-buffer 'gdb-registers-buffer))))
\f
;;
;; Locals buffer.
(defvar gdb-locals-mode-map
(let ((map (make-sparse-keymap)))
(suppress-keymap map)
- map))
+ (define-key map "q" 'kill-this-buffer)
+ map))
(defun gdb-locals-mode ()
"Major mode for gdb locals.
\\{gdb-locals-mode-map}"
+ (kill-all-local-variables)
(setq major-mode 'gdb-locals-mode)
- (setq mode-name "Locals")
+ (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)))
+ 'gdb-invalidate-locals
+ 'gdbmi-invalidate-locals))
(defun gdb-locals-buffer-name ()
(with-current-buffer gud-comint-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))
+ (let ((special-display-regexps (append special-display-regexps '(".*")))
+ (special-display-frame-alist gdb-frame-parameters))
+ (display-buffer (gdb-get-create-buffer 'gdb-locals-buffer))))
\f
;;;; Window management
-
-;;; The way we abuse the dedicated-p flag is pretty gross, but seems
-;;; to do the right thing. Seeing as there is no way for Lisp code to
-;;; get at the use_time field of a window, I'm not sure there exists a
-;;; more elegant solution without writing C code.
-
(defun gdb-display-buffer (buf &optional size)
- (let ((must-split nil)
- (answer nil))
- (unwind-protect
- (progn
- (walk-windows
- #'(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)
- (setq answer window))
- (setq must-split t)))))
- (walk-windows
- #'(lambda (win)
- (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))
- (set-window-buffer answer buf)))
- answer))
-
-(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))
+ (let ((answer (get-buffer-window buf 0))
+ (must-split nil))
+ (if answer
+ (display-buffer buf) ;Raise the frame if necessary.
+ ;; The buffer is not yet displayed.
+ (pop-to-buffer gud-comint-buffer) ;Select the right frame.
+ (let ((window (get-lru-window)))
+ (if window
+ (progn
+ (set-window-buffer window buf)
+ (setq answer window))
+ (setq must-split t)))
+ (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))
+ (set-window-buffer answer buf)
+ (set-window-dedicated-p answer t)))
+ answer)))
\f
;;; Shared keymap initialization:
(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]
- `(menu-item "View" ,menu :visible (eq gud-minor-mode 'gdba)))
-; (define-key menu [both] '(menu-item "Both" gdb-view-both
-; :help "Display both source and assembler"
-; :button (:radio . (eq gdb-selected-view 'both))))
- (define-key menu [assembler] '(menu-item "Machine" gdb-view-assembler
- :help "Display assembler only"
- :button (:radio . (eq gdb-selected-view 'assembler))))
- (define-key menu [source] '(menu-item "Source" gdb-view-source-function
- :help "Display source only"
- :button (:radio . (eq gdb-selected-view 'source)))))
-
(let ((menu (make-sparse-keymap "GDB-UI")))
(define-key gud-menu-map [ui]
`(menu-item "GDB-UI" ,menu :visible (eq gud-minor-mode 'gdba)))
(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
- (if gud-last-last-frame
- (gud-find-file (car gud-last-last-frame))
- (gud-find-file gdb-main-file))))
- (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()
-;(interactive)
-;(setq gdb-selected-view 'both))
-
(defcustom gdb-show-main nil
"Nil means don't display source file containing the main routine."
:type 'boolean
- :group 'gud)
+ :group 'gud
+ :version "21.4")
+
+(defun gdb-set-window-buffer (name)
+ (set-window-buffer (selected-window) (get-buffer name))
+ (set-window-dedicated-p (selected-window) t))
(defun gdb-setup-windows ()
"Layout the window pattern for gdb-many-windows."
(delete-other-windows)
(gdb-display-breakpoints-buffer)
(delete-other-windows)
- (switch-to-buffer gud-comint-buffer)
+ ; Don't dedicate.
+ (pop-to-buffer gud-comint-buffer)
(split-window nil ( / ( * (window-height) 3) 4))
(split-window nil ( / (window-height) 3))
(split-window-horizontally)
(other-window 1)
- (switch-to-buffer (gdb-locals-buffer-name))
+ (gdb-set-window-buffer (gdb-locals-buffer-name))
(other-window 1)
(switch-to-buffer
- (if (and gdb-view-source
- (eq gdb-selected-view 'source))
(if gud-last-last-frame
(gud-find-file (car gud-last-last-frame))
- (gud-find-file gdb-main-file))
- (gdb-get-create-buffer 'gdb-assembler-buffer)))
+ (gud-find-file gdb-main-file)))
(when gdb-use-inferior-io-buffer
(split-window-horizontally)
(other-window 1)
- (switch-to-buffer (gdb-inferior-io-name)))
+ (gdb-set-window-buffer (gdb-inferior-io-name)))
(other-window 1)
- (switch-to-buffer (gdb-stack-buffer-name))
+ (gdb-set-window-buffer (gdb-stack-buffer-name))
(split-window-horizontally)
(other-window 1)
- (switch-to-buffer (gdb-breakpoints-buffer-name))
+ (gdb-set-window-buffer (gdb-breakpoints-buffer-name))
(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'."
+ "Nil 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)
+ :group 'gud
+ :version "21.4")
(defun gdb-many-windows (arg)
"Toggle the number of windows in the basic arrangement."
"Restore the basic arrangement of windows used by gdba.
This arrangement depends on the value of `gdb-many-windows'."
(interactive)
- (if gdb-many-windows
- (progn
- (switch-to-buffer gud-comint-buffer)
- (delete-other-windows)
- (gdb-setup-windows))
- (switch-to-buffer gud-comint-buffer)
+ (pop-to-buffer gud-comint-buffer) ;Select the right window and frame.
(delete-other-windows)
+ (if gdb-many-windows
+ (gdb-setup-windows)
(split-window)
(other-window 1)
(switch-to-buffer
- (if (and gdb-view-source
- (eq gdb-selected-view 'source))
(if gud-last-last-frame
(gud-find-file (car gud-last-last-frame))
- (gud-find-file gdb-main-file))
- (gdb-get-create-buffer 'gdb-assembler-buffer)))
+ (gud-find-file gdb-main-file)))
(other-window 1)))
(defun gdb-reset ()
- "Exit a debugging session cleanly by killing the gdb buffers and resetting
- the source buffers."
+ "Exit a debugging session cleanly.
+Kills the gdb buffers and resets the source buffers."
(dolist (buffer (buffer-list))
(unless (eq buffer gud-comint-buffer)
(with-current-buffer buffer
(setq gdb-cdir (match-string 0))))
(if (search-forward "Located in " nil t)
(if (looking-at "\\S-*")
- (setq gdb-main-file (match-string 0)))
- (setq gdb-view-source nil))
- (if gdb-many-windows
+ (setq gdb-main-file (match-string 0))))
+ (if gdb-many-windows
(gdb-setup-windows)
(gdb-get-create-buffer 'gdb-breakpoints-buffer)
- (when gdb-show-main
- (switch-to-buffer gud-comint-buffer)
- (delete-other-windows)
- (split-window)
- (other-window 1)
- (switch-to-buffer
- (if gdb-view-source
- (gud-find-file gdb-main-file)
- (gdb-get-create-buffer 'gdb-assembler-buffer)))
- (other-window 1))))
+ (if gdb-show-main
+ (let ((pop-up-windows t))
+ (display-buffer (gud-find-file gdb-main-file))))))
;;from put-image
(defun gdb-put-string (putstring pos &optional dprop)
(if (>= (car (window-fringes)) 8)
(gdb-put-string
nil (1+ start)
- `(left-fringe
- ,(or breakpoint-bitmap
- (setq breakpoint-bitmap
- (define-fringe-bitmap
- "\x3c\x7e\xff\xff\xff\xff\x7e\x3c")))
+ `(left-fringe breakpoint
,(if enabled
'breakpoint-enabled-bitmap-face
'breakpoint-disabled-bitmap-face)))
(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)
+ (if (get-buffer-window (current-buffer) 0)
+ (set-window-margins
+ (get-buffer-window (current-buffer) 0)
left-margin-width right-margin-width))))
(put-image
(if enabled
(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)
+ (if (get-buffer-window (current-buffer) 0)
+ (set-window-margins
+ (get-buffer-window (current-buffer) 0)
left-margin-width right-margin-width))))
(gdb-put-string (if enabled "B" "b") (1+ start)))))
(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)
+ (if (get-buffer-window (current-buffer) 0)
+ (set-window-margins
+ (get-buffer-window (current-buffer) 0)
left-margin-width right-margin-width))))
\f
(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))))
+ (set-window-point (get-buffer-window buffer 0) pos))))
(defvar gdb-assembler-mode-map
(let ((map (make-sparse-keymap)))
(suppress-keymap map)
- map))
+ (define-key map "q" 'kill-this-buffer)
+ 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)
(setq fringes-outside-margins t)
(setq buffer-read-only t)
(use-local-map gdb-assembler-mode-map)
- (gdb-invalidate-assembler))
+ (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
(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))
+ (let ((special-display-regexps (append special-display-regexps '(".*")))
+ (special-display-frame-alist gdb-frame-parameters))
+ (display-buffer (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
(progn
;; take previous disassemble command off the queue
(with-current-buffer gud-comint-buffer
- (let ((queue gdb-input-queue) (item))
+ (let ((queue gdb-input-queue))
(dolist (item queue)
(if (equal (cdr item) '(gdb-assembler-handler))
(setq gdb-input-queue
(delq 'gdb-get-current-frame gdb-pending-triggers))
(with-current-buffer (gdb-get-create-buffer 'gdb-partial-output-buffer)
(goto-char (point-min))
+ (if (looking-at "Stack level \\([0-9]+\\)")
+ (setq gdb-current-stack-level (match-string 1)))
(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)
(setq gdb-current-address
(concat "0x" (match-string 1 address)))
(setq gdb-current-address (concat "0x" address))))
- (if (or (if (not (re-search-forward "(\\S-*:[0-9]*);" nil t))
- (progn (setq gdb-view-source nil) t))
- (eq gdb-selected-view 'assembler))
- (progn
- (gdb-display-buffer
- (gdb-get-create-buffer 'gdb-assembler-buffer))
+ (if (not (re-search-forward "(\\S-*:[0-9]*);" nil t))
;;update with new frame for machine code if necessary
- (gdb-invalidate-assembler))))))
+ (gdb-invalidate-assembler)))))
(if (re-search-forward " source language \\(\\S-*\\)\." nil t)
(setq gdb-current-language (match-string 1))))