* gdbtk.c (gdb_get_tracepoint_info): Change formatting of address.

        (tracepoint_exists): Remove code which confuses assembly traces.

diff --git a/gdb/ChangeLog-gdbtk b/gdb/ChangeLog-gdbtk
index 0bb53f24beda794fe22d6bec6e5a5b25057ce13b..0a0254fd0a99f81ac1dee2391f894167762fdefc 100644 (file)
--- a/gdb/ChangeLog-gdbtk
+++ b/gdb/ChangeLog-gdbtk
@@ -1,3 +1,8 @@
+Sun Mar 29 21:19:46 1998  Keith Seitz  <keiths@onions.cygnus.com>
+
+       * gdbtk.c (gdb_get_tracepoint_info): Change formatting of address.
+       (tracepoint_exists): Remove code which confuses assembly traces.
+
 Sat Mar 28 12:13:23 1998  Keith Seitz  <keiths@onions.cygnus.com>
 
        * gdbtk.c (gdb_cmd): If argc > 2, assume that the busy and idle hooks

diff --git a/gdb/gdbtk.c b/gdb/gdbtk.c
index 33091548a130808752494ebe2df4c5d98e0f1270..5737fbdb9e1c60fcaf670e7ebbe14715eaa4799e 100644 (file)
--- a/gdb/gdbtk.c
+++ b/gdb/gdbtk.c
@@ -2704,7 +2704,7 @@ gdb_get_tracepoint_info (clientData, interp, objc, objv)
   find_pc_partial_function (tp->address, &funcname, NULL, NULL);
   Tcl_ListObjAppendElement (interp, list, Tcl_NewStringObj (funcname, -1));
   Tcl_ListObjAppendElement (interp, list, Tcl_NewIntObj (sal.line));
-  sprintf (tmp, "0x%08x", tp->address);
+  sprintf (tmp, "0x%lx", tp->address);
   Tcl_ListObjAppendElement (interp, list, Tcl_NewStringObj (tmp, -1));
   Tcl_ListObjAppendElement (interp, list, Tcl_NewIntObj (tp->enabled));
   Tcl_ListObjAppendElement (interp, list, Tcl_NewIntObj (tp->pass_count));
@@ -2865,11 +2865,13 @@ tracepoint_exists (char * args)
             {
               if (tp->address == sals.sals[0].pc)
                 result = tp->number;
+#if 0
+              /* Why is this here? This messes up assembly traces */
               else if (tp->source_file != NULL
                        && strcmp (tp->source_file, file) == 0
                        && sals.sals[0].line == tp->line_number)
-                
                 result = tp->number;
+#endif                
             }
         }
     }