From cf4088a92f240b01e6db8f39a5a3abfa918f6f2c Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Sun, 22 Jul 2018 23:23:11 -0400 Subject: [PATCH] Remove some unused variables Found using the newly-enabled -Wunused-variable. gdb/ChangeLog: * aarch64-linux-nat.c (aarch64_linux_nat_target::stopped_data_address): Remove unused variable. * arm-linux-nat.c (fetch_regs): Likewise. (store_regs): Likewise. (fetch_vfp_regs): Likewise. (store_vfp_regs): Likewise. (arm_linux_nat_target::insert_hw_breakpoint): Likewise. (arm_linux_nat_target::remove_hw_breakpoint): Likewise. (arm_linux_nat_target::insert_watchpoint): Likewise. (arm_linux_nat_target::remove_watchpoint): Likewise. * mips-linux-nat.c (mips_linux_nat_target::insert_watchpoint): Likewise. * nat/aarch64-sve-linux-ptrace.c (aarch64_sve_get_sveregs): Likewise. * ppc-linux-nat.c (fetch_register): Likewise. (fetch_all_gp_regs): Likewise. (fetch_ppc_registers): Likewise. (store_all_gp_regs): Likewise. (store_ppc_registers): Likewise. (hwdebug_insert_point): Likewise. (can_use_watchpoint_cond_accel): Likewise. * remote-sim.c (gdb_os_write_stdout): Likewise. gdb/gdbserver/ChangeLog: * linux-mips-low.c (mips_collect_ptrace_register): Remove unused variable. (mips_supply_ptrace_register): Likewise. --- gdb/ChangeLog | 26 ++++++++++++++++++++++++++ gdb/aarch64-linux-nat.c | 2 +- gdb/arm-linux-nat.c | 12 ++++-------- gdb/gdbserver/ChangeLog | 6 ++++++ gdb/gdbserver/linux-mips-low.c | 2 -- gdb/mips-linux-nat.c | 1 - gdb/nat/aarch64-sve-linux-ptrace.c | 1 - gdb/ppc-linux-nat.c | 10 ---------- gdb/remote-sim.c | 3 --- 9 files changed, 37 insertions(+), 26 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 388b923e5dc..efa6a5a0a0f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,29 @@ +2018-07-22 Simon Marchi + + * aarch64-linux-nat.c + (aarch64_linux_nat_target::stopped_data_address): Remove unused + variable. + * arm-linux-nat.c (fetch_regs): Likewise. + (store_regs): Likewise. + (fetch_vfp_regs): Likewise. + (store_vfp_regs): Likewise. + (arm_linux_nat_target::insert_hw_breakpoint): Likewise. + (arm_linux_nat_target::remove_hw_breakpoint): Likewise. + (arm_linux_nat_target::insert_watchpoint): Likewise. + (arm_linux_nat_target::remove_watchpoint): Likewise. + * mips-linux-nat.c (mips_linux_nat_target::insert_watchpoint): + Likewise. + * nat/aarch64-sve-linux-ptrace.c (aarch64_sve_get_sveregs): + Likewise. + * ppc-linux-nat.c (fetch_register): Likewise. + (fetch_all_gp_regs): Likewise. + (fetch_ppc_registers): Likewise. + (store_all_gp_regs): Likewise. + (store_ppc_registers): Likewise. + (hwdebug_insert_point): Likewise. + (can_use_watchpoint_cond_accel): Likewise. + * remote-sim.c (gdb_os_write_stdout): Likewise. + 2018-07-22 Simon Marchi Tom Tromey diff --git a/gdb/aarch64-linux-nat.c b/gdb/aarch64-linux-nat.c index 43af99d11d2..678c89029d4 100644 --- a/gdb/aarch64-linux-nat.c +++ b/gdb/aarch64-linux-nat.c @@ -819,7 +819,7 @@ bool aarch64_linux_nat_target::stopped_data_address (CORE_ADDR *addr_p) { siginfo_t siginfo; - int i, tid; + int i; struct aarch64_debug_reg_state *state; if (!linux_nat_get_siginfo (inferior_ptid, &siginfo)) diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c index 3c552ecde26..7d287c65680 100644 --- a/gdb/arm-linux-nat.c +++ b/gdb/arm-linux-nat.c @@ -205,7 +205,7 @@ store_fpregs (const struct regcache *regcache) static void fetch_regs (struct regcache *regcache) { - int ret, regno, tid; + int ret, tid; elf_gregset_t regs; /* Get the thread id for the ptrace call. */ @@ -232,7 +232,7 @@ fetch_regs (struct regcache *regcache) static void store_regs (const struct regcache *regcache) { - int ret, regno, tid; + int ret, tid; elf_gregset_t regs; /* Get the thread id for the ptrace call. */ @@ -339,7 +339,7 @@ static void fetch_vfp_regs (struct regcache *regcache) { gdb_byte regbuf[VFP_REGS_SIZE]; - int ret, regno, tid; + int ret, tid; struct gdbarch *gdbarch = regcache->arch (); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); @@ -368,7 +368,7 @@ static void store_vfp_regs (const struct regcache *regcache) { gdb_byte regbuf[VFP_REGS_SIZE]; - int ret, regno, tid; + int ret, tid; struct gdbarch *gdbarch = regcache->arch (); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); @@ -1064,7 +1064,6 @@ int arm_linux_nat_target::insert_hw_breakpoint (struct gdbarch *gdbarch, struct bp_target_info *bp_tgt) { - struct lwp_info *lp; struct arm_linux_hw_breakpoint p; if (arm_linux_get_hw_breakpoint_count () == 0) @@ -1082,7 +1081,6 @@ int arm_linux_nat_target::remove_hw_breakpoint (struct gdbarch *gdbarch, struct bp_target_info *bp_tgt) { - struct lwp_info *lp; struct arm_linux_hw_breakpoint p; if (arm_linux_get_hw_breakpoint_count () == 0) @@ -1134,7 +1132,6 @@ arm_linux_nat_target::insert_watchpoint (CORE_ADDR addr, int len, enum target_hw_bp_type rw, struct expression *cond) { - struct lwp_info *lp; struct arm_linux_hw_breakpoint p; if (arm_linux_get_hw_watchpoint_count () == 0) @@ -1153,7 +1150,6 @@ arm_linux_nat_target::remove_watchpoint (CORE_ADDR addr, int len, enum target_hw_bp_type rw, struct expression *cond) { - struct lwp_info *lp; struct arm_linux_hw_breakpoint p; if (arm_linux_get_hw_watchpoint_count () == 0) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 23369e4abc3..66fc16cea1a 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,9 @@ +2018-07-22 Simon Marchi + + * linux-mips-low.c (mips_collect_ptrace_register): Remove unused + variable. + (mips_supply_ptrace_register): Likewise. + 2018-07-22 Tom Tromey * configure: Rebuild. diff --git a/gdb/gdbserver/linux-mips-low.c b/gdb/gdbserver/linux-mips-low.c index 2194af6c0a5..393488ac5ba 100644 --- a/gdb/gdbserver/linux-mips-low.c +++ b/gdb/gdbserver/linux-mips-low.c @@ -852,7 +852,6 @@ static void mips_collect_ptrace_register (struct regcache *regcache, int regno, char *buf) { - const struct target_desc *tdesc = current_process ()->tdesc; int use_64bit = sizeof (PTRACE_XFER_TYPE) == 8; if (use_64bit && register_size (regcache->tdesc, regno) == 4) @@ -872,7 +871,6 @@ static void mips_supply_ptrace_register (struct regcache *regcache, int regno, const char *buf) { - const struct target_desc *tdesc = current_process ()->tdesc; int use_64bit = sizeof (PTRACE_XFER_TYPE) == 8; if (use_64bit && register_size (regcache->tdesc, regno) == 4) diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c index e37fa4dc302..32835c16b24 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -673,7 +673,6 @@ mips_linux_nat_target::insert_watchpoint (CORE_ADDR addr, int len, struct mips_watchpoint *new_watch; struct mips_watchpoint **pw; - int i; int retval; if (!mips_linux_read_watch_registers (inferior_ptid.lwp (), diff --git a/gdb/nat/aarch64-sve-linux-ptrace.c b/gdb/nat/aarch64-sve-linux-ptrace.c index a2f9261ba6f..7b4027195be 100644 --- a/gdb/nat/aarch64-sve-linux-ptrace.c +++ b/gdb/nat/aarch64-sve-linux-ptrace.c @@ -67,7 +67,6 @@ std::unique_ptr aarch64_sve_get_sveregs (int tid) { struct iovec iovec; - struct user_sve_header header; uint64_t vq = aarch64_sve_get_vq (tid); if (vq == 0) diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c index 9719a0e906d..0b7052d0f6d 100644 --- a/gdb/ppc-linux-nat.c +++ b/gdb/ppc-linux-nat.c @@ -532,11 +532,9 @@ static void fetch_register (struct regcache *regcache, int tid, int regno) { struct gdbarch *gdbarch = regcache->arch (); - struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); /* This isn't really an address. But ptrace thinks of it as one. */ CORE_ADDR regaddr = ppc_register_u_addr (gdbarch, regno); int bytes_transferred; - unsigned int offset; /* Offset of registers within the u area. */ gdb_byte buf[PPC_MAX_REGISTER_SIZE]; if (altivec_register_p (gdbarch, regno)) @@ -630,8 +628,6 @@ fetch_register (struct regcache *regcache, int tid, int regno) static int fetch_all_gp_regs (struct regcache *regcache, int tid) { - struct gdbarch *gdbarch = regcache->arch (); - struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); gdb_gregset_t gregset; if (ptrace (PTRACE_GETREGS, tid, 0, (void *) &gregset) < 0) @@ -728,7 +724,6 @@ fetch_fp_regs (struct regcache *regcache, int tid) static void fetch_ppc_registers (struct regcache *regcache, int tid) { - int i; struct gdbarch *gdbarch = regcache->arch (); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); @@ -1004,8 +999,6 @@ store_register (const struct regcache *regcache, int tid, int regno) static int store_all_gp_regs (const struct regcache *regcache, int tid, int regno) { - struct gdbarch *gdbarch = regcache->arch (); - struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); gdb_gregset_t gregset; if (ptrace (PTRACE_GETREGS, tid, 0, (void *) &gregset) < 0) @@ -1122,7 +1115,6 @@ store_fp_regs (const struct regcache *regcache, int tid, int regno) static void store_ppc_registers (const struct regcache *regcache, int tid) { - int i; struct gdbarch *gdbarch = regcache->arch (); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); @@ -1407,7 +1399,6 @@ hwdebug_insert_point (struct ppc_hw_breakpoint *b, int tid) gdb::unique_xmalloc_ptr p (XDUP (ppc_hw_breakpoint, b)); struct hw_break_tuple *hw_breaks; struct thread_points *t; - struct hw_break_tuple *tuple; errno = 0; slot = ptrace (PPC_PTRACE_SETHWDEBUG, tid, 0, p.get ()); @@ -1627,7 +1618,6 @@ can_use_watchpoint_cond_accel (void) struct thread_points *p; int tid = inferior_ptid.lwp (); int cnt = hwdebug_info.num_condition_regs, i; - CORE_ADDR tmp_value; if (!have_ptrace_hwdebug_interface () || cnt == 0) return 0; diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c index 2900872e767..d30b38ecb7c 100644 --- a/gdb/remote-sim.c +++ b/gdb/remote-sim.c @@ -377,9 +377,6 @@ end_callbacks (void) static int gdb_os_write_stdout (host_callback *p, const char *buf, int len) { - int i; - char b[2]; - ui_file_write (gdb_stdtarg, buf, len); return len; } -- 2.30.2