[Emacs-diffs] Changes to emacs/lisp/progmodes/gdb-ui.el,v

[Nick Roberts]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Nick Roberts <nickrob>  08/04/24 22:26:39

Index: gdb-ui.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/gdb-ui.el,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -b -r1.237 -r1.238
--- gdb-ui.el   23 Apr 2008 05:55:36 -0000      1.237
+++ gdb-ui.el   24 Apr 2008 22:26:38 -0000      1.238
@@ -3538,8 +3538,9 @@
                     (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 @@
                            (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 @@
     (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))