From 8ed444119e98e77fb02391681951681d44987496 Mon Sep 17 00:00:00 2001 From: Martin Hunt Date: Fri, 11 Jun 2004 18:49:38 +0000 Subject: [PATCH] 2004-06-11 Martin Hunt * generic/gdbtk-cmds.c (gdb_find_file_command): Use symtab_to_fullname() instead of symtab_to_filename(). (gdb_loc): Ditto. (gdb_loadfile): Ditto. * generic/gdbtk-bp.c (gdb_get_breakpoint_info): Ditto. (gdb_get_tracepoint_info): Ditto. * generic/gdbtk-register.c (get_register): Simplify and remove references to DEPRECATED_REGISTER_CONVERT_TO_VIRTUAL. --- gdb/gdbtk/ChangeLog | 12 ++++++++++++ gdb/gdbtk/generic/gdbtk-bp.c | 5 +++-- gdb/gdbtk/generic/gdbtk-cmds.c | 6 +++--- gdb/gdbtk/generic/gdbtk-register.c | 21 +++++---------------- 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/gdb/gdbtk/ChangeLog b/gdb/gdbtk/ChangeLog index ae25ae19c8..a3fc8cd60c 100644 --- a/gdb/gdbtk/ChangeLog +++ b/gdb/gdbtk/ChangeLog @@ -1,3 +1,15 @@ +2004-06-11 Martin Hunt + + * generic/gdbtk-cmds.c (gdb_find_file_command): Use + symtab_to_fullname() instead of symtab_to_filename(). + (gdb_loc): Ditto. + (gdb_loadfile): Ditto. + * generic/gdbtk-bp.c (gdb_get_breakpoint_info): Ditto. + (gdb_get_tracepoint_info): Ditto. + + * generic/gdbtk-register.c (get_register): Simplify and remove + references to DEPRECATED_REGISTER_CONVERT_TO_VIRTUAL. + 2004-05-27 Martin Hunt * library/tdump.tcl (build_win): Remove old nonworking diff --git a/gdb/gdbtk/generic/gdbtk-bp.c b/gdb/gdbtk/generic/gdbtk-bp.c index 9c46a4cc73..8ed01c49b1 100644 --- a/gdb/gdbtk/generic/gdbtk-bp.c +++ b/gdb/gdbtk/generic/gdbtk-bp.c @@ -21,6 +21,7 @@ #include "defs.h" #include "symtab.h" #include "symfile.h" +#include "source.h" #include "linespec.h" #include "breakpoint.h" #include "tracepoint.h" @@ -312,7 +313,7 @@ gdb_get_breakpoint_info (ClientData clientData, Tcl_Interp *interp, int objc, sal = find_pc_line (b->loc->address, 0); - filename = symtab_to_filename (sal.symtab); + filename = symtab_to_fullname (sal.symtab); if (filename == NULL) filename = ""; @@ -825,7 +826,7 @@ gdb_get_tracepoint_info (ClientData clientData, Tcl_Interp *interp, Tcl_SetListObj (result_ptr->obj_ptr, 0, NULL); sal = find_pc_line (tp->address, 0); - filename = symtab_to_filename (sal.symtab); + filename = symtab_to_fullname (sal.symtab); if (filename == NULL) filename = "N/A"; Tcl_ListObjAppendElement (interp, result_ptr->obj_ptr, diff --git a/gdb/gdbtk/generic/gdbtk-cmds.c b/gdb/gdbtk/generic/gdbtk-cmds.c index 2c8ecb286c..32a1bacc32 100644 --- a/gdb/gdbtk/generic/gdbtk-cmds.c +++ b/gdb/gdbtk/generic/gdbtk-cmds.c @@ -1079,7 +1079,7 @@ gdb_find_file_command (ClientData clientData, Tcl_Interp *interp, } fullname = - (st->fullname == NULL ? symtab_to_filename (st) : st->fullname); + (st->fullname == NULL ? symtab_to_fullname (st) : st->fullname); } /* We may not be able to open the file (not available). */ @@ -2189,7 +2189,7 @@ gdb_loc (ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST obj Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr, Tcl_NewStringObj (fname, -1)); - filename = symtab_to_filename (sal.symtab); + filename = symtab_to_fullname (sal.symtab); if (filename == NULL) filename = ""; @@ -2647,7 +2647,7 @@ gdb_loadfile (ClientData clientData, Tcl_Interp *interp, int objc, return TCL_ERROR; } - file = symtab_to_filename ( symtab ); + file = symtab_to_fullname ( symtab ); if ((fp = fopen ( file, "r" )) == NULL) { gdbtk_set_result (interp, "Can't open file for reading"); diff --git a/gdb/gdbtk/generic/gdbtk-register.c b/gdb/gdbtk/generic/gdbtk-register.c index a24285a3e3..c827633077 100644 --- a/gdb/gdbtk/generic/gdbtk-register.c +++ b/gdb/gdbtk/generic/gdbtk-register.c @@ -266,8 +266,7 @@ get_register (int regnum, void *arg) CORE_ADDR addr; enum lval_type lval; struct type *reg_vtype; - char raw_buffer[MAX_REGISTER_SIZE]; - char virtual_buffer[MAX_REGISTER_SIZE]; + char buffer[MAX_REGISTER_SIZE]; int optim, format; struct cleanup *old_chain = NULL; struct ui_file *stb; @@ -292,7 +291,7 @@ get_register (int regnum, void *arg) } frame_register (get_selected_frame (), regnum, &optim, &lval, - &addr, &realnum, raw_buffer); + &addr, &realnum, buffer); if (optim) { @@ -301,16 +300,6 @@ get_register (int regnum, void *arg) return; } - /* Convert raw data to virtual format if necessary. */ - if (DEPRECATED_REGISTER_CONVERTIBLE_P () && DEPRECATED_REGISTER_CONVERTIBLE (regnum)) - { - DEPRECATED_REGISTER_CONVERT_TO_VIRTUAL (regnum, reg_vtype, - raw_buffer, virtual_buffer); - } - else - memcpy (virtual_buffer, raw_buffer, - DEPRECATED_REGISTER_VIRTUAL_SIZE (regnum)); - stb = mem_fileopen (); old_chain = make_cleanup_ui_file_delete (stb); @@ -326,7 +315,7 @@ get_register (int regnum, void *arg) { int idx = TARGET_BYTE_ORDER == BFD_ENDIAN_BIG ? j : DEPRECATED_REGISTER_RAW_SIZE (regnum) - 1 - j; - sprintf (ptr, "%02x", (unsigned char) raw_buffer[idx]); + sprintf (ptr, "%02x", (unsigned char) buffer[idx]); ptr += 2; } fputs_unfiltered (buf, stb); @@ -337,11 +326,11 @@ get_register (int regnum, void *arg) && (strcmp (FIELD_NAME (TYPE_FIELD (reg_vtype, 0)), REGISTER_NAME (regnum)) == 0)) { - val_print (FIELD_TYPE (TYPE_FIELD (reg_vtype, 0)), virtual_buffer, 0, 0, + val_print (FIELD_TYPE (TYPE_FIELD (reg_vtype, 0)), buffer, 0, 0, stb, format, 1, 0, Val_pretty_default); } else - val_print (reg_vtype, virtual_buffer, 0, 0, + val_print (reg_vtype, buffer, 0, 0, stb, format, 1, 0, Val_pretty_default); } -- 2.11.0