aboutsummaryrefslogtreecommitdiff
path: root/gdb/target.h
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2013-07-25 14:34:51 +0000
committerTom Tromey <tromey@redhat.com>2013-07-25 14:34:51 +0000
commit7fdc15218d384617a3aad142cfeca0594a7c5ff2 (patch)
tree79400605229edd964c75d69e0fea1e966fcd3ea7 /gdb/target.h
parentc22a2b88fe63d857110e9c86f3775e55197c9a04 (diff)
downloadgdb-7fdc15218d384617a3aad142cfeca0594a7c5ff2.zip
gdb-7fdc15218d384617a3aad142cfeca0594a7c5ff2.tar.gz
gdb-7fdc15218d384617a3aad142cfeca0594a7c5ff2.tar.bz2
remove pop_target
This patch fixes the target double-close problem (PR remote/15266), and in the process removes pop_target entire (PR remote/15256). The first issue is that pop_target calls target_close. However, it then calls unpush_target, which also calls target_close. This means targets must be able to be closed twice. Not only is this strange, but it also directly contradicts the contract of to_xclose targets. (We currently have just a single such target, and it is never pushed; but I plan to add more, and so this latent bug is triggered.) The second issue is that it seems to me that calling pop_target is often unsafe. This is what cropped up in 15256, where the remote target assumed that it could pop_target -- but there was another target higher on the stack, leading to confusion. But, it is always just as easy to call unpush_target as it is to call pop_target; and it is also safer. So, removing pop_target seemed like an improvement. Finally, this adds an assertion to target_close to ensure that no currently-pushed target can be closed. Built and regtested on x86-64 Fedora 18; both natively and using the native-gdbserver board file. PR remote/15256, PR remote/15266: * bfd-target.c (target_bfd_reopen): Initialize to_magic. * monitor.c (monitor_detach): Use unpush_target. * remote-m32r-sdi.c (m32r_detach): Use unpush_target. * remote-mips.c (mips_detach): Use unpush_target. Don't call mips_close. * remote-sim.c (gdbsim_detach): Use unpush_target. * target.c (pop_target): Remove. (pop_all_targets_above): Don't call target_close. (target_close): Assert that the target is unpushed. * target.h (pop_target): Don't declare. * tracepoint.c (tfile_open): Use unpush_target.
Diffstat (limited to 'gdb/target.h')
-rw-r--r--gdb/target.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/gdb/target.h b/gdb/target.h
index 1cf198f..1d73bcd 100644
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -1759,9 +1759,7 @@ int target_verify_memory (const gdb_byte *data,
unpush_target: Remove this from the stack of currently used targets,
no matter where it is on the list. Returns 0 if no
- change, 1 if removed from stack.
-
- pop_target: Remove the top thing on the stack of current targets. */
+ change, 1 if removed from stack. */
extern void add_target (struct target_ops *);
@@ -1783,8 +1781,6 @@ extern void target_pre_inferior (int);
extern void target_preopen (int);
-extern void pop_target (void);
-
/* Does whatever cleanup is required to get rid of all pushed targets. */
extern void pop_all_targets (void);