[PATCH/gdbtk] Make gdbtk compile again

Roland Schwingel <[email protected]> Fri, 25 May 2012 13:36:21 +0200

Newsgroups	gmane.comp.debugging.insight
Message-ID	<[email protected]>

Hi...

Due to recent changes in gdb's signal handling, the addition of dprintf 
and changes to blocks gdbtk was no longer compiling. I committed the 
attached simple patch to fix this.

Changelog:
2012-05-25  Roland Schwingel  <[email protected]>

    * generic/gdbtk-bp.c (gdb_set_bp): Add new NULL param
    to call to create_breakpoint() due to changes in gdb.
    * generic/gdbtk-cmds.c (gdb_listfuncs): Iterator param
    in call to ALL_BLOCK_SYMBOLS() now is a pointer to
    struct block_iterator instead of struct dict_iterator.
    * generic/gdbtk-stack.c (gdb_block_vars,gdb_get_blocks)
    (gdb_get_vars_command): Likewise.
    * generic/gdbtk-hooks.c (gdbtk_annotate_signal): Change
    function calls: target_signal_to_name -> gdb_signal_to_name
    target_signal_to_string -> gdb_signal_to_string due to
    recent changes in gdb.

I hope this was ok as it blocked reintegration of my other patches.

Roland

patch.txt (text/plain, 2.1 KB)

$svn diff
Index: gdbtk-stack.c
===================================================================
--- gdbtk-stack.c       (revision 117583)
+++ gdbtk-stack.c       (working copy)
@@ -92,7 +92,7 @@
                int objc, Tcl_Obj *CONST objv[])
 {
   struct block *block;
-  struct dict_iterator iter;
+  struct block_iterator iter;
   struct symbol *sym;
   CORE_ADDR start, end;

@@ -162,7 +162,7 @@
                int objc, Tcl_Obj *CONST objv[])
 {
   struct block *block;
-  struct dict_iterator iter;
+  struct block_iterator iter;
   int junk;
   struct symbol *sym;
   CORE_ADDR pc;
@@ -282,7 +282,7 @@
   struct symbol *sym;
   struct block *block;
   char *args;
-  struct dict_iterator iter;
+  struct block_iterator iter;
   int i, arguments;

   if (objc > 2)
Index: gdbtk-hooks.c
===================================================================
--- gdbtk-hooks.c       (revision 117583)
+++ gdbtk-hooks.c       (working copy)
@@ -818,8 +818,8 @@
   tp = inferior_thread ();

   buf = xstrprintf ("gdbtk_signal %s {%s}",
-            target_signal_to_name (tp->suspend.stop_signal),
-            target_signal_to_string (tp->suspend.stop_signal));
+            gdb_signal_to_name (tp->suspend.stop_signal),
+            gdb_signal_to_string (tp->suspend.stop_signal));
   if (Tcl_Eval (gdbtk_interp, buf) != TCL_OK)
     report_error ();
   free(buf);
Index: gdbtk-cmds.c
===================================================================
--- gdbtk-cmds.c        (revision 117583)
+++ gdbtk-cmds.c        (working copy)
@@ -1537,7 +1537,7 @@
   struct block *b;
   struct symbol *sym;
   int i;
-  struct dict_iterator iter;
+  struct block_iterator iter;
   Tcl_Obj *funcVals[2];

   if (objc != 2)
Index: gdbtk-bp.c
===================================================================
--- gdbtk-bp.c  (revision 117583)
+++ gdbtk-bp.c  (working copy)
@@ -535,6 +535,7 @@
   TRY_CATCH (e, RETURN_MASK_ALL)
     {
       create_breakpoint (get_current_arch (), address, condition, thread,
+                        NULL,
                         0      /* condition and thread are valid */,
                         temp,
                         bp_breakpoint /* type wanted */,