Remove unused variables

This patch removes set-but-unused variables.  This holds all the
removals I consider to be simple and relatively uncontroversial.

2016-07-14  Tom Tromey  <tom@tromey.com>

	* mips-tdep.c (micromips_scan_prologue): Remove "frame_addr".
	(mips_o32_push_dummy_call): Remove "stack_used_p".
	* aarch64-tdep.c (aarch64_record_data_proc_imm): Remove
	"insn_bit28".
	* rust-lang.c (rust_print_type): Remove "len".
	* rust-exp.y (super_name): Remove "current_len".
	* python/py-framefilter.c (py_print_type): Remove "type".
	* mdebugread.c (parse_partial_symbols): Remove
	"past_first_source_file".
	<N_SO>: Remove "valu", "first_so_symnum", "prev_textlow_not_set".
	* m2-valprint.c (m2_print_unbounded_array): Remove
	"content_type".
	(m2_val_print): Remove "i".
	* linespec.c (unexpected_linespec_error): Remove "cleanup".
	* f-valprint.c (f_val_print): Remove "i".
	* elfread.c (elf_symtab_read): Remove "offset".
	* dwarf2-frame.c (dwarf2_fetch_cfa_info): Remove "addr_size".
	* jit.c (jit_dealloc_cache): Remove "i" and "frame_arch".
This commit is contained in:
Tom Tromey 2016-06-06 14:18:30 -06:00
parent ac29888840
commit 78cc6c2d9a
13 changed files with 29 additions and 55 deletions

View file

@ -1,3 +1,24 @@
2016-07-14 Tom Tromey <tom@tromey.com>
* mips-tdep.c (micromips_scan_prologue): Remove "frame_addr".
(mips_o32_push_dummy_call): Remove "stack_used_p".
* aarch64-tdep.c (aarch64_record_data_proc_imm): Remove
"insn_bit28".
* rust-lang.c (rust_print_type): Remove "len".
* rust-exp.y (super_name): Remove "current_len".
* python/py-framefilter.c (py_print_type): Remove "type".
* mdebugread.c (parse_partial_symbols): Remove
"past_first_source_file".
<N_SO>: Remove "valu", "first_so_symnum", "prev_textlow_not_set".
* m2-valprint.c (m2_print_unbounded_array): Remove
"content_type".
(m2_val_print): Remove "i".
* linespec.c (unexpected_linespec_error): Remove "cleanup".
* f-valprint.c (f_val_print): Remove "i".
* elfread.c (elf_symtab_read): Remove "offset".
* dwarf2-frame.c (dwarf2_fetch_cfa_info): Remove "addr_size".
* jit.c (jit_dealloc_cache): Remove "i" and "frame_arch".
2016-07-14 Tom Tromey <tom@tromey.com> 2016-07-14 Tom Tromey <tom@tromey.com>
* arch-utils.c (default_skip_permanent_breakpoint): Remove * arch-utils.c (default_skip_permanent_breakpoint): Remove

View file

@ -2981,11 +2981,10 @@ aarch64_record_data_proc_reg (insn_decode_record *aarch64_insn_r)
static unsigned int static unsigned int
aarch64_record_data_proc_imm (insn_decode_record *aarch64_insn_r) aarch64_record_data_proc_imm (insn_decode_record *aarch64_insn_r)
{ {
uint8_t reg_rd, insn_bit28, insn_bit23, insn_bits24_27, setflags; uint8_t reg_rd, insn_bit23, insn_bits24_27, setflags;
uint32_t record_buf[4]; uint32_t record_buf[4];
reg_rd = bits (aarch64_insn_r->aarch64_insn, 0, 4); reg_rd = bits (aarch64_insn_r->aarch64_insn, 0, 4);
insn_bit28 = bit (aarch64_insn_r->aarch64_insn, 28);
insn_bit23 = bit (aarch64_insn_r->aarch64_insn, 23); insn_bit23 = bit (aarch64_insn_r->aarch64_insn, 23);
insn_bits24_27 = bits (aarch64_insn_r->aarch64_insn, 24, 27); insn_bits24_27 = bits (aarch64_insn_r->aarch64_insn, 24, 27);

View file

@ -908,7 +908,6 @@ dwarf2_fetch_cfa_info (struct gdbarch *gdbarch, CORE_ADDR pc,
struct dwarf2_fde *fde; struct dwarf2_fde *fde;
CORE_ADDR text_offset; CORE_ADDR text_offset;
struct dwarf2_frame_state fs; struct dwarf2_frame_state fs;
int addr_size;
memset (&fs, 0, sizeof (struct dwarf2_frame_state)); memset (&fs, 0, sizeof (struct dwarf2_frame_state));
@ -923,7 +922,6 @@ dwarf2_fetch_cfa_info (struct gdbarch *gdbarch, CORE_ADDR pc,
fs.data_align = fde->cie->data_alignment_factor; fs.data_align = fde->cie->data_alignment_factor;
fs.code_align = fde->cie->code_alignment_factor; fs.code_align = fde->cie->code_alignment_factor;
fs.retaddr_column = fde->cie->return_address_register; fs.retaddr_column = fde->cie->return_address_register;
addr_size = fde->cie->addr_size;
/* Check for "quirks" - known bugs in producers. */ /* Check for "quirks" - known bugs in producers. */
dwarf2_frame_find_quirks (&fs, fde); dwarf2_frame_find_quirks (&fs, fde);

View file

@ -233,7 +233,6 @@ elf_symtab_read (struct objfile *objfile, int type,
asymbol *sym; asymbol *sym;
long i; long i;
CORE_ADDR symaddr; CORE_ADDR symaddr;
CORE_ADDR offset;
enum minimal_symbol_type ms_type; enum minimal_symbol_type ms_type;
/* Name of the last file symbol. This is either a constant string or is /* Name of the last file symbol. This is either a constant string or is
saved on the objfile's filename cache. */ saved on the objfile's filename cache. */
@ -263,8 +262,6 @@ elf_symtab_read (struct objfile *objfile, int type,
continue; continue;
} }
offset = ANOFFSET (objfile->section_offsets,
gdb_bfd_section_index (objfile->obfd, sym->section));
if (type == ST_DYNAMIC if (type == ST_DYNAMIC
&& sym->section == bfd_und_section_ptr && sym->section == bfd_und_section_ptr
&& (sym->flags & BSF_FUNCTION)) && (sym->flags & BSF_FUNCTION))

View file

@ -218,7 +218,6 @@ f_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
{ {
struct gdbarch *gdbarch = get_type_arch (type); struct gdbarch *gdbarch = get_type_arch (type);
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
unsigned int i = 0; /* Number of characters printed. */
int printed_field = 0; /* Number of fields printed. */ int printed_field = 0; /* Number of fields printed. */
struct type *elttype; struct type *elttype;
CORE_ADDR addr; CORE_ADDR addr;
@ -293,7 +292,7 @@ f_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
{ {
if (want_space) if (want_space)
fputs_filtered (" ", stream); fputs_filtered (" ", stream);
i = val_print_string (TYPE_TARGET_TYPE (type), NULL, addr, -1, val_print_string (TYPE_TARGET_TYPE (type), NULL, addr, -1,
stream, options); stream, options);
} }
return; return;

View file

@ -1171,12 +1171,8 @@ static void
jit_dealloc_cache (struct frame_info *this_frame, void *cache) jit_dealloc_cache (struct frame_info *this_frame, void *cache)
{ {
struct jit_unwind_private *priv_data = (struct jit_unwind_private *) cache; struct jit_unwind_private *priv_data = (struct jit_unwind_private *) cache;
struct gdbarch *frame_arch;
int i;
gdb_assert (priv_data->regcache != NULL); gdb_assert (priv_data->regcache != NULL);
frame_arch = get_frame_arch (priv_data->this_frame);
regcache_xfree (priv_data->regcache); regcache_xfree (priv_data->regcache);
xfree (priv_data); xfree (priv_data);
} }

View file

@ -1519,10 +1519,9 @@ unexpected_linespec_error (linespec_parser *parser)
|| token.type == LSTOKEN_KEYWORD) || token.type == LSTOKEN_KEYWORD)
{ {
char *string; char *string;
struct cleanup *cleanup;
string = copy_token_string (token); string = copy_token_string (token);
cleanup = make_cleanup (xfree, string); make_cleanup (xfree, string);
throw_error (GENERIC_ERROR, throw_error (GENERIC_ERROR,
_("malformed linespec error: unexpected %s, \"%s\""), _("malformed linespec error: unexpected %s, \"%s\""),
token_type_strings[token.type], string); token_type_strings[token.type], string);

View file

@ -162,13 +162,11 @@ m2_print_unbounded_array (struct type *type, const gdb_byte *valaddr,
struct ui_file *stream, int recurse, struct ui_file *stream, int recurse,
const struct value_print_options *options) const struct value_print_options *options)
{ {
struct type *content_type;
CORE_ADDR addr; CORE_ADDR addr;
LONGEST len; LONGEST len;
struct value *val; struct value *val;
type = check_typedef (type); type = check_typedef (type);
content_type = TYPE_TARGET_TYPE (TYPE_FIELD_TYPE (type, 0));
addr = unpack_pointer (TYPE_FIELD_TYPE (type, 0), addr = unpack_pointer (TYPE_FIELD_TYPE (type, 0),
(TYPE_FIELD_BITPOS (type, 0) / 8) + (TYPE_FIELD_BITPOS (type, 0) / 8) +
@ -316,7 +314,6 @@ m2_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
const struct value_print_options *options) const struct value_print_options *options)
{ {
struct gdbarch *gdbarch = get_type_arch (type); struct gdbarch *gdbarch = get_type_arch (type);
unsigned int i = 0; /* Number of characters printed. */
unsigned len; unsigned len;
struct type *elttype; struct type *elttype;
CORE_ADDR addr; CORE_ADDR addr;
@ -355,7 +352,6 @@ m2_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
LA_PRINT_STRING (stream, TYPE_TARGET_TYPE (type), LA_PRINT_STRING (stream, TYPE_TARGET_TYPE (type),
valaddr + embedded_offset, len, NULL, valaddr + embedded_offset, len, NULL,
0, options); 0, options);
i = len;
} }
else else
{ {

View file

@ -2368,7 +2368,6 @@ parse_partial_symbols (struct objfile *objfile)
SYMR sh; SYMR sh;
struct partial_symtab *pst; struct partial_symtab *pst;
int textlow_not_set = 1; int textlow_not_set = 1;
int past_first_source_file = 0;
/* List of current psymtab's include files. */ /* List of current psymtab's include files. */
const char **psymtab_include_list; const char **psymtab_include_list;
@ -2957,16 +2956,8 @@ parse_partial_symbols (struct objfile *objfile)
case N_SO: case N_SO:
{ {
CORE_ADDR valu;
static int prev_so_symnum = -10; static int prev_so_symnum = -10;
static int first_so_symnum;
const char *p; const char *p;
int prev_textlow_not_set;
valu = sh.value + ANOFFSET (objfile->section_offsets,
SECT_OFF_TEXT (objfile));
prev_textlow_not_set = textlow_not_set;
/* A zero value is probably an indication for the /* A zero value is probably an indication for the
SunPRO 3.0 compiler. dbx_end_psymtab explicitly tests SunPRO 3.0 compiler. dbx_end_psymtab explicitly tests
@ -2974,19 +2965,12 @@ parse_partial_symbols (struct objfile *objfile)
if (sh.value == 0 if (sh.value == 0
&& gdbarch_sofun_address_maybe_missing (gdbarch)) && gdbarch_sofun_address_maybe_missing (gdbarch))
{
textlow_not_set = 1; textlow_not_set = 1;
valu = 0;
}
else else
textlow_not_set = 0; textlow_not_set = 0;
past_first_source_file = 1;
if (prev_so_symnum != symnum - 1) if (prev_so_symnum != symnum - 1)
{ /* Here if prev stab wasn't N_SO. */ { /* Here if prev stab wasn't N_SO. */
first_so_symnum = symnum;
if (pst) if (pst)
{ {
pst = (struct partial_symtab *) 0; pst = (struct partial_symtab *) 0;

View file

@ -2939,7 +2939,6 @@ micromips_scan_prologue (struct gdbarch *gdbarch,
int non_prologue_insns = 0; int non_prologue_insns = 0;
long frame_offset = 0; /* Size of stack frame. */ long frame_offset = 0; /* Size of stack frame. */
long frame_adjust = 0; /* Offset of FP from SP. */ long frame_adjust = 0; /* Offset of FP from SP. */
CORE_ADDR frame_addr = 0; /* Value of $30, used as frame pointer. */
int prev_delay_slot = 0; int prev_delay_slot = 0;
int in_delay_slot; int in_delay_slot;
CORE_ADDR prev_pc; CORE_ADDR prev_pc;
@ -3068,7 +3067,6 @@ micromips_scan_prologue (struct gdbarch *gdbarch,
else if (sreg == MIPS_SP_REGNUM && dreg == 30) else if (sreg == MIPS_SP_REGNUM && dreg == 30)
/* (D)ADDIU $fp, $sp, imm */ /* (D)ADDIU $fp, $sp, imm */
{ {
frame_addr = sp + offset;
frame_adjust = offset; frame_adjust = offset;
frame_reg = 30; frame_reg = 30;
} }
@ -3144,10 +3142,7 @@ micromips_scan_prologue (struct gdbarch *gdbarch,
dreg = b5s5_reg (insn); dreg = b5s5_reg (insn);
if (sreg == MIPS_SP_REGNUM && dreg == 30) if (sreg == MIPS_SP_REGNUM && dreg == 30)
/* MOVE $fp, $sp */ /* MOVE $fp, $sp */
{
frame_addr = sp;
frame_reg = 30; frame_reg = 30;
}
else if ((sreg & 0x1c) != 0x4) else if ((sreg & 0x1c) != 0x4)
/* MOVE reg, $a0-$a3 */ /* MOVE reg, $a0-$a3 */
this_non_prologue_insn = 1; this_non_prologue_insn = 1;
@ -5502,8 +5497,6 @@ mips_o32_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
} }
while (len > 0) while (len > 0)
{ {
/* Remember if the argument was written to the stack. */
int stack_used_p = 0;
int partial_len = (len < MIPS32_REGSIZE ? len : MIPS32_REGSIZE); int partial_len = (len < MIPS32_REGSIZE ? len : MIPS32_REGSIZE);
if (mips_debug) if (mips_debug)
@ -5518,7 +5511,6 @@ mips_o32_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
promoted to int before being stored? */ promoted to int before being stored? */
int longword_offset = 0; int longword_offset = 0;
CORE_ADDR addr; CORE_ADDR addr;
stack_used_p = 1;
if (mips_debug) if (mips_debug)
{ {
@ -5960,8 +5952,6 @@ mips_o64_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
&& len % MIPS64_REGSIZE != 0); && len % MIPS64_REGSIZE != 0);
while (len > 0) while (len > 0)
{ {
/* Remember if the argument was written to the stack. */
int stack_used_p = 0;
int partial_len = (len < MIPS64_REGSIZE ? len : MIPS64_REGSIZE); int partial_len = (len < MIPS64_REGSIZE ? len : MIPS64_REGSIZE);
if (mips_debug) if (mips_debug)
@ -5976,7 +5966,6 @@ mips_o64_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
promoted to int before being stored? */ promoted to int before being stored? */
int longword_offset = 0; int longword_offset = 0;
CORE_ADDR addr; CORE_ADDR addr;
stack_used_p = 1;
if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG) if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG)
{ {
if ((typecode == TYPE_CODE_INT if ((typecode == TYPE_CODE_INT

View file

@ -211,13 +211,12 @@ py_print_type (struct ui_out *out, struct value *val)
TRY TRY
{ {
struct type *type;
struct ui_file *stb; struct ui_file *stb;
struct cleanup *cleanup; struct cleanup *cleanup;
stb = mem_fileopen (); stb = mem_fileopen ();
cleanup = make_cleanup_ui_file_delete (stb); cleanup = make_cleanup_ui_file_delete (stb);
type = check_typedef (value_type (val)); check_typedef (value_type (val));
type_print (value_type (val), "", stb, -1); type_print (value_type (val), "", stb, -1);
ui_out_field_stream (out, "type", stb); ui_out_field_stream (out, "type", stb);
do_cleanups (cleanup); do_cleanups (cleanup);

View file

@ -968,17 +968,15 @@ super_name (const struct rust_op *ident, unsigned int n_supers)
int i; int i;
int len; int len;
VEC (int) *offsets = NULL; VEC (int) *offsets = NULL;
unsigned int current_len, previous_len; unsigned int current_len;
struct cleanup *cleanup; struct cleanup *cleanup;
cleanup = make_cleanup (VEC_cleanup (int), &offsets); cleanup = make_cleanup (VEC_cleanup (int), &offsets);
current_len = cp_find_first_component (scope); current_len = cp_find_first_component (scope);
previous_len = 0;
while (scope[current_len] != '\0') while (scope[current_len] != '\0')
{ {
VEC_safe_push (int, offsets, current_len); VEC_safe_push (int, offsets, current_len);
gdb_assert (scope[current_len] == ':'); gdb_assert (scope[current_len] == ':');
previous_len = current_len;
/* The "::". */ /* The "::". */
current_len += 2; current_len += 2;
current_len += cp_find_first_component (scope current_len += cp_find_first_component (scope

View file

@ -888,7 +888,6 @@ rust_print_type (struct type *type, const char *varstring,
{ {
fputs_filtered (TYPE_TAG_NAME (type), stream); fputs_filtered (TYPE_TAG_NAME (type), stream);
fputs_filtered (" ", stream); fputs_filtered (" ", stream);
len = strlen (TYPE_TAG_NAME (type));
} }
fputs_filtered ("{\n", stream); fputs_filtered ("{\n", stream);