diff options
| author | Nick Roberts <nickrob@snap.net.nz> | 2008-04-24 22:26:38 +0000 |
|---|---|---|
| committer | Nick Roberts <nickrob@snap.net.nz> | 2008-04-24 22:26:38 +0000 |
| commit | 3ed96733c694187b6008a097a251a5a694c8ae50 (patch) | |
| tree | cf033c1f609f36dc838a3ddb3be92ffa90938bb4 /lisp/progmodes/gdb-ui.el | |
| parent | ed466c8e47ffb7b1177d93b8c2966d60883218bc (diff) | |
| download | emacs-3ed96733c694187b6008a097a251a5a694c8ae50.tar.gz | |
(gdb-invalidate-assembler): Compare numeric
value of addresses rather than (partial) string value.
(gdb-frame-handler): Change regexp according to above change.
Diffstat (limited to 'lisp/progmodes/gdb-ui.el')
| -rw-r--r-- | lisp/progmodes/gdb-ui.el | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el index a3f3993629c..15de8f3f663 100644 --- a/lisp/progmodes/gdb-ui.el +++ b/lisp/progmodes/gdb-ui.el @@ -3538,8 +3538,9 @@ BUFFER nil or omitted means use the current buffer." (string-equal gdb-selected-frame gdb-previous-frame)) (if (or (not (member 'gdb-invalidate-assembler gdb-pending-triggers)) - (not (string-equal gdb-pc-address - gdb-previous-frame-pc-address))) + (not (equal (string-to-number gdb-pc-address) + (string-to-number + gdb-previous-frame-pc-address)))) (progn ;; take previous disassemble command, if any, off the queue (with-current-buffer gud-comint-buffer @@ -3550,9 +3551,7 @@ BUFFER nil or omitted means use the current buffer." (delete item gdb-input-queue)))))) (gdb-enqueue-input (list - (concat gdb-server-prefix "disassemble " - (if (member gdb-pc-address '(nil "main")) nil "0x") - gdb-pc-address "\n") + (concat gdb-server-prefix "disassemble " gdb-pc-address "\n") 'gdb-assembler-handler)) (push 'gdb-invalidate-assembler gdb-pending-triggers) (setq gdb-previous-frame-pc-address gdb-pc-address) @@ -3579,7 +3578,7 @@ BUFFER nil or omitted means use the current buffer." (setq gdb-frame-number (match-string 1)) (setq gdb-frame-address (match-string 2))) (goto-char (point-min)) - (when (re-search-forward ".*=\\s-+0x0*\\(\\S-*\\)\\s-+in\\s-+\\(.*?\\)\ + (when (re-search-forward ".*=\\s-+\\(\\S-*\\)\\s-+in\\s-+\\(.*?\\)\ \\(?: (\\(\\S-+?\\):[0-9]+?)\\)*; " nil t) (setq gdb-selected-frame (match-string 2)) |