mirror of
https://github.com/bminor/binutils-gdb.git
synced 2025-12-26 17:18:55 +00:00
gcc -Wall lint:
* breakpoint.c (watchpoint_check): Remove unused variable b. * stack.c (print_frame_info): Move sp and buf inside #if. * eval.c (evaluate_subexp): Remove unused variables pp, mangle_ptr, ptr, and mangle_tstr. * valarith.c (value_x_binop): Remove unused variables mangle_tstr and mangle_ptr. * symtab.c (lookup_symtab): Put variable copy inside #if. (decode_line_1): Put variable q1 inside #if 0. * target.h: Declare target_link. * infrun.c (wait_for_inferior): Remove unused variables signame. * remote.c (remote_resume): Remove unused variable name. * c-exp.y (parse_number): Parenthesize operand of shift. * dbxread.c (record_minimal_symbol): Parenthesize operand of && (this is a semantic change, the warning seems to have detected a bug). * dbxread.c (end_psymtab): Move variable p1 inside #if. * coffread.c: Move variable temptype inside #if. * ch-typeprint.c (chill_type_print_base): Remove unused variable name. * ch-valprint.c: #include typeprint.h and ch-lang.h. (chill_val_print): Remove unused variable in_range. (chill_val_print): Remove statement "length > TYPE_LENGTH (type);". (chill_val_print): Add default case for switch. * stabsread.h: Declare stabsect_build_psymtabs. * os9kread.c (read_minimal_symbols): Make this return void. (os9k_symfile_read): Remove unused variables stb_exist and val. (os9k_symfile_init): Remove unused variable val. (fill_sym): Remove unused variable id. (read_os9k_psymtab): Put variable back_to inside #if 0. Remove unused variable nsl. Remove unused variable symfile_bfd. #if 0 unused variables lbrac_unmatched_complaint and lbrac_mismatch_complaint. Remove declaration for non-existent function os9k_next_symbol_text. * annotate.c, annotate.h: New files, containing a function for each annotation which outputs it. * Move breakpoints_changed from breakpoint.c to annotate.c. * breakpoint.c, blockframe.c, infrun.c, cp-valprint.c, main.c, printcmd.c, source.c, stack.c, utils.c, valprint.c: Use annotate.c functions to output annotations. * Makefile.in (OBS): Add annotate.o.
This commit is contained in:
Jim Kingdon
@@ -33,6 +33,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
|
||||
#include "breakpoint.h"
|
||||
#include "demangle.h"
|
||||
#include "valprint.h"
|
||||
#include "annotate.h"
|
||||
|
||||
extern int asm_demangle; /* Whether to demangle syms in asm printouts */
|
||||
extern int addressprint; /* Whether to print hex addresses in HLL " */
|
||||
@@ -826,34 +827,26 @@ print_command_1 (exp, inspect, voidprint)
|
||||
{
|
||||
int histindex = record_latest_value (val);
|
||||
|
||||
if (annotation_level > 1)
|
||||
{
|
||||
if (histindex >= 0)
|
||||
printf_filtered ("\n\032\032value-history-begin %d ", histindex);
|
||||
else
|
||||
printf_filtered ("\n\032\032value-begin ");
|
||||
print_value_flags (VALUE_TYPE (val));
|
||||
printf_filtered ("\n");
|
||||
}
|
||||
if (histindex >= 0)
|
||||
annotate_value_history_begin (histindex, VALUE_TYPE (val));
|
||||
else
|
||||
annotate_value_begin (VALUE_TYPE (val));
|
||||
|
||||
if (inspect)
|
||||
printf_unfiltered ("\031(gdb-makebuffer \"%s\" %d '(\"", exp, histindex);
|
||||
else
|
||||
if (histindex >= 0) printf_filtered ("$%d = ", histindex);
|
||||
|
||||
if (annotation_level > 1 && histindex >= 0)
|
||||
printf_filtered ("\n\032\032value-history-value\n");
|
||||
if (histindex >= 0)
|
||||
annotate_value_history_value ();
|
||||
|
||||
print_formatted (val, format, fmt.size);
|
||||
printf_filtered ("\n");
|
||||
|
||||
if (annotation_level > 1)
|
||||
{
|
||||
if (histindex >= 0)
|
||||
printf_filtered ("\n\032\032value-history-end\n");
|
||||
else
|
||||
printf_filtered ("\n\032\032value-end\n");
|
||||
}
|
||||
if (histindex >= 0)
|
||||
annotate_value_history_end ();
|
||||
else
|
||||
annotate_value_end ();
|
||||
|
||||
if (inspect)
|
||||
printf_unfiltered("\") )\030");
|
||||
@@ -920,17 +913,11 @@ output_command (exp, from_tty)
|
||||
|
||||
val = evaluate_expression (expr);
|
||||
|
||||
if (annotation_level > 1)
|
||||
{
|
||||
printf_filtered ("\n\032\032value-begin ");
|
||||
print_value_flags (VALUE_TYPE (val));
|
||||
printf_filtered ("\n");
|
||||
}
|
||||
annotate_value_begin (VALUE_TYPE (val));
|
||||
|
||||
print_formatted (val, format, fmt.size);
|
||||
|
||||
if (annotation_level > 1)
|
||||
printf_filtered ("\n\032\032value-end\n");
|
||||
annotate_value_end ();
|
||||
|
||||
do_cleanups (old_chain);
|
||||
}
|
||||
@@ -1313,11 +1300,16 @@ do_one_display (d)
|
||||
|
||||
current_display_number = d->number;
|
||||
|
||||
printf_filtered ("%d: ", d->number);
|
||||
annotate_display_begin ();
|
||||
printf_filtered ("%d", d->number);
|
||||
annotate_display_number_end ();
|
||||
printf_filtered (": ");
|
||||
if (d->format.size)
|
||||
{
|
||||
CORE_ADDR addr;
|
||||
|
||||
|
||||
annotate_display_format ();
|
||||
|
||||
printf_filtered ("x/");
|
||||
if (d->format.count != 1)
|
||||
printf_filtered ("%d", d->format.count);
|
||||
@@ -1325,7 +1317,12 @@ do_one_display (d)
|
||||
if (d->format.format != 'i' && d->format.format != 's')
|
||||
printf_filtered ("%c", d->format.size);
|
||||
printf_filtered (" ");
|
||||
|
||||
annotate_display_expression ();
|
||||
|
||||
print_expression (d->exp, gdb_stdout);
|
||||
annotate_display_expression_end ();
|
||||
|
||||
if (d->format.count != 1)
|
||||
printf_filtered ("\n");
|
||||
else
|
||||
@@ -1334,20 +1331,34 @@ do_one_display (d)
|
||||
addr = value_as_pointer (evaluate_expression (d->exp));
|
||||
if (d->format.format == 'i')
|
||||
addr = ADDR_BITS_REMOVE (addr);
|
||||
|
||||
|
||||
annotate_display_value ();
|
||||
|
||||
do_examine (d->format, addr);
|
||||
}
|
||||
else
|
||||
{
|
||||
annotate_display_format ();
|
||||
|
||||
if (d->format.format)
|
||||
printf_filtered ("/%c ", d->format.format);
|
||||
|
||||
annotate_display_expression ();
|
||||
|
||||
print_expression (d->exp, gdb_stdout);
|
||||
annotate_display_expression_end ();
|
||||
|
||||
printf_filtered (" = ");
|
||||
|
||||
annotate_display_expression ();
|
||||
|
||||
print_formatted (evaluate_expression (d->exp),
|
||||
d->format.format, d->format.size);
|
||||
printf_filtered ("\n");
|
||||
}
|
||||
|
||||
annotate_display_end ();
|
||||
|
||||
gdb_flush (gdb_stdout);
|
||||
current_display_number = -1;
|
||||
}
|
||||
@@ -1646,13 +1657,11 @@ print_frame_args (func, fi, num, stream)
|
||||
fprintf_filtered (stream, ", ");
|
||||
wrap_here (" ");
|
||||
|
||||
if (annotation_level > 1)
|
||||
printf_filtered ("\n\032\032arg-begin\n");
|
||||
annotate_arg_begin ();
|
||||
|
||||
fprintf_symbol_filtered (stream, SYMBOL_SOURCE_NAME (sym),
|
||||
SYMBOL_LANGUAGE (sym), DMGL_PARAMS | DMGL_ANSI);
|
||||
if (annotation_level > 1)
|
||||
printf_filtered ("\n\032\032arg-name-end\n");
|
||||
annotate_arg_name_end ();
|
||||
fputs_filtered ("=", stream);
|
||||
|
||||
/* Avoid value_print because it will deref ref parameters. We just
|
||||
@@ -1662,12 +1671,7 @@ print_frame_args (func, fi, num, stream)
|
||||
2 for each recurse. */
|
||||
val = read_var_value (sym, FRAME_INFO_ID (fi));
|
||||
|
||||
if (annotation_level > 1)
|
||||
{
|
||||
printf_filtered ("\n\032\032arg-value ");
|
||||
print_value_flags (val == NULL ? NULL : VALUE_TYPE (val));
|
||||
printf_filtered ("\n");
|
||||
}
|
||||
annotate_arg_value (val == NULL ? NULL : VALUE_TYPE (val));
|
||||
|
||||
if (val)
|
||||
val_print (VALUE_TYPE (val), VALUE_CONTENTS (val), VALUE_ADDRESS (val),
|
||||
@@ -1675,8 +1679,7 @@ print_frame_args (func, fi, num, stream)
|
||||
else
|
||||
fputs_filtered ("???", stream);
|
||||
|
||||
if (annotation_level > 1)
|
||||
printf_filtered ("\n\032\032arg-end\n");
|
||||
annotate_arg_end ();
|
||||
|
||||
first = 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user