bp->address => bp->loc->address

bp->address => bp->loc->address

[David Carlton]

I've committed the following patch, replacing uses of bp->address by
bp->loc->address.  Tested by compiling (the build had been broken),
and committed as obvious; Daniel, I assume this is correct, but please
let me know if there's something else that should be done here.

David Carlton
carlton@kealia.com

2003-11-11  David Carlton  <carlton@kealia.com>

	* generic/gdbtk-bp.c (gdb_find_bp_at_addr): Replace use of
	BREAKPOINT->address by BREAKPOINT->loc->address.
	(gdb_get_breakpoint_info): Ditto.

Index: gdbtk-bp.c
===================================================================
RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk-bp.c,v
retrieving revision 1.20
diff -u -p -r1.20 gdbtk-bp.c
--- gdbtk-bp.c	6 Mar 2003 21:45:39 -0000	1.20
+++ gdbtk-bp.c	11 Nov 2003 18:54:56 -0000
@@ -220,7 +220,7 @@ gdb_find_bp_at_addr (ClientData clientDa
   for (i = 0; i < breakpoint_list_size; i++)
     {
       if (breakpoint_list[i] != NULL
-	  && breakpoint_list[i]->address == addr)
+	  && breakpoint_list[i]->loc->address == addr)
 	Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
 				  Tcl_NewIntObj (i));
     }
@@ -310,7 +310,7 @@ gdb_get_breakpoint_info (ClientData clie
       return TCL_ERROR;
     }
 
-  sal = find_pc_line (b->address, 0);
+  sal = find_pc_line (b->loc->address, 0);
 
   filename = symtab_to_filename (sal.symtab);
   if (filename == NULL)
@@ -320,14 +320,16 @@ gdb_get_breakpoint_info (ClientData clie
   Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
 			    Tcl_NewStringObj (filename, -1));
 
-  funcname = pc_function_name (b->address);
+  funcname = pc_function_name (b->loc->address);
   new_obj = Tcl_NewStringObj (funcname, -1);
   Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr, new_obj);
 
   Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
 			    Tcl_NewIntObj (b->line_number));
   Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
-			    Tcl_NewStringObj (core_addr_to_string (b->address), -1));
+			    Tcl_NewStringObj (core_addr_to_string
+					      (b->loc->address),
+					      -1));
   Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
 			    Tcl_NewStringObj (bptypes[b->type], -1));
   Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,

Re: bp->address => bp->loc->address

[Daniel Jacobowitz]

On Tue, Nov 11, 2003 at 10:58:30AM -0800, David Carlton wrote:
> I've committed the following patch, replacing uses of bp->address by
> bp->loc->address.  Tested by compiling (the build had been broken),
> and committed as obvious; Daniel, I assume this is correct, but please
> let me know if there's something else that should be done here.

Thank you.  It will do for now.  I don't know what we will have to do
about it later when multiple addresses are available; an Insight
developer gets to figure that out :)

> 
> David Carlton
> carlton@kealia.com
> 
> 2003-11-11  David Carlton  <carlton@kealia.com>
> 
> 	* generic/gdbtk-bp.c (gdb_find_bp_at_addr): Replace use of
> 	BREAKPOINT->address by BREAKPOINT->loc->address.
> 	(gdb_get_breakpoint_info): Ditto.
> 
> Index: gdbtk-bp.c
> ===================================================================
> RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk-bp.c,v
> retrieving revision 1.20
> diff -u -p -r1.20 gdbtk-bp.c
> --- gdbtk-bp.c	6 Mar 2003 21:45:39 -0000	1.20
> +++ gdbtk-bp.c	11 Nov 2003 18:54:56 -0000
> @@ -220,7 +220,7 @@ gdb_find_bp_at_addr (ClientData clientDa
>    for (i = 0; i < breakpoint_list_size; i++)
>      {
>        if (breakpoint_list[i] != NULL
> -	  && breakpoint_list[i]->address == addr)
> +	  && breakpoint_list[i]->loc->address == addr)
>  	Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
>  				  Tcl_NewIntObj (i));
>      }
> @@ -310,7 +310,7 @@ gdb_get_breakpoint_info (ClientData clie
>        return TCL_ERROR;
>      }
>  
> -  sal = find_pc_line (b->address, 0);
> +  sal = find_pc_line (b->loc->address, 0);
>  
>    filename = symtab_to_filename (sal.symtab);
>    if (filename == NULL)
> @@ -320,14 +320,16 @@ gdb_get_breakpoint_info (ClientData clie
>    Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
>  			    Tcl_NewStringObj (filename, -1));
>  
> -  funcname = pc_function_name (b->address);
> +  funcname = pc_function_name (b->loc->address);
>    new_obj = Tcl_NewStringObj (funcname, -1);
>    Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr, new_obj);
>  
>    Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
>  			    Tcl_NewIntObj (b->line_number));
>    Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
> -			    Tcl_NewStringObj (core_addr_to_string (b->address), -1));
> +			    Tcl_NewStringObj (core_addr_to_string
> +					      (b->loc->address),
> +					      -1));
>    Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
>  			    Tcl_NewStringObj (bptypes[b->type], -1));
>    Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
> 

-- 
Daniel Jacobowitz
MontaVista Software                         Debian GNU/Linux Developer