[PATCH 5/8] Refactor clone_all_breakpoints

Yao Qi
2016-05-20T15:13:08Z

This patch is to change the interface of clone_all_breakpoints, from
lists of breakpoints and raw_breakpoints to child thread and parent
process. I choose child thread to pass because we need the ptid of
the child thread in the following patch.

gdb/gdbserver:

2016-05-20 Yao Qi <yao.qi@linaro.org>

* mem-break.c (clone_all_breakpoints): Remove all parameters.
Add new parameters child_thread and parent_proc. Callers
updated.
* mem-break.h (clone_all_breakpoints): Update declaration.
---
gdb/gdbserver/linux-low.c | 4 +---
gdb/gdbserver/mem-break.c | 14 +++++++-------
gdb/gdbserver/mem-break.h | 8 ++++----
3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
index a63cc7a..539d787 100644
--- a/gdb/gdbserver/linux-low.c
+++ b/gdb/gdbserver/linux-low.c
@@ -542,9 +542,7 @@ handle_extended_wait (struct lwp_info **orig_event_lwp, int wstat)

parent_proc = get_thread_process (event_thr);
child_proc->attached = parent_proc->attached;
- clone_all_breakpoints (&child_proc->breakpoints,
- &child_proc->raw_breakpoints,
- parent_proc->breakpoints);
+ clone_all_breakpoints (child_thr, parent_proc);

tdesc = XNEW (struct target_desc);
copy_target_description (tdesc, parent_proc->tdesc);
diff --git a/gdb/gdbserver/mem-break.c b/gdb/gdbserver/mem-break.c
index 1fe1d20..4e45c0e 100644
--- a/gdb/gdbserver/mem-break.c
+++ b/gdb/gdbserver/mem-break.c
@@ -2141,21 +2141,21 @@ clone_one_breakpoint (const struct breakpoint *src)
return dest;
}

-/* Create a new breakpoint list NEW_LIST that is a copy of the
- list starting at SRC_LIST. Create the corresponding new
- raw_breakpoint list NEW_RAW_LIST as well. */
+/* See mem-break.h. */

void
-clone_all_breakpoints (struct breakpoint **new_list,
- struct raw_breakpoint **new_raw_list,
- const struct breakpoint *src_list)
+clone_all_breakpoints (struct thread_info *child_thread,
+ struct process_info *parent_proc)
{
const struct breakpoint *bp;
struct breakpoint *new_bkpt;
struct breakpoint *bkpt_tail = NULL;
struct raw_breakpoint *raw_bkpt_tail = NULL;
+ struct process_info *child_proc = get_thread_process (child_thread);
+ struct breakpoint **new_list = &child_proc->breakpoints;
+ struct raw_breakpoint **new_raw_list = &child_proc->raw_breakpoints;

- for (bp = src_list; bp != NULL; bp = bp->next)
+ for (bp = parent_proc->breakpoints; bp != NULL; bp = bp->next)
{
new_bkpt = clone_one_breakpoint (bp);
APPEND_TO_LIST (new_list, new_bkpt, bkpt_tail);
diff --git a/gdb/gdbserver/mem-break.h b/gdb/gdbserver/mem-break.h
index 280e4f8..757399a 100644
--- a/gdb/gdbserver/mem-break.h
+++ b/gdb/gdbserver/mem-break.h
@@ -258,10 +258,10 @@ int insert_memory_breakpoint (struct raw_breakpoint *bp);

int remove_memory_breakpoint (struct raw_breakpoint *bp);

-/* Create a new breakpoint list NEW_BKPT_LIST that is a copy of SRC. */
+/* Create a new breakpoint list in CHILD_THREAD's process that is a
+ copy of breakpoint list in PARENT_PROC. */

-void clone_all_breakpoints (struct breakpoint **new_bkpt_list,
- struct raw_breakpoint **new_raw_bkpt_list,
- const struct breakpoint *src);
+void clone_all_breakpoints (struct thread_info *child_thread,
+ struct process_info *parent_proc);

#endif /* MEM_BREAK_H */
--
1.9.1