From patchwork Fri May 20 15:12:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 12417 Received: (qmail 68160 invoked by alias); 20 May 2016 15:13:08 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 67867 invoked by uid 89); 20 May 2016 15:13:04 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.5 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:3295 X-HELO: mail-pf0-f195.google.com Received: from mail-pf0-f195.google.com (HELO mail-pf0-f195.google.com) (209.85.192.195) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Fri, 20 May 2016 15:13:00 +0000 Received: by mail-pf0-f195.google.com with SMTP id y7so11615253pfb.0 for ; Fri, 20 May 2016 08:13:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=uYIDBnlUN+S7uKL5liFb/G4YbSXKyWFXStObkindPQk=; b=Uc+nt6DImGlSrxukhc9XFjAJH8dQ9IBT4mq+dMOEk33M4hKC+3gUwT4LxZeoPBCQRD jclzxljFeBG40++Egk005jGMdQJOsz7xqrOUbRay7qTUroVv0RfFheNhre+0egy3mNhu 3JJ5jzczUWD1xcUSi7gnnGLez2Ry/AKRXPPlJ+MRbbLfMDZen6/QnGcsXY2PfkH7K6G5 rCcB9SUBZyXHl0Hl3udEPj5IfxILhw7CDyoGhxinF4x2yveSacprP6rKEaORJVL3dW48 NRQ/PcAVWjdqlC6yQf3ggiS+B1+3R6kIaY7vi/2LBvLFj2mQewpE5bKsx28cSDtFx6FQ j94A== X-Gm-Message-State: AOPr4FUO2Ixr/VIKGUaajMjJMB06pqXMcjAp3NNdiwnD72ttspSyG9t78OCyISSeo250sQ== X-Received: by 10.98.18.195 with SMTP id 64mr5621523pfs.152.1463757178407; Fri, 20 May 2016 08:12:58 -0700 (PDT) Received: from E107787-LIN.cambridge.arm.com (gcc113.osuosl.org. [140.211.9.71]) by smtp.gmail.com with ESMTPSA id p80sm27985272pfj.58.2016.05.20.08.12.57 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 May 2016 08:12:57 -0700 (PDT) From: Yao Qi X-Google-Original-From: Yao Qi To: gdb-patches@sourceware.org Subject: [PATCH 5/8] Refactor clone_all_breakpoints Date: Fri, 20 May 2016 16:12:38 +0100 Message-Id: <1463757161-25850-6-git-send-email-yao.qi@linaro.org> In-Reply-To: <1463757161-25850-1-git-send-email-yao.qi@linaro.org> References: <1463757161-25850-1-git-send-email-yao.qi@linaro.org> X-IsSubscribed: yes 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 * 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 */